diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-09-16 12:42:48 -0400 |
---|---|---|
committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-09-16 09:42:48 -0700 |
commit | d50f25ab1e382ec9a8a815eba33c3c87c9611869 (patch) | |
tree | 707540b44d27c0fd8c51d2b95555c454f256fbb0 | |
parent | 64a39c38e34135028d7d73b4d77cf0542bf14e83 (diff) |
purge text label redundancy in data2 (#44)
-rw-r--r-- | asm/rom4.s | 8 | ||||
-rw-r--r-- | asm/rom5.s | 858 | ||||
-rw-r--r-- | asm/rom_8040EB4.s | 98 | ||||
-rw-r--r-- | asm/rom_8065394.s | 142 | ||||
-rw-r--r-- | data/data2.s | 1601 | ||||
-rw-r--r-- | data/multichoice.s | 78 | ||||
-rw-r--r-- | src/link.c | 4 | ||||
-rw-r--r-- | src/main_menu.c | 4 |
8 files changed, 1148 insertions, 1645 deletions
diff --git a/asm/rom4.s b/asm/rom4.s index a80d050b2..c87dfef9e 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -16996,7 +16996,7 @@ sub_805A5CC: @ 805A5CC pop {r1} bx r1 .align 2, 0 -_0805A5F0: .4byte gUnknown_0842C5BB +_0805A5F0: .4byte gOtherText_OhABite thumb_func_end sub_805A5CC thumb_func_start fish7 @@ -17119,7 +17119,7 @@ sub_805A6B4: @ 805A6B4 pop {r1} bx r1 .align 2, 0 -_0805A6D8: .4byte gUnknown_0842C5C7 +_0805A6D8: .4byte gOtherText_PokeOnHook thumb_func_end sub_805A6B4 thumb_func_start sub_805A6DC @@ -17260,7 +17260,7 @@ sub_805A7BC: @ 805A7BC .align 2, 0 _0805A7FC: .4byte 0x0202e858 _0805A800: .4byte 0x02020004 -_0805A804: .4byte gUnknown_0842C5E2 +_0805A804: .4byte gOtherText_NotEvenANibble thumb_func_end sub_805A7BC thumb_func_start sub_805A808 @@ -17296,7 +17296,7 @@ sub_805A808: @ 805A808 .align 2, 0 _0805A84C: .4byte 0x0202e858 _0805A850: .4byte 0x02020004 -_0805A854: .4byte gUnknown_0842C5F9 +_0805A854: .4byte gOtherText_ItGotAway thumb_func_end sub_805A808 thumb_func_start fishD diff --git a/asm/rom5.s b/asm/rom5.s index 5a65a49d8..d70b329a1 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -15777,7 +15777,7 @@ _08082814: pop {r1} bx r1 .align 2, 0 -_08082818: .4byte gUnknown_0840E64C +_08082818: .4byte gOtherText_CancelWithTerminator thumb_func_end ReturnEmptyStringIfNull thumb_func_start sub_808281C @@ -16523,7 +16523,7 @@ sub_8082D18: @ 8082D18 bx r0 .align 2, 0 _08082D44: .4byte 0x020231cc -_08082D48: .4byte gUnknown_0842D2BC +_08082D48: .4byte gOtherText_PLink thumb_func_end sub_8082D18 thumb_func_start sub_8082D4C @@ -32708,7 +32708,7 @@ _0808A9DC: b _0808AADA .align 2, 0 _0808AA20: .4byte 0x00000807 -_0808AA24: .4byte gUnknown_0840F090 +_0808AA24: .4byte gOtherText_CantBeUsedBadge _0808AA28: .4byte sub_808AAF0 _0808AA2C: ldr r1, _0808AA78 @@ -34599,14 +34599,14 @@ _0808B962: _0808B96C: .4byte sub_808B9C4 _0808B970: .4byte 0x03004b20 _0808B974: .4byte gSaveBlock2 -_0808B978: .4byte gUnknown_0842C3A6 -_0808B97C: .4byte gUnknown_0842C3B0 -_0808B980: .4byte gUnknown_0842C3BE -_0808B984: .4byte gUnknown_0842C3CE -_0808B988: .4byte gUnknown_0842C3DE -_0808B98C: .4byte gUnknown_0842C3FA -_0808B990: .4byte gUnknown_0842C3E7 -_0808B994: .4byte gUnknown_0842C3F0 +_0808B978: .4byte gSystemText_OptionMenu +_0808B97C: .4byte gSystemText_TextSpeed +_0808B980: .4byte gSystemText_BattleScene +_0808B984: .4byte gSystemText_BattleStyle +_0808B988: .4byte gSystemText_Sound +_0808B98C: .4byte gSystemText_ButtonMode +_0808B990: .4byte gSystemText_Frame +_0808B994: .4byte gSystemText_Cancel _0808B998: .4byte REG_WIN0H _0808B99C: .4byte 0x000011df _0808B9A0: .4byte 0x0000011f @@ -35092,9 +35092,9 @@ sub_808BCF8: @ 808BCF8 pop {r0} bx r0 .align 2, 0 -_0808BD40: .4byte gUnknown_0842C409 -_0808BD44: .4byte gUnknown_0842C411 -_0808BD48: .4byte gUnknown_0842C418 +_0808BD40: .4byte gSystemText_Slow +_0808BD44: .4byte gSystemText_Mid +_0808BD48: .4byte gSystemText_Fast thumb_func_end sub_808BCF8 thumb_func_start sub_808BD4C @@ -35147,8 +35147,8 @@ sub_808BD6C: @ 808BD6C pop {r0} bx r0 .align 2, 0 -_0808BDA4: .4byte gUnknown_0842C420 -_0808BDA8: .4byte gUnknown_0842C426 +_0808BDA4: .4byte gSystemText_On +_0808BDA8: .4byte gSystemText_Off thumb_func_end sub_808BD6C thumb_func_start sub_808BDAC @@ -35201,8 +35201,8 @@ sub_808BDCC: @ 808BDCC pop {r0} bx r0 .align 2, 0 -_0808BE04: .4byte gUnknown_0842C42D -_0808BE08: .4byte gUnknown_0842C436 +_0808BE04: .4byte gSystemText_Shift +_0808BE08: .4byte gSystemText_Set thumb_func_end sub_808BDCC thumb_func_start sub_808BE0C @@ -35258,8 +35258,8 @@ sub_808BE34: @ 808BE34 pop {r0} bx r0 .align 2, 0 -_0808BE6C: .4byte gUnknown_0842C43D -_0808BE70: .4byte gUnknown_0842C445 +_0808BE6C: .4byte gSystemText_Mono +_0808BE70: .4byte gSystemText_Stereo thumb_func_end sub_808BE34 thumb_func_start sub_808BE74 @@ -35373,8 +35373,8 @@ _0808BF0A: strb r0, [r4] b _0808BF64 .align 2, 0 -_0808BF40: .4byte gUnknown_0842C457 -_0808BF44: .4byte gUnknown_0842C44F +_0808BF40: .4byte gSystemText_Terminator +_0808BF44: .4byte gSystemText_Type _0808BF48: mov r2, sp adds r4, r2, r5 @@ -35490,9 +35490,9 @@ sub_808BFD8: @ 808BFD8 pop {r0} bx r0 .align 2, 0 -_0808C020: .4byte gUnknown_0842C45B -_0808C024: .4byte gUnknown_0842C465 -_0808C028: .4byte gUnknown_0842C46B +_0808C020: .4byte gSystemText_Normal +_0808C024: .4byte gSystemText_LR +_0808C028: .4byte gSystemText_LA thumb_func_end sub_808BFD8 thumb_func_start sub_808C02C @@ -41980,9 +41980,9 @@ _0808F45A: b _0808F67C .align 2, 0 _0808F4F8: .4byte 0x0202ffbc -_0808F4FC: .4byte gUnknown_0840DFF9 -_0808F500: .4byte gUnknown_0840E013 -_0808F504: .4byte gUnknown_0840E01D +_0808F4FC: .4byte gDexText_UnknownPoke +_0808F500: .4byte gDexText_UnknownHeight +_0808F504: .4byte gDexText_UnknownWeight _0808F508: .4byte gPokedexEntries _0808F50C: ldr r0, _0808F524 @@ -42806,7 +42806,7 @@ _0808FBC4: adds r1, r2 b _0808FDA0 .align 2, 0 -_0808FBE8: .4byte gUnknown_0840E02A +_0808FBE8: .4byte gDexText_CryOf _0808FBEC: .4byte 0x0202ffbc _0808FBF0: .4byte 0x03001770 _0808FBF4: .4byte 0x0000043c @@ -43467,7 +43467,7 @@ _08090174: b _08090368 .align 2, 0 _080901AC: .4byte gWindowConfig_81E702C -_080901B0: .4byte gUnknown_0840E035 +_080901B0: .4byte gDexText_SizeComparedTo _080901B4: .4byte gSaveBlock2 _080901B8: .4byte 0x03001770 _080901BC: .4byte 0x0000043c @@ -44331,7 +44331,7 @@ _080908A0: bl sub_8091154 b _080908D6 .align 2, 0 -_080908C8: .4byte gUnknown_0840E047 +_080908C8: .4byte gDexText_RegisterComplete _080908CC: adds r0, r6, 0 movs r1, 0xD @@ -44388,9 +44388,9 @@ _080908D6: adds r0, r1 b _080909E0 .align 2, 0 -_0809094C: .4byte gUnknown_0840DFF9 -_08090950: .4byte gUnknown_0840E013 -_08090954: .4byte gUnknown_0840E01D +_0809094C: .4byte gDexText_UnknownPoke +_08090950: .4byte gDexText_UnknownHeight +_08090954: .4byte gDexText_UnknownWeight _08090958: .4byte gPokedexEntries _0809095C: .4byte 0x03004b20 _08090960: @@ -45679,7 +45679,7 @@ _0809133A: ldrb r0, [r6] b _0809134E .align 2, 0 -_08091340: .4byte gUnknown_0840DFF9 +_08091340: .4byte gDexText_UnknownPoke _08091344: adds r0, r3, 0x1 lsls r0, 24 @@ -47663,7 +47663,7 @@ _080922D4: bl audio_play b _080923EC .align 2, 0 -_080922E8: .4byte gUnknown_0840E067 +_080922E8: .4byte gDexText_Searching _080922EC: .4byte sub_80923FC _080922F0: movs r0, 0x15 @@ -47899,7 +47899,7 @@ sub_80924A4: @ 80924A4 .align 2, 0 _080924D0: .4byte 0x0202ffb4 _080924D4: .4byte 0x0000060c -_080924D8: .4byte gUnknown_0840E081 +_080924D8: .4byte gDexText_SearchComplete _080924DC: movs r0, 0x20 bl audio_play @@ -47918,7 +47918,7 @@ _080924F6: pop {r0} bx r0 .align 2, 0 -_080924FC: .4byte gUnknown_0840E093 +_080924FC: .4byte gDexText_NoMatching _08092500: .4byte 0x03004b20 _08092504: .4byte sub_8092508 thumb_func_end sub_80924A4 @@ -51843,7 +51843,7 @@ sub_80942F8: @ 80942F8 .align 2, 0 _08094328: .4byte 0x020231cc _0809432C: .4byte 0x02000094 -_08094330: .4byte gUnknown_0842C8DC +_08094330: .4byte gOtherText_TrainersTrainerCard thumb_func_end sub_80942F8 thumb_func_start sub_8094334 @@ -51862,7 +51862,7 @@ _08094348: bx r0 .align 2, 0 _0809434C: .4byte 0x02000000 -_08094350: .4byte gUnknown_0842C8EC +_08094350: .4byte gOtherText_FirstHOF thumb_func_end sub_8094334 thumb_func_start sub_8094354 @@ -51933,7 +51933,7 @@ _080943D8: bx r0 .align 2, 0 _080943DC: .4byte 0x02000000 -_080943E0: .4byte gUnknown_0842C8FF +_080943E0: .4byte gOtherText_LinkCableBattles thumb_func_end sub_80943C4 thumb_func_start sub_80943E4 @@ -51987,7 +51987,7 @@ _0809443C: bx r0 .align 2, 0 _08094440: .4byte 0x02000000 -_08094444: .4byte gUnknown_0842C924 +_08094444: .4byte gOtherText_BattleTowerWinRecord thumb_func_end sub_8094428 thumb_func_start sub_8094448 @@ -52047,7 +52047,7 @@ _080944AC: bx r0 .align 2, 0 _080944B0: .4byte 0x02000000 -_080944B4: .4byte gUnknown_0842C943 +_080944B4: .4byte gOtherText_ContestRecord thumb_func_end sub_8094498 thumb_func_start sub_80944B8 @@ -52093,7 +52093,7 @@ _080944FC: bx r0 .align 2, 0 _08094500: .4byte 0x02000000 -_08094504: .4byte gUnknown_0842C959 +_08094504: .4byte gOtherText_MixingRecord thumb_func_end sub_80944E8 thumb_func_start sub_8094508 @@ -52139,7 +52139,7 @@ _0809454C: bx r0 .align 2, 0 _08094550: .4byte 0x02000000 -_08094554: .4byte gUnknown_0842C96A +_08094554: .4byte gOtherText_TradeRecord thumb_func_end sub_8094538 thumb_func_start sub_8094558 @@ -52193,9 +52193,9 @@ _0809459E: pop {r0} bx r0 .align 2, 0 -_080945B4: .4byte gUnknown_0842C979 +_080945B4: .4byte gOtherText_Boy _080945B8: .4byte gSaveBlock2 -_080945BC: .4byte gUnknown_0842C97D +_080945BC: .4byte gOtherText_Girl thumb_func_end unref_sub_8094588 thumb_func_start sub_80945C0 @@ -52415,7 +52415,7 @@ sub_8094740: @ 8094740 pop {r0} bx r0 .align 2, 0 -_08094770: .4byte gUnknown_0842C983 +_08094770: .4byte gOtherText_Player _08094774: .4byte gSaveBlock2 thumb_func_end sub_8094740 @@ -52482,7 +52482,7 @@ sub_80947B0: @ 80947B0 pop {r0} bx r0 .align 2, 0 -_080947F4: .4byte gUnknown_0842C98A +_080947F4: .4byte gOtherText_Badges thumb_func_end sub_80947B0 thumb_func_start sub_80947F8 @@ -52520,7 +52520,7 @@ sub_80947F8: @ 80947F8 pop {r0} bx r0 .align 2, 0 -_08094840: .4byte gUnknown_0842C992 +_08094840: .4byte gOtherText_Pokedex thumb_func_end sub_80947F8 thumb_func_start sub_8094844 @@ -52556,7 +52556,7 @@ sub_8094844: @ 8094844 pop {r0} bx r0 .align 2, 0 -_08094888: .4byte gUnknown_0842C99A +_08094888: .4byte gOtherText_PlayTime _0809488C: .4byte gSaveBlock2 thumb_func_end sub_8094844 @@ -54300,7 +54300,7 @@ _080955F8: .4byte 0x03004b20 _080955FC: .4byte gUnknown_083B5FF4 _08095600: .4byte 0x020231cc _08095604: .4byte 0x020234cc -_08095608: .4byte gUnknown_0840F046 +_08095608: .4byte gOtherText_CantSwitchPokeWithYours _0809560C: .4byte sub_80954C0 _08095610: movs r0, 0x64 @@ -54335,7 +54335,7 @@ _08095610: _08095654: .4byte 0x03004360 _08095658: .4byte 0x020231cc _0809565C: .4byte 0x020234cc -_08095660: .4byte gUnknown_0840F023 +_08095660: .4byte gOtherText_NoEnergyLeft _08095664: .4byte 0x03004b20 _08095668: .4byte sub_80954C0 _0809566C: @@ -54404,7 +54404,7 @@ _080956EC: .4byte 0x02024a6a _080956F0: .4byte 0x02024a68 _080956F4: .4byte 0x03004360 _080956F8: .4byte 0x020234cc -_080956FC: .4byte gUnknown_0840F079 +_080956FC: .4byte gOtherText_EGGCantBattle _08095700: .4byte 0x03004b20 _08095704: .4byte sub_80954C0 _08095708: @@ -54441,7 +54441,7 @@ _0809574C: .4byte 0x02000000 _08095750: .4byte 0x0001609d _08095754: .4byte 0x020231cc _08095758: .4byte 0x020234cc -_0809575C: .4byte gUnknown_0840F003 +_0809575C: .4byte gOtherText_AlreadySelected _08095760: .4byte 0x03004b20 _08095764: .4byte sub_80954C0 _08095768: @@ -54504,7 +54504,7 @@ _080957EC: .4byte 0x02024e6c _080957F0: .4byte 0x02024a6a _080957F4: .4byte 0x020231cc _080957F8: .4byte 0x020234cc -_080957FC: .4byte gUnknown_0840EFCC +_080957FC: .4byte gOtherText_CantBeSwitched _08095800: .4byte 0x03004b20 _08095804: .4byte sub_80954C0 _08095808: @@ -54533,7 +54533,7 @@ _08095808: _0809583C: .4byte 0x03004360 _08095840: .4byte 0x020231cc _08095844: .4byte 0x020234cc -_08095848: .4byte gUnknown_0840EFE8 +_08095848: .4byte gOtherText_AlreadyBattle _0809584C: .4byte 0x03004b20 _08095850: .4byte sub_80954C0 _08095854: @@ -55566,7 +55566,7 @@ _08095FE8: ldr r0, _08096004 b _08096022 .align 2, 0 -_08096004: .4byte gUnknown_08410C40 +_08096004: .4byte gPCText_PartyFull2 _08096008: movs r1, 0xC ldrsh r0, [r4, r1] @@ -55587,7 +55587,7 @@ _08096022: strh r0, [r4, 0x8] b _080960F4 .align 2, 0 -_08096030: .4byte gUnknown_08410C1C +_08096030: .4byte gPCText_OnlyOne _08096034: movs r0, 0x1 movs r1, 0 @@ -55865,7 +55865,7 @@ _0809623E: .align 2, 0 _08096258: .4byte 0x020300a0 _0809625C: .4byte 0x020383e4 -_08096260: .4byte gUnknown_08410C54 +_08096260: .4byte gPCText_BOX thumb_func_end sub_80961D8 thumb_func_start sub_8096264 @@ -75040,7 +75040,7 @@ sub_809F9D0: @ 809F9D0 bx r0 .align 2, 0 _0809FA24: .4byte 0x03004b28 -_0809FA28: .4byte gUnknown_0840F944 +_0809FA28: .4byte gOtherText_CantForgetHMs _0809FA2C: .4byte sub_809F814 thumb_func_end sub_809F9D0 @@ -75305,7 +75305,7 @@ sub_809FC0C: @ 809FC0C pop {r0} bx r0 .align 2, 0 -_0809FC30: .4byte gUnknown_0840F7F3 +_0809FC30: .4byte gOtherText_Type2 thumb_func_end sub_809FC0C thumb_func_start sub_809FC34 @@ -75381,16 +75381,16 @@ _0809FC3C: b _0809FCF2 .align 2, 0 _0809FCD0: .4byte 0x020231cc -_0809FCD4: .4byte gUnknown_0840F7EF -_0809FCD8: .4byte gUnknown_0840E678 -_0809FCDC: .4byte gUnknown_0840F91B +_0809FCD4: .4byte gOtherText_OriginalTrainer +_0809FCD8: .4byte gOtherText_FiveQuestionsAndSlash +_0809FCDC: .4byte gOtherText_EggAbout _0809FCE0: cmp r0, 0xA bhi _0809FCEC ldr r0, _0809FCE8 b _0809FCF2 .align 2, 0 -_0809FCE8: .4byte gUnknown_0840F8EE +_0809FCE8: .4byte gOtherText_EggSoon _0809FCEC: cmp r1, 0x28 bhi _0809FD00 @@ -75401,7 +75401,7 @@ _0809FCF2: bl MenuPrint b _0809FD0A .align 2, 0 -_0809FCFC: .4byte gUnknown_0840F8BB +_0809FCFC: .4byte gOtherText_EggSomeTime _0809FD00: ldr r0, _0809FD18 movs r1, 0xB @@ -75414,7 +75414,7 @@ _0809FD0A: bl sub_80A0708 b _0809FE4C .align 2, 0 -_0809FD18: .4byte gUnknown_0840F884 +_0809FD18: .4byte gOtherText_EggLongTime _0809FD1C: ldr r4, _0809FD64 adds r0, r6, 0 @@ -75448,7 +75448,7 @@ _0809FD1C: .align 2, 0 _0809FD64: .4byte 0x020232cc _0809FD68: .4byte 0x020231cc -_0809FD6C: .4byte gUnknown_0840F7EF +_0809FD6C: .4byte gOtherText_OriginalTrainer _0809FD70: adds r0, r5, 0 movs r1, 0xA @@ -75662,15 +75662,15 @@ sub_809FEB8: @ 809FEB8 pop {r0} bx r0 .align 2, 0 -_0809FF40: .4byte gUnknown_0840F81A -_0809FF44: .4byte gUnknown_0840F826 -_0809FF48: .4byte gUnknown_0840F7EE -_0809FF4C: .4byte gUnknown_0840F7EB -_0809FF50: .4byte gUnknown_0840F7C6 -_0809FF54: .4byte gUnknown_0840F7CD -_0809FF58: .4byte gUnknown_0840F7D5 -_0809FF5C: .4byte gUnknown_0840F7DD -_0809FF60: .4byte gUnknown_0840F7E5 +_0809FF40: .4byte gOtherText_ExpPoints +_0809FF44: .4byte gOtherText_NextLv +_0809FF48: .4byte gOtherText_Terminator18 +_0809FF4C: .4byte gOtherText_HP +_0809FF50: .4byte gOtherText_Attack +_0809FF54: .4byte gOtherText_Defense +_0809FF58: .4byte gOtherText_SpAtk +_0809FF5C: .4byte gOtherText_SpDef +_0809FF60: .4byte gOtherText_Speed thumb_func_end sub_809FEB8 thumb_func_start sub_809FF64 @@ -75878,8 +75878,8 @@ _080A010A: b _080A0150 .align 2, 0 _080A012C: .4byte 0x02018000 -_080A0130: .4byte gUnknown_0840F7F9 -_080A0134: .4byte gUnknown_0840F7FF +_080A0130: .4byte gOtherText_Power2 +_080A0134: .4byte gOtherText_Accuracy2 _080A0138: ldr r0, _080A0154 movs r1, 0xD @@ -75895,8 +75895,8 @@ _080A0150: pop {r0} bx r0 .align 2, 0 -_080A0154: .4byte gUnknown_0840F808 -_080A0158: .4byte gUnknown_0840F80F +_080A0154: .4byte gOtherText_Appeal2 +_080A0158: .4byte gOtherText_Jam2 thumb_func_end sub_80A00F4 thumb_func_start sub_80A015C @@ -75940,8 +75940,8 @@ _080A0168: bl MenuPrint b _080A0276 .align 2, 0 -_080A01B0: .4byte gUnknown_0840E680 -_080A01B4: .4byte gUnknown_0840E682 +_080A01B0: .4byte gOtherText_OneDash +_080A01B4: .4byte gOtherText_TwoDashes _080A01B8: ldr r0, _080A01E0 ldrb r0, [r0, 0xB] @@ -76066,7 +76066,7 @@ sub_80A029C: @ 80A029C b _080A037E .align 2, 0 _080A02B8: .4byte 0x02018000 -_080A02BC: .4byte gUnknown_0840E645 +_080A02BC: .4byte gOtherText_CancelNoTerminator _080A02C0: ldrh r5, [r4] ldrb r0, [r1, 0xB] @@ -76366,7 +76366,7 @@ sub_80A04CC: @ 80A04CC _080A0504: .4byte 0x0000ffff _080A0508: .4byte gBattleMoves _080A050C: .4byte 0x020231cc -_080A0510: .4byte gUnknown_0840E685 +_080A0510: .4byte gOtherText_ThreeDashes2 _080A0514: ldr r0, _080A0550 ldrb r1, [r2, 0x1] @@ -76398,7 +76398,7 @@ _080A052A: .align 2, 0 _080A0550: .4byte 0x020231cc _080A0554: .4byte gBattleMoves -_080A0558: .4byte gUnknown_0840E685 +_080A0558: .4byte gOtherText_ThreeDashes2 _080A055C: ldr r0, _080A0578 ldrb r1, [r1, 0x3] @@ -76637,7 +76637,7 @@ sub_80A0708: @ 80A0708 ldr r0, _080A0738 b _080A076E .align 2, 0 -_080A0738: .4byte gUnknown_0842D197 +_080A0738: .4byte gOtherText_EggObtainedInTrade _080A073C: adds r0, r4, 0 movs r1, 0x23 @@ -76649,7 +76649,7 @@ _080A073C: ldr r0, _080A0750 b _080A076E .align 2, 0 -_080A0750: .4byte gUnknown_0842D164 +_080A0750: .4byte gOtherText_EggNicePlace _080A0754: adds r0, r4, 0 bl sub_80A0664 @@ -76659,7 +76659,7 @@ _080A0754: ldr r0, _080A0764 b _080A076E .align 2, 0 -_080A0764: .4byte gUnknown_0842D197 +_080A0764: .4byte gOtherText_EggObtainedInTrade _080A0768: cmp r7, 0xFD bne _080A077C @@ -76670,7 +76670,7 @@ _080A076E: bl MenuPrint b _080A0786 .align 2, 0 -_080A0778: .4byte gUnknown_0842D1C3 +_080A0778: .4byte gOtherText_EggHotSprings _080A077C: ldr r0, _080A0794 mov r1, r9 @@ -76684,7 +76684,7 @@ _080A0786: pop {r0} bx r0 .align 2, 0 -_080A0794: .4byte gUnknown_0842D133 +_080A0794: .4byte gOtherText_EggDayCare thumb_func_end sub_80A0708 thumb_func_start sub_80A0798 @@ -76762,10 +76762,10 @@ _080A07DA: .align 2, 0 _080A0838: .4byte 0x020234cc _080A083C: .4byte gNatureNames -_080A0840: .4byte gUnknown_0842D0E6 -_080A0844: .4byte gUnknown_0842D0E7 +_080A0840: .4byte gOtherText_Terminator4 +_080A0844: .4byte gOtherText_Nature _080A0848: .4byte 0x020231cc -_080A084C: .4byte gUnknown_0842D0FB +_080A084C: .4byte gOtherText_Egg2 _080A0850: cmp r6, 0x57 bhi _080A08E8 @@ -76795,7 +76795,7 @@ _080A0850: b _080A0934 .align 2, 0 _080A0890: .4byte 0x020231cc -_080A0894: .4byte gUnknown_0842D0F3 +_080A0894: .4byte gOtherText_Met _080A0898: adds r0, r7, 0 movs r1, 0x25 @@ -76829,7 +76829,7 @@ _080A0898: ldr r1, _080A08E0 b _080A08F0 .align 2, 0 -_080A08E0: .4byte gUnknown_0842D118 +_080A08E0: .4byte gOtherText_FatefulEncounter _080A08E4: cmp r6, 0x57 bls _080A08FC @@ -76843,7 +76843,7 @@ _080A08F0: bl StringCopy b _080A0934 .align 2, 0 -_080A08F8: .4byte gUnknown_0842D103 +_080A08F8: .4byte gOtherText_ObtainedInTrade _080A08FC: adds r0, r7, 0 movs r1, 0x24 @@ -76881,7 +76881,7 @@ _080A0934: bx r0 .align 2, 0 _080A094C: .4byte 0x020231cc -_080A0950: .4byte gUnknown_0842D12B +_080A0950: .4byte gOtherText_Met2 _080A0954: .4byte 0x020234cc thumb_func_end sub_80A0798 @@ -77020,7 +77020,7 @@ _080A0A6E: movs r1, 0xB b _080A0A7C .align 2, 0 -_080A0A74: .4byte gUnknown_0840E689 +_080A0A74: .4byte gOtherText_MaleSymbol2 _080A0A78: ldr r0, _080A0A8C movs r1, 0xC @@ -77033,7 +77033,7 @@ _080A0A84: pop {r0} bx r0 .align 2, 0 -_080A0A8C: .4byte gUnknown_0840E68B +_080A0A8C: .4byte gOtherText_FemaleSymbolAndLv thumb_func_end sub_80A0A2C thumb_func_start sub_80A0A90 @@ -77161,7 +77161,7 @@ sub_80A0B88: @ 80A0B88 b _080A0BD8 .align 2, 0 _080A0BA0: .4byte 0x020231cc -_080A0BA4: .4byte gUnknown_0840E66F +_080A0BA4: .4byte gOtherText_None _080A0BA8: ldr r4, _080A0BE8 ldr r1, _080A0BEC @@ -77194,7 +77194,7 @@ _080A0BD8: bx r0 .align 2, 0 _080A0BE8: .4byte 0x020231cc -_080A0BEC: .4byte gUnknown_0840F82F +_080A0BEC: .4byte gOtherText_Ribbons00 _080A0BF0: .4byte gUnknown_083C15AE thumb_func_end sub_80A0B88 @@ -77247,7 +77247,7 @@ _080A0C48: b _080A0C68 .align 2, 0 _080A0C58: .4byte 0x020231cc -_080A0C5C: .4byte gUnknown_0840E66F +_080A0C5C: .4byte gOtherText_None _080A0C60: ldr r1, _080A0C78 adds r0, r5, 0 @@ -78053,7 +78053,7 @@ _080A12BC: .4byte 0x80000001 _080A12C0: .4byte 0x0600e480 _080A12C4: .4byte 0x0600ec80 _080A12C8: .4byte 0x0600ecc0 -_080A12CC: .4byte gUnknown_0840F813 +_080A12CC: .4byte gOtherText_Status thumb_func_end sub_80A1048 thumb_func_start sub_80A12D0 @@ -78273,7 +78273,7 @@ _080A1470: bx r0 .align 2, 0 _080A1480: .4byte 0x02018000 -_080A1484: .4byte gUnknown_0840F813 +_080A1484: .4byte gOtherText_Status thumb_func_end sub_80A1334 thumb_func_start sub_80A1488 @@ -78503,7 +78503,7 @@ _080A163C: bx r0 .align 2, 0 _080A164C: .4byte 0x02018000 -_080A1650: .4byte gUnknown_0840F813 +_080A1650: .4byte gOtherText_Status thumb_func_end sub_80A1500 thumb_func_start sub_80A1654 @@ -79865,7 +79865,7 @@ _080A2052: pop {r1} bx r1 .align 2, 0 -_080A2074: .4byte gUnknown_0842D0F1 +_080A2074: .4byte gOtherText_Comma thumb_func_end sub_80A203C thumb_func_start BgFrame_FillTileMap @@ -84428,7 +84428,7 @@ _080A4348: .4byte 0x03005d10 _080A434C: .4byte 0x02038559 _080A4350: .4byte 0x03000701 _080A4354: .4byte 0x020231cc -_080A4358: .4byte gUnknown_0840E6E4 +_080A4358: .4byte gOtherText_CloseBag _080A435C: .4byte 0x020221e8 _080A4360: adds r1, r5, 0x2 @@ -85193,7 +85193,7 @@ sub_80A490C: @ 80A490C .align 2, 0 _080A4960: .4byte 0x03005d10 _080A4964: .4byte 0x02038559 -_080A4968: .4byte gUnknown_0840E75C +_080A4968: .4byte gOtherText_ReturnTo _080A496C: .4byte gUnknown_0840E740 _080A4970: .4byte 0x03000701 _080A4974: @@ -85260,7 +85260,7 @@ sub_80A49AC: @ 80A49AC .align 2, 0 _080A49E8: .4byte 0x03005d10 _080A49EC: .4byte 0x02038559 -_080A49F0: .4byte gUnknown_0840E75C +_080A49F0: .4byte gOtherText_ReturnTo _080A49F4: cmp r4, 0x1 bne _080A4A4C @@ -85500,7 +85500,7 @@ _080A4BAE: b _080A4BE6 .align 2, 0 _080A4BB4: .4byte 0x00000103 -_080A4BB8: .4byte gUnknown_0840E63B +_080A4BB8: .4byte gOtherText_Walk _080A4BBC: adds r0, r4, 0 bl itemid_is_mail @@ -85526,7 +85526,7 @@ _080A4BE6: pop {r1} bx r1 .align 2, 0 -_080A4BEC: .4byte gUnknown_0840E669 +_080A4BEC: .4byte gOtherText_Check thumb_func_end sub_80A4B90 thumb_func_start sub_80A4BF0 @@ -87518,7 +87518,7 @@ sub_80A5BF8: @ 80A5BF8 pop {r0} bx r0 .align 2, 0 -_080A5C1C: .4byte gUnknown_0840E79C +_080A5C1C: .4byte gOtherText_NoPokemon _080A5C20: .4byte sub_80A5C48 thumb_func_end sub_80A5BF8 @@ -88099,7 +88099,7 @@ DisplayCannotDismountBikeMessage: @ 80A607C _080A60B4: .4byte 0x0203855e _080A60B8: .4byte 0x020231cc _080A60BC: .4byte 0x020234cc -_080A60C0: .4byte gUnknown_0840E7CB +_080A60C0: .4byte gOtherText_CantBeHeld _080A60C4: .4byte sub_80A6024 thumb_func_end DisplayCannotDismountBikeMessage @@ -88128,7 +88128,7 @@ ItemMenu_Give: @ 80A60C8 b _080A616E .align 2, 0 _080A60FC: .4byte 0x0203855e -_080A6100: .4byte gUnknown_0840E781 +_080A6100: .4byte gOtherText_CantWriteMail _080A6104: .4byte sub_80A6024 _080A6108: ldrh r0, [r5] @@ -88290,7 +88290,7 @@ sub_80A6214: @ 80A6214 .align 2, 0 _080A6244: .4byte 0x02038559 _080A6248: .4byte 0x0203855e -_080A624C: .4byte gUnknown_0840E781 +_080A624C: .4byte gOtherText_CantWriteMail _080A6250: .4byte sub_80A6024 _080A6254: ldrh r0, [r4] @@ -88317,7 +88317,7 @@ _080A6280: .align 2, 0 _080A6288: .4byte 0x020231cc _080A628C: .4byte 0x020234cc -_080A6290: .4byte gUnknown_0840E7DD +_080A6290: .4byte gOtherText_CantBeHeldHere _080A6294: .4byte sub_80A6024 _080A6298: cmp r6, 0x5 @@ -88471,7 +88471,7 @@ _080A63CC: .4byte 0x02038559 _080A63D0: .4byte 0x0203855e _080A63D4: .4byte 0x020232cc _080A63D8: .4byte 0x020234cc -_080A63DC: .4byte gUnknown_0840EEA4 +_080A63DC: .4byte gOtherText_CantBuyThat _080A63E0: .4byte sub_80A6444 _080A63E4: ldr r4, _080A6400 @@ -88489,7 +88489,7 @@ _080A63FA: bx r0 .align 2, 0 _080A6400: .4byte 0x020234cc -_080A6404: .4byte gUnknown_0840EEC4 +_080A6404: .4byte gOtherText_HowManyToSell _080A6408: .4byte sub_80A648C thumb_func_end sub_80A6354 @@ -88743,7 +88743,7 @@ _080A6600: .4byte 0x020219cc _080A6604: .4byte 0x0203855e _080A6608: .4byte 0x020232cc _080A660C: .4byte 0x020234cc -_080A6610: .4byte gUnknown_0840EF0C +_080A6610: .4byte gOtherText_SoldItem _080A6614: .4byte sub_80A6574 thumb_func_end sub_80A65AC @@ -88880,7 +88880,7 @@ _080A672C: .4byte 0x020231cc _080A6730: .4byte 0x0203855e _080A6734: .4byte 0x03004b20 _080A6738: .4byte 0x020234cc -_080A673C: .4byte gUnknown_0840EEE9 +_080A673C: .4byte gOtherText_CanPay _080A6740: .4byte sub_80A6650 _080A6744: movs r0, 0x2 @@ -90542,37 +90542,37 @@ _080A74AC: ldr r0, _080A74B0 b _080A74E6 .align 2, 0 -_080A74B0: .4byte gUnknown_0840E7B3 +_080A74B0: .4byte gOtherText_SwitchWhichItem _080A74B4: ldr r0, _080A74B8 b _080A74E6 .align 2, 0 -_080A74B8: .4byte gUnknown_0840E766 +_080A74B8: .4byte gOtherText_WhatWillYouDo2 _080A74BC: ldr r0, _080A74C0 b _080A74E6 .align 2, 0 -_080A74C0: .4byte gUnknown_0840E89F +_080A74C0: .4byte gOtherText_HowManyToToss _080A74C4: ldr r0, _080A74C8 b _080A74E6 .align 2, 0 -_080A74C8: .4byte gUnknown_0840E8B2 +_080A74C8: .4byte gOtherText_ThrewAwayItem _080A74CC: ldr r0, _080A74D0 b _080A74E6 .align 2, 0 -_080A74D0: .4byte gUnknown_0840E8C7 +_080A74D0: .4byte gOtherText_OkayToThrowAwayPrompt _080A74D4: ldr r0, _080A74D8 b _080A74E6 .align 2, 0 -_080A74D8: .4byte gUnknown_0840E7F4 +_080A74D8: .4byte gOtherText_HowManyToDeposit _080A74DC: ldr r0, _080A74E0 b _080A74E6 .align 2, 0 -_080A74E0: .4byte gUnknown_0840E815 +_080A74E0: .4byte gOtherText_DepositedItems _080A74E4: ldr r0, _080A74F0 _080A74E6: @@ -90580,7 +90580,7 @@ _080A74E6: bl sub_80A4A98 b _080A74FC .align 2, 0 -_080A74F0: .4byte gUnknown_0840E829 +_080A74F0: .4byte gOtherText_NoRoomForItems _080A74F4: ldr r0, _080A7518 ldrb r1, [r4, 0x1] @@ -90601,7 +90601,7 @@ _080A7512: pop {r0} bx r0 .align 2, 0 -_080A7518: .4byte gUnknown_0840E849 +_080A7518: .4byte gOtherText_CantStoreSomeoneItem thumb_func_end sub_80A7420 thumb_func_start sub_80A751C @@ -94554,7 +94554,7 @@ itemid_copy_name: @ 80A9224 bl StringAppend b _080A9258 .align 2, 0 -_080A9248: .4byte gUnknown_0840E6D4 +_080A9248: .4byte gOtherText_Berry2 _080A924C: bl itemid_get_item adds r1, r0, 0 @@ -100125,7 +100125,7 @@ _080ABD8C: .4byte gUnknown_083CA340 _080ABD90: .4byte 0x02038695 _080ABD94: .4byte 0x02019260 _080ABD98: .4byte 0x0203858e -_080ABD9C: .4byte gUnknown_083CC3A0 +_080ABD9C: .4byte gUnknownText_UnknownFormatting2 _080ABDA0: cmp r4, 0 beq _080ABDCC @@ -100230,7 +100230,7 @@ _080ABE20: bx r0 .align 2, 0 _080ABE74: .4byte gContestMoves -_080ABE78: .4byte gUnknown_083CC3A7 +_080ABE78: .4byte gUnknownText_UnknownFormatting3 _080ABE7C: .4byte gMoveNames _080ABE80: .4byte gUnknown_083CA340 + 0x1 _080ABE84: .4byte 0x0000ffff @@ -106646,7 +106646,7 @@ _080AF1FE: .align 2, 0 _080AF21C: .4byte 0x02019260 _080AF220: .4byte 0x020238cc -_080AF224: .4byte gUnknown_083CC355 +_080AF224: .4byte gUnknownText_MissedTurn _080AF228: ldr r0, _080AF270 ldrh r2, [r1, 0x6] @@ -107538,7 +107538,7 @@ sub_80AF860: @ 80AF860 _080AF88C: .4byte 0x030042a0 _080AF890: .4byte 0x03004280 _080AF894: .4byte 0x0202e908 -_080AF898: .4byte gUnknown_083CC361 +_080AF898: .4byte gUnknownText_LinkStandbyAndWinner thumb_func_end sub_80AF860 thumb_func_start unref_sub_80AF89C @@ -114792,7 +114792,7 @@ Task_ExitSellMenu: @ 80B2FFC b _080B3040 .align 2, 0 _080B3028: .4byte 0x03000708 -_080B302C: .4byte gUnknown_0840EE5C +_080B302C: .4byte gOtherText_CanIHelpYou _080B3030: .4byte ReturnToShopMenuAfterExitingSellMenu _080B3034: ldr r1, _080B3048 @@ -114805,7 +114805,7 @@ _080B3040: pop {r0} bx r0 .align 2, 0 -_080B3048: .4byte gUnknown_0840EE30 +_080B3048: .4byte gOtherText_AnythingElse _080B304C: .4byte ReturnToShopMenuAfterExitingSellMenu thumb_func_end Task_ExitSellMenu @@ -115854,7 +115854,7 @@ sub_80B37F8: @ 80B37F8 _080B3884: .4byte 0x03000708 _080B3888: .4byte 0x03004b20 _080B388C: .4byte 0x020231cc -_080B3890: .4byte gUnknown_0840E6D0 +_080B3890: .4byte gOtherText_xString1 _080B3894: .4byte 0x020219cc _080B3898: .4byte 0x0000c3e1 thumb_func_end sub_80B37F8 @@ -116094,7 +116094,7 @@ _080B3A60: bx r0 .align 2, 0 _080B3A68: .4byte 0x03000708 -_080B3A6C: .4byte gUnknown_0840E645 +_080B3A6C: .4byte gOtherText_CancelNoTerminator thumb_func_end sub_80B39D0 thumb_func_start sub_80B3A70 @@ -116160,7 +116160,7 @@ _080B3AE0: pop {r0} bx r0 .align 2, 0 -_080B3AE8: .4byte gUnknown_0840ECA1 +_080B3AE8: .4byte gOtherText_QuitShopping thumb_func_end sub_80B3A70 thumb_func_start sub_80B3AEC @@ -116221,7 +116221,7 @@ _080B3B06: _080B3B5C: .4byte 0x03001770 _080B3B60: .4byte 0x03000708 _080B3B64: .4byte 0x03004b20 -_080B3B68: .4byte gUnknown_0840EE7F +_080B3B68: .4byte gOtherText_FreePremierBall _080B3B6C: .4byte sub_80B4378 _080B3B70: .4byte 0x0000c3e1 _080B3B74: @@ -116357,7 +116357,7 @@ _080B3C80: .4byte 0x02025734 _080B3C84: .4byte 0x020386a0 _080B3C88: .4byte 0x03000708 _080B3C8C: .4byte 0x03004b20 -_080B3C90: .4byte gUnknown_0840ED5E +_080B3C90: .4byte gOtherText_HereYouGo _080B3C94: .4byte sub_80B3B80 _080B3C98: .4byte 0x0000c3e1 _080B3C9C: @@ -116365,7 +116365,7 @@ _080B3C9C: ldr r2, _080B3CA8 b _080B3CD8 .align 2, 0 -_080B3CA4: .4byte gUnknown_0840EDF1 +_080B3CA4: .4byte gOtherText_NoRoomFor _080B3CA8: .4byte sub_80B3BD0 _080B3CAC: ldrb r0, [r4, 0xB] @@ -116385,7 +116385,7 @@ _080B3CAC: ldr r1, _080B3CD0 b _080B3CD6 .align 2, 0 -_080B3CD0: .4byte gUnknown_0840ED80 +_080B3CD0: .4byte gOtherText_HereYouGo2 _080B3CD4: ldr r1, _080B3CE4 _080B3CD6: @@ -116396,7 +116396,7 @@ _080B3CD8: bl DisplayItemMessageOnField b _080B3D24 .align 2, 0 -_080B3CE4: .4byte gUnknown_0840EDA9 +_080B3CE4: .4byte gOtherText_HereYouGo3 _080B3CE8: .4byte sub_80B3B80 _080B3CEC: .4byte 0x0000c3e1 _080B3CF0: @@ -116412,7 +116412,7 @@ _080B3CF0: b _080B3D24 .align 2, 0 _080B3D08: .4byte 0x020234cc -_080B3D0C: .4byte gUnknown_0840EE14 +_080B3D0C: .4byte gOtherText_SpaceForIsFull _080B3D10: .4byte sub_80B3BD0 _080B3D14: .4byte 0x0000c3e1 _080B3D18: @@ -116427,7 +116427,7 @@ _080B3D24: pop {r0} bx r0 .align 2, 0 -_080B3D2C: .4byte gUnknown_0840EDD2 +_080B3D2C: .4byte gOtherText_NotEnoughMoney _080B3D30: .4byte sub_80B3BD0 _080B3D34: .4byte 0x0000c3e1 thumb_func_end sub_80B3BF4 @@ -116613,7 +116613,7 @@ _080B3EBC: .4byte 0x020231cc _080B3EC0: .4byte 0x020232cc _080B3EC4: .4byte 0x020233cc _080B3EC8: .4byte 0x020234cc -_080B3ECC: .4byte gUnknown_0840ECD8 +_080B3ECC: .4byte gOtherText_ThatWillBe _080B3ED0: .4byte sub_80B3D38 _080B3ED4: .4byte 0x0000c3e1 _080B3ED8: @@ -117071,7 +117071,7 @@ _080B4270: .4byte 0x020386a0 _080B4274: .4byte 0x02025734 _080B4278: .4byte 0x020231cc _080B427C: .4byte 0x020234cc -_080B4280: .4byte gUnknown_0840ECB0 +_080B4280: .4byte gOtherText_HowManyYouWant _080B4284: .4byte sub_80B3EFC _080B4288: .4byte 0x0000c3e1 _080B428C: @@ -117108,7 +117108,7 @@ _080B42BA: _080B42C8: .4byte 0x020386a0 _080B42CC: .4byte gDecorations _080B42D0: .4byte 0x02025734 -_080B42D4: .4byte gUnknown_0840EDD2 +_080B42D4: .4byte gOtherText_NotEnoughMoney _080B42D8: .4byte sub_80B3BD0 _080B42DC: .4byte 0x0000c3e1 _080B42E0: @@ -117140,7 +117140,7 @@ _080B42E0: _080B4318: .4byte 0x020231cc _080B431C: .4byte 0x020232cc _080B4320: .4byte 0x020234cc -_080B4324: .4byte gUnknown_0840ED01 +_080B4324: .4byte gOtherText_ThatWillBe2 _080B4328: ldr r0, _080B4340 ldr r1, _080B4344 @@ -117154,7 +117154,7 @@ _080B4330: b _080B436C .align 2, 0 _080B4340: .4byte 0x020234cc -_080B4344: .4byte gUnknown_0840ED2C +_080B4344: .4byte gOtherText_ThatWillBe3 _080B4348: .4byte sub_80B3D38 _080B434C: .4byte 0x0000c3e1 _080B4350: @@ -119838,8 +119838,8 @@ CreatePCMenu: @ 80B5734 lsrs r5, r0, 24 b _080B5762 .align 2, 0 -_080B5758: .4byte gUnknown_0841076D -_080B575C: .4byte gUnknown_08410753 +_080B5758: .4byte gPCText_PlayersPC +_080B575C: .4byte gPCText_SomeonesPC _080B5760: movs r5, 0x8 _080B5762: @@ -119867,8 +119867,8 @@ _080B5762: b _080B57C0 .align 2, 0 _080B5798: .4byte 0x00000804 -_080B579C: .4byte gUnknown_08410775 -_080B57A0: .4byte gUnknown_08410782 +_080B579C: .4byte gPCText_HallOfFame +_080B57A0: .4byte gPCText_LogOff _080B57A4: movs r7, 0x3 adds r4, r5, 0x2 @@ -119895,9 +119895,9 @@ _080B57C0: bl MenuPrint b _080B57F2 .align 2, 0 -_080B57DC: .4byte gUnknown_08410782 +_080B57DC: .4byte gPCText_LogOff _080B57E0: .4byte 0x0000084b -_080B57E4: .4byte gUnknown_08410760 +_080B57E4: .4byte gPCText_LanettesPC _080B57E8: ldr r0, _080B5830 movs r1, 0x1 @@ -119933,8 +119933,8 @@ _080B57F2: pop {r0} bx r0 .align 2, 0 -_080B5830: .4byte gUnknown_08410753 -_080B5834: .4byte gUnknown_0841076D +_080B5830: .4byte gPCText_SomeonesPC +_080B5834: .4byte gPCText_PlayersPC thumb_func_end CreatePCMenu thumb_func_start sub_80B5838 @@ -123858,7 +123858,7 @@ sub_80B74FC: @ 80B74FC _080B7528: .4byte 0x020231cc _080B752C: .4byte 0x02000000 _080B7530: .4byte 0x020234cc -_080B7534: .4byte gUnknown_0842C9A4 +_080B7534: .4byte gOtherText_SentToPC _080B7538: .4byte gWindowConfig_81E6E88 thumb_func_end sub_80B74FC @@ -128213,7 +128213,7 @@ _080B9570: b _080B95E6 .align 2, 0 _080B95A4: .4byte 0x03004b20 -_080B95A8: .4byte gUnknown_0842C8AC +_080B95A8: .4byte gOtherText_MixingComplete _080B95AC: ldrh r0, [r4, 0x10] adds r0, 0x1 @@ -128320,7 +128320,7 @@ _080B9650: bl ClearLinkCallback_2 b _080B97D6 .align 2, 0 -_080B9674: .4byte gUnknown_0842C89A +_080B9674: .4byte gOtherText_MixingRecordsWithFriend _080B9678: ldrh r0, [r5, 0x20] adds r0, 0x1 @@ -129947,12 +129947,12 @@ _080BA344: pop {r0} bx r0 .align 2, 0 -_080BA354: .4byte gUnknown_083D02C8 -_080BA358: .4byte gUnknown_083D02D1 -_080BA35C: .4byte gUnknown_083D02D5 +_080BA354: .4byte gDebugText_SoundCheckJap +_080BA358: .4byte gDebugText_BGM +_080BA35C: .4byte gDebugText_SE _080BA360: .4byte gUnknown_083D02D9 -_080BA364: .4byte gUnknown_083D02E6 -_080BA368: .4byte gUnknown_083D02F2 +_080BA364: .4byte gDebugText_UpDown +_080BA368: .4byte gDebugText_DriverTest _080BA36C: .4byte 0x0202f388 _080BA370: .4byte 0x03004b20 _080BA374: .4byte sub_80BA384 @@ -130770,15 +130770,15 @@ sub_80BA800: @ 80BA800 .align 2, 0 _080BA9E8: .4byte gUnknown_083D0312 _080BA9EC: .4byte gUnknown_083D031C -_080BA9F0: .4byte gUnknown_083D0327 -_080BA9F4: .4byte gUnknown_083D0331 -_080BA9F8: .4byte gUnknown_083D033B -_080BA9FC: .4byte gUnknown_083D0345 -_080BAA00: .4byte gUnknown_083D034F -_080BAA04: .4byte gUnknown_083D0359 -_080BAA08: .4byte gUnknown_083D0363 -_080BAA0C: .4byte gUnknown_083D036D -_080BAA10: .4byte gUnknown_083D0377 +_080BA9F0: .4byte gDebugText_Voice +_080BA9F4: .4byte gDebugText_Volume +_080BA9F8: .4byte gDebugText_Panpot +_080BA9FC: .4byte gDebugText_Pitch +_080BAA00: .4byte gDebugText_Length +_080BAA04: .4byte gDebugText_Release +_080BAA08: .4byte gDebugText_Progress +_080BAA0C: .4byte gDebugText_Chorus +_080BAA10: .4byte gDebugText_Priority _080BAA14: .4byte gUnknown_083D0381 _080BAA18: .4byte gUnknown_083D038A _080BAA1C: .4byte gUnknown_083D0393 @@ -131525,8 +131525,8 @@ sub_80BAF84: @ 80BAF84 pop {r0} bx r0 .align 2, 0 -_080BB01C: .4byte gUnknown_083D03FD -_080BB020: .4byte gUnknown_083D0400 +_080BB01C: .4byte gOtherText_SE +_080BB020: .4byte gOtherText_Pan _080BB024: .4byte gUnknown_083D0381 _080BB028: .4byte REG_WIN0H _080BB02C: .4byte 0x020387b4 @@ -131774,8 +131774,8 @@ sub_80BB1D4: @ 80BB1D4 mov r0, sp b _080BB22A .align 2, 0 -_080BB218: .4byte gUnknown_083D0404 -_080BB21C: .4byte gUnknown_083D0409 +_080BB218: .4byte gOtherText_LR +_080BB21C: .4byte gOtherText_RL _080BB220: .4byte 0x020387b4 _080BB224: .4byte gUnknown_083D03F8 _080BB228: @@ -133806,7 +133806,7 @@ sub_80BC190: @ 80BC190 bx r1 .align 2, 0 _080BC1C8: .4byte 0x0202713e -_080BC1CC: .4byte gUnknown_0840F965 +_080BC1CC: .4byte gOtherText_PlayersBase thumb_func_end sub_80BC190 thumb_func_start GetSecretBaseMapName @@ -134431,7 +134431,7 @@ _080BC6A0: pop {r0} bx r0 .align 2, 0 -_080BC6A8: .4byte gUnknown_0840F9BB +_080BC6A8: .4byte gSecretBaseText_NoRegistry _080BC6AC: .4byte sub_80BCC54 thumb_func_end sub_80BC62C @@ -134556,7 +134556,7 @@ _080BC75A: b _080BC7B2 .align 2, 0 _080BC7A0: .4byte 0x020231cc -_080BC7A4: .4byte gUnknown_0840E640 +_080BC7A4: .4byte gUnknownText_Exit _080BC7A8: movs r0, 0x1 movs r1, 0xBC @@ -134958,7 +134958,7 @@ sub_80BCA84: @ 80BCA84 _080BCAD8: .4byte 0x03004b28 _080BCADC: .4byte 0x020231cc _080BCAE0: .4byte 0x020234cc -_080BCAE4: .4byte gUnknown_0840F96D +_080BCAE4: .4byte gOtherText_OkayToDeleteFromRegistry _080BCAE8: .4byte sub_80BCAEC thumb_func_end sub_80BCA84 @@ -135067,7 +135067,7 @@ sub_80BCB90: @ 80BCB90 pop {r0} bx r0 .align 2, 0 -_080BCBB8: .4byte gUnknown_0840F998 +_080BCBB8: .4byte gOtherText_RegisteredDataDeleted _080BCBBC: .4byte sub_80BCB10 thumb_func_end sub_80BCB90 @@ -141452,7 +141452,7 @@ GetMomOrDadStringForTVMessage: @ 80BFC10 _080BFC40: .4byte 0x02025734 _080BFC44: .4byte gSaveBlock2 _080BFC48: .4byte 0x020231cc -_080BFC4C: .4byte gUnknown_0840FF36 +_080BFC4C: .4byte gOtherText_Mom _080BFC50: .4byte 0x00004003 _080BFC54: movs r0, 0x5 @@ -141500,7 +141500,7 @@ _080BFCAA: b _080BFD10 .align 2, 0 _080BFCB4: .4byte 0x020231cc -_080BFCB8: .4byte gUnknown_0840FF36 +_080BFCB8: .4byte gOtherText_Mom _080BFCBC: .4byte 0x00004003 _080BFCC0: ldr r0, _080BFCCC @@ -141509,7 +141509,7 @@ _080BFCC0: b _080BFD10 .align 2, 0 _080BFCCC: .4byte 0x020231cc -_080BFCD0: .4byte gUnknown_0840FF32 +_080BFCD0: .4byte gOtherText_Dad _080BFCD4: bl Random lsls r0, 16 @@ -141527,7 +141527,7 @@ _080BFCD4: b _080BFD10 .align 2, 0 _080BFCF8: .4byte 0x020231cc -_080BFCFC: .4byte gUnknown_0840FF36 +_080BFCFC: .4byte gOtherText_Mom _080BFD00: ldr r0, _080BFD18 ldr r1, _080BFD1C @@ -141541,7 +141541,7 @@ _080BFD10: bx r0 .align 2, 0 _080BFD18: .4byte 0x020231cc -_080BFD1C: .4byte gUnknown_0840FF32 +_080BFD1C: .4byte gOtherText_Dad thumb_func_end GetMomOrDadStringForTVMessage thumb_func_start sub_80BFD20 @@ -146204,7 +146204,7 @@ sub_80C24F4: @ 80C24F4 .align 2, 0 _080C252C: .4byte 0x0202f388 _080C2530: .4byte 0x0203869a -_080C2534: .4byte gUnknown_0842CEAF +_080C2534: .4byte gOtherText_LinkStandby _080C2538: .4byte 0x03004b20 _080C253C: .4byte sub_80C255C _080C2540: @@ -146340,7 +146340,7 @@ sub_80C2600: @ 80C2600 .align 2, 0 _080C2644: .4byte 0x03004b20 _080C2648: .4byte sub_80C2F64 -_080C264C: .4byte gUnknown_0842CE60 +_080C264C: .4byte gContestText_AnnounceResults _080C2650: .4byte 0x02018000 _080C2654: cmp r0, 0x1 @@ -146391,7 +146391,7 @@ _080C26A6: strh r0, [r5, 0x8] b _080C26D4 .align 2, 0 -_080C26B4: .4byte gUnknown_0842CE78 +_080C26B4: .4byte gContestText_PreliminaryResults _080C26B8: .4byte 0x02018000 _080C26BC: .4byte 0x0000ffff _080C26C0: @@ -146530,7 +146530,7 @@ sub_80C2770: @ 80C2770 .align 2, 0 _080C27BC: .4byte 0x02018000 _080C27C0: .4byte 0x03004b20 -_080C27C4: .4byte gUnknown_0842CE91 +_080C27C4: .4byte gContestText_Round2Results _080C27C8: .4byte 0x0000ffff _080C27CC: cmp r3, 0x2 @@ -146863,7 +146863,7 @@ _080C2A4A: _080C2A54: .4byte 0x0203857d _080C2A58: .4byte 0x020232cc _080C2A5C: .4byte 0x02038572 -_080C2A60: .4byte gUnknown_0842CEA2 +_080C2A60: .4byte gContestText_PokeWon _080C2A64: .4byte 0x02018000 _080C2A68: .4byte 0x0000ffff _080C2A6C: .4byte 0x03004b20 @@ -147270,7 +147270,7 @@ sub_80C2D80: @ 80C2D80 b _080C2DCA .align 2, 0 _080C2DAC: .4byte 0x0203869a -_080C2DB0: .4byte gUnknown_0842CEAF +_080C2DB0: .4byte gOtherText_LinkStandby _080C2DB4: .4byte 0x03004b20 _080C2DB8: .4byte sub_80C2DD8 _080C2DBC: @@ -153222,7 +153222,7 @@ _080C5B58: .4byte 0x020233cc _080C5B5C: .4byte 0x020231cc _080C5B60: .4byte gSpeciesNames _080C5B64: .4byte 0x020232cc -_080C5B68: .4byte gUnknown_0842C9E1 +_080C5B68: .4byte gOtherText_Marco _080C5B6C: ldr r0, _080C5B7C ldr r1, _080C5B80 @@ -155791,7 +155791,7 @@ _080C6F74: _080C6F9C: .4byte 0x000002f6 _080C6FA0: .4byte 0x020231cc _080C6FA4: .4byte 0x020232cc -_080C6FA8: .4byte gUnknown_0840FAB2 +_080C6FA8: .4byte gSecretBaseText_GoldRank _080C6FAC: .4byte 0x0202e8dc _080C6FB0: ldr r0, _080C6FCC @@ -155808,7 +155808,7 @@ _080C6FB0: .align 2, 0 _080C6FCC: .4byte 0x020231cc _080C6FD0: .4byte 0x020232cc -_080C6FD4: .4byte gUnknown_0840FAB7 +_080C6FD4: .4byte gSecretBaseText_SilverRank _080C6FD8: .4byte 0x0202e8dc _080C6FDC: ldr r1, _080C6FE4 @@ -160131,7 +160131,7 @@ DisplayDadsAdviceCannotUseItemMessage: @ 80C90EC pop {r0} bx r0 .align 2, 0 -_080C9100: .4byte gUnknown_0840E8EA +_080C9100: .4byte gOtherText_DadsAdvice thumb_func_end DisplayDadsAdviceCannotUseItemMessage thumb_func_start sub_80C9104 @@ -160146,7 +160146,7 @@ sub_80C9104: @ 80C9104 pop {r0} bx r0 .align 2, 0 -_080C9118: .4byte gUnknown_0840E929 +_080C9118: .4byte gOtherText_CantGetOffBike thumb_func_end sub_80C9104 thumb_func_start CheckIfItemIsTMHMOrEvolutionStone @@ -160560,7 +160560,7 @@ _080C9448: pop {r0} bx r0 .align 2, 0 -_080C9450: .4byte gUnknown_0840E9C8 +_080C9450: .4byte gOtherText_NoResponse _080C9454: .4byte sub_80C9520 thumb_func_end ItemUseOnFieldCB_Itemfinder @@ -161369,7 +161369,7 @@ _080C9A24: bx r0 .align 2, 0 _080C9A2C: .4byte 0x030048a0 -_080C9A30: .4byte gUnknown_0840E94E +_080C9A30: .4byte gOtherText_ItemfinderResponding _080C9A34: .4byte sub_80C9520 thumb_func_end sub_80C99EC @@ -161439,7 +161439,7 @@ _080C9AAE: _080C9AB4: .4byte 0x03004b28 _080C9AB8: .4byte 0x030048a0 _080C9ABC: .4byte gUnknown_083D61F0 -_080C9AC0: .4byte gUnknown_0840E992 +_080C9AC0: .4byte gOtherText_ItemfinderFoundItem _080C9AC4: .4byte sub_80C9520 thumb_func_end sub_80C9A38 @@ -161540,7 +161540,7 @@ ItemUseOutOfBattle_CoinCase: @ 80C9B38 .align 2, 0 _080C9B8C: .4byte 0x020231cc _080C9B90: .4byte 0x020234cc -_080C9B94: .4byte gUnknown_0840E9F5 +_080C9B94: .4byte gOtherText_Coins3 _080C9B98: .4byte 0x03004b20 _080C9B9C: .4byte sub_80A5C48 _080C9BA0: @@ -161954,7 +161954,7 @@ ItemUseOutOfBattle_TMHM: @ 80C9E90 b _080C9ED4 .align 2, 0 _080C9EBC: .4byte 0x0203855e -_080C9EC0: .4byte gUnknown_0840EA16 +_080C9EC0: .4byte gOtherText_BootedHM _080C9EC4: .4byte sub_80C9EE4 _080C9EC8: ldr r1, _080C9EDC @@ -161967,7 +161967,7 @@ _080C9ED4: pop {r0} bx r0 .align 2, 0 -_080C9EDC: .4byte gUnknown_0840EA06 +_080C9EDC: .4byte gOtherText_BootedTM _080C9EE0: .4byte sub_80C9EE4 thumb_func_end ItemUseOutOfBattle_TMHM @@ -162041,7 +162041,7 @@ _080C9F68: .4byte 0x020231cc _080C9F6C: .4byte 0x0203855e _080C9F70: .4byte gMoveNames _080C9F74: .4byte 0x020234cc -_080C9F78: .4byte gUnknown_0840EA27 +_080C9F78: .4byte gOtherText_ContainsMove _080C9F7C: .4byte sub_80C9F80 thumb_func_end sub_80C9F10 @@ -162114,7 +162114,7 @@ sub_80C9FDC: @ 80C9FDC _080CA004: .4byte 0x0203855e _080CA008: .4byte 0x020232cc _080CA00C: .4byte 0x020234cc -_080CA010: .4byte gUnknown_0840EA4F +_080CA010: .4byte gOtherText_UsedItem thumb_func_end sub_80C9FDC thumb_func_start ItemUseOutOfBattle_Repel @@ -162159,7 +162159,7 @@ _080CA06C: pop {r0} bx r0 .align 2, 0 -_080CA074: .4byte gUnknown_0840EA61 +_080CA074: .4byte gOtherText_RepelLingers _080CA078: .4byte sub_80A5C48 thumb_func_end ItemUseOutOfBattle_Repel @@ -162239,7 +162239,7 @@ _080CA10C: .4byte 0x0203855e _080CA110: .4byte 0x0000084d _080CA114: .4byte 0x0000084e _080CA118: .4byte 0x020234cc -_080CA11C: .4byte gUnknown_0840EA95 +_080CA11C: .4byte gOtherText_UsedFlute _080CA120: .4byte 0x03004b20 _080CA124: cmp r0, 0x2A @@ -162270,7 +162270,7 @@ _080CA152: _080CA158: .4byte 0x0000084e _080CA15C: .4byte 0x0000084d _080CA160: .4byte 0x020234cc -_080CA164: .4byte gUnknown_0840EAC3 +_080CA164: .4byte gOtherText_UsedRepel _080CA168: .4byte 0x03004b20 _080CA16C: .4byte sub_80CA098 thumb_func_end ItemUseOutOfBattle_BlackWhiteFlute @@ -162423,7 +162423,7 @@ _080CA284: pop {r0} bx r0 .align 2, 0 -_080CA28C: .4byte gUnknown_0840EAF4 +_080CA28C: .4byte gOtherText_BoxIsFull _080CA290: .4byte sub_80A5C48 thumb_func_end ItemUseInBattle_PokeBall @@ -162534,7 +162534,7 @@ _080CA35C: .4byte 0x02024a6a _080CA360: .4byte 0x02024e6c _080CA364: .4byte 0x03004360 _080CA368: .4byte 0x0203855e -_080CA36C: .4byte gUnknown_0840EF85 +_080CA36C: .4byte gOtherText_WontHaveAnyEffect _080CA370: .4byte sub_80A5C48 _080CA374: ldr r0, _080CA38C @@ -162692,7 +162692,7 @@ _080CA494: .4byte 0x0203855e _080CA498: .4byte 0x03004360 _080CA49C: .4byte 0x020231cc _080CA4A0: .4byte 0x020234cc -_080CA4A4: .4byte gUnknown_0840F5D7 +_080CA4A4: .4byte gOtherText_SnapConfusion _080CA4A8: .4byte sub_80A7094 _080CA4AC: ldr r1, _080CA4C0 @@ -162705,7 +162705,7 @@ _080CA4B8: pop {r0} bx r0 .align 2, 0 -_080CA4C0: .4byte gUnknown_0840EF85 +_080CA4C0: .4byte gOtherText_WontHaveAnyEffect _080CA4C4: .4byte sub_80A5C48 thumb_func_end unref_sub_80CA448 @@ -226665,8 +226665,8 @@ _080E92AC: ldr r0, _080E92C0 b _080E9326 .align 2, 0 -_080E92BC: .4byte gUnknown_084110EE -_080E92C0: .4byte gUnknown_0841110D +_080E92BC: .4byte gOtherText_TextDeletedConfirmPage1 +_080E92C0: .4byte gOtherText_TextDeletedConfirmPage2 _080E92C4: ldr r0, _080E92D8 ldr r0, [r0] @@ -226679,17 +226679,17 @@ _080E92C4: b _080E933E .align 2, 0 _080E92D8: .4byte gUnknown_083DB694 -_080E92DC: .4byte gUnknown_08411220 +_080E92DC: .4byte gOtherText_QuitGivingInfo _080E92E0: ldr r0, _080E92E4 b _080E933E .align 2, 0 -_080E92E4: .4byte gUnknown_08411239 +_080E92E4: .4byte gOtherText_StopGivingMail _080E92E8: ldr r0, _080E92EC b _080E933E .align 2, 0 -_080E92EC: .4byte gUnknown_08411127 +_080E92EC: .4byte gOtherText_QuitEditing _080E92F0: ldr r0, _080E9300 movs r1, 0x4 @@ -226699,18 +226699,18 @@ _080E92F0: ldr r0, _080E9304 b _080E9326 .align 2, 0 -_080E9300: .4byte gUnknown_08411135 -_080E9304: .4byte gUnknown_08411158 +_080E9300: .4byte gOtherText_EditedTextNoSavePage1 +_080E9304: .4byte gOtherText_EditedTextNoSavePage2 _080E9308: ldr r0, _080E930C b _080E933E .align 2, 0 -_080E930C: .4byte gUnknown_08411166 +_080E930C: .4byte gOtherText_EnterAPhraseOrWord _080E9310: ldr r0, _080E9314 b _080E933E .align 2, 0 -_080E9314: .4byte gUnknown_08411185 +_080E9314: .4byte gOtherText_TextNoDelete _080E9318: ldr r0, _080E9334 movs r1, 0x4 @@ -226725,8 +226725,8 @@ _080E9326: bl sub_80E91B0 b _080E935C .align 2, 0 -_080E9334: .4byte gUnknown_084111A7 -_080E9338: .4byte gUnknown_084111C7 +_080E9334: .4byte gOtherText_OnlyOnePhrase +_080E9338: .4byte gOtherText_OriginalSongRestored _080E933C: ldr r0, _080E934C _080E933E: @@ -226736,7 +226736,7 @@ _080E933E: bl sub_80E91B0 b _080E935C .align 2, 0 -_080E934C: .4byte gUnknown_084111EB +_080E934C: .4byte gOtherText_TrendyAlready _080E9350: ldr r0, _080E9364 movs r1, 0x4 @@ -226748,7 +226748,7 @@ _080E935C: pop {r0} bx r0 .align 2, 0 -_080E9364: .4byte gUnknown_08411202 +_080E9364: .4byte gOtherText_CombineTwoPhrases thumb_func_end sub_80E91D4 thumb_func_start sub_80E9368 @@ -226785,42 +226785,42 @@ _080E93B8: ldr r4, _080E93BC b _080E93FA .align 2, 0 -_080E93BC: .4byte gUnknown_08411257 +_080E93BC: .4byte gOtherText_Profile _080E93C0: ldr r4, _080E93C4 b _080E93FA .align 2, 0 -_080E93C4: .4byte gUnknown_0841125F +_080E93C4: .4byte gOtherText_AtBattleStart _080E93C8: ldr r4, _080E93CC b _080E93FA .align 2, 0 -_080E93CC: .4byte gUnknown_08411276 +_080E93CC: .4byte gOtherText_UponWinningBattle _080E93D0: ldr r4, _080E93D4 b _080E93FA .align 2, 0 -_080E93D4: .4byte gUnknown_0841128D +_080E93D4: .4byte gOtherText_UponLosingBattle _080E93D8: ldr r4, _080E93DC b _080E93FA .align 2, 0 -_080E93DC: .4byte gUnknown_084112A3 +_080E93DC: .4byte gOtherText_TheBardsSong _080E93E0: ldr r4, _080E93E4 b _080E93FA .align 2, 0 -_080E93E4: .4byte gUnknown_084112B3 +_080E93E4: .4byte gOtherText_WhatsHipHappening _080E93E8: ldr r4, _080E93EC b _080E93FA .align 2, 0 -_080E93EC: .4byte gUnknown_084112CD +_080E93EC: .4byte gOtherText_Interview _080E93F0: ldr r4, _080E93F4 b _080E93FA .align 2, 0 -_080E93F4: .4byte gUnknown_084112D7 +_080E93F4: .4byte gOtherText_GoodSaying _080E93F8: movs r4, 0 _080E93FA: @@ -230718,7 +230718,7 @@ sub_80EB218: @ 80EB218 ldr r1, _080EB23C b _080EB2A2 .align 2, 0 -_080EB23C: .4byte gUnknown_0842C890 +_080EB23C: .4byte gOtherText_ThreeQuestions _080EB240: ldr r0, _080EB250 cmp r4, r0 @@ -230814,7 +230814,7 @@ sub_80EB2D4: @ 80EB2D4 lsrs r0, 16 b _080EB374 .align 2, 0 -_080EB2F4: .4byte gUnknown_0842C890 +_080EB2F4: .4byte gOtherText_ThreeQuestions _080EB2F8: ldr r0, _080EB304 cmp r4, r0 @@ -230976,7 +230976,7 @@ sub_80EB3FC: @ 80EB3FC bl StringCopy b _080EB4A6 .align 2, 0 -_080EB41C: .4byte gUnknown_0842C890 +_080EB41C: .4byte gOtherText_ThreeQuestions _080EB420: ldr r0, _080EB43C cmp r4, r0 @@ -241455,11 +241455,11 @@ _080F08C6: pop {r0} bx r0 .align 2, 0 -_080F08CC: .4byte gUnknown_08410E22 +_080F08CC: .4byte gOtherText_NumberRegistered _080F08D0: .4byte gUnknown_083DFEC4 _080F08D4: .4byte 0x00008788 _080F08D8: .4byte 0x00008774 -_080F08DC: .4byte gUnknown_08410E31 +_080F08DC: .4byte gOtherText_NumberBattles _080F08E0: .4byte 0x0001869f thumb_func_end sub_80F081C @@ -242103,7 +242103,7 @@ _080F0DE4: lsls r2, r5, 3 b _080F0E54 .align 2, 0 -_080F0DEC: .4byte gUnknown_08410E40 +_080F0DEC: .4byte gOtherText_Strategy _080F0DF0: ldr r0, _080F0DFC ldr r0, [r0] @@ -242120,7 +242120,7 @@ _080F0E08: lsls r2, r5, 3 b _080F0E54 .align 2, 0 -_080F0E10: .4byte gUnknown_08410E4C +_080F0E10: .4byte gOtherText_TrainersPokemon _080F0E14: ldr r0, _080F0E20 ldr r0, [r0] @@ -242137,7 +242137,7 @@ _080F0E2C: lsls r2, r5, 3 b _080F0E54 .align 2, 0 -_080F0E34: .4byte gUnknown_08410E61 +_080F0E34: .4byte gOtherText_SelfIntroduction _080F0E38: ldr r0, _080F0E60 ldr r0, [r0] @@ -243095,7 +243095,7 @@ sub_80F15A8: @ 80F15A8 .align 2, 0 _080F1600: .4byte gUnknown_083DFEC4 _080F1604: .4byte 0x00008788 -_080F1608: .4byte gUnknown_08410E8C +_080F1608: .4byte gOtherText_Ribbons _080F160C: .4byte 0x000087dc _080F1610: .4byte 0x0000893c thumb_func_end sub_80F15A8 @@ -243530,7 +243530,7 @@ _080F1994: .4byte 0x00008788 _080F1998: .4byte 0x000087dc _080F199C: .4byte 0x0000893f _080F19A0: .4byte 0x03004360 -_080F19A4: .4byte gUnknown_08410E76 +_080F19A4: .4byte gOtherText_Nature2 _080F19A8: .4byte gNatureNames _080F19AC: ldr r1, _080F19D0 @@ -249104,7 +249104,7 @@ sub_80F443C: @ 80F443C pop {r1} bx r1 .align 2, 0 -_080F4458: .4byte gUnknown_08410E87 +_080F4458: .4byte gOtherText_Number thumb_func_end sub_80F443C thumb_func_start sub_80F445C @@ -249322,7 +249322,7 @@ _080F45F4: .4byte 0x0000893f _080F45F8: .4byte 0x00008829 _080F45FC: .4byte 0x0000893d _080F4600: .4byte 0x000088e9 -_080F4604: .4byte gUnknown_08410E7E +_080F4604: .4byte gOtherText_InParty _080F4608: lsls r0, r6, 1 adds r0, r6 @@ -256455,9 +256455,9 @@ _080F7D02: _080F7D50: .4byte 0x020284c8 _080F7D54: .4byte 0x0000ffff _080F7D58: .4byte 0x020234cc -_080F7D5C: .4byte gUnknown_0841134B +_080F7D5C: .4byte gOtherText_Is _080F7D60: .4byte gUnknown_083E5388 -_080F7D64: .4byte gUnknown_0841134F +_080F7D64: .4byte gOtherText_DontYouAgree _080F7D68: ldr r0, _080F7DA0 ldr r3, _080F7DA4 @@ -257837,7 +257837,7 @@ _080F87A4: bx r0 .align 2, 0 _080F87BC: .4byte 0x020284c8 -_080F87C0: .4byte gUnknown_08410866 +_080F87C0: .4byte gPCText_Cancel thumb_func_end sub_80F8758 thumb_func_start sub_80F87C4 @@ -258654,7 +258654,7 @@ _080F8E04: .align 2, 0 _080F8E3C: .4byte 0x02000000 _080F8E40: .4byte 0x020000d8 -_080F8E44: .4byte gUnknown_0842C894 +_080F8E44: .4byte gOtherText_From _080F8E48: ldr r1, _080F8E7C adds r0, r2, 0 @@ -258681,7 +258681,7 @@ _080F8E6A: pop {r0} bx r0 .align 2, 0 -_080F8E7C: .4byte gUnknown_0842C894 +_080F8E7C: .4byte gOtherText_From thumb_func_end sub_80F8DA0 thumb_func_start sub_80F8E80 @@ -265218,13 +265218,13 @@ sub_80FBFF8: @ 80FBFF8 bl StringCopy b _080FC026 .align 2, 0 -_080FC010: .4byte gUnknown_084117C9 +_080FC010: .4byte gOtherText_Ferry _080FC014: ldr r1, _080FC01C bl StringCopy b _080FC026 .align 2, 0 -_080FC01C: .4byte gUnknown_084117CF +_080FC01C: .4byte gOtherText_SecretBase _080FC020: movs r2, 0 bl sub_80FBFB4 @@ -265249,7 +265249,7 @@ _080FC042: pop {r1} bx r1 .align 2, 0 -_080FC048: .4byte gUnknown_084117DB +_080FC048: .4byte gOtherText_Hideout thumb_func_end sub_80FC02C thumb_func_start sub_80FC04C @@ -265403,7 +265403,7 @@ _080FC184: b _080FC1E6 .align 2, 0 _080FC19C: .4byte gUnknown_083E771C -_080FC1A0: .4byte gUnknown_0840E604 +_080FC1A0: .4byte gOtherText_FlyToWhere _080FC1A4: bl sub_80FC31C b _080FC1E6 @@ -270124,7 +270124,7 @@ _080FE58E: pop {r0} bx r0 .align 2, 0 -_080FE5A8: .4byte gUnknown_0840E640 +_080FE5A8: .4byte gUnknownText_Exit thumb_func_end sub_80FE528 thumb_func_start sub_80FE5AC @@ -270277,7 +270277,7 @@ _080FE6DC: bl DisplayItemMessageOnField b _080FE720 .align 2, 0 -_080FE6FC: .4byte gUnknown_0840FA64 +_080FE6FC: .4byte gSecretBaseText_NoDecors _080FE700: .4byte sub_80FE418 _080FE704: adds r0, r5, 0 @@ -270825,7 +270825,7 @@ _080FEB3C: _080FEB58: .4byte 0x020388f4 _080FEB5C: .4byte 0x020388d5 _080FEB60: .4byte 0x020388f7 -_080FEB64: .4byte gUnknown_0840E640 +_080FEB64: .4byte gUnknownText_Exit _080FEB68: ldr r0, _080FEBC0 ldr r1, [r0] @@ -271630,7 +271630,7 @@ sub_80FF160: @ 80FF160 bl DisplayItemMessageOnField b _080FF1A2 .align 2, 0 -_080FF180: .4byte gUnknown_0840FA64 +_080FF180: .4byte gSecretBaseText_NoDecors _080FF184: .4byte sub_80FE428 _080FF188: ldr r1, _080FF1A8 @@ -272210,7 +272210,7 @@ sub_80FF5BC: @ 80FF5BC .align 2, 0 _080FF5E4: .4byte 0x0201f000 _080FF5E8: .4byte 0x020388f6 -_080FF5EC: .4byte gUnknown_0840FBD3 +_080FF5EC: .4byte gSecretBaseText_DecorCantPlace _080FF5F0: bl sub_80FEFA4 lsls r0, 24 @@ -272258,7 +272258,7 @@ _080FF62C: _080FF654: .4byte 0x020231cc _080FF658: .4byte 0x0201f000 _080FF65C: .4byte 0x020234cc -_080FF660: .4byte gUnknown_0840FB11 +_080FF660: .4byte gSecretBaseText_NoMoreDecor _080FF664: ldr r0, _080FF67C ldr r1, _080FF680 @@ -272273,7 +272273,7 @@ _080FF66E: b _080FF69C .align 2, 0 _080FF67C: .4byte 0x020234cc -_080FF680: .4byte gUnknown_0840FB57 +_080FF680: .4byte gSecretBaseText_NoMoreDecor2 _080FF684: .4byte sub_80FEFF4 _080FF688: bl sub_80FEF74 @@ -272288,7 +272288,7 @@ _080FF69C: pop {r0} bx r0 .align 2, 0 -_080FF6A4: .4byte gUnknown_0840FAF9 +_080FF6A4: .4byte gSecretBaseText_InUseAlready _080FF6A8: .4byte sub_80FEFF4 thumb_func_end sub_80FF5BC @@ -272860,7 +272860,7 @@ _080FFB54: .4byte 0x03004b20 _080FFB58: .4byte 0x02020004 _080FFB5C: .4byte 0x020391a8 _080FFB60: .4byte 0x020391a9 -_080FFB64: .4byte gUnknown_0840FAE6 +_080FFB64: .4byte gSecretBaseText_CancelDecorating _080FFB68: .4byte sub_8100248 thumb_func_end sub_80FFB08 @@ -273532,7 +273532,7 @@ sub_8100038: @ 8100038 _0810006C: .4byte 0x020388f5 _08100070: .4byte 0x020388d0 _08100074: .4byte gDecorations -_08100078: .4byte gUnknown_0840FABE +_08100078: .4byte gSecretBaseText_PlaceItHere _0810007C: .4byte sub_81000A0 _08100080: movs r0, 0x20 @@ -273547,7 +273547,7 @@ _08100092: pop {r0} bx r0 .align 2, 0 -_08100098: .4byte gUnknown_0840FACD +_08100098: .4byte gSecretBaseText_CantBePlacedHere _0810009C: .4byte sub_81006A8 thumb_func_end sub_8100038 @@ -274868,7 +274868,7 @@ _08100A50: pop {r0} bx r0 .align 2, 0 -_08100A58: .4byte gUnknown_0840FD11 +_08100A58: .4byte gSecretBaseText_NoDecorInUse _08100A5C: .4byte sub_80FE428 thumb_func_end sub_8100A0C @@ -275239,7 +275239,7 @@ _08100D24: bx r0 .align 2, 0 _08100D2C: .4byte 0x0000ffff -_08100D30: .4byte gUnknown_0840FCEA +_08100D30: .4byte gSecretBaseText_DecorReturned _08100D34: .4byte sub_81010F0 thumb_func_end sub_8100C88 @@ -275604,7 +275604,7 @@ _0810100C: .4byte 0x03004b20 _08101010: .4byte 0x02020004 _08101014: .4byte 0x020391a8 _08101018: .4byte SpriteCallbackDummy -_0810101C: .4byte gUnknown_0840FC87 +_0810101C: .4byte gSecretBaseText_StopPuttingAwayDecor _08101020: .4byte sub_810156C thumb_func_end sub_8100FB4 @@ -275624,7 +275624,7 @@ sub_8101024: @ 8101024 b _081010B0 .align 2, 0 _08101040: .4byte 0x02039234 -_08101044: .4byte gUnknown_0840FCC8 +_08101044: .4byte gSecretBaseText_ReturnDecor _08101048: .4byte sub_8101518 _0810104C: lsls r1, r5, 2 @@ -275685,7 +275685,7 @@ _081010BC: .4byte 0x03004b28 _081010C0: .4byte 0x02020004 _081010C4: .4byte 0x020391a8 _081010C8: .4byte SpriteCallbackDummy -_081010CC: .4byte gUnknown_0840FC87 +_081010CC: .4byte gSecretBaseText_StopPuttingAwayDecor _081010D0: .4byte sub_810156C _081010D4: ldr r1, _081010E8 @@ -275698,7 +275698,7 @@ _081010E0: pop {r0} bx r0 .align 2, 0 -_081010E8: .4byte gUnknown_0840FCA6 +_081010E8: .4byte gSecretBaseText_NoDecor _081010EC: .4byte sub_81010F0 thumb_func_end sub_8101024 @@ -276540,7 +276540,7 @@ sub_8101700: @ 8101700 bl DisplayItemMessageOnField b _08101742 .align 2, 0 -_08101720: .4byte gUnknown_0840FA64 +_08101720: .4byte gSecretBaseText_NoDecors _08101724: .4byte sub_80FE428 _08101728: ldr r1, _08101748 @@ -276580,7 +276580,7 @@ unref_sub_8101750: @ 8101750 bl DisplayItemMessageOnField b _08101792 .align 2, 0 -_08101770: .4byte gUnknown_0840FA64 +_08101770: .4byte gSecretBaseText_NoDecors _08101774: .4byte sub_80FE428 _08101778: ldr r1, _08101798 @@ -276643,7 +276643,7 @@ _081017F0: .4byte 0x020388f5 _081017F4: .4byte 0x020388d0 _081017F8: .4byte gDecorations + 0x1 _081017FC: .4byte 0x020234cc -_08101800: .4byte gUnknown_0840FC39 +_08101800: .4byte gSecretBaseText_WillBeDiscarded _08101804: .4byte sub_8101824 _08101808: ldr r1, _0810181C @@ -276656,7 +276656,7 @@ _08101814: pop {r0} bx r0 .align 2, 0 -_0810181C: .4byte gUnknown_0840FC05 +_0810181C: .4byte gSecretBaseText_DecorInUse _08101820: .4byte sub_80FEFF4 thumb_func_end sub_81017A0 @@ -276716,7 +276716,7 @@ sub_8101848: @ 8101848 .align 2, 0 _08101890: .4byte 0x020388f5 _08101894: .4byte 0x020388d0 -_08101898: .4byte gUnknown_0840FC62 +_08101898: .4byte gSecretBaseText_DecorThrownAway _0810189C: .4byte sub_80FEFF4 thumb_func_end sub_8101848 @@ -277598,7 +277598,7 @@ sub_8101F44: @ 8101F44 pop {r1} bx r1 .align 2, 0 -_08101F58: .4byte gUnknown_0842CADB +_08101F58: .4byte gOtherText_DontHaveThreeCoins _08101F5C: .4byte 0x02000000 thumb_func_end sub_8101F44 @@ -278125,7 +278125,7 @@ sub_8102318: @ 8102318 pop {r1} bx r1 .align 2, 0 -_0810233C: .4byte gUnknown_0842CA90 +_0810233C: .4byte gOtherText_QuitGamePrompt _08102340: .4byte 0x02000000 thumb_func_end sub_8102318 @@ -278186,7 +278186,7 @@ sub_810239C: @ 810239C pop {r1} bx r1 .align 2, 0 -_081023B0: .4byte gUnknown_0842CA9F +_081023B0: .4byte gOtherText_MaxCoins _081023B4: .4byte 0x02000000 thumb_func_end sub_810239C @@ -278224,7 +278224,7 @@ sub_81023E0: @ 81023E0 pop {r1} bx r1 .align 2, 0 -_081023F4: .4byte gUnknown_0842CAB7 +_081023F4: .4byte gOtherText_OutOfCoins _081023F8: .4byte 0x02000000 thumb_func_end sub_81023E0 @@ -283642,7 +283642,7 @@ sub_8104B80: @ 8104B80 bx r0 .align 2, 0 _08104BC0: .4byte gWindowConfig_81E7144 -_08104BC4: .4byte gUnknown_0842CAF7 +_08104BC4: .4byte gOtherText_ReelTime thumb_func_end sub_8104B80 thumb_func_start sub_8104BC8 @@ -287585,8 +287585,8 @@ sub_8106918: @ 8106918 _08106974: .4byte 0x03005e40 _08106978: .4byte 0x03005e8c _0810697C: .4byte gUnknown_083F60AC -_08106980: .4byte gUnknown_0840FF65 -_08106984: .4byte gUnknown_0840FF75 +_08106980: .4byte gContestText_ContestWinner +_08106984: .4byte gOtherText_Unknown1 _08106988: ldr r4, _081069C4 lsls r5, r0, 3 @@ -294165,7 +294165,7 @@ _08109A98: b _08109AD8 .align 2, 0 _08109AB8: .4byte 0x020284c8 -_08109ABC: .4byte gUnknown_0840E678 +_08109ABC: .4byte gOtherText_FiveQuestionsAndSlash _08109AC0: ldrb r0, [r1] lsls r0, 5 @@ -294220,7 +294220,7 @@ _08109ADE: bx r0 .align 2, 0 _08109B28: .4byte gDecorations + 0x1 -_08109B2C: .4byte gUnknown_0840E645 +_08109B2C: .4byte gOtherText_CancelNoTerminator _08109B30: .4byte 0x03004b20 thumb_func_end sub_8109A48 @@ -294957,7 +294957,7 @@ sub_810A134: @ 810A134 bx r0 .align 2, 0 _0810A16C: .4byte 0x03004b20 -_0810A170: .4byte gUnknown_0840E568 +_0810A170: .4byte gOtherText_BirchInTrouble _0810A174: .4byte sub_810A178 thumb_func_end sub_810A134 @@ -295167,7 +295167,7 @@ sub_810A2D8: @ 810A2D8 bx r0 .align 2, 0 _0810A324: .4byte 0x03004b20 -_0810A328: .4byte gUnknown_0840E5AB +_0810A328: .4byte gOtherText_DoYouChoosePoke _0810A32C: .4byte sub_810A330 thumb_func_end sub_810A2D8 @@ -295454,7 +295454,7 @@ _0810A4D8: .align 2, 0 _0810A568: .4byte gUnknown_083F76BE _0810A56C: .4byte REG_WIN0H -_0810A570: .4byte gUnknown_0840E5CD +_0810A570: .4byte gOtherText_Poke _0810A574: .4byte gSpeciesNames _0810A578: .4byte REG_WIN0V thumb_func_end sub_810A42C @@ -296357,7 +296357,7 @@ sub_810AC60: @ 810AC60 pop {r0} bx r0 .align 2, 0 -_0810ACC4: .4byte gUnknown_0842D4FF +_0810ACC4: .4byte gOtherText_CorrectTimePrompt _0810ACC8: .4byte gUnknown_08376D74 _0810ACCC: .4byte 0x03004b20 _0810ACD0: .4byte c3_80BF560 @@ -298249,11 +298249,11 @@ sub_810BB30: @ 810BB30 bx r0 .align 2, 0 _0810BB70: .4byte gWindowConfig_81E6E34 -_0810BB74: .4byte gUnknown_0840EBED -_0810BB78: .4byte gUnknown_0840EBF3 -_0810BB7C: .4byte gUnknown_0840EBF7 -_0810BB80: .4byte gUnknown_0840EBFD -_0810BB84: .4byte gUnknown_0840EC04 +_0810BB74: .4byte gContestStatsText_Spicy +_0810BB78: .4byte gContestStatsText_Dry +_0810BB7C: .4byte gContestStatsText_Sweet +_0810BB80: .4byte gContestStatsText_Bitter +_0810BB84: .4byte gContestStatsText_Sour thumb_func_end sub_810BB30 thumb_func_start sub_810BB88 @@ -298313,7 +298313,7 @@ _0810BBF4: .4byte gWindowConfig_81E6E34 _0810BBF8: .4byte 0x020231cc _0810BBFC: .4byte 0x02025734 _0810BC00: .4byte 0x02039248 -_0810BC04: .4byte gUnknown_0840EC14 +_0810BC04: .4byte gContestStatsText_StowCase _0810BC08: lsls r5, r6, 3 mov r1, r10 @@ -299527,7 +299527,7 @@ _0810C5A8: .4byte gUnknown_083F7EB8 _0810C5AC: .4byte 0x02025734 _0810C5B0: .4byte 0x02039248 _0810C5B4: .4byte 0x020234cc -_0810C5B8: .4byte gUnknown_0840EC1F +_0810C5B8: .4byte gContestStatsText_ThrowAwayPrompt _0810C5BC: .4byte sub_810C5EC thumb_func_end sub_810C540 @@ -299610,7 +299610,7 @@ sub_810C610: @ 810C610 .align 2, 0 _0810C658: .4byte 0x02039248 _0810C65C: .4byte 0x020234cc -_0810C660: .4byte gUnknown_0840EC33 +_0810C660: .4byte gContestStatsText_WasThrownAway _0810C664: .4byte sub_810C704 thumb_func_end sub_810C610 @@ -301867,7 +301867,7 @@ sub_810D74C: @ 810D74C b _0810D780 .align 2, 0 _0810D770: .4byte 0x020231cc -_0810D774: .4byte gUnknown_084107A9 +_0810D774: .4byte gOtherText_Times _0810D778: ldr r0, _0810D7CC ldr r1, _0810D7D0 @@ -301906,10 +301906,10 @@ _0810D780: b _0810D7E8 .align 2, 0 _0810D7CC: .4byte 0x020231cc -_0810D7D0: .4byte gUnknown_0841078A +_0810D7D0: .4byte gOtherText_99Times _0810D7D4: .4byte 0x00000e0f _0810D7D8: .4byte 0x020232cc -_0810D7DC: .4byte gUnknown_084107A0 +_0810D7DC: .4byte gOtherText_Seconds _0810D7E0: ldr r0, _0810D7F4 ldr r1, _0810D7F8 @@ -301922,7 +301922,7 @@ _0810D7E8: b _0810D81A .align 2, 0 _0810D7F4: .4byte 0x020232cc -_0810D7F8: .4byte gUnknown_08410795 +_0810D7F8: .4byte gOtherText_1Minute _0810D7FC: cmp r6, 0x3 bhi _0810D804 @@ -303273,7 +303273,7 @@ sub_810E298: @ 810E298 .align 2, 0 _0810E2AC: .4byte gSaveBlock2 _0810E2B0: .4byte 0x020231cc -_0810E2B4: .4byte gUnknown_084107B2 +_0810E2B4: .4byte gOtherText_BigGuy _0810E2B8: ldr r0, _0810E2C4 ldr r1, _0810E2C8 @@ -303283,7 +303283,7 @@ _0810E2C0: bx r0 .align 2, 0 _0810E2C4: .4byte 0x020231cc -_0810E2C8: .4byte gUnknown_084107BA +_0810E2C8: .4byte gOtherText_BigGirl thumb_func_end sub_810E298 thumb_func_start sub_810E2CC @@ -303300,7 +303300,7 @@ sub_810E2CC: @ 810E2CC .align 2, 0 _0810E2E0: .4byte gSaveBlock2 _0810E2E4: .4byte 0x020231cc -_0810E2E8: .4byte gUnknown_084107C7 +_0810E2E8: .4byte gOtherText_Daughter _0810E2EC: ldr r0, _0810E2F8 ldr r1, _0810E2FC @@ -303310,7 +303310,7 @@ _0810E2F4: bx r0 .align 2, 0 _0810E2F8: .4byte 0x020231cc -_0810E2FC: .4byte gUnknown_084107C3 +_0810E2FC: .4byte gOtherText_Son thumb_func_end sub_810E2CC thumb_func_start sub_810E300 @@ -304193,7 +304193,7 @@ sub_810E944: @ 810E944 pop {r0} bx r0 .align 2, 0 -_0810E978: .4byte gUnknown_0841085E +_0810E978: .4byte gOtherText_NowOn _0810E97C: .4byte gUnknown_083F8380 _0810E980: .4byte 0x0202e8ce thumb_func_end sub_810E944 @@ -306915,7 +306915,7 @@ _0810FE58: b _0810FEF2 .align 2, 0 _0810FE64: .4byte 0x020231cc -_0810FE68: .4byte gUnknown_0840FF42 +_0810FE68: .4byte gOtherText_Steven _0810FE6C: ldr r0, _0810FE78 ldr r1, _0810FE7C @@ -306923,7 +306923,7 @@ _0810FE6C: b _0810FEF2 .align 2, 0 _0810FE78: .4byte 0x020231cc -_0810FE7C: .4byte gUnknown_0840FF49 +_0810FE7C: .4byte gOtherText_Brawly _0810FE80: ldr r0, _0810FE8C ldr r1, _0810FE90 @@ -306931,7 +306931,7 @@ _0810FE80: b _0810FEF2 .align 2, 0 _0810FE8C: .4byte 0x020231cc -_0810FE90: .4byte gUnknown_0840FF50 +_0810FE90: .4byte gOtherText_Winona _0810FE94: ldr r0, _0810FEA0 ldr r1, _0810FEA4 @@ -306939,7 +306939,7 @@ _0810FE94: b _0810FEF2 .align 2, 0 _0810FEA0: .4byte 0x020231cc -_0810FEA4: .4byte gUnknown_0840FF57 +_0810FEA4: .4byte gOtherText_Phoebe _0810FEA8: ldr r0, _0810FEB4 ldr r1, _0810FEB8 @@ -306947,7 +306947,7 @@ _0810FEA8: b _0810FEF2 .align 2, 0 _0810FEB4: .4byte 0x020231cc -_0810FEB8: .4byte gUnknown_0840FF5E +_0810FEB8: .4byte gOtherText_Glacia _0810FEBC: ldr r0, _0810FEC8 ldr r1, _0810FECC @@ -306955,7 +306955,7 @@ _0810FEBC: b _0810FEF2 .align 2, 0 _0810FEC8: .4byte 0x020231cc -_0810FECC: .4byte gUnknown_0840FF3A +_0810FECC: .4byte gOtherText_Wallace _0810FED0: ldr r4, _0810FEF8 adds r0, r4, 0 @@ -307565,7 +307565,7 @@ sub_81102E8: @ 81102E8 _08110338: .4byte 0x020231cc _0811033C: .4byte 0x020232cc _08110340: .4byte 0x020233cc -_08110344: .4byte gUnknown_0842CA04 +_08110344: .4byte gOtherText_WinRecord thumb_func_end sub_81102E8 thumb_func_start sub_8110348 @@ -307621,8 +307621,8 @@ sub_8110348: @ 8110348 bl MenuPrint b _0811042E .align 2, 0 -_081103B8: .4byte gUnknown_0842CA3C -_081103BC: .4byte gUnknown_0842CA44 +_081103B8: .4byte gOtherText_SevenDashes +_081103BC: .4byte gOtherText_FourDashes _081103C0: ldr r4, _08110438 adds r0, r4, 0 @@ -307716,9 +307716,9 @@ _08110468: pop {r0} bx r0 .align 2, 0 -_08110488: .4byte gUnknown_0842C9F0 +_08110488: .4byte gOtherText_BattleResults _0811048C: .4byte 0x020287ec -_08110490: .4byte gUnknown_0842CA20 +_08110490: .4byte gOtherText_WinLoseDraw thumb_func_end sub_811043C thumb_func_start sub_8110494 @@ -307797,7 +307797,7 @@ _0811050A: .align 2, 0 _0811052C: .4byte 0x0000270f _08110530: .4byte 0x020231cc -_08110534: .4byte gUnknown_0842CA70 +_08110534: .4byte gOtherText_WinStreak thumb_func_end sub_81104E8 thumb_func_start sub_8110538 @@ -307825,7 +307825,7 @@ sub_8110538: @ 8110538 bx r0 .align 2, 0 _08110564: .4byte 0x02024f4c -_08110568: .4byte gUnknown_0842CA83 +_08110568: .4byte gOtherText_Record thumb_func_end sub_8110538 thumb_func_start sub_811056C @@ -307876,7 +307876,7 @@ sub_8110594: @ 8110594 bl sub_81104E8 b _081105D8 .align 2, 0 -_081105C8: .4byte gUnknown_0842CA7B +_081105C8: .4byte gOtherText_Current _081105CC: ldr r0, _081105E0 adds r1, r5, 0 @@ -307888,7 +307888,7 @@ _081105D8: pop {r0} bx r0 .align 2, 0 -_081105E0: .4byte gUnknown_0842CA8A +_081105E0: .4byte gOtherText_Prev thumb_func_end sub_8110594 thumb_func_start sub_81105E4 @@ -307944,9 +307944,9 @@ _08110614: pop {r0} bx r0 .align 2, 0 -_08110658: .4byte gUnknown_0842CA49 -_0811065C: .4byte gUnknown_0842CA63 -_08110660: .4byte gUnknown_0842CA69 +_08110658: .4byte gOtherText_BattleTowerResults +_0811065C: .4byte gOtherText_Lv50 +_08110660: .4byte gOtherText_Lv100 thumb_func_end sub_81105E4 thumb_func_start unref_sub_8110664 @@ -313458,7 +313458,7 @@ _08113434: .align 2, 0 _0811345C: .4byte 0x00000179 _08113460: .4byte 0x03004828 -_08113464: .4byte gUnknown_0842D1EE +_08113464: .4byte gOtherText_LinkStandby2 _08113468: .4byte 0x03004b20 _0811346C: ldr r0, _08113488 @@ -313769,7 +313769,7 @@ _08113700: .4byte gUnknown_08400F8C _08113704: .4byte 0x020238cc _08113708: .4byte 0x03004b20 _0811370C: .4byte 0x02024d1e -_08113710: .4byte gUnknown_0842D1FE +_08113710: .4byte gOtherText_YesNoAndPlayer _08113714: .4byte 0x0000ffff _08113718: .4byte 0x00002d9f _0811371C: @@ -321774,7 +321774,7 @@ sub_81176A8: @ 81176A8 _08117758: .4byte 0x020231cc _0811775C: .4byte 0x03004b20 _08117760: .4byte 0x020234cc -_08117764: .4byte gUnknown_0842C9E7 +_08117764: .4byte gOtherText_Coins _08117768: .4byte gUnknown_083F8DF0 _0811776C: .4byte 0x0202e8cc _08117770: .4byte gUnknown_081C4139 @@ -327975,7 +327975,7 @@ _0811A7EA: bx r0 .align 2, 0 _0811A824: .4byte 0x020231cc -_0811A828: .4byte gUnknown_0840E6DB +_0811A828: .4byte gOtherText_Coins2 thumb_func_end sub_811A798 thumb_func_start GetCoins @@ -343994,7 +343994,7 @@ _08122716: pop {r0} bx r0 .align 2, 0 -_0812271C: .4byte gUnknown_0840F0C2 +_0812271C: .4byte gOtherText_NoMoreThreePoke _08122720: .4byte 0x03004b20 _08122724: .4byte sub_8122728 thumb_func_end sub_8122694 @@ -351410,7 +351410,7 @@ sub_81260D0: @ 81260D0 bx r0 .align 2, 0 _081260E4: .4byte 0x020234cc -_081260E8: .4byte gUnknown_0842F93A +_081260E8: .4byte gOtherText_DataCannotUseVersion thumb_func_end sub_81260D0 thumb_func_start sub_81260EC @@ -351933,7 +351933,7 @@ _08126484: .4byte 0x020231cc _08126488: .4byte 0x02028894 _0812648C: .4byte 0x020232cc _08126490: .4byte 0x020234cc -_08126494: .4byte gUnknown_0842F798 +_08126494: .4byte gOtherText_BerryObtainedDadHasIt _08126498: adds r0, r6, 0 adds r1, r4, 0 @@ -351945,7 +351945,7 @@ _08126498: b _081264B8 .align 2, 0 _081264AC: .4byte 0x020234cc -_081264B0: .4byte gUnknown_0842F7CA +_081264B0: .4byte gOtherText_BerryTransformed _081264B4: ldr r0, _081264D4 ldr r1, _081264D8 @@ -351962,7 +351962,7 @@ _081264B8: b _081264E4 .align 2, 0 _081264D4: .4byte 0x020234cc -_081264D8: .4byte gUnknown_0842F7F6 +_081264D8: .4byte gOtherText_BerryAlreadyObtained _081264DC: .4byte 0x0000402d _081264E0: movs r0, 0x1 @@ -351999,7 +351999,7 @@ sub_81264F0: @ 81264F0 bx r1 .align 2, 0 _0812651C: .4byte 0x020234cc -_08126520: .4byte gUnknown_0842F81E +_08126520: .4byte gOtherText_SpecialRibbonReceived thumb_func_end sub_81264F0 thumb_func_start sub_8126524 @@ -352070,7 +352070,7 @@ sub_812658C: @ 812658C bx r1 .align 2, 0 _081265A8: .4byte 0x020234cc -_081265AC: .4byte gUnknown_0842F852 +_081265AC: .4byte gOtherText_DexUpgraded thumb_func_end sub_812658C thumb_func_start sub_81265B0 @@ -352093,7 +352093,7 @@ sub_81265B0: @ 81265B0 bx r1 .align 2, 0 _081265D4: .4byte 0x020234cc -_081265D8: .4byte gUnknown_0842F888 +_081265D8: .4byte gOtherText_RareWordAdded thumb_func_end sub_81265B0 thumb_func_start sub_81265DC @@ -352155,7 +352155,7 @@ sub_8126608: @ 8126608 b _08126662 .align 2, 0 _08126650: .4byte 0x020231cc -_08126654: .4byte gUnknown_0840DCC4 +_08126654: .4byte gSystemText_Egg _08126658: ldr r0, _08126678 ldr r1, _0812667C @@ -352173,10 +352173,10 @@ _08126662: b _081266F6 .align 2, 0 _08126678: .4byte 0x020231cc -_0812667C: .4byte gUnknown_0840DCC8 +_0812667C: .4byte gSystemText_Pokemon2 _08126680: .4byte 0x03004350 _08126684: .4byte 0x020234cc -_08126688: .4byte gUnknown_0842F8B6 +_08126688: .4byte gOtherText_PartyIsFull _0812668C: ldr r7, _08126708 adds r0, r7, 0 @@ -352234,7 +352234,7 @@ _081266F6: .align 2, 0 _08126708: .4byte 0x03004554 _0812670C: .4byte 0x020234cc -_08126710: .4byte gUnknown_0842F8A4 +_08126710: .4byte gOtherText_PokeWasSentOver thumb_func_end sub_8126608 thumb_func_start sub_8126714 @@ -352263,7 +352263,7 @@ sub_8126714: @ 8126714 .align 2, 0 _08126748: .4byte 0x0202533c _0812674C: .4byte 0x020234cc -_08126750: .4byte gUnknown_0842F8E5 +_08126750: .4byte gOtherText_NewTrainerInHoenn thumb_func_end sub_8126714 thumb_func_start sub_8126754 @@ -352282,7 +352282,7 @@ sub_8126754: @ 8126754 bx r1 .align 2, 0 _08126770: .4byte 0x020234cc -_08126774: .4byte gUnknown_084118D1 +_08126774: .4byte gSystemText_ClockAdjustmentUsable thumb_func_end sub_8126754 thumb_func_start sub_8126778 @@ -378003,7 +378003,7 @@ _08132B1C: .4byte 0x030007b0 _08132B20: .4byte 0x000002c5 _08132B24: .4byte 0x03004360 _08132B28: .4byte 0xffff0000 -_08132B2C: .4byte gUnknown_0842CCE9 +_08132B2C: .4byte gOtherText_PokeLearnedMove _08132B30: .4byte 0x0202e8cc _08132B34: ldr r1, [r4] @@ -378112,7 +378112,7 @@ _08132BF0: adds r0, 0x1 b _08132FD4 .align 2, 0 -_08132C00: .4byte gUnknown_0842CCF8 +_08132C00: .4byte gOtherText_DeleteOlderMove _08132C04: .4byte 0x030007b0 _08132C08: bl MenuUpdateWindowText @@ -378145,7 +378145,7 @@ _08132C2C: movs r0, 0x13 b _08132FD4 .align 2, 0 -_08132C4C: .4byte gUnknown_0842CE06 +_08132C4C: .4byte gOtherText_WhichMoveToForget _08132C50: .4byte 0x030007b0 _08132C54: movs r0, 0x1 @@ -378172,7 +378172,7 @@ _08132C74: adds r0, 0x1 b _08132FD4 .align 2, 0 -_08132C84: .4byte gUnknown_0842CD65 +_08132C84: .4byte gOtherText_StopLearningMove _08132C88: .4byte 0x030007b0 _08132C8C: bl MenuUpdateWindowText @@ -378512,7 +378512,7 @@ _08132F40: .4byte 0x020233cc _08132F44: .4byte gMoveNames _08132F48: .4byte 0x000002c6 _08132F4C: .4byte 0x020232cc -_08132F50: .4byte gUnknown_0842CD77 +_08132F50: .4byte gOtherText_ForgotMove123 _08132F54: .4byte 0x0202e8cc _08132F58: bl MenuUpdateWindowText @@ -378529,7 +378529,7 @@ _08132F58: bl fanfare_play b _08132FD6 .align 2, 0 -_08132F78: .4byte gUnknown_0842CDA3 +_08132F78: .4byte gOtherText_ForgotOrDidNotLearnMove _08132F7C: .4byte 0x030007b0 _08132F80: .4byte 0x0000016f _08132F84: @@ -378709,7 +378709,7 @@ _081330D4: .4byte 0x02020004 _081330D8: .4byte 0x030007b0 _081330DC: .4byte gUnknown_08402D08 _081330E0: .4byte 0x02039360 -_081330E4: .4byte gUnknown_0842CCC7 +_081330E4: .4byte gOtherText_TeachWhichMove thumb_func_end sub_8133030 thumb_func_start sub_81330E8 @@ -378887,7 +378887,7 @@ _08133234: .4byte 0x02020004 _08133238: .4byte 0x030007b0 _0813323C: .4byte gUnknown_08402D08 _08133240: .4byte 0x02039360 -_08133244: .4byte gUnknown_0842CCC7 +_08133244: .4byte gOtherText_TeachWhichMove thumb_func_end sub_8133140 thumb_func_start sub_8133248 @@ -379365,7 +379365,7 @@ _081335F8: .4byte 0x000002c5 _081335FC: .4byte 0x03004360 _08133600: .4byte gMoveNames _08133604: .4byte 0x020231cc -_08133608: .4byte gUnknown_0840E640 +_08133608: .4byte gUnknownText_Exit thumb_func_end sub_8133558 thumb_func_start sub_813360C @@ -379524,7 +379524,7 @@ _081336E8: _08133738: .4byte 0x030007b0 _0813373C: .4byte 0x020232cc _08133740: .4byte 0x020234cc -_08133744: .4byte gUnknown_0842CCDF +_08133744: .4byte gOtherText_TeachSpecificMove _08133748: ldr r4, _08133764 ldr r1, _08133768 @@ -379540,7 +379540,7 @@ _08133748: b _08133796 .align 2, 0 _08133764: .4byte 0x020234cc -_08133768: .4byte gUnknown_0842CDDC +_08133768: .4byte gOtherText_GiveUpTeachingMove _0813376C: movs r0, 0x2 ands r0, r1 @@ -379595,7 +379595,7 @@ _08133796: .align 2, 0 _081337D4: .4byte 0x030007b0 _081337D8: .4byte 0x020234cc -_081337DC: .4byte gUnknown_0842CDDC +_081337DC: .4byte gOtherText_GiveUpTeachingMove _081337E0: .4byte 0x02020004 _081337E4: ldrb r1, [r4, 0x19] @@ -379659,7 +379659,7 @@ _08133844: bl sub_8072C74 b _081338FA .align 2, 0 -_0813385C: .4byte gUnknown_0840E640 +_0813385C: .4byte gUnknownText_Exit _08133860: lsls r1, r6, 1 adds r0, r2, 0 @@ -379834,7 +379834,7 @@ _081339B4: b _081339D8 .align 2, 0 _081339C4: .4byte gBattleMoves -_081339C8: .4byte gUnknown_0840E685 +_081339C8: .4byte gOtherText_ThreeDashes2 _081339CC: ldrb r1, [r1, 0x3] _081339CE: @@ -380480,7 +380480,7 @@ sub_8133EB8: @ 8133EB8 bx r0 .align 2, 0 _08133EE8: .4byte 0x0202e8f4 -_08133EEC: .4byte gUnknown_0840EFA1 +_08133EEC: .4byte gOtherText_CantUseOnPoke _08133EF0: .4byte 0x03004b20 _08133EF4: .4byte sub_8133E74 thumb_func_end sub_8133EB8 @@ -386269,7 +386269,7 @@ _08136C28: .4byte gUnknown_083DFEC4 _08136C2C: .4byte 0x000087dc _08136C30: .4byte 0x03004360 _08136C34: .4byte 0x02039304 -_08136C38: .4byte gUnknown_08411581 +_08136C38: .4byte gOtherText_GetsAPokeBlock _08136C3C: .4byte gWindowConfig_81E709C thumb_func_end sub_8136BB8 @@ -386443,7 +386443,7 @@ sub_8136D60: @ 8136D60 bx r0 .align 2, 0 _08136D84: .4byte gWindowConfig_81E709C -_08136D88: .4byte gUnknown_084115E1 +_08136D88: .4byte gOtherText_WontEat thumb_func_end sub_8136D60 thumb_func_start sub_8136D8C @@ -386504,7 +386504,7 @@ _08136DD8: b _08136E04 .align 2, 0 _08136DF4: .4byte gUnknown_08406134 -_08136DF8: .4byte gUnknown_084115C2 +_08136DF8: .4byte gOtherText_WasEnhanced _08136DFC: ldr r1, _08136E0C adds r0, r4, 0 @@ -386514,7 +386514,7 @@ _08136E04: pop {r0} bx r0 .align 2, 0 -_08136E0C: .4byte gUnknown_084115D0 +_08136E0C: .4byte gOtherText_NothingChanged thumb_func_end sub_8136DC0 thumb_func_start sub_8136E10 @@ -392251,7 +392251,7 @@ _08139C9C: .4byte 0x02039314 _08139CA0: .4byte gUnknown_084062B8 _08139CA4: .4byte 0x030007b4 _08139CA8: .4byte TaskDummy -_08139CAC: .4byte gUnknown_0840E6B5 +_08139CAC: .4byte gOtherText_WhatWillYouDo _08139CB0: .4byte sub_8139CF4 thumb_func_end sub_8139C74 @@ -392280,7 +392280,7 @@ _08139CDC: .4byte 0x02039314 _08139CE0: .4byte gUnknown_084062BC _08139CE4: .4byte 0x030007b4 _08139CE8: .4byte TaskDummy -_08139CEC: .4byte gUnknown_0840E6B5 +_08139CEC: .4byte gOtherText_WhatWillYouDo _08139CF0: .4byte sub_8139CF4 thumb_func_end sub_8139CB4 @@ -392438,7 +392438,7 @@ sub_8139E24: @ 8139E24 pop {r0} bx r0 .align 2, 0 -_08139E38: .4byte gUnknown_0840E6B5 +_08139E38: .4byte gOtherText_WhatWillYouDo _08139E3C: .4byte sub_8139CF4 thumb_func_end sub_8139E24 @@ -392490,7 +392490,7 @@ sub_8139E6C: @ 8139E6C b _08139ECA .align 2, 0 _08139E9C: .4byte 0x0201fe00 -_08139EA0: .4byte gUnknown_0840FE79 +_08139EA0: .4byte gOtherText_NoMailHere _08139EA4: .4byte sub_8139E24 _08139EA8: strb r2, [r1] @@ -392863,7 +392863,7 @@ _0813A188: pop {r0} bx r0 .align 2, 0 -_0813A190: .4byte gUnknown_0840FDF6 +_0813A190: .4byte gOtherText_NoItems _0813A194: .4byte sub_8139E40 thumb_func_end sub_813A118 @@ -392924,7 +392924,7 @@ _0813A20C: pop {r0} bx r0 .align 2, 0 -_0813A214: .4byte gUnknown_0840FDF6 +_0813A214: .4byte gOtherText_NoItems _0813A218: .4byte sub_8139E40 thumb_func_end sub_813A198 @@ -394316,7 +394316,7 @@ _0813AD04: bl sub_8072A18 b _0813ACCE .align 2, 0 -_0813AD1C: .4byte gUnknown_0840E645 +_0813AD1C: .4byte gOtherText_CancelNoTerminator _0813AD20: movs r0, 0 bl SetBgTilemapBuffer @@ -394380,47 +394380,47 @@ _0813ADA0: ldr r1, _0813ADA4 b _0813ADF0 .align 2, 0 -_0813ADA4: .4byte gUnknown_0840E697 +_0813ADA4: .4byte gMenuText_GoBackToPrev _0813ADA8: ldr r1, _0813ADAC b _0813ADF0 .align 2, 0 -_0813ADAC: .4byte gUnknown_0840FE2E +_0813ADAC: .4byte gOtherText_HowManyToWithdraw _0813ADB0: ldr r1, _0813ADB4 b _0813ADF0 .align 2, 0 -_0813ADB4: .4byte gUnknown_0840FE50 +_0813ADB4: .4byte gOtherText_WithdrewThing _0813ADB8: ldr r1, _0813ADBC b _0813ADF0 .align 2, 0 -_0813ADBC: .4byte gUnknown_0840E89F +_0813ADBC: .4byte gOtherText_HowManyToToss _0813ADC0: ldr r1, _0813ADC4 b _0813ADF0 .align 2, 0 -_0813ADC4: .4byte gUnknown_0840E8B2 +_0813ADC4: .4byte gOtherText_ThrewAwayItem _0813ADC8: ldr r1, _0813ADCC b _0813ADF0 .align 2, 0 -_0813ADCC: .4byte gUnknown_0840FE0C +_0813ADCC: .4byte gOtherText_NoMoreRoom _0813ADD0: ldr r1, _0813ADD4 b _0813ADF0 .align 2, 0 -_0813ADD4: .4byte gUnknown_0840E878 +_0813ADD4: .4byte gOtherText_TooImportant _0813ADD8: ldr r1, _0813ADDC b _0813ADF0 .align 2, 0 -_0813ADDC: .4byte gUnknown_0840E8C7 +_0813ADDC: .4byte gOtherText_OkayToThrowAwayPrompt _0813ADE0: ldr r1, _0813ADE4 b _0813ADF0 .align 2, 0 -_0813ADE4: .4byte gUnknown_0840E7B3 +_0813ADE4: .4byte gOtherText_SwitchWhichItem _0813ADE8: adds r0, r1, 0 bl itemid_get_description @@ -394792,7 +394792,7 @@ _0813B0C4: bl MenuPrint b _0813B08A .align 2, 0 -_0813B0D0: .4byte gUnknown_0840E645 +_0813B0D0: .4byte gOtherText_CancelNoTerminator _0813B0D4: movs r0, 0 bl SetBgTilemapBuffer @@ -394867,7 +394867,7 @@ sub_813B108: @ 813B108 pop {r0} bx r0 .align 2, 0 -_0813B16C: .4byte gUnknown_0840FD73 +_0813B16C: .4byte gPCText_Mailbox _0813B170: .4byte 0x0201fe00 thumb_func_end sub_813B108 @@ -395052,7 +395052,7 @@ _0813B2E8: .4byte 0x020231cc _0813B2EC: .4byte 0x0201fe00 _0813B2F0: .4byte 0x02028292 _0813B2F4: .4byte 0x020234cc -_0813B2F8: .4byte gUnknown_0840FE91 +_0813B2F8: .4byte gOtherText_WhatWillYouDoMail _0813B2FC: .4byte sub_813B348 thumb_func_end sub_813B294 @@ -395347,9 +395347,9 @@ sub_813B510: @ 813B510 bx r0 .align 2, 0 _0813B540: .4byte 0x020231cc -_0813B544: .4byte gUnknown_0840FE68 +_0813B544: .4byte gOtherText_MoveToBag _0813B548: .4byte gUnknown_0840633A -_0813B54C: .4byte gUnknown_0840FEBB +_0813B54C: .4byte gOtherText_MessageWillBeLost _0813B550: .4byte sub_813B554 thumb_func_end sub_813B510 @@ -395408,7 +395408,7 @@ sub_813B578: @ 813B578 .align 2, 0 _0813B5BC: .4byte 0x0201fe00 _0813B5C0: .4byte 0x02028280 -_0813B5C4: .4byte gUnknown_0840FEE3 +_0813B5C4: .4byte gOtherText_BagIsFull _0813B5C8: .4byte sub_813B758 _0813B5CC: ldr r1, _0813B608 @@ -395440,7 +395440,7 @@ _0813B602: pop {r0} bx r0 .align 2, 0 -_0813B608: .4byte gUnknown_0840FEF6 +_0813B608: .4byte gOtherText_MailWasReturned _0813B60C: .4byte sub_813B758 thumb_func_end sub_813B578 @@ -395590,7 +395590,7 @@ sub_813B718: @ 813B718 pop {r0} bx r0 .align 2, 0 -_0813B72C: .4byte gUnknown_0840E79C +_0813B72C: .4byte gOtherText_NoPokemon _0813B730: .4byte sub_813B758 thumb_func_end sub_813B718 @@ -402793,7 +402793,7 @@ sub_813EEE4: @ 813EEE4 _0813EF98: .4byte 0x02000008 _0813EF9C: .4byte gWindowConfig_81E709C _0813EFA0: .4byte REG_BG0CNT -_0813EFA4: .4byte gUnknown_0842C5B5 +_0813EFA4: .4byte gOtherText_Hoenn _0813EFA8: .4byte sub_813EFC4 _0813EFAC: .4byte sub_813EFB0 thumb_func_end sub_813EEE4 @@ -409207,7 +409207,7 @@ _08142228: bx r0 .align 2, 0 _08142264: .4byte 0x0201e000 -_08142268: .4byte gUnknown_0840E4CD +_08142268: .4byte gMenuText_HOFSaving _0814226C: .4byte 0x03004b20 _08142270: .4byte sub_8142274 thumb_func_end sub_814217C @@ -409929,7 +409929,7 @@ _0814280A: pop {r0} bx r0 .align 2, 0 -_08142810: .4byte gUnknown_0840E525 +_08142810: .4byte gMenuText_HOFCongratulations _08142814: .4byte sub_8142818 thumb_func_end sub_8142794 @@ -410501,7 +410501,7 @@ _08142C3C: _08142CB0: .4byte 0xffff0000 _08142CB4: .4byte 0x0000735f _08142CB8: .4byte 0x020231cc -_08142CBC: .4byte gUnknown_0840E513 +_08142CBC: .4byte gMenuText_HOFNumber _08142CC0: .4byte 0x03004b20 _08142CC4: .4byte sub_8142CC8 thumb_func_end sub_8142B04 @@ -410920,7 +410920,7 @@ sub_8142FEC: @ 8142FEC pop {r0} bx r0 .align 2, 0 -_08143020: .4byte gUnknown_0840E4F1 +_08143020: .4byte gMenuText_HOFCorrupt _08143024: .4byte 0x03004b20 _08143028: .4byte sub_814302C thumb_func_end sub_8142FEC @@ -410972,7 +410972,7 @@ sub_8143068: @ 8143068 pop {r0} bx r0 .align 2, 0 -_08143084: .4byte gUnknown_0840E44F +_08143084: .4byte gMenuText_WelcomeToHOFAndDexRating thumb_func_end sub_8143068 thumb_func_start sub_8143088 @@ -411106,7 +411106,7 @@ _0814313A: _08143188: .4byte 0x020231cc _0814318C: .4byte 0x000001ff _08143190: .4byte 0x0000ffff -_08143194: .4byte gUnknown_0840E547 +_08143194: .4byte gOtherText_Number2 _08143198: movs r0, 0xFC strb r0, [r7] @@ -411281,8 +411281,8 @@ _081432E4: bx r0 .align 2, 0 _081432F4: .4byte 0x020231cc -_081432F8: .4byte gUnknown_0840E54C -_081432FC: .4byte gUnknown_0840E551 +_081432F8: .4byte gOtherText_Level3 +_081432FC: .4byte gOtherText_IDNumber thumb_func_end sub_8143088 thumb_func_start sub_8143300 @@ -411381,9 +411381,9 @@ sub_8143300: @ 8143300 pop {r0} bx r0 .align 2, 0 -_081433CC: .4byte gUnknown_0840E559 +_081433CC: .4byte gOtherText_Name _081433D0: .4byte gSaveBlock2 -_081433D4: .4byte gUnknown_0840E560 +_081433D4: .4byte gOtherText_IDNumber2 _081433D8: .4byte 0x020231cc _081433DC: .4byte gMainMenuString_Time thumb_func_end sub_8143300 @@ -416914,7 +416914,7 @@ pokedex_diploma_something: @ 8145FB8 .align 2, 0 _08145FDC: .4byte REG_BG3HOFS _08145FE0: .4byte 0x020231cc -_08145FE4: .4byte gUnknown_0842D222 +_08145FE4: .4byte gOtherText_NationalDex _08145FE8: ldr r0, _08146004 strh r1, [r0] @@ -416931,8 +416931,8 @@ _08145FF4: .align 2, 0 _08146004: .4byte REG_BG3HOFS _08146008: .4byte 0x020231cc -_0814600C: .4byte gUnknown_0842D21C -_08146010: .4byte gUnknown_0842D22B +_0814600C: .4byte gOtherText_HoennDex +_08146010: .4byte gOtherText_DiplomaCertificationGameFreak thumb_func_end pokedex_diploma_something thumb_func_start sub_8146014 @@ -417600,9 +417600,9 @@ _0814654E: .align 2, 0 _0814659C: .4byte 0x0203855e _081465A0: .4byte 0x020231cc -_081465A4: .4byte gUnknown_0840EB07 +_081465A4: .4byte gOtherText_Size _081465A8: .4byte 0x020232cc -_081465AC: .4byte gUnknown_0840EB15 +_081465AC: .4byte gContestStatsText_Unknown1 _081465B0: ldr r0, _081465E0 movs r1, 0x10 @@ -417627,8 +417627,8 @@ _081465BA: bl MenuPrint b _081465F6 .align 2, 0 -_081465E0: .4byte gUnknown_0840E674 -_081465E4: .4byte gUnknown_0840EB0E +_081465E0: .4byte gOtherText_ThreeQuestions2 +_081465E4: .4byte gOtherText_Firm _081465E8: .4byte gUnknown_0841192C _081465EC: ldr r0, _081465FC @@ -417640,7 +417640,7 @@ _081465F6: pop {r0} bx r0 .align 2, 0 -_081465FC: .4byte gUnknown_0840E674 +_081465FC: .4byte gOtherText_ThreeQuestions2 thumb_func_end sub_81464E4 thumb_func_start sub_8146600 @@ -418143,8 +418143,8 @@ _081469D2: pop {r1} bx r1 .align 2, 0 -_081469DC: .4byte gUnknown_0842C571 -_081469E0: .4byte gUnknown_0842C58F +_081469DC: .4byte gSystemText_EventLoadSuccess +_081469E0: .4byte gSystemText_LoadingError thumb_func_end sub_81469AC thumb_func_start sub_81469E4 @@ -418218,7 +418218,7 @@ _08146A7C: b _08146D82 .align 2, 0 _08146A8C: .4byte 0x0202f388 -_08146A90: .4byte gUnknown_0842C4C0 +_08146A90: .4byte gSystemText_LinkStandby _08146A94: .4byte 0x03001770 _08146A98: .4byte 0x0000043c _08146A9C: @@ -418273,7 +418273,7 @@ _08146AEC: b _08146C38 .align 2, 0 _08146B08: .4byte 0x03002a60 -_08146B0C: .4byte gUnknown_0842C4E9 +_08146B0C: .4byte gSystemText_LoadEventPressA _08146B10: .4byte 0x03001770 _08146B14: .4byte 0x0000043c _08146B18: @@ -418313,7 +418313,7 @@ _08146B26: b _08146D82 .align 2, 0 _08146B64: .4byte 0x03001770 -_08146B68: .4byte gUnknown_0842C524 +_08146B68: .4byte gSystemText_LoadingEvent _08146B6C: .4byte 0x0000043c _08146B70: adds r0, r2, 0 @@ -418376,7 +418376,7 @@ _08146BE8: bl sub_8072044 b _08146D7C .align 2, 0 -_08146BFC: .4byte gUnknown_0842C535 +_08146BFC: .4byte gSystemText_DontCutLink _08146C00: bl CloseLink movs r0, 0x6 @@ -418845,7 +418845,7 @@ _08146FEC: .4byte gUnknown_083F62EC _08146FF0: .4byte gUnknown_08411960 _08146FF4: .4byte gWindowConfig_81E6C3C _08146FF8: .4byte gWindowConfig_81E6CE4 -_08146FFC: .4byte gUnknown_084115F9 +_08146FFC: .4byte gSystemText_SaveFailedBackupCheck _08147000: .4byte 0x04000208 _08147004: .4byte 0x04000200 _08147008: .4byte REG_DISPSTAT @@ -418968,10 +418968,10 @@ _081470A6: .align 2, 0 _081470C8: .4byte 0x0203933e _081470CC: .4byte 0x03005ea8 -_081470D0: .4byte gUnknown_0841170F +_081470D0: .4byte gSystemText_CheckCompleteSaveAttempt _081470D4: .4byte 0x0203933c -_081470D8: .4byte gUnknown_084115F9 -_081470DC: .4byte gUnknown_0841164E +_081470D8: .4byte gSystemText_SaveFailedBackupCheck +_081470DC: .4byte gSystemText_BackupDamagedGameContinue _081470E0: .4byte sub_81471A4 _081470E4: .if REVISION >= 1 @@ -419002,7 +419002,7 @@ _081470E4: b _0814713E .align 2, 0 _08147104: .4byte 0x03005ebc -_08147108: .4byte gUnknown_08411747 +_08147108: .4byte gSystemText_SaveCompletedGameEnd _0814710C: .if REVISION >= 1 movs r0, 0x1 @@ -419029,7 +419029,7 @@ _0814710C: bl SetMainCallback2 b _08147144 .align 2, 0 -_0814712C: .4byte gUnknown_0841164E +_0814712C: .4byte gSystemText_BackupDamagedGameContinue _08147130: .4byte sub_8147154 _08147134: ldr r0, _0814714C @@ -419049,7 +419049,7 @@ _08147144: pop {r0} bx r0 .align 2, 0 -_0814714C: .4byte gUnknown_08411799 +_0814714C: .4byte gSystemText_SaveCompletedPressA _08147150: .4byte sub_81471A4 thumb_func_end sub_8147048 @@ -419096,7 +419096,7 @@ _0814718A: .align 2, 0 _08147190: .4byte 0x0203933e _08147194: .4byte 0x03001770 -_08147198: .4byte gUnknown_084116CB +_08147198: .4byte gSystemText_GameplayEnded _0814719C: .4byte sub_8146E3C _081471A0: .4byte sub_81471A4 thumb_func_end sub_8147154 @@ -420709,7 +420709,7 @@ _08147EA4: .4byte 0x02039312 _08147EA8: .4byte 0x020231cc _08147EAC: .4byte 0x020232cc _08147EB0: .4byte 0x020234cc -_08147EB4: .4byte gUnknown_0840EC4B +_08147EB4: .4byte gContestStatsText_NormallyAte _08147EB8: cmp r0, 0 ble _08147ED0 @@ -420719,7 +420719,7 @@ _08147EB8: b _08147ED8 .align 2, 0 _08147EC8: .4byte 0x020234cc -_08147ECC: .4byte gUnknown_0840EC5C +_08147ECC: .4byte gContestStatsText_HappilyAte _08147ED0: ldr r0, _08147EF8 ldr r1, _08147EFC @@ -420741,7 +420741,7 @@ _08147ED8: bx r0 .align 2, 0 _08147EF8: .4byte 0x020234cc -_08147EFC: .4byte gUnknown_0840EC75 +_08147EFC: .4byte gContestStatsText_DisdainfullyAte _08147F00: .4byte 0x03004b20 _08147F04: .4byte sub_8147E10 thumb_func_end sub_8147E40 @@ -421891,7 +421891,7 @@ sub_8148830: @ 8148830 bx r0 .align 2, 0 _081488A8: .4byte sub_814881C -_081488AC: .4byte gUnknown_0842CE27 +_081488AC: .4byte gSystemText_ClearAllSaveDataPrompt _081488B0: .4byte gUnknown_08376D74 _081488B4: .4byte 0x03004b20 _081488B8: .4byte sub_81488BC @@ -421932,7 +421932,7 @@ _081488E2: str r1, [r0] b _0814891E .align 2, 0 -_08148900: .4byte gUnknown_0842CE42 +_08148900: .4byte gSystemText_ClearingData _08148904: .4byte 0x03004b20 _08148908: .4byte sub_8148930 _0814890C: diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index fec754203..8ffe9a35a 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -3109,7 +3109,7 @@ sub_80425C4: @ 80425C4 ldr r1, _080425E0 b _08042602 .align 2, 0 -_080425E0: .4byte gUnknown_0820C33D +_080425E0: .4byte gOtherText_MaleSymbol3 _080425E4: cmp r1, 0xFE bne _08042600 @@ -3122,7 +3122,7 @@ _080425E4: ldr r1, _080425FC b _08042602 .align 2, 0 -_080425FC: .4byte gUnknown_0820C33F +_080425FC: .4byte gOtherText_FemaleSymbol3 _08042600: ldr r1, _08042610 _08042602: @@ -3132,7 +3132,7 @@ _08042602: pop {r1} bx r1 .align 2, 0 -_08042610: .4byte gUnknown_0820C341 +_08042610: .4byte gOtherText_GenderlessSymbol thumb_func_end sub_80425C4 thumb_func_start sub_8042614 @@ -3208,8 +3208,8 @@ _08042648: pop {r0} bx r0 .align 2, 0 -_080426A8: .4byte gUnknown_0842CC28 -_080426AC: .4byte gUnknown_0842CC2A +_080426A8: .4byte gOtherText_NewLine2 +_080426AC: .4byte gOtherText_CancelAndLv thumb_func_end sub_8042630 thumb_func_start sub_80426B0 @@ -3273,7 +3273,7 @@ _080426C6: pop {r0} bx r0 .align 2, 0 -_08042728: .4byte gUnknown_0842CC28 +_08042728: .4byte gOtherText_NewLine2 thumb_func_end sub_80426B0 thumb_func_start sub_804272C @@ -4475,7 +4475,7 @@ _08043124: _08043150: .4byte 0x03004360 _08043154: .4byte 0x020231cc _08043158: .4byte 0x020234cc -_0804315C: .4byte gUnknown_0842CC38 +_0804315C: .4byte gOtherText_HatchedFromEgg _08043160: .4byte 0x00000173 _08043164: bl task_is_not_running_overworld_fanfare @@ -4514,7 +4514,7 @@ _08043180: _080431A8: .4byte 0x03004360 _080431AC: .4byte 0x020231cc _080431B0: .4byte 0x020234cc -_080431B4: .4byte gUnknown_0842CC5A +_080431B4: .4byte gOtherText_NickHatchPrompt _080431B8: bl sub_8043724 lsls r0, 24 @@ -16475,7 +16475,7 @@ sub_8049088: @ 8049088 pop {r0} bx r0 .align 2, 0 -_080490B0: .4byte gUnknown_0842C7B6 +_080490B0: .4byte gTradeText_TradeOkayPrompt _080490B4: .4byte 0x03004824 _080490B8: .4byte 0x06010000 thumb_func_end sub_8049088 @@ -18700,7 +18700,7 @@ _0804A230: .4byte 0x02020004 _0804A234: .4byte gTradeMonSpriteCoords _0804A238: .4byte gUnknown_0820C334 _0804A23C: .4byte gUnknown_0820C334 + 0x1 -_0804A240: .4byte gUnknown_0842C7CA +_0804A240: .4byte gOtherText_Terminator2 _0804A244: ldr r0, _0804A2A4 ldr r0, [r0, 0x14] @@ -18907,9 +18907,9 @@ _0804A3D4: bls _0804A3B8 b _0804A404 .align 2, 0 -_0804A3E8: .4byte gUnknown_0820C33C +_0804A3E8: .4byte gOtherText_Terminator _0804A3EC: .4byte gMoveNames -_0804A3F0: .4byte gUnknown_0842C7CB +_0804A3F0: .4byte gOtherText_ControlAndMiscText _0804A3F4: ldr r1, _0804A414 adds r0, r6, 0 @@ -18926,8 +18926,8 @@ _0804A404: pop {r0} bx r0 .align 2, 0 -_0804A414: .4byte gUnknown_0820C33C -_0804A418: .4byte gUnknown_0842C7D6 +_0804A414: .4byte gOtherText_Terminator +_0804A418: .4byte gOtherText_FourQuestions thumb_func_end sub_804A33C thumb_func_start sub_804A41C @@ -23033,7 +23033,7 @@ _0804C6C8: bl _0804D40C .align 2, 0 _0804C6F8: .4byte 0x020234cc -_0804C6FC: .4byte gUnknown_0842C60B +_0804C6FC: .4byte gTradeText_WillBeSent _0804C700: .4byte 0x03004828 _0804C704: ldr r2, [r6] @@ -23103,7 +23103,7 @@ _0804C718: _0804C78C: .4byte 0x02020004 _0804C790: .4byte 0x000fffff _0804C794: .4byte 0x020234cc -_0804C798: .4byte gUnknown_0842C622 +_0804C798: .4byte gTradeText_ByeBye _0804C79C: ldr r7, _0804C810 ldr r2, [r6] @@ -24622,7 +24622,7 @@ _0804D40C: b _0804D570 .align 2, 0 _0804D414: .4byte 0x020234cc -_0804D418: .4byte gUnknown_0842C62F +_0804D418: .4byte gTradeText_SentOverPoke _0804D41C: ldr r1, [r6] adds r1, 0xC0 @@ -24675,7 +24675,7 @@ _0804D43E: .align 2, 0 _0804D480: .4byte 0x00000173 _0804D484: .4byte 0x020234cc -_0804D488: .4byte gUnknown_0842C640 +_0804D488: .4byte gTradeText_TakeGoodCare _0804D48C: ldr r2, [r6] adds r1, r2, 0 @@ -25820,7 +25820,7 @@ _0804DE88: .4byte 0x03004828 _0804DE8C: .4byte 0x0201f000 _0804DE90: .4byte 0x0000043c _0804DE94: .4byte 0x020234cc -_0804DE98: .4byte gUnknown_0842D1EE +_0804DE98: .4byte gOtherText_LinkStandby2 _0804DE9C: bl sub_80084A4 ldr r0, _0804DEAC @@ -25908,7 +25908,7 @@ _0804DF3E: .align 2, 0 _0804DF48: .4byte 0x0000043c _0804DF4C: .4byte 0x03004828 -_0804DF50: .4byte gUnknown_08411905 +_0804DF50: .4byte gSystemText_Saving _0804DF54: bl sub_8047A1C movs r0, 0x15 @@ -26787,7 +26787,7 @@ _0804E6BE: strb r0, [r1] b _0804E71A .align 2, 0 -_0804E6CC: .4byte gUnknown_0842D307 +_0804E6CC: .4byte gOtherText_BlenderChooseBerry _0804E6D0: .4byte 0x03004854 _0804E6D4: bl MenuUpdateWindowText @@ -27499,7 +27499,7 @@ _0804ED14: str r3, [r0] b _0804F0CE .align 2, 0 -_0804ED40: .4byte gUnknown_0842D3A5 +_0804ED40: .4byte gOtherText_LinkStandby3 _0804ED44: .4byte 0x03004854 _0804ED48: mov r2, r8 @@ -27918,7 +27918,7 @@ _0804F084: bl MenuPrintMessage b _0804F0AA .align 2, 0 -_0804F09C: .4byte gUnknown_0842D2D9 +_0804F09C: .4byte gOtherText_LinkNotFound _0804F0A0: bl MenuUpdateWindowText lsls r0, 24 @@ -31090,7 +31090,7 @@ sub_80508FC: @ 80508FC _08050944: .4byte 0x03004854 _08050948: .4byte 0x0000ffff _0805094C: .4byte 0x00002d9f -_08050950: .4byte gUnknown_0842D2C5 +_08050950: .4byte gOtherText_YesNoTerminating thumb_func_end sub_80508FC thumb_func_start sub_8050954 @@ -31315,7 +31315,7 @@ _08050B08: b _08050CB6 .align 2, 0 _08050B2C: .4byte 0x03004854 -_08050B30: .4byte gUnknown_0842D3B5 +_08050B30: .4byte gOtherText_BlendAnotherBerryPrompt _08050B34: bl MenuUpdateWindowText lsls r0, 24 @@ -31493,7 +31493,7 @@ _08050C88: strb r0, [r1] b _08050CB6 .align 2, 0 -_08050C90: .4byte gUnknown_0842D3A5 +_08050C90: .4byte gOtherText_LinkStandby3 _08050C94: .4byte 0x03004854 _08050C98: bl MenuUpdateWindowText @@ -31796,7 +31796,7 @@ _08050ED8: .align 2, 0 _08050F0C: .4byte 0x020234cc _08050F10: .4byte 0x03002978 -_08050F14: .4byte gUnknown_0842D461 +_08050F14: .4byte gOtherText_OtherCaseIsFull _08050F18: ldr r1, [r5] adds r1, 0x6F @@ -31832,7 +31832,7 @@ _08050F4C: .align 2, 0 _08050F60: .4byte 0x020234cc _08050F64: .4byte 0x03002978 -_08050F68: .4byte gUnknown_0842D434 +_08050F68: .4byte gOtherText_NoBerriesForBlend _08050F6C: bl MenuUpdateWindowText lsls r0, 24 @@ -31883,7 +31883,7 @@ _08050FAA: ldr r1, [r0] b _080510AC .align 2, 0 -_08050FCC: .4byte gUnknown_0842C328 +_08050FCC: .4byte gMultiText_Saving _08050FD0: .4byte 0x03004854 _08050FD4: bl sub_8007ECC @@ -32093,7 +32093,7 @@ _0805116E: ldr r0, _0805118C b _080511AC .align 2, 0 -_0805118C: .4byte gUnknown_0842D41A +_0805118C: .4byte gOtherText_CaseIsFull _08051190: ldr r0, [r3] adds r0, 0x6F @@ -32113,7 +32113,7 @@ _080511AC: bl MenuPrintMessage b _0805121E .align 2, 0 -_080511B8: .4byte gUnknown_0842D3DC +_080511B8: .4byte gOtherText_OutOfBerries _080511BC: bl MenuUpdateWindowText lsls r0, 24 @@ -32898,7 +32898,7 @@ _080517BC: .4byte 0x03002fa4 _080517C0: .4byte 0x03004854 _080517C4: .4byte 0x03002974 _080517C8: .4byte gUnknown_08216284 -_080517CC: .4byte gUnknown_0842D373 +_080517CC: .4byte gOtherText_PressAToStart _080517D0: .4byte 0x03001770 _080517D4: movs r1, 0x8 @@ -32935,7 +32935,7 @@ _0805180C: pop {r0} bx r0 .align 2, 0 -_08051814: .4byte gUnknown_0842D390 +_08051814: .4byte gOtherText_PleaseWait _08051818: .4byte 0x03002a68 thumb_func_end unref_sub_80516F8 @@ -33858,18 +33858,18 @@ _08051E04: str r0, [r2] b _08051FE2 .align 2, 0 -_08051F14: .4byte gUnknown_0842D479 +_08051F14: .4byte gOtherText_ResultsOfBlending _08051F18: .4byte 0x03004854 _08051F1C: .4byte 0x03002970 -_08051F20: .4byte gUnknown_0842D498 +_08051F20: .4byte gOtherText_Berry _08051F24: .4byte 0x03002978 _08051F28: .4byte gUnknown_082165E9 _08051F2C: .4byte gUnknown_082165EE -_08051F30: .4byte gUnknown_0842D4B7 -_08051F34: .4byte gUnknown_0842D4C5 -_08051F38: .4byte gUnknown_0842D49F -_08051F3C: .4byte gUnknown_0842D4AD -_08051F40: .4byte gUnknown_0842D4B2 +_08051F30: .4byte gOtherText_MaxSpeed +_08051F34: .4byte gOtherText_RPM +_08051F38: .4byte gOtherText_RequiredTime +_08051F3C: .4byte gOtherText_Min +_08051F40: .4byte gOtherText_Sec _08051F44: ldr r0, _08051F54 ldrh r1, [r0, 0x2E] @@ -34039,11 +34039,11 @@ sub_805201C: @ 805201C bx r0 .align 2, 0 _080520B0: .4byte gUnknown_083F7EB8 -_080520B4: .4byte gUnknown_0842D368 +_080520B4: .4byte gOtherText_PokeBlockMade _080520B8: .4byte gUnknown_082162C8 -_080520BC: .4byte gUnknown_0842D4D3 -_080520C0: .4byte gUnknown_0842D4E1 -_080520C4: .4byte gUnknown_0842D4F4 +_080520BC: .4byte gOtherText_BlockLevelIs +_080520C0: .4byte gOtherText_BlockFeelIs +_080520C4: .4byte gOtherText_Period _080520C8: .4byte gUnknown_08216249 thumb_func_end sub_805201C @@ -34395,7 +34395,7 @@ _080522B6: mov r8, r2 b _0805243C .align 2, 0 -_0805236C: .4byte gUnknown_0842D4CB +_0805236C: .4byte gOtherText_Ranking _08052370: .4byte gSpriteTemplate_821645C _08052374: .4byte 0x03004854 _08052378: .4byte 0x02020004 @@ -34676,7 +34676,7 @@ _0805259E: bl itemid_copy_name b _080525F8 .align 2, 0 -_080525C8: .4byte gUnknown_082165FA +_080525C8: .4byte gOtherText_BPMAndDash _080525CC: .4byte 0x03000560 _080525D0: .4byte gBerries _080525D4: .4byte gUnknown_082165F8 @@ -35402,11 +35402,11 @@ _08052B50: pop {r0} bx r0 .align 2, 0 -_08052BBC: .4byte gUnknown_0842C2E6 -_08052BC0: .4byte gUnknown_0842C30A +_08052BBC: .4byte gMultiText_BerryBlenderMaxSpeedRecord +_08052BC0: .4byte gMultiText_2P3P4P _08052BC4: .4byte 0x02025734 _08052BC8: .4byte 0x0000096c -_08052BCC: .4byte gUnknown_0842D4C5 +_08052BCC: .4byte gOtherText_RPM thumb_func_end ShowBerryBlenderRecordWindow thumb_func_start sub_8052BD0 diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s index f79867f66..11f80f448 100644 --- a/asm/rom_8065394.s +++ b/asm/rom_8065394.s @@ -11351,7 +11351,7 @@ sub_806A74C: @ 806A74C _0806A83C: .4byte 0x020234cc _0806A840: .4byte 0x00002710 _0806A844: .4byte 0x020231cc -_0806A848: .4byte gUnknown_0842D4F6 +_0806A848: .4byte gOtherText_Day _0806A84C: .4byte gUnknown_08376500 thumb_func_end sub_806A74C @@ -11398,7 +11398,7 @@ sub_806A850: @ 806A850 pop {r0} bx r0 .align 2, 0 -_0806A8A8: .4byte gUnknown_0842D4FC +_0806A8A8: .4byte gOtherText_OK thumb_func_end sub_806A850 thumb_func_start sub_806A8AC @@ -11900,11 +11900,11 @@ _0806AC80: bl DoSoftReset b _0806ACC4 .align 2, 0 -_0806AC98: .4byte gUnknown_08411804 +_0806AC98: .4byte gSystemText_PresentTime _0806AC9C: .4byte 0x03004038 -_0806ACA0: .4byte gUnknown_08411819 +_0806ACA0: .4byte gSystemText_PreviousTime _0806ACA4: .4byte gSaveBlock2 -_0806ACA8: .4byte gUnknown_084117E3 +_0806ACA8: .4byte gSystemText_ResetRTCPrompt _0806ACAC: .4byte 0x03001770 _0806ACB0: movs r0, 0x1 @@ -11994,7 +11994,7 @@ _0806AD4E: .align 2, 0 _0806AD5C: .4byte 0x0202f388 _0806AD60: .4byte 0x03005eb8 -_0806AD64: .4byte gUnknown_084118A0 +_0806AD64: .4byte gSystemText_NoSaveFileNoTime _0806AD68: bl RtcCalcLocalTime ldr r0, _0806AD7C @@ -12040,7 +12040,7 @@ _0806AD96: b _0806AEC4 .align 2, 0 _0806ADC4: .4byte 0x03004b20 -_0806ADC8: .4byte gUnknown_0841182F +_0806ADC8: .4byte gSystemText_PleaseResetTime _0806ADCC: .4byte 0x03004038 _0806ADD0: .4byte gSaveBlock2 _0806ADD4: .4byte sub_806AA64 @@ -12101,7 +12101,7 @@ _0806AE08: _0806AE4C: .4byte 0x03004038 _0806AE50: .4byte gSaveBlock2 _0806AE54: .4byte 0x00004040 -_0806AE58: .4byte gUnknown_08411846 +_0806AE58: .4byte gSystemText_ClockResetDataSave _0806AE5C: movs r0, 0 bl sub_8125D44 @@ -12115,7 +12115,7 @@ _0806AE5C: bl audio_play b _0806AE88 .align 2, 0 -_0806AE78: .4byte gUnknown_08411881 +_0806AE78: .4byte gSystemText_SaveCompleted _0806AE7C: ldr r0, _0806AECC bl sub_806ABDC @@ -12157,7 +12157,7 @@ _0806AEC4: pop {r0} bx r0 .align 2, 0 -_0806AECC: .4byte gUnknown_08411891 +_0806AECC: .4byte gSystemText_SaveFailed _0806AED0: .4byte 0x03001770 _0806AED4: .4byte 0x0000ffff _0806AED8: .4byte 0x0202f388 @@ -19819,7 +19819,7 @@ _0806E9D8: .4byte TaskDummy _0806E9DC: .4byte 0x0201c000 _0806E9E0: .4byte 0x0202e8f4 _0806E9E4: .4byte 0x0202e8f8 -_0806E9E8: .4byte gUnknown_0840F17F +_0806E9E8: .4byte gOtherText_MailMustBeRemoved _0806E9EC: .4byte party_menu_link_mon_held_item_object _0806E9F0: ldr r0, [r4] @@ -19851,7 +19851,7 @@ _0806E9F0: _0806EA30: .4byte 0x020231cc _0806EA34: .4byte 0x020232cc _0806EA38: .4byte 0x020234cc -_0806EA3C: .4byte gUnknown_0840F1CD +_0806EA3C: .4byte gOtherText_AlreadyHolding _0806EA40: .4byte sub_806EBB8 _0806EA44: ldr r0, [r4] @@ -19982,7 +19982,7 @@ _0806EB34: .align 2, 0 _0806EB50: .4byte 0x020231cc _0806EB54: .4byte 0x020234cc -_0806EB58: .4byte gUnknown_0840F26E +_0806EB58: .4byte gOtherText_TakenAndReplaced _0806EB5C: ldr r0, _0806EB70 movs r1, 0 @@ -19992,7 +19992,7 @@ _0806EB5C: bl sub_80A9424 b _0806EB9A .align 2, 0 -_0806EB70: .4byte gUnknown_0840F2FC +_0806EB70: .4byte gOtherText_BagFullCannotRemoveItem _0806EB74: cmp r1, 0x1 beq _0806EB80 @@ -20095,7 +20095,7 @@ _0806EC30: .4byte 0x03004360 _0806EC34: .4byte 0x020231cc _0806EC38: .4byte 0x020232cc _0806EC3C: .4byte 0x020234cc -_0806EC40: .4byte gUnknown_0840F1AE +_0806EC40: .4byte gOtherText_WasGivenToHold thumb_func_end sub_806EBF0 thumb_func_start sub_806EC44 @@ -20148,7 +20148,7 @@ _0806ECA4: .4byte TaskDummy _0806ECA8: .4byte 0x0201c000 _0806ECAC: .4byte 0x0202e8f4 _0806ECB0: .4byte 0x02028280 -_0806ECB4: .4byte gUnknown_0840F29B +_0806ECB4: .4byte gOtherText_PokeHoldingItemCantMail _0806ECB8: .4byte party_menu_link_mon_held_item_object _0806ECBC: ldr r0, [r5] @@ -20167,7 +20167,7 @@ _0806ECDA: pop {r0} bx r0 .align 2, 0 -_0806ECE0: .4byte gUnknown_0840F2D3 +_0806ECE0: .4byte gOtherText_MailTransferredMailbox _0806ECE4: .4byte party_menu_link_mon_held_item_object thumb_func_end sub_806EC44 @@ -20212,7 +20212,7 @@ _0806ED38: .4byte 0x03004b20 _0806ED3C: .4byte TaskDummy _0806ED40: .4byte 0x0201c000 _0806ED44: .4byte 0x020234cc -_0806ED48: .4byte gUnknown_0840F213 +_0806ED48: .4byte gOtherText_NotHoldingAnything _0806ED4C: .4byte party_menu_link_mon_held_item_object _0806ED50: mov r0, sp @@ -20258,7 +20258,7 @@ _0806EDA2: pop {r0} bx r0 .align 2, 0 -_0806EDAC: .4byte gUnknown_0840F2FC +_0806EDAC: .4byte gOtherText_BagFullCannotRemoveItem _0806EDB0: .4byte party_menu_link_mon_held_item_object thumb_func_end sub_806ECE8 @@ -20297,7 +20297,7 @@ _0806EDF4: .4byte 0x03004360 _0806EDF8: .4byte 0x020231cc _0806EDFC: .4byte 0x020232cc _0806EE00: .4byte 0x020234cc -_0806EE04: .4byte gUnknown_0840F230 +_0806EE04: .4byte gOtherText_ReceivedTheThingFrom thumb_func_end sub_806EDB4 thumb_func_start sub_806EE08 @@ -20333,7 +20333,7 @@ sub_806EE08: @ 806EE08 _0806EE48: .4byte 0x03004b20 _0806EE4C: .4byte TaskDummy _0806EE50: .4byte 0x0201c000 -_0806EE54: .4byte gUnknown_0840F0E8 +_0806EE54: .4byte gOtherText_SendRemovedMailPrompt _0806EE58: .4byte sub_806EFEC thumb_func_end sub_806EE08 @@ -20363,7 +20363,7 @@ sub_806EE5C: @ 806EE5C b _0806EEA0 .align 2, 0 _0806EE90: .4byte 0x0201c000 -_0806EE94: .4byte gUnknown_0840F24B +_0806EE94: .4byte gOtherText_MailTaken _0806EE98: ldr r0, _0806EEAC movs r1, 0 @@ -20375,7 +20375,7 @@ _0806EEA0: movs r3, 0xD b _0806EEDE .align 2, 0 -_0806EEAC: .4byte gUnknown_0840F2FC +_0806EEAC: .4byte gOtherText_BagFullCannotRemoveItem _0806EEB0: cmp r1, 0x1 beq _0806EEBC @@ -20476,7 +20476,7 @@ sub_806EF38: @ 806EF38 b _0806EF80 .align 2, 0 _0806EF70: .4byte 0x0201c000 -_0806EF74: .4byte gUnknown_0840F10A +_0806EF74: .4byte gOtherText_MailWasSent _0806EF78: ldr r0, _0806EF90 movs r1, 0 @@ -20491,7 +20491,7 @@ _0806EF80: str r0, [r1] b _0806EFD8 .align 2, 0 -_0806EF90: .4byte gUnknown_0840F12A +_0806EF90: .4byte gOtherText_MailboxIsFull _0806EF94: .4byte 0x03004b20 _0806EF98: .4byte party_menu_link_mon_held_item_object _0806EF9C: @@ -20529,7 +20529,7 @@ _0806EFD8: pop {r0} bx r0 .align 2, 0 -_0806EFE0: .4byte gUnknown_0840F147 +_0806EFE0: .4byte gOtherText_MailRemovedMessageLost _0806EFE4: .4byte 0x03004b20 _0806EFE8: .4byte sub_806EF00 thumb_func_end sub_806EF38 @@ -20694,7 +20694,7 @@ _0806F11C: .4byte 0x020232cc _0806F120: .4byte gMoveNames _0806F124: .4byte 0xfffff282 _0806F128: .4byte 0x020234cc -_0806F12C: .4byte gUnknown_0840F49E +_0806F12C: .4byte gOtherText_AlreadyKnows _0806F130: .4byte 0x03004b20 _0806F134: .4byte party_menu_link_mon_held_item_object _0806F138: @@ -20722,7 +20722,7 @@ _0806F138: b _0806F1B6 .align 2, 0 _0806F16C: .4byte 0x020234cc -_0806F170: .4byte gUnknown_0840F347 +_0806F170: .4byte gOtherText_NotCompatible _0806F174: .4byte 0x03004b20 _0806F178: .4byte party_menu_link_mon_held_item_object _0806F17C: @@ -20760,7 +20760,7 @@ _0806F1B8: bx r0 .align 2, 0 _0806F1C0: .4byte 0x020234cc -_0806F1C4: .4byte gUnknown_0840F37C +_0806F1C4: .4byte gOtherText_WantsToLearn _0806F1C8: .4byte 0x03004b20 _0806F1CC: .4byte sub_806F358 thumb_func_end sub_806F0B4 @@ -20818,7 +20818,7 @@ _0806F234: .4byte 0x020232cc _0806F238: .4byte 0x0201c000 _0806F23C: .4byte gMoveNames _0806F240: .4byte 0x020234cc -_0806F244: .4byte gUnknown_0840F338 +_0806F244: .4byte gOtherText_LearnedMove _0806F248: .4byte 0xfffff282 _0806F24C: .4byte 0x03004b20 _0806F250: .4byte sub_806F254 @@ -21014,7 +21014,7 @@ sub_806F390: @ 806F390 str r1, [r0] b _0806F3F4 .align 2, 0 -_0806F3C8: .4byte gUnknown_0840F429 +_0806F3C8: .4byte gOtherText_WhichMoveToForget2 _0806F3CC: .4byte 0x03004b20 _0806F3D0: .4byte sub_806F44C _0806F3D4: @@ -21182,7 +21182,7 @@ _0806F524: .4byte 0x020231cc _0806F528: .4byte 0x020232cc _0806F52C: .4byte gMoveNames _0806F530: .4byte 0x020234cc -_0806F534: .4byte gUnknown_0840F44B +_0806F534: .4byte gOtherText_ForgetMove123_2 _0806F538: .4byte sub_806F53C thumb_func_end sub_806F490 @@ -21278,7 +21278,7 @@ _0806F5FC: .4byte 0x020232cc _0806F600: .4byte 0x0201c000 _0806F604: .4byte gMoveNames _0806F608: .4byte 0x020234cc -_0806F60C: .4byte gUnknown_0840F3F0 +_0806F60C: .4byte gOtherText_StopTryingTo _0806F610: .4byte sub_806F67C thumb_func_end sub_806F588 @@ -21323,7 +21323,7 @@ _0806F660: .4byte 0x020232cc _0806F664: .4byte 0x0201c000 _0806F668: .4byte gMoveNames _0806F66C: .4byte 0x020234cc -_0806F670: .4byte gUnknown_0840F3F0 +_0806F670: .4byte gOtherText_StopTryingTo _0806F674: .4byte 0x03004b20 _0806F678: .4byte sub_806F67C thumb_func_end sub_806F614 @@ -21405,7 +21405,7 @@ _0806F714: .4byte 0x020231cc _0806F718: .4byte 0x020232cc _0806F71C: .4byte gMoveNames _0806F720: .4byte 0x020234cc -_0806F724: .4byte gUnknown_0840F409 +_0806F724: .4byte gOtherText_DidNotLearnMove2 _0806F728: .4byte 0x03004b20 _0806F72C: .4byte sub_806F2FC _0806F730: @@ -21464,7 +21464,7 @@ _0806F79C: .4byte 0x020231cc _0806F7A0: .4byte 0x020232cc _0806F7A4: .4byte gMoveNames _0806F7A8: .4byte 0x020234cc -_0806F7AC: .4byte gUnknown_0840F37C +_0806F7AC: .4byte gOtherText_WantsToLearn _0806F7B0: .4byte 0x03004b20 _0806F7B4: .4byte sub_806F358 thumb_func_end sub_806F6B4 @@ -21678,7 +21678,7 @@ _0806F948: .4byte 0x020231cc _0806F94C: .4byte 0x020232cc _0806F950: .4byte 0x03004b20 _0806F954: .4byte 0x020234cc -_0806F958: .4byte gUnknown_0840F4B5 +_0806F958: .4byte gOtherText_HPRestoredBy _0806F95C: ldr r0, _0806F9D4 ldr r1, _0806F9D8 @@ -21734,7 +21734,7 @@ _0806F964: b _0806FA10 .align 2, 0 _0806F9D4: .4byte 0x020234cc -_0806F9D8: .4byte gUnknown_0840F566 +_0806F9D8: .4byte gOtherText_RegainedHealth _0806F9DC: .4byte 0x0201c000 _0806F9E0: .4byte gUnknown_083769A8 _0806F9E4: .4byte 0xfffff261 @@ -22031,7 +22031,7 @@ _0806FC40: b _0806FD84 .align 2, 0 _0806FC4C: .4byte 0x020234cc -_0806FC50: .4byte gUnknown_0840F4DA +_0806FC50: .4byte gOtherText_CuredPoisoning _0806FC54: ldr r0, _0806FC60 ldr r1, _0806FC64 @@ -22039,7 +22039,7 @@ _0806FC54: b _0806FD84 .align 2, 0 _0806FC60: .4byte 0x020234cc -_0806FC64: .4byte gUnknown_0840F518 +_0806FC64: .4byte gOtherText_WokeUp _0806FC68: ldr r0, _0806FC74 ldr r1, _0806FC78 @@ -22047,7 +22047,7 @@ _0806FC68: b _0806FD84 .align 2, 0 _0806FC74: .4byte 0x020234cc -_0806FC78: .4byte gUnknown_0840F526 +_0806FC78: .4byte gOtherText_BurnHealed _0806FC7C: ldr r0, _0806FC88 ldr r1, _0806FC8C @@ -22055,7 +22055,7 @@ _0806FC7C: b _0806FD84 .align 2, 0 _0806FC88: .4byte 0x020234cc -_0806FC8C: .4byte gUnknown_0840F53E +_0806FC8C: .4byte gOtherText_ThawedOut _0806FC90: ldr r0, _0806FC9C ldr r1, _0806FCA0 @@ -22063,7 +22063,7 @@ _0806FC90: b _0806FD84 .align 2, 0 _0806FC9C: .4byte 0x020234cc -_0806FCA0: .4byte gUnknown_0840F4FB +_0806FCA0: .4byte gOtherText_CuredParalysis _0806FCA4: ldr r0, _0806FCB0 ldr r1, _0806FCB4 @@ -22071,7 +22071,7 @@ _0806FCA4: b _0806FD84 .align 2, 0 _0806FCB0: .4byte 0x020234cc -_0806FCB4: .4byte gUnknown_0840F5D7 +_0806FCB4: .4byte gOtherText_SnapConfusion _0806FCB8: ldr r0, _0806FCC4 ldr r1, _0806FCC8 @@ -22079,7 +22079,7 @@ _0806FCB8: b _0806FD84 .align 2, 0 _0806FCC4: .4byte 0x020234cc -_0806FCC8: .4byte gUnknown_0840F5FA +_0806FCC8: .4byte gOtherText_GotOverLove _0806FCCC: ldr r0, _0806FCD8 ldr r1, _0806FCDC @@ -22087,42 +22087,42 @@ _0806FCCC: b _0806FD84 .align 2, 0 _0806FCD8: .4byte 0x020234cc -_0806FCDC: .4byte gUnknown_0840F57C +_0806FCDC: .4byte gOtherText_BecameHealthy _0806FCE0: ldr r0, _0806FCE8 ldr r1, _0806FCEC b _0806FD34 .align 2, 0 _0806FCE8: .4byte 0x020232cc -_0806FCEC: .4byte gUnknown_0840EF72 +_0806FCEC: .4byte gOtherText_Hp2 _0806FCF0: ldr r0, _0806FCF8 ldr r1, _0806FCFC b _0806FD34 .align 2, 0 _0806FCF8: .4byte 0x020232cc -_0806FCFC: .4byte gUnknown_0840F7C6 +_0806FCFC: .4byte gOtherText_Attack _0806FD00: ldr r0, _0806FD08 ldr r1, _0806FD0C b _0806FD34 .align 2, 0 _0806FD08: .4byte 0x020232cc -_0806FD0C: .4byte gUnknown_0840F7CD +_0806FD0C: .4byte gOtherText_Defense _0806FD10: ldr r0, _0806FD18 ldr r1, _0806FD1C b _0806FD34 .align 2, 0 _0806FD18: .4byte 0x020232cc -_0806FD1C: .4byte gUnknown_0840F7E5 +_0806FD1C: .4byte gOtherText_Speed _0806FD20: ldr r0, _0806FD28 ldr r1, _0806FD2C b _0806FD34 .align 2, 0 _0806FD28: .4byte 0x020232cc -_0806FD2C: .4byte gUnknown_0840EF75 +_0806FD2C: .4byte gOtherText_SpAtk2 _0806FD30: ldr r0, _0806FD44 ldr r1, _0806FD48 @@ -22134,9 +22134,9 @@ _0806FD34: b _0806FD84 .align 2, 0 _0806FD44: .4byte 0x020232cc -_0806FD48: .4byte gUnknown_0840EF7D +_0806FD48: .4byte gOtherText_SpDef2 _0806FD4C: .4byte 0x020234cc -_0806FD50: .4byte gUnknown_0840F5C1 +_0806FD50: .4byte gOtherText_WasRaised _0806FD54: ldr r0, _0806FD60 ldr r1, _0806FD64 @@ -22144,7 +22144,7 @@ _0806FD54: b _0806FD84 .align 2, 0 _0806FD60: .4byte 0x020234cc -_0806FD64: .4byte gUnknown_0840F591 +_0806FD64: .4byte gOtherText_PPIncreased _0806FD68: ldr r0, _0806FD74 ldr r1, _0806FD78 @@ -22152,7 +22152,7 @@ _0806FD68: b _0806FD84 .align 2, 0 _0806FD74: .4byte 0x020234cc -_0806FD78: .4byte gUnknown_0840F553 +_0806FD78: .4byte gOtherText_PPRestored _0806FD7C: ldr r0, _0806FD88 ldr r1, _0806FD8C @@ -22162,7 +22162,7 @@ _0806FD84: bx r0 .align 2, 0 _0806FD88: .4byte 0x020234cc -_0806FD8C: .4byte gUnknown_0840EF85 +_0806FD8C: .4byte gOtherText_WontHaveAnyEffect thumb_func_end GetMedicineItemEffectMessage thumb_func_start sub_806FD90 @@ -22352,7 +22352,7 @@ _0806FEE6: b _08070002 .align 2, 0 _0806FF08: .4byte 0x0202e8f4 -_0806FF0C: .4byte gUnknown_0840EF85 +_0806FF0C: .4byte gOtherText_WontHaveAnyEffect _0806FF10: .4byte 0x03004b20 _0806FF14: ldr r1, _0806FF30 @@ -22781,7 +22781,7 @@ _08070298: .4byte 0x0202e8f4 _0807029C: .4byte 0xfffff280 _080702A0: .4byte 0x03004b20 _080702A4: .4byte TaskDummy -_080702A8: .4byte gUnknown_0840EF85 +_080702A8: .4byte gOtherText_WontHaveAnyEffect _080702AC: .4byte sub_806FB0C _080702B0: ldrh r0, [r4, 0x6] @@ -23157,7 +23157,7 @@ ether_effect_related: @ 8070570 _080705A8: .4byte 0x0201c000 _080705AC: .4byte 0x03004b20 _080705B0: .4byte 0x0202e8f4 -_080705B4: .4byte gUnknown_0840EF85 +_080705B4: .4byte gOtherText_WontHaveAnyEffect _080705B8: ldr r1, _0807060C movs r0, 0x1 @@ -23317,7 +23317,7 @@ _080706F6: b _0807077C .align 2, 0 _08070718: .4byte 0x0202e8f4 -_0807071C: .4byte gUnknown_0840EF85 +_0807071C: .4byte gOtherText_WontHaveAnyEffect _08070720: .4byte sub_806FB0C _08070724: ldr r1, _08070784 @@ -23365,7 +23365,7 @@ _08070788: .4byte 0x0201c000 _0807078C: .4byte 0x020231cc _08070790: .4byte 0x020232cc _08070794: .4byte 0x020234cc -_08070798: .4byte gUnknown_0840F5A6 +_08070798: .4byte gOtherText_ElevatedTo _0807079C: .4byte sub_80707A0 thumb_func_end sub_8070680 @@ -23534,7 +23534,7 @@ _080708E8: .4byte 0x0201c000 _080708EC: .4byte gUnknown_08376D1C _080708F0: .4byte 0x0201b264 _080708F4: .4byte gUnknown_08376D04 -_080708F8: .4byte gUnknown_0840E691 +_080708F8: .4byte gOtherText_TallPlusAndRightArrow _080708FC: adds r4, r6, 0x6 lsls r1, r4, 3 @@ -23585,7 +23585,7 @@ _08070910: pop {r0} bx r0 .align 2, 0 -_08070960: .4byte gUnknown_0840E691 +_08070960: .4byte gOtherText_TallPlusAndRightArrow _08070964: .4byte 0x0201b264 thumb_func_end sub_8070848 @@ -23873,7 +23873,7 @@ _08070BC0: .4byte 0x020232cc _08070BC4: .4byte 0x02024e82 _08070BC8: .4byte gMoveNames _08070BCC: .4byte 0x020234cc -_08070BD0: .4byte gUnknown_0840F37C +_08070BD0: .4byte gOtherText_WantsToLearn _08070BD4: .4byte 0x03004b20 _08070BD8: .4byte sub_806F358 _08070BDC: @@ -23924,7 +23924,7 @@ _08070C38: .4byte 0x020231cc _08070C3C: .4byte 0x020232cc _08070C40: .4byte gMoveNames _08070C44: .4byte 0x020234cc -_08070C48: .4byte gUnknown_0840F338 +_08070C48: .4byte gOtherText_LearnedMove _08070C4C: .4byte 0x03004b20 _08070C50: .4byte sub_806F254 thumb_func_end sub_8070AC8 @@ -24019,7 +24019,7 @@ _08070D0C: .4byte 0x020232cc _08070D10: .4byte 0x02024e82 _08070D14: .4byte gMoveNames _08070D18: .4byte 0x020234cc -_08070D1C: .4byte gUnknown_0840F37C +_08070D1C: .4byte gOtherText_WantsToLearn _08070D20: .4byte 0x03004b20 _08070D24: .4byte sub_806F358 _08070D28: @@ -24062,7 +24062,7 @@ _08070D74: .4byte 0x020231cc _08070D78: .4byte 0x020232cc _08070D7C: .4byte gMoveNames _08070D80: .4byte 0x020234cc -_08070D84: .4byte gUnknown_0840F338 +_08070D84: .4byte gOtherText_LearnedMove _08070D88: .4byte 0x03004b20 _08070D8C: .4byte sub_806F254 thumb_func_end sub_8070C54 @@ -24140,7 +24140,7 @@ _08070E20: .4byte 0x03005e94 _08070E24: .4byte sub_80A53F8 _08070E28: .4byte 0x0201c000 _08070E2C: .4byte 0x0202e8f4 -_08070E30: .4byte gUnknown_0840EF85 +_08070E30: .4byte gOtherText_WontHaveAnyEffect _08070E34: .4byte sub_806FB0C _08070E38: adds r0, r6, 0 @@ -24525,7 +24525,7 @@ sub_80710DC: @ 80710DC .align 2, 0 _08071108: .4byte 0x020231cc _0807110C: .4byte 0x02038808 -_08071110: .4byte gUnknown_0842C4A9 +_08071110: .4byte gOtherText_SafariStock thumb_func_end sub_80710DC thumb_func_start sub_8071114 @@ -25645,7 +25645,7 @@ _0807194C: pop {r1} bx r1 .align 2, 0 -_08071958: .4byte gUnknown_0840E5D5 +_08071958: .4byte gSystemText_SaveErrorExchangeBackup _0807195C: .4byte sub_80719AC thumb_func_end sub_8071900 @@ -25961,7 +25961,7 @@ _08071BB4: movs r3, 0 b _08071BFA .align 2, 0 -_08071BD0: .4byte gUnknown_08411905 +_08071BD0: .4byte gSystemText_Saving _08071BD4: bl sub_8047A1C bl sub_8125E2C diff --git a/data/data2.s b/data/data2.s index 734d6c793..1f18691e9 100644 --- a/data/data2.s +++ b/data/data2.s @@ -2950,18 +2950,16 @@ gUnknown_0820C334:: @ 820C334 .byte 18, 5 .byte 18, 7 -gUnknown_0820C33C:: +gOtherText_Terminator:: .string "$" -gUnknown_0820C33D:: @ 820C33D -OtherText_MaleSymbol3:: +gOtherText_MaleSymbol3:: @ 820C33D .string "♂$" -gUnknown_0820C33F:: @ 820C33F -OtherText_FemaleSymbol3:: +gOtherText_FemaleSymbol3:: @ 820C33F .string "♀$" -gUnknown_0820C341:: @ 820C341 +gOtherText_GenderlessSymbol:: @ 820C341 .string "$$" .align 2 @@ -3844,10 +3842,8 @@ gUnknown_082165F3:: @ 82165F3 gUnknown_082165F8:: @ 82165F8 .string " $" -gUnknown_082165FA:: @ 82165FA -OtherText_BPM:: +gOtherText_BPMAndDash:: @ 82165FA .string "BPM$" -OtherText_Dash:: .string "-$" gUnknown_08216600:: @ 8216600 @@ -7286,7 +7282,7 @@ gUnknown_08376624:: @ 8376624 .4byte OtherText_CantUseThatHere .4byte OtherText_RestoreWhatMove .4byte OtherText_BoostPP - .4byte OtherText_Terminator19 + .4byte gOtherText_CancelWithTerminator .4byte OtherText_DoWhatWithItem .4byte OtherText_NoPokeForBattle .4byte OtherText_ChoosePoke2 @@ -7906,12 +7902,12 @@ gUnknown_08376CEC:: @ 8376CEC .align 2 gUnknown_08376D04:: @ 8376D04 - .4byte OtherText_HP - .4byte OtherText_Attack - .4byte OtherText_Defense - .4byte OtherText_SpAtk - .4byte OtherText_SpDef - .4byte OtherText_Speed + .4byte gOtherText_HP + .4byte gOtherText_Attack + .4byte gOtherText_Defense + .4byte gOtherText_SpAtk + .4byte gOtherText_SpDef + .4byte gOtherText_Speed gUnknown_08376D1C:: @ 8376D1C .byte 0x3A @ HP @@ -11501,13 +11497,13 @@ gUnknown_0839F494:: @ 839F494 .4byte OtherText_Summary, sub_8089FCC .4byte OtherText_Switch2, sub_808A02C .4byte OtherText_Item, sub_808A140 - .4byte OtherText_Cancel2, sub_808A918 + .4byte gOtherText_CancelNoTerminator, sub_808A918 .4byte OtherText_Give2, sub_808A630 .4byte OtherText_Take2, sub_808A688 .4byte OtherText_Take, sub_808A6B8 .4byte OtherText_Mail, sub_808A6E8 .4byte OtherText_Read2, sub_808A810 - .4byte OtherText_Cancel2, sub_808A938 + .4byte gOtherText_CancelNoTerminator, sub_808A938 .4byte gMoveNames + 13 * MOVE_CUT, sub_808A984 .4byte gMoveNames + 13 * MOVE_FLASH, sub_808A984 .4byte gMoveNames + 13 * MOVE_ROCK_SMASH, sub_808A984 @@ -12126,7 +12122,7 @@ gUnknown_083B5F8C:: @ 83B5F8C .align 2 gUnknown_083B5FCC:: @ 83B5FCC .4byte OtherText_Summary, sub_8095544 - .4byte OtherText_Cancel2, sub_80958C4 + .4byte gOtherText_CancelNoTerminator, sub_80958C4 .4byte OtherText_Shift, sub_8095584 .4byte OtherText_SendOut, sub_8095584 @@ -12983,7 +12979,7 @@ gUnknown_083C1068:: @ 83C1068 .4byte OtherText_ContestMoves .4byte OtherText_Switch .4byte OtherText_Info - .4byte OtherText_Cancel2 + .4byte gOtherText_CancelNoTerminator .align 2 gSpriteAffineAnim_83C1088:: @ 83C1088 @@ -13389,13 +13385,13 @@ gUnknown_083C1618:: @ 83C1618 gUnknown_083C1640:: @ 83C1640 .4byte OtherText_Use, sub_80A5B78 .4byte OtherText_Toss, sub_80A5F14 - .4byte OtherText_Cancel2, sub_80A5F80 + .4byte gOtherText_CancelNoTerminator, sub_80A5F80 .4byte OtherText_Register, sub_80A5FAC .4byte OtherText_Use, ItemMenu_UseInBattle - .4byte OtherText_Cancel2, sub_80A7124 + .4byte gOtherText_CancelNoTerminator, sub_80A7124 .4byte OtherText_Give2, ItemMenu_Give .4byte OtherText_CheckTag, sub_80A6178 - .4byte OtherText_Terminator19, 0x0 + .4byte gOtherText_CancelWithTerminator, 0x0 .4byte OtherText_Confirm, sub_80A69E0 @ 6-byte entries; format of entry is unknown @@ -13694,9 +13690,7 @@ Unknown_83C9166: Unknown_83C916E: .string "Contest results$" - .string "パラメータへんこう$" @ "Change parameter" - .string "わざ へんこう$" @ "Change move" Unknown_83C9190: @@ -13792,7 +13786,6 @@ gUnknown_083C92E4:: @ 83C92E4 gUnknown_083C932C:: @ 83C932C .string "{COLOR CYAN}{HIGHLIGHT RED}$" - .string "かいし$" @ Start gUnknown_083C9337:: @ 83C9337 @@ -14032,16 +14025,12 @@ gUnknown_083CA4D4:: @ 83CA4D4 .include "data/text/contest_strings.s" -gUnknown_083CC355:: @ 83CC355 -UnknownText_MissedTurn:: +gUnknownText_MissedTurn:: @ 83CC355 .string "Missed turn$" -gUnknown_083CC361:: @ 83CC361 -UnknownText_LinkStandby:: +gUnknownText_LinkStandbyAndWinner:: @ 83CC361 .string "Link standby...$" -UnknownText_UnknownFormatting:: .string "{COLOR WHITE2}$" -UnknownText_WinnerIs:: .string "The winner is {STR_VAR_1}’s {STR_VAR_2}!\nCongratulations!$" @ unknown, unreferenced data @@ -14049,12 +14038,10 @@ UnknownText_WinnerIs:: .byte 0x9C .byte 0x77 -gUnknown_083CC3A0:: @ 83CC3A0 -UnknownText_UnknownFormatting2:: +gUnknownText_UnknownFormatting2:: @ 83CC3A0 .string "{COLOR GREEN}{SHADOW RED}$" -gUnknown_083CC3A7:: @ 83CC3A7 -UnknownText_UnknownFormatting3:: +gUnknownText_UnknownFormatting3:: @ 83CC3A7 .string "{COLOR LIGHT_GREY}$" .align 2 @@ -14210,9 +14197,9 @@ gUnknown_083CC5D0:: @ 83CC5D0 .align 2 gUnknown_083CC6D0:: @ 83CC6D0 - .4byte ContestStatsText_Buy, sub_80B2EFC - .4byte ContestStatsText_Sell, sub_80B2F30 - .4byte ContestStatsText_Quit2, HandleShopMenuQuit + .4byte MartText_Buy, sub_80B2EFC + .4byte MartText_Sell, sub_80B2F30 + .4byte MartText_Quit2, HandleShopMenuQuit gUnknown_083CC6E8:: @ 83CC6E8 .byte 0, 1, 2 @@ -14749,27 +14736,22 @@ gUnknown_083D02BA:: @ 83D02BA .align 2 @ object file boundary? -gUnknown_083D02C8:: @ 83D02C8 -DebugText_SoundCheckJap: +gDebugText_SoundCheckJap:: @ 83D02C8 .string "サウンドチェック$" @ Sound Check -gUnknown_083D02D1:: @ 83D02D1 -DebugText_BGM: +gDebugText_BGM:: @ 83D02D1 .string "BGM$" -gUnknown_083D02D5:: @ 83D02D5 -DebugText_SE: +gDebugText_SE:: @ 83D02D5 .string "SE $" gUnknown_083D02D9:: @ 83D02D9 .incbin "baserom.gba", 0x003d02d9, 0xd -gUnknown_083D02E6:: @ 83D02E6 -DebugText_UpDown: +gDebugText_UpDown:: @ 83D02E6 .string "L‥UP R‥DOWN$" -gUnknown_083D02F2:: @ 83D02F2 -DebugText_DriverTest: +gDebugText_DriverTest:: @ 83D02F2 .string "R‥DRIVER-TEST$" gUnknown_083D0300:: @ 83D0300 @@ -14781,40 +14763,31 @@ gUnknown_083D0312:: @ 83D0312 gUnknown_083D031C:: @ 83D031C .incbin "baserom.gba", 0x003d031c, 0xb -gUnknown_083D0327:: @ 83D0327 -DebugText_Voice: +gDebugText_Voice:: @ 83D0327 .string "VOICE‥‥‥‥$" -gUnknown_083D0331:: @ 83D0331 -DebugText_Volume: +gDebugText_Volume:: @ 83D0331 .string "VOLUME‥‥‥$" -gUnknown_083D033B:: @ 83D033B -DebugText_Panpot: +gDebugText_Panpot:: @ 83D033B .string "PANPOT‥‥‥$" -gUnknown_083D0345:: @ 83D0345 -DebugText_Pitch: +gDebugText_Pitch:: @ 83D0345 .string "PITCH‥‥‥‥$" -gUnknown_083D034F:: @ 83D034F -DebugText_Length: +gDebugText_Length:: @ 83D034F .string "LENGTH‥‥‥$" -gUnknown_083D0359:: @ 83D0359 -DebugText_Release: +gDebugText_Release:: @ 83D0359 .string "RELEASE‥‥$" -gUnknown_083D0363:: @ 83D0363 -DebugText_Progress: +gDebugText_Progress:: @ 83D0363 .string "PROGRESS‥$" -gUnknown_083D036D:: @ 83D036D -DebugText_Chorus: +gDebugText_Chorus:: @ 83D036D .string "CHORUS‥‥‥$" -gUnknown_083D0377:: @ 83D0377 -DebugText_Priority: +gDebugText_Priority:: @ 83D0377 .string "PRIORITY‥$" gUnknown_083D0381:: @ 83D0381 @@ -14841,20 +14814,16 @@ gUnknown_083D03E0:: @ 83D03E0 gUnknown_083D03F8:: @ 83D03F8 .byte 0x3F, 0x00, 0xC0, 0x7F, 0x80 @ stereo panning -gUnknown_083D03FD:: @ 83D03FD -OtherText_SE: +gOtherText_SE:: @ 83D03FD .string "SE$" -gUnknown_083D0400:: @ 83D0400 -OtherText_Pan: +gOtherText_Pan:: @ 83D0400 .string "PAN$" -gUnknown_083D0404:: @ 83D0404 -OtherText_LR: +gOtherText_LR:: @ 83D0404 .string " LR$" -gUnknown_083D0409:: @ 83D0409 -OtherText_RL: +gOtherText_RL:: @ 83D0409 .string " RL$" @ 83D040E @@ -14869,7 +14838,7 @@ gUnknown_083D1374:: @ 83D1374 .align 2 gUnknown_083D13D4:: @ 83D13D4 .4byte SecretBaseText_DelRegist, sub_80BCA84 - .4byte UnknownText_Exit, sub_80BCBF8 + .4byte gUnknownText_Exit, sub_80BCBF8 .align 2 gUnknown_083D13E4:: @ 83D13E4 @@ -22278,14 +22247,14 @@ gUnknown_083EC604:: @ 83EC604 .4byte SecretBaseText_Decorate, sub_80FF160 .4byte SecretBaseText_PutAway, sub_8100A0C .4byte SecretBaseText_Toss, sub_8101700 - .4byte UnknownText_Exit, gpu_pal_decompress_alloc_tag_and_upload + .4byte gUnknownText_Exit, gpu_pal_decompress_alloc_tag_and_upload .align 2 gUnknown_083EC624:: @ 83EC624 .4byte SecretBaseText_PutOutDecor .4byte SecretBaseText_StoreChosenDecor .4byte SecretBaseText_ThrowAwayDecor - .4byte MenuText_GoBackToPrev + .4byte gMenuText_GoBackToPrev .align 2 gUnknown_083EC634:: @ 83EC634 @@ -24149,7 +24118,7 @@ gUnknown_083F7EB8:: @ 83F7EB8 gUnknown_083F7EF4:: @ 83F7EF4 .4byte OtherText_Use, sub_810C508 .4byte OtherText_Toss, sub_810C5C0 - .4byte OtherText_Cancel2, sub_810C748 + .4byte gOtherText_CancelNoTerminator, sub_810C748 .4byte OtherText_Use, sub_810C788 .4byte OtherText_Use, sub_810C854 @@ -24318,7 +24287,7 @@ gUnknown_083F83C0:: @ 83F83C0 .4byte OtherText_BlackFlute .4byte OtherText_PrettyChair .4byte OtherText_PrettyDesk - .4byte OtherText_Cancel2 + .4byte gOtherText_CancelNoTerminator gUnknown_083F83E0:: @ 83F83E0 .incbin "baserom.gba", 0x003f83e0, 0xc @@ -25661,7 +25630,7 @@ gUnknown_084017B0:: @ 84017B0 .4byte OtherText_Summary, sub_812265C .4byte OtherText_Enter2, sub_8122694 .4byte OtherText_NoEntry, sub_8122770 - .4byte UnknownText_Exit, sub_8122838 + .4byte gUnknownText_Exit, sub_8122838 gUnknown_084017D0:: @ 84017D0 .byte 1, 0, 3 @@ -25690,7 +25659,7 @@ gUnknown_084017D8:: @ 84017D8 gUnknown_084017F0:: @ 84017F0 .4byte OtherText_Store, sub_8122F70 .4byte OtherText_Summary, sub_81230BC - .4byte UnknownText_Exit, sub_81230F4 + .4byte gUnknownText_Exit, sub_81230F4 gUnknown_08401808:: @ 8401808 .byte 0, 1, 2 @@ -26952,12 +26921,12 @@ gUnknown_08406288:: @ 8406288 .4byte PCText_TakeOutItems .4byte PCText_StoreItems .4byte PCText_ThrowAwayItems - .4byte MenuText_GoBackToPrev + .4byte gMenuText_GoBackToPrev .align 2 gUnknown_08406298:: @ 8406298 .4byte SecretBaseText_ItemStorage, sub_8139E40 - .4byte PCText_Mailbox, sub_8139E6C + .4byte gPCText_Mailbox, sub_8139E6C .4byte SecretBaseText_Decoration, sub_8139ED8 .4byte SecretBaseText_TurnOff, sub_8139EF8 @@ -26972,7 +26941,7 @@ gUnknown_084062C0:: @ 84062C0 .4byte PCText_WithdrawItem, sub_813A118 .4byte PCText_DepositItem, sub_813A0A0 .4byte PCText_TossItem, sub_813A198 - .4byte UnknownText_Exit, sub_813A21C + .4byte gUnknownText_Exit, sub_813A21C .align 2 gUnknown_084062E0:: @ 84062E0 @@ -26990,9 +26959,9 @@ gUnknown_084062F0:: @ 84062F0 .align 2 gUnknown_084062F8:: @ 84062F8 .4byte OtherText_Read, sub_813B428 - .4byte OtherText_MoveToBag, sub_813B510 + .4byte gOtherText_MoveToBag, sub_813B510 .4byte OtherText_Give, sub_813B630 - .4byte OtherText_Cancel2, sub_813B734 + .4byte gOtherText_CancelNoTerminator, sub_813B734 gUnknown_08406318:: @ 8406318 .string "{STR_VAR_1}{CLEAR_TO 80}$" @@ -28037,12 +28006,10 @@ gExpandedPlaceholder_Brendan:: @ 840DCB8 gExpandedPlaceholder_May:: @ 840DCC0 .string "MAY$" -gUnknown_0840DCC4:: @ 840DCC4 -SystemText_Egg: +gSystemText_Egg:: @ 840DCC4 .string "EGG$" -gUnknown_0840DCC8:: @ 840DCC8 -SystemText_Pokemon2: +gSystemText_Pokemon2:: @ 840DCC8 .string "POKéMON$" gMainMenuString_NewGame:: @ 840DCD0 @@ -28126,50 +28093,41 @@ gDefaultGirlName3:: gDefaultGirlName4:: .string "SARA$" -SystemText_IntroWeCall:: +gSystemText_IntroWeCall:: .string "This is what we call\na POKéMON.$" -gUnknown_0840DFF7:: @ 840DFF7 -SystemText_NewPara:: +gSystemText_NewPara:: @ 840DFF7 .string "\p$" -gUnknown_0840DFF9:: @ 840DFF9 -DexText_UnknownPoke:: +gDexText_UnknownPoke:: @ 840DFF9 .string " ????? POKéMON$" @ why 12 spaces? -gUnknown_0840E013:: @ 840E013 - .incbin "baserom.gba", 0x0040e013, 0xa +gDexText_UnknownHeight:: @ 840E013 + .string "{CLEAR_TO 0x0C}??’??”$" -gUnknown_0840E01D:: @ 840E01D -DexText_UnknownWeight: +gDexText_UnknownWeight:: @ 840E01D .string "????.? lbs.$" -DexText_Terminator4: .string "$" -gUnknown_0840E02A:: @ 840E02A +gDexText_CryOf:: @ 840E02A .string "{CLEAR_TO 2}CRY OF$" - .string "$" -gUnknown_0840E035:: @ 840E035 -DexText_SizeComparedTo: +gDexText_SizeComparedTo:: @ 840E035 .string "SIZE COMPARED TO $" -gUnknown_0840E047:: @ 840E047 -DexText_RegisterComplete: +gDexText_RegisterComplete:: @ 840E047 .string "POKéDEX registration completed.$" -gUnknown_0840E067:: @ 840E067 -DexText_Searching: +gDexText_Searching:: @ 840E067 .string "Searching...\nPlease wait.$" -gUnknown_0840E081:: @ 840E081 -DexText_SearchComplete: +gDexText_SearchComplete:: @ 840E081 .string "Search completed.$" -gUnknown_0840E093:: @ 840E093 -DexText_NoMatching:: +gDexText_NoMatching:: @ 840E093 .string "No matching POKéMON were found.$" + DexText_SearchForPoke:: .string "Search for POKéMON based on\nselected parameters.$" DexText_SwitchDex:: @@ -28269,66 +28227,50 @@ DexText_RightPointingTriangle:: DexText_Terminator6:: .string " $" -gUnknown_0840E44F:: @ 840E44F -MenuText_WelcomeToHOF:: +gMenuText_WelcomeToHOFAndDexRating:: @ 840E44F .string "Welcome to the HALL OF FAME!$" -MenuText_HOFDexRate:: .string "Spotted POKéMON: {STR_VAR_1}!\nOwned POKéMON: {STR_VAR_2}!\pPROF. BIRCH’s POKéDEX rating!\pPROF. BIRCH: Let’s see...\p$" -gUnknown_0840E4CD:: @ 840E4CD -MenuText_HOFSaving:: +gMenuText_HOFSaving:: @ 840E4CD .string "SAVING...\nDON’T TURN OFF THE POWER.$" -gUnknown_0840E4F1:: @ 840E4F1 -MenuText_HOFCorrupt:: +gMenuText_HOFCorrupt:: @ 840E4F1 .string "The HALL OF FAME data is corrupt.$" -gUnknown_0840E513:: @ 840E513 -MenuText_HOFNumber:: +gMenuText_HOFNumber:: @ 840E513 .string "HALL OF FAME No. $" -gUnknown_0840E525:: @ 840E525 -MenuText_HOFCongratulations:: +gMenuText_HOFCongratulations:: @ 840E525 .string "LEAGUE CHAMPION!\nCONGRATULATIONS!$" -gUnknown_0840E547:: @ 840E547 -OtherText_Number2:: +gOtherText_Number2:: @ 840E547 .string "No. $" -gUnknown_0840E54C:: @ 840E54C -OtherText_Level3:: +gOtherText_Level3:: @ 840E54C .string "Lv. $" -gUnknown_0840E551:: @ 840E551 -OtherText_IDNumber:: +gOtherText_IDNumber:: @ 840E551 .string "IDNo. /$" -gUnknown_0840E559:: @ 840E559 -OtherText_Name:: +gOtherText_Name:: @ 840E559 .string "NAME /$" -gUnknown_0840E560:: @ 840E560 -OtherText_IDNumber2:: - .string "IDNo. /$" @ identical string for no reason? +gOtherText_IDNumber2:: @ 840E560 + .string "IDNo. /$" -gUnknown_0840E568:: @ 840E568 -OtherText_BirchInTrouble:: +gOtherText_BirchInTrouble:: @ 840E568 .string "{HIGHLIGHT WHITE2}{COLOR DARK_GREY}PROF. BIRCH is in trouble!\nRelease a POKéMON and rescue him!$" -gUnknown_0840E5AB:: @ 840E5AB -OtherText_DoYouChoosePoke:: +gOtherText_DoYouChoosePoke:: @ 840E5AB .string "{HIGHLIGHT WHITE2}{COLOR DARK_GREY}Do you choose this POKéMON?$" -gUnknown_0840E5CD:: @ 840E5CD -OtherText_Poke:: +gOtherText_Poke:: @ 840E5CD .string "POKéMON$" -gUnknown_0840E5D5:: @ 840E5D5 -SystemText_SaveErrorExchangeBackup:: +gSystemText_SaveErrorExchangeBackup:: @ 840E5D5 .string "Save error.\pPlease exchange the\nbackup memory.$" -gUnknown_0840E604:: @ 840E604 -OtherText_FlyToWhere:: +gOtherText_FlyToWhere:: @ 840E604 .string "FLY to where?$" OtherText_Use:: @@ -28344,23 +28286,18 @@ OtherText_CheckTag:: OtherText_Confirm:: .string "CONFIRM$" -gUnknown_0840E63B:: @ 840E63B -OtherText_Walk:: +gOtherText_Walk:: @ 840E63B .string "WALK$" -gUnknown_0840E640:: @ 840E640 -UnknownText_Exit:: +gUnknownText_Exit:: @ 840E640 .string "EXIT$" -gUnknown_0840E645:: @ 840E645 -OtherText_Cancel2:: +gOtherText_CancelNoTerminator:: @ 840E645 .string "CANCEL$" -gUnknown_0840E64C:: @ 840E64C -OtherText_Terminator19:: - .string "$" -OtherText_Cancel3:: - .string "CANCEL$" +gOtherText_CancelWithTerminator:: @ 840E64C + .string "$CANCEL$" + OtherText_Item:: .string "ITEM$" OtherText_Mail:: @@ -28370,75 +28307,57 @@ OtherText_Take2:: OtherText_Store:: .string "STORE$" -gUnknown_0840E669:: @ 840E669 -OtherText_Check:: +gOtherText_Check:: @ 840E669 .string "CHECK$" -gUnknown_0840E66F:: @ 840E66F -OtherText_None:: +gOtherText_None:: @ 840E66F .string "NONE$" -gUnknown_0840E674:: @ 840E674 -OtherText_ThreeQuestions2:: +gOtherText_ThreeQuestions2:: @ 840E674 .string "???$" -gUnknown_0840E678:: @ 840E678 -OtherText_FiveQuestions:: +gOtherText_FiveQuestionsAndSlash:: @ 840E678 .string "?????$" -OtherText_Backslash:: .string "/$" -gUnknown_0840E680:: @ 840E680 -OtherText_OneDash:: +gOtherText_OneDash:: @ 840E680 .string "-$" -gUnknown_0840E682:: @ 840E682 -OtherText_TwoDashes:: +gOtherText_TwoDashes:: @ 840E682 .string "--$" -gUnknown_0840E685:: @ 840E685 -OtherText_ThreeDashes2:: +gOtherText_ThreeDashes2:: @ 840E685 .string "---$" -gUnknown_0840E689:: @ 840E689 -OtherText_MaleSymbol2:: +gOtherText_MaleSymbol2:: @ 840E689 .string "♂$" -gUnknown_0840E68B:: @ 840E68B -OtherText_FemaleSymbol2:: +gOtherText_FemaleSymbolAndLv:: @ 840E68B .string "♀$" -OtherText_Level2:: .string "Lv.$" -gUnknown_0840E691:: @ 840E691 -OtherText_TallPlus:: +gOtherText_TallPlusAndRightArrow:: @ 840E691 .string "{TALL_PLUS}$" -OtherText_RightArrow:: .string "{RIGHT_ARROW}$" -gUnknown_0840E697:: @ 840E697 -MenuText_GoBackToPrev:: +gMenuText_GoBackToPrev:: @ 840E697 .string "Go back to the\nprevious menu.$" -gUnknown_0840E6B5:: @ 840E6B5 -OtherText_WhatWillYouDo:: +gOtherText_WhatWillYouDo:: @ 840E6B5 .string "What would you like to do?$" -gUnknown_0840E6D0:: @ 840E6D0 -OtherText_xString1:: +gOtherText_xString1:: @ 840E6D0 .string "×{STR_VAR_1}$" -gUnknown_0840E6D4:: @ 840E6D4 -OtherText_Berry2:: +gOtherText_Berry2:: @ 840E6D4 .string " BERRY$" -gUnknown_0840E6DB:: @ 840E6DB -OtherText_Coins2:: +gOtherText_Coins2:: @ 840E6DB .string "{STR_VAR_1} COINS$" -gUnknown_0840E6E4:: @ 840E6E4 -OtherText_CloseBag:: +gOtherText_CloseBag:: @ 840E6E4 .string "CLOSE BAG$" + OtherText_TheField3:: .string "the field.$" OtherText_TheBattle:: @@ -28464,132 +28383,100 @@ gUnknown_0840E740:: @ 840E740 .4byte OtherText_TheField2 .4byte OtherText_ThePC -gUnknown_0840E75C:: @ 840E75C -OtherText_ReturnTo: +gOtherText_ReturnTo:: @ 840E75C .string "Return to$" -gUnknown_0840E766:: @ 840E766 -OtherText_WhatWillYouDo2: +gOtherText_WhatWillYouDo2:: @ 840E766 .string "What would you\nlike to do?$" -gUnknown_0840E781:: @ 840E781 -OtherText_CantWriteMail: +gOtherText_CantWriteMail:: @ 840E781 .string "You can’t write\nMAIL here.$" -gUnknown_0840E79C:: @ 840E79C -OtherText_NoPokemon: +gOtherText_NoPokemon:: @ 840E79C .string "There is no\nPOKéMON.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840E7B3:: @ 840E7B3 -OtherText_SwitchWhichItem: +gOtherText_SwitchWhichItem:: @ 840E7B3 .string "Switch with which\nitem?$" -gUnknown_0840E7CB:: @ 840E7CB -OtherText_CantBeHeld: +gOtherText_CantBeHeld:: @ 840E7CB .string "{STR_VAR_1} can’t be held.$" -gUnknown_0840E7DD:: @ 840E7DD -OtherText_CantBeHeldHere: +gOtherText_CantBeHeldHere:: @ 840E7DD .string "{STR_VAR_1} can’t be held here.$" -gUnknown_0840E7F4:: @ 840E7F4 -OtherText_HowManyToDeposit: +gOtherText_HowManyToDeposit:: @ 840E7F4 .string "How many do you\nwant to deposit?$" -gUnknown_0840E815:: @ 840E815 -OtherText_DepositedItems: +gOtherText_DepositedItems:: @ 840E815 .string "Deposited {STR_VAR_2}\n{STR_VAR_1}(s).$" -gUnknown_0840E829:: @ 840E829 -OtherText_NoRoomForItems: +gOtherText_NoRoomForItems:: @ 840E829 .string "There’s no room to\nstore items.$" -gUnknown_0840E849:: @ 840E849 -OtherText_CantStoreSomeoneItem: +gOtherText_CantStoreSomeoneItem:: @ 840E849 .string "You can’t store\nsomeone else’s item\nin the PC.$" -gUnknown_0840E878:: @ 840E878 -OtherText_TooImportant: +gOtherText_TooImportant:: @ 840E878 .string "That’s much too\nimportant to toss\nout!$" -gUnknown_0840E89F:: @ 840E89F -OtherText_HowManyToToss: +gOtherText_HowManyToToss:: @ 840E89F .string "Toss out how many?$" -gUnknown_0840E8B2:: @ 840E8B2 -OtherText_ThrewAwayItem: +gOtherText_ThrewAwayItem:: @ 840E8B2 .string "Threw away {STR_VAR_2}\n{STR_VAR_1}(s).$" -gUnknown_0840E8C7:: @ 840E8C7 -OtherText_OkayToThrowAwayPrompt: +gOtherText_OkayToThrowAwayPrompt:: @ 840E8C7 .string "Is it okay to\nthrow away {STR_VAR_2}\n{STR_VAR_1}(s)?$" -gUnknown_0840E8EA:: @ 840E8EA -OtherText_DadsAdvice: +gOtherText_DadsAdvice:: @ 840E8EA .string "DAD’s advice...\n{PLAYER}, there’s a time and place for\leverything!{PAUSE_UNTIL_PRESS}$" -gUnknown_0840E929:: @ 840E929 -OtherText_CantGetOffBike: +gOtherText_CantGetOffBike:: @ 840E929 .string "You can’t dismount your BIKE here.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840E94E:: @ 840E94E -OtherText_ItemfinderResponding: +gOtherText_ItemfinderResponding:: @ 840E94E .string "Oh!\nThe machine’s responding!\pThere’s an item buried around here!{PAUSE_UNTIL_PRESS}$" -gUnknown_0840E992:: @ 840E992 -OtherText_ItemfinderFoundItem: +gOtherText_ItemfinderFoundItem:: @ 840E992 .string "The machine’s indicating something\nright underfoot!{PAUSE_UNTIL_PRESS}$" -gUnknown_0840E9C8:: @ 840E9C8 -OtherText_NoResponse: +gOtherText_NoResponse:: @ 840E9C8 .string "... ... ... ... Nope!\nThere’s no response.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840E9F5:: @ 840E9F5 -OtherText_Coins3: +gOtherText_Coins3:: @ 840E9F5 .string "Your COINS:\n{STR_VAR_1}{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EA06:: @ 840EA06 -OtherText_BootedTM: +gOtherText_BootedTM:: @ 840EA06 .string "Booted up a TM.$" -gUnknown_0840EA16:: @ 840EA16 -OtherText_BootedHM: +gOtherText_BootedHM:: @ 840EA16 .string "Booted up an HM.$" -gUnknown_0840EA27:: @ 840EA27 -OtherText_ContainsMove: +gOtherText_ContainsMove:: @ 840EA27 .string "It contained\n{STR_VAR_1}.\pTeach {STR_VAR_1}\nto a POKéMON?$" -gUnknown_0840EA4F:: @ 840EA4F -OtherText_UsedItem: +gOtherText_UsedItem:: @ 840EA4F .string "{PLAYER} used the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EA61:: @ 840EA61 -OtherText_RepelLingers: +gOtherText_RepelLingers:: @ 840EA61 .string "But the effects of a REPEL lingered\nfrom earlier.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EA95:: @ 840EA95 -OtherText_UsedFlute: +gOtherText_UsedFlute:: @ 840EA95 .string "{PLAYER} used the\n{STR_VAR_2}.\pWild POKéMON will be lured.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EAC3:: @ 840EAC3 -OtherText_UsedRepel: +gOtherText_UsedRepel:: @ 840EAC3 .string "{PLAYER} used the\n{STR_VAR_2}.\pWild POKéMON will be repelled.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EAF4:: @ 840EAF4 -OtherText_BoxIsFull: +gOtherText_BoxIsFull:: @ 840EAF4 .string "The BOX is full.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EB07:: @ 840EB07 -OtherText_Size: +gOtherText_Size:: @ 840EB07 .string "SIZE /$" -gUnknown_0840EB0E:: @ 840EB0E -OtherText_Firm: +gOtherText_Firm:: @ 840EB0E .string "FIRM /$" -gUnknown_0840EB15:: @ 840EB15 -ContestStatsText_Unknown1: +gContestStatsText_Unknown1:: @ 840EB15 .string "{STR_VAR_1}.{STR_VAR_2}”$" ContestStatsText_VerySoft: @@ -28602,7 +28489,6 @@ ContestStatsText_VeryHard: .string "Very hard$" ContestStatsText_SuperHard: .string "Super hard$" - ContestStatsText_RedPokeBlock: .string "RED {POKEBLOCK}$" ContestStatsText_BluePokeBlock: @@ -28632,131 +28518,102 @@ ContestStatsText_WhitePokeBlock: ContestStatsText_GoldPokeBlock: .string "GOLD {POKEBLOCK}$" -gUnknown_0840EBED:: @ 840EBED -ContestStatsText_Spicy: +gContestStatsText_Spicy:: @ 840EBED .string "SPICY$" -gUnknown_0840EBF3:: @ 840EBF3 -ContestStatsText_Dry: +gContestStatsText_Dry:: @ 840EBF3 .string "DRY$" -gUnknown_0840EBF7:: @ 840EBF7 -ContestStatsText_Sweet: +gContestStatsText_Sweet:: @ 840EBF7 .string "SWEET$" -gUnknown_0840EBFD:: @ 840EBFD -ContestStatsText_Bitter: +gContestStatsText_Bitter:: @ 840EBFD .string "BITTER$" -gUnknown_0840EC04:: @ 840EC04 -ContestStatsText_Sour: +gContestStatsText_Sour:: @ 840EC04 .string "SOUR$" -ContestStatsText_Tasty: - .string "TASTY$" -ContestStatsText_Feel: + .string "TASTY$" @ tasty is probably unused, but feel isn't. .string "FEEL$" -gUnknown_0840EC14:: @ 840EC14 -ContestStatsText_StowCase: +gContestStatsText_StowCase:: @ 840EC14 .string "Stow CASE.$" -gUnknown_0840EC1F:: @ 840EC1F -ContestStatsText_ThrowAwayPrompt: +gContestStatsText_ThrowAwayPrompt:: @ 840EC1F .string "Throw away this\n{STR_VAR_1}?$" -gUnknown_0840EC33:: @ 840EC33 -ContestStatsText_WasThrownAway: +gContestStatsText_WasThrownAway:: @ 840EC33 .string "The {STR_VAR_1}\nwas thrown away.$" -gUnknown_0840EC4B:: @ 840EC4B -ContestStatsText_NormallyAte: +gContestStatsText_NormallyAte:: @ 840EC4B .string "{STR_VAR_1} ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EC5C:: @ 840EC5C -ContestStatsText_HappilyAte: +gContestStatsText_HappilyAte:: @ 840EC5C .string "{STR_VAR_1} happily ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EC75:: @ 840EC75 -ContestStatsText_DisdainfullyAte: +gContestStatsText_DisdainfullyAte:: @ 840EC75 .string "{STR_VAR_1} disdainfully ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -ContestStatsText_Buy: @ i have a feeling contest things still call these + +MartText_Buy: .string "BUY$" -ContestStatsText_Sell: +MartText_Sell: .string "SELL$" -ContestStatsText_Quit2: +MartText_Quit2: .string "QUIT$" -gUnknown_0840ECA1:: @ 840ECA1 -OtherText_QuitShopping: +gOtherText_QuitShopping:: @ 840ECA1 .string "Quit shopping.$" -gUnknown_0840ECB0:: @ 840ECB0 -OtherText_HowManyYouWant: +gOtherText_HowManyYouWant:: @ 840ECB0 .string "{STR_VAR_1}? Certainly.\nHow many would you like?$" -gUnknown_0840ECD8:: @ 840ECD8 -OtherText_ThatWillBe: +gOtherText_ThatWillBe:: @ 840ECD8 .string "{STR_VAR_1}? And you wanted {STR_VAR_2}?\nThat will be ¥{STR_VAR_3}.$" -gUnknown_0840ED01:: @ 840ED01 -OtherText_ThatWillBe2: +gOtherText_ThatWillBe2:: @ 840ED01 .string "{STR_VAR_1}, is it?\nThat’ll be ¥{STR_VAR_2}. Do you want it?$" -gUnknown_0840ED2C:: @ 840ED2C -OtherText_ThatWillBe3: +gOtherText_ThatWillBe3:: @ 840ED2C .string "You wanted {STR_VAR_1}?\nThat’ll be ¥{STR_VAR_2}. Will that be okay?$" -gUnknown_0840ED5E:: @ 840ED5E -OtherText_HereYouGo: +gOtherText_HereYouGo:: @ 840ED5E .string "Here you go!\nThank you very much.$" -gUnknown_0840ED80:: @ 840ED80 -OtherText_HereYouGo2: +gOtherText_HereYouGo2:: @ 840ED80 .string "Thank you!\nI’ll send it to your home PC.$" -gUnknown_0840EDA9:: @ 840EDA9 -OtherText_HereYouGo3: +gOtherText_HereYouGo3:: @ 840EDA9 .string "Thanks!\nI’ll send it to your PC at home.$" -gUnknown_0840EDD2:: @ 840EDD2 -OtherText_NotEnoughMoney: +gOtherText_NotEnoughMoney:: @ 840EDD2 .string "You don’t have enough money.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EDF1:: @ 840EDF1 -OtherText_NoRoomFor: +gOtherText_NoRoomFor:: @ 840EDF1 .string "You have no more room for items.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EE14:: @ 840EE14 -OtherText_SpaceForIsFull: +gOtherText_SpaceForIsFull:: @ 840EE14 .string "The space for {STR_VAR_1} is full.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EE30:: @ 840EE30 -OtherText_AnythingElse: +gOtherText_AnythingElse:: @ 840EE30 .string "Is there anything else I can help\nyou with?$" -gUnknown_0840EE5C:: @ 840EE5C -OtherText_CanIHelpYou: +gOtherText_CanIHelpYou:: @ 840EE5C .string "Can I help you with anything else?$" -gUnknown_0840EE7F:: @ 840EE7F -OtherText_FreePremierBall: +gOtherText_FreePremierBall:: @ 840EE7F .string "I’ll throw in a PREMIER BALL, too.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EEA4:: @ 840EEA4 -OtherText_CantBuyThat: +gOtherText_CantBuyThat:: @ 840EEA4 .string "{STR_VAR_2}? Oh, no.\nI can’t buy that.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EEC4:: @ 840EEC4 -OtherText_HowManyToSell: +gOtherText_HowManyToSell:: @ 840EEC4 .string "{STR_VAR_2}?\nHow many would you like to sell?$" -gUnknown_0840EEE9:: @ 840EEE9 -OtherText_CanPay: +gOtherText_CanPay:: @ 840EEE9 .string "I can pay ¥{STR_VAR_1}.\nWould that be okay?$" -gUnknown_0840EF0C:: @ 840EF0C -OtherText_SoldItem:: +gOtherText_SoldItem:: @ 840EF0C .string "Turned over the {STR_VAR_2}\nand received ¥{STR_VAR_1}.$" + OtherText_Money:: .string "¥{STR_VAR_1}$" OtherText_Shift:: @@ -28778,205 +28635,157 @@ OtherText_Take:: OtherText_Read2:: .string "READ$" -gUnknown_0840EF72:: @ 840EF72 -OtherText_Hp2: +gOtherText_Hp2:: @ 840EF72 .string "HP$" -gUnknown_0840EF75:: @ 840EF75 -OtherText_SpAtk2: +gOtherText_SpAtk2:: @ 840EF75 .string "SP. ATK$" -gUnknown_0840EF7D:: @ 840EF7D -OtherText_SpDef2: +gOtherText_SpDef2:: @ 840EF7D .string "SP. DEF$" -gUnknown_0840EF85:: @ 840EF85 -OtherText_WontHaveAnyEffect: +gOtherText_WontHaveAnyEffect:: @ 840EF85 .string "It won’t have any effect.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EFA1:: @ 840EFA1 -OtherText_CantUseItemOnPoke: +gOtherText_CantUseOnPoke:: @ 840EFA1 .if REVISION >= 1 .string "This can’t be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}$" .else .string "This item can’t be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}$" .endif -gUnknown_0840EFCC:: @ 840EFCC -OtherText_CantBeSwitched: +gOtherText_CantBeSwitched:: @ 840EFCC .string "{STR_VAR_1} can’t be switched\nout!{PAUSE_UNTIL_PRESS}$" -gUnknown_0840EFE8:: @ 840EFE8 -OtherText_AlreadyBattle: +gOtherText_AlreadyBattle:: @ 840EFE8 .string "{STR_VAR_1} is already\nin battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F003:: @ 840F003 -OtherText_AlreadySelected: +gOtherText_AlreadySelected:: @ 840F003 .string "{STR_VAR_1} has already been\nselected.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F023:: @ 840F023 -OtherText_NoEnergyLeft: +gOtherText_NoEnergyLeft:: @ 840F023 .string "{STR_VAR_1} has no energy\nleft to battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F046:: @ 840F046 -OtherText_CantSwitchPokeWithYours: +gOtherText_CantSwitchPokeWithYours:: @ 840F046 .string "You can’t switch {STR_VAR_1}’s\nPOKéMON with one of yours!{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F079:: @ 840F079 -OtherText_EGGCantBattle: +gOtherText_EGGCantBattle:: @ 840F079 .string "An EGG can’t battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F090:: @ 840F090 -OtherText_CantBeUsedBadge: +gOtherText_CantBeUsedBadge:: @ 840F090 .string "This can’t be used until a new\nBADGE is obtained.$" -gUnknown_0840F0C2:: @ 840F0C2 -OtherText_NoMoreThreePoke: +gOtherText_NoMoreThreePoke:: @ 840F0C2 .string "No more than three POKéMON\nmay enter.$" -gUnknown_0840F0E8:: @ 840F0E8 -OtherText_SendRemovedMailPrompt: +gOtherText_SendRemovedMailPrompt:: @ 840F0E8 .string "Send the removed MAIL to\nyour PC?$" -gUnknown_0840F10A:: @ 840F10A -OtherText_MailWasSent: +gOtherText_MailWasSent:: @ 840F10A .string "The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F12A:: @ 840F12A -OtherText_MailboxIsFull: +gOtherText_MailboxIsFull:: @ 840F12A .string "Your PC’s MAILBOX is full.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F147:: @ 840F147 -OtherText_MailRemovedMessageLost: +gOtherText_MailRemovedMessageLost:: @ 840F147 .string "If the MAIL is removed, the\nmessage will be lost. Okay?$" -gUnknown_0840F17F:: @ 840F17F -OtherText_MailMustBeRemoved: +gOtherText_MailMustBeRemoved:: @ 840F17F .string "MAIL must be removed before\nholding an item.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F1AE:: @ 840F1AE -OtherText_WasGivenToHold: +gOtherText_WasGivenToHold:: @ 840F1AE .string "{STR_VAR_1} was given the\n{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F1CD:: @ 840F1CD -OtherText_AlreadyHolding: +gOtherText_AlreadyHolding:: @ 840F1CD .string "{STR_VAR_1} is already holding\none {STR_VAR_2}.\pWould you like to switch the\ntwo items?$" -gUnknown_0840F213:: @ 840F213 -OtherText_NotHoldingAnything: +gOtherText_NotHoldingAnything:: @ 840F213 .string "{STR_VAR_1} isn’t\nholding anything.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F230:: @ 840F230 -OtherText_ReceivedTheThingFrom: +gOtherText_ReceivedTheThingFrom:: @ 840F230 .string "Received the {STR_VAR_2}\nfrom {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F24B:: @ 840F24B -OtherText_MailTaken: +gOtherText_MailTaken:: @ 840F24B .string "MAIL was taken from the\nPOKéMON.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F26E:: @ 840F26E -OtherText_TakenAndReplaced: +gOtherText_TakenAndReplaced:: @ 840F26E .string "The {STR_VAR_2} was taken and\nreplaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F29B:: @ 840F29B -OtherText_PokeHoldingItemCantMail: +gOtherText_PokeHoldingItemCantMail:: @ 840F29B .string "This POKéMON is holding an item.\nIt cannot hold MAIL.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F2D3:: @ 840F2D3 -OtherText_MailTransferredMailbox: +gOtherText_MailTransferredMailbox:: @ 840F2D3 .string "MAIL was transferred from\nthe MAILBOX.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F2FC:: @ 840F2FC -OtherText_BagFullCannotRemoveItem: +gOtherText_BagFullCannotRemoveItem:: @ 840F2FC .string "The BAG is full. The POKéMON’s\nitem could not be removed.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F338:: @ 840F338 -OtherText_LearnedMove: +gOtherText_LearnedMove:: @ 840F338 .string "{STR_VAR_1} learned\n{STR_VAR_2}!$" -gUnknown_0840F347:: @ 840F347 -OtherText_NotCompatible: +gOtherText_NotCompatible:: @ 840F347 .string "{STR_VAR_1} and {STR_VAR_2}\nare not compatible.\p{STR_VAR_2} can’t be learned.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F37C:: @ 840F37C -OtherText_WantsToLearn: +gOtherText_WantsToLearn:: @ 840F37C .string "{STR_VAR_1} wants to learn the\nmove {STR_VAR_2}.\pHowever, {STR_VAR_1} already\nknows four moves.\pShould a move be deleted and\nreplaced with {STR_VAR_2}?$" -gUnknown_0840F3F0:: @ 840F3F0 -OtherText_StopTryingTo: +gOtherText_StopTryingTo:: @ 840F3F0 .string "Stop trying to teach\n{STR_VAR_2}?$" -gUnknown_0840F409:: @ 840F409 -OtherText_DidNotLearnMove2: +gOtherText_DidNotLearnMove2:: @ 840F409 .string "{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F429:: @ 840F429 -OtherText_WhichMoveToForget2: +gOtherText_WhichMoveToForget2:: @ 840F429 .string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F44B:: @ 840F44B -OtherText_ForgetMove123_2: @ it might look like its a dupe but one's used in a menu while one's for battle +gOtherText_ForgetMove123_2:: @ 840F44B .string "{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}... {PAUSE 15}... {PAUSE 15}... {PAUSE 15}{PLAY_SE SE_KON}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F49E:: @ 840F49E -OtherText_AlreadyKnows: +gOtherText_AlreadyKnows:: @ 840F49E .string "{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F4B5:: @ 840F4B5 -OtherText_HPRestoredBy: +gOtherText_HPRestoredBy:: @ 840F4B5 .string "{STR_VAR_1}’s HP was restored by\n{STR_VAR_2} points.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F4DA:: @ 840F4DA -OtherText_CuredPoisoning: +gOtherText_CuredPoisoning:: @ 840F4DA .string "{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F4FB:: @ 840F4FB -OtherText_CuredParalysis: +gOtherText_CuredParalysis:: @ 840F4FB .string "{STR_VAR_1} was cured of\nparalysis.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F518:: @ 840F518 -OtherText_WokeUp: +gOtherText_WokeUp:: @ 840F518 .string "{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F526:: @ 840F526 -OtherText_BurnHealed: +gOtherText_BurnHealed:: @ 840F526 .string "{STR_VAR_1}’s burn was healed.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F53E:: @ 840F53E -OtherText_ThawedOut: +gOtherText_ThawedOut:: @ 840F53E .string "{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F553:: @ 840F553 -OtherText_PPRestored: +gOtherText_PPRestored:: @ 840F553 .string "PP was restored.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F566:: @ 840F566 -OtherText_RegainedHealth: +gOtherText_RegainedHealth:: @ 840F566 .string "{STR_VAR_1} regained health.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F57C:: @ 840F57C -OtherText_BecameHealthy: +gOtherText_BecameHealthy:: @ 840F57C .string "{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F591:: @ 840F591 -OtherText_PPIncreased: +gOtherText_PPIncreased:: @ 840F591 .string "{STR_VAR_1}’s PP increased.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F5A6:: @ 840F5A6 -OtherText_ElevatedTo: +gOtherText_ElevatedTo:: @ 840F5A6 .string "{STR_VAR_1} was elevated to\nLv. {STR_VAR_2}.$" -gUnknown_0840F5C1:: @ 840F5C1 -OtherText_WasRaised: +gOtherText_WasRaised:: @ 840F5C1 .string "{STR_VAR_1}’s {STR_VAR_2} was\nraised.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F5D7:: @ 840F5D7 -OtherText_SnapConfusion: +gOtherText_SnapConfusion:: @ 840F5D7 .string "{STR_VAR_1} snapped out of its\nconfusion.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F5FA:: @ 840F5FA -OtherText_GotOverLove:: +gOtherText_GotOverLove:: @ 840F5FA .string "{STR_VAR_1} got over its\ninfatuation.{PAUSE_UNTIL_PRESS}$" + OtherText_ChoosePoke:: .string "Choose a POKéMON.$" OtherText_MovePokeTo:: @@ -29018,73 +28827,57 @@ OtherText_NoIdenticalHoldItems:: OtherText_TeachWhichPoke:: .string "Teach which POKéMON?$" -gUnknown_0840F7C6:: @ 840F7C6 -OtherText_Attack: +gOtherText_Attack:: @ 840F7C6 .string "ATTACK$" -gUnknown_0840F7CD:: @ 840F7CD -OtherText_Defense: +gOtherText_Defense:: @ 840F7CD .string "DEFENSE$" -gUnknown_0840F7D5:: @ 840F7D5 -OtherText_SpAtk: +gOtherText_SpAtk:: @ 840F7D5 .string "SP. ATK$" -gUnknown_0840F7DD:: @ 840F7DD -OtherText_SpDef: +gOtherText_SpDef:: @ 840F7DD .string "SP. DEF$" -gUnknown_0840F7E5:: @ 840F7E5 -OtherText_Speed: +gOtherText_Speed:: @ 840F7E5 .string "SPEED$" -gUnknown_0840F7EB:: @ 840F7EB -OtherText_HP: +gOtherText_HP:: @ 840F7EB .string "HP$" -gUnknown_0840F7EE:: @ 840F7EE -OtherText_Terminator18: +gOtherText_Terminator18:: @ 840F7EE .string "$" -gUnknown_0840F7EF:: @ 840F7EF -OtherText_OriginalTrainer: +gOtherText_OriginalTrainer:: @ 840F7EF .string "OT/$" -gUnknown_0840F7F3:: @ 840F7F3 -OtherText_Type2: +gOtherText_Type2:: @ 840F7F3 .string "TYPE/$" -gUnknown_0840F7F9:: @ 840F7F9 -OtherText_Power2: +gOtherText_Power2:: @ 840F7F9 .string "POWER$" -gUnknown_0840F7FF:: @ 840F7FF -OtherText_Accuracy2: +gOtherText_Accuracy2:: @ 840F7FF .string "ACCURACY$" -gUnknown_0840F808:: @ 840F808 -OtherText_Appeal2: +gOtherText_Appeal2:: @ 840F808 .string "APPEAL$" -gUnknown_0840F80F:: @ 840F80F -OtherText_Jam2: +gOtherText_Jam2:: @ 840F80F .string "JAM$" -gUnknown_0840F813:: @ 840F813 -OtherText_Status: +gOtherText_Status:: @ 840F813 .string "STATUS$" -gUnknown_0840F81A:: @ 840F81A -OtherText_ExpPoints: +gOtherText_ExpPoints:: @ 840F81A .string "EXP. POINTS$" -gUnknown_0840F826:: @ 840F826 -OtherText_NextLv: +gOtherText_NextLv:: @ 840F826 .string "NEXT LV.$" -gUnknown_0840F82F:: @ 840F82F -OtherText_Ribbons00:: +gOtherText_Ribbons00:: @ 840F82F .string "RIBBONS: 00$" + OtherText_Event:: .string "EVENT$" OtherText_Switch:: @@ -29100,41 +28893,33 @@ OtherText_ContestMoves:: OtherText_Info:: .string "INFO$" -gUnknown_0840F884:: @ 840F884 -OtherText_EggLong: +gOtherText_EggLongTime:: @ 840F884 .string "It looks like this EGG will\ntake a long time to hatch.$" -gUnknown_0840F8BB:: @ 840F8BB -OtherText_EggSome: +gOtherText_EggSomeTime:: @ 840F8BB .string "What will hatch from this?\nIt will take some time.$" -gUnknown_0840F8EE:: @ 840F8EE -OtherText_EggSoon: +gOtherText_EggSoon:: @ 840F8EE .string "It moves occasionally.\nIt should hatch soon.$" -gUnknown_0840F91B:: @ 840F91B -OtherText_EggAbout: +gOtherText_EggAbout:: @ 840F91B .string "It’s making sounds.\nIt’s about to hatch!$" -gUnknown_0840F944:: @ 840F944 -OtherText_CantForgetHMs: +gOtherText_CantForgetHMs:: @ 840F944 .string "HM moves can’t be\nforgotten now.$" -gUnknown_0840F965:: @ 840F965 -OtherText_PlayersBase: +gOtherText_PlayersBase:: @ 840F965 .string "’s BASE$" -gUnknown_0840F96D:: @ 840F96D -OtherText_OkayToDeleteFromRegistry: +gOtherText_OkayToDeleteFromRegistry:: @ 840F96D .string "Is it okay to delete {STR_VAR_1}\nfrom the REGISTRY?$" -gUnknown_0840F998:: @ 840F998 -OtherText_RegisteredDataDeleted: +gOtherText_RegisteredDataDeleted:: @ 840F998 .string "The registered data was deleted.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840F9BB:: @ 840F9BB -SecretBaseText_NoRegistry:: +gSecretBaseText_NoRegistry:: @ 840F9BB .string "There is no REGISTRY.{PAUSE_UNTIL_PRESS}$" + SecretBaseText_DelRegist:: .string "DEL REGIST.$" SecretBaseText_Decorate:: @@ -29150,9 +28935,9 @@ SecretBaseText_StoreChosenDecor:: SecretBaseText_ThrowAwayDecor:: .string "Throw away unwanted decorations.$" -gUnknown_0840FA64:: @ 840FA64 -SecretBaseText_NoDecors:: +gSecretBaseText_NoDecors:: @ 840FA64 .string "There are no decorations.{PAUSE_UNTIL_PRESS}$" + SecretBaseText_Desk:: .string "DESK$" SecretBaseText_Chair:: @@ -29170,75 +28955,58 @@ SecretBaseText_Doll:: SecretBaseText_Cushion:: .string "CUSHION$" -gUnknown_0840FAB2:: @ 840FAB2 -SecretBaseText_GoldRank: +gSecretBaseText_GoldRank:: @ 840FAB2 .string "GOLD$" -gUnknown_0840FAB7:: @ 840FAB7 -SecretBaseText_SilverRank: +gSecretBaseText_SilverRank:: @ 840FAB7 .string "SILVER$" -gUnknown_0840FABE:: @ 840FABE -SecretBaseText_PlaceItHere: +gSecretBaseText_PlaceItHere:: @ 840FABE .string "Place it here?$" -gUnknown_0840FACD:: @ 840FACD -SecretBaseText_CantBePlacedHere: +gSecretBaseText_CantBePlacedHere:: @ 840FACD .string "It can’t be placed here.$" -gUnknown_0840FAE6:: @ 840FAE6 -SecretBaseText_CancelDecorating: +gSecretBaseText_CancelDecorating:: @ 840FAE6 .string "Cancel decorating?$" -gUnknown_0840FAF9:: @ 840FAF9 -SecretBaseText_InUseAlready: +gSecretBaseText_InUseAlready:: @ 840FAF9 .string "This is in use already.$" -gUnknown_0840FB11:: @ 840FB11 -SecretBaseText_NoMoreDecor: +gSecretBaseText_NoMoreDecor:: @ 840FB11 .string "No more decorations can be placed.\nThe most that can be placed is {STR_VAR_1}.$" -gUnknown_0840FB57:: @ 840FB57 -SecretBaseText_NoMoreDecor2: +gSecretBaseText_NoMoreDecor2:: @ 840FB57 .string "No more decorations can be placed.\nThe most that can be placed is {STR_VAR_1}.$" -SecretBaseText_CantBePlacedHere2: .string "This can’t be placed here.\nIt must be on a DESK, etc.$" -gUnknown_0840FBD3:: @ 840FBD3 -SecretBaseText_DecorCantPlace: +gSecretBaseText_DecorCantPlace:: @ 840FBD3 .string "This decoration can’t be placed in\nyour own room.$" -gUnknown_0840FC05:: @ 840FC05 -SecretBaseText_DecorInUse: +gSecretBaseText_DecorInUse:: @ 840FC05 .string "This decoration is in use.\nIt can’t be thrown away.$" -gUnknown_0840FC39:: @ 840FC39 -SecretBaseText_WillBeDiscarded: +gSecretBaseText_WillBeDiscarded:: @ 840FC39 .string "This {STR_VAR_1} will be discarded.\nIs that okay?$" -gUnknown_0840FC62:: @ 840FC62 -SecretBaseText_DecorThrownAway: +gSecretBaseText_DecorThrownAway:: @ 840FC62 .string "The decoration item was thrown away.$" -gUnknown_0840FC87:: @ 840FC87 -SecretBaseText_StopPuttingAwayDecor: +gSecretBaseText_StopPuttingAwayDecor:: @ 840FC87 .string "Stop putting away decorations?$" -gUnknown_0840FCA6:: @ 840FCA6 -SecretBaseText_NoDecor: +gSecretBaseText_NoDecor:: @ 840FCA6 .string "There is no decoration item here.$" -gUnknown_0840FCC8:: @ 840FCC8 -SecretBaseText_ReturnDecor: +gSecretBaseText_ReturnDecor:: @ 840FCC8 .string "Return this decoration to the PC?$" -gUnknown_0840FCEA:: @ 840FCEA -SecretBaseText_DecorReturned: +gSecretBaseText_DecorReturned:: @ 840FCEA .string "The decoration was returned to the PC.$" -gUnknown_0840FD11:: @ 840FD11 -SecretBaseText_NoDecorInUse:: +gSecretBaseText_NoDecorInUse:: @ 840FD11 .string "There are no decorations in use.{PAUSE_UNTIL_PRESS}$" + SecretBaseText_Tristan:: .string "TRISTAN$" SecretBaseText_Philip:: @@ -29254,9 +29022,9 @@ SecretBaseText_Decoration:: SecretBaseText_ItemStorage:: .string "ITEM STORAGE$" -gUnknown_0840FD73:: @ 840FD73 -PCText_Mailbox:: +gPCText_Mailbox:: @ 840FD73 .string "MAILBOX$" + PCText_DepositItem:: .string "DEPOSIT ITEM$" PCText_WithdrawItem:: @@ -29270,90 +29038,72 @@ PCText_TakeOutItems:: PCText_ThrowAwayItems:: .string "Throw away items stored in the PC.$" -gUnknown_0840FDF6:: @ 840FDF6 -OtherText_NoItems: +gOtherText_NoItems:: @ 840FDF6 .string "There are no items.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840FE0C:: @ 840FE0C -OtherText_NoMoreRoom: +gOtherText_NoMoreRoom:: @ 840FE0C .string "There is no more\nroom in the BAG.$" -gUnknown_0840FE2E:: @ 840FE2E -OtherText_HowManyToWithdraw: +gOtherText_HowManyToWithdraw:: @ 840FE2E .string "How many do you\nwant to withdraw?$" -gUnknown_0840FE50:: @ 840FE50 -OtherText_WithdrewThing: +gOtherText_WithdrewThing:: @ 840FE50 .string "Withdrew {STR_VAR_2}\n{STR_VAR_1}(s).$" -OtherText_Read:: + +OtherText_Read: .string "READ$" -gUnknown_0840FE68:: @ 840FE68 -OtherText_MoveToBag:: +gOtherText_MoveToBag:: @ 840FE68 .string "MOVE TO BAG$" -OtherText_Give:: + +OtherText_Give: .string "GIVE$" -gUnknown_0840FE79:: @ 840FE79 -OtherText_NoMailHere: +gOtherText_NoMailHere:: @ 840FE79 .string "There’s no MAIL here.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840FE91:: @ 840FE91 -OtherText_WhatWillYouDoMail: +gOtherText_WhatWillYouDoMail:: @ 840FE91 .string "What would you like to do with\n{STR_VAR_1}’s MAIL?$" -gUnknown_0840FEBB:: @ 840FEBB -OtherText_MessageWillBeLost: +gOtherText_MessageWillBeLost:: @ 840FEBB .string "The message will be lost.\nIs that okay?$" -gUnknown_0840FEE3:: @ 840FEE3 -OtherText_BagIsFull: +gOtherText_BagIsFull:: @ 840FEE3 .string "The BAG is full.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840FEF6:: @ 840FEF6 -OtherText_MailWasReturned: +gOtherText_MailWasReturned:: @ 840FEF6 .string "The MAIL was returned to the BAG\nwith its message erased.{PAUSE_UNTIL_PRESS}$" -gUnknown_0840FF32:: @ 840FF32 -OtherText_Dad: +gOtherText_Dad:: @ 840FF32 .string "DAD$" -gUnknown_0840FF36:: @ 840FF36 -OtherText_Mom: +gOtherText_Mom:: @ 840FF36 .string "MOM$" -gUnknown_0840FF3A:: @ 840FF3A -OtherText_Wallace: +gOtherText_Wallace:: @ 840FF3A .string "WALLACE$" -gUnknown_0840FF42:: @ 840FF42 -OtherText_Steven: +gOtherText_Steven:: @ 840FF42 .string "STEVEN$" -gUnknown_0840FF49:: @ 840FF49 -OtherText_Brawly: +gOtherText_Brawly:: @ 840FF49 .string "BRAWLY$" -gUnknown_0840FF50:: @ 840FF50 -OtherText_Winona: +gOtherText_Winona:: @ 840FF50 .string "WINONA$" -gUnknown_0840FF57:: @ 840FF57 -OtherText_Phoebe: +gOtherText_Phoebe:: @ 840FF57 .string "PHOEBE$" -gUnknown_0840FF5E:: @ 840FF5E -OtherText_Glacia: +gOtherText_Glacia:: @ 840FF5E .string "GLACIA$" -gUnknown_0840FF65:: @ 840FF65 -ContestText_ContestWinner: +gContestText_ContestWinner:: @ 840FF65 .string "CONTEST WINNER\n$" -gUnknown_0840FF75:: @ 840FF75 -@ come back to this one and clean up -OtherText_Unknown1:: +gOtherText_Unknown1:: @ 840FF75 .string "’s $" + OtherText_Cool:: .string "COOL $" OtherText_Beauty2:: @@ -29424,7 +29174,6 @@ OtherText_MightyTough:: .string "The mighty tough\nhyper POKéMON $" OtherText_Exclamation:: .string "!$" - OtherText_Petalburg:: .string "PETALBURG$" OtherText_Slateport:: @@ -29726,59 +29475,46 @@ OtherText_TMsHMs:: OtherText_Berries:: .string "BERRIES$" -gUnknown_08410753:: @ 8410753 -PCText_SomeonesPC: +gPCText_SomeonesPC:: @ 8410753 .string "SOMEONE’S PC$" -gUnknown_08410760:: @ 8410760 -PCText_LanettesPC: +gPCText_LanettesPC:: @ 8410760 .string "LANETTE’S PC$" -gUnknown_0841076D:: @ 841076D -PCText_PlayersPC: +gPCText_PlayersPC:: @ 841076D .string "{PLAYER}’s PC$" -gUnknown_08410775:: @ 8410775 -PCText_HallOfFame: +gPCText_HallOfFame:: @ 8410775 .string "HALL OF FAME$" -gUnknown_08410782:: @ 8410782 -PCText_LogOff: +gPCText_LogOff:: @ 8410782 .string "LOG OFF$" -gUnknown_0841078A:: @ 841078A -OtherText_99Times: +gOtherText_99Times:: @ 841078A .string "99 times +$" -gUnknown_08410795:: @ 8410795 -OtherText_1Minute: +gOtherText_1Minute:: @ 8410795 .string "1 minute +$" -gUnknown_084107A0:: @ 84107A0 -OtherText_Seconds: +gOtherText_Seconds:: @ 84107A0 .string " seconds$" -gUnknown_084107A9:: @ 84107A9 -OtherText_Times: +gOtherText_Times:: @ 84107A9 .string " times$" -OtherText_Period2: .string ".$" -gUnknown_084107B2:: @ 84107B2 -OtherText_BigGuy: +gOtherText_BigGuy:: @ 84107B2 .string "Big guy$" -gUnknown_084107BA:: @ 84107BA -OtherText_BigGirl: +gOtherText_BigGirl:: @ 84107BA .string "Big girl$" -gUnknown_084107C3:: @ 84107C3 -OtherText_Son: +gOtherText_Son:: @ 84107C3 .string "son$" -gUnknown_084107C7:: @ 84107C7 -OtherText_Daughter: +gOtherText_Daughter:: @ 84107C7 .string "daughter$" + OtherText_BlueFlute: .string "BLUE FLUTE$" OtherText_YellowFlute: @@ -29826,13 +29562,12 @@ OtherText_B4F: OtherText_Rooftop: .string "ROOFTOP$" -gUnknown_0841085E:: @ 841085E -OtherText_NowOn: +gOtherText_NowOn:: @ 841085E .string "Now on:$" -gUnknown_08410866:: @ 8410866 -PCText_Cancel: +gPCText_Cancel:: @ 8410866 .string "CANCEL$" + PCText_ExitBox: .string "Exit from the BOX.$" PCText_WhatYouDo: @@ -29962,17 +29697,15 @@ PCText_OrganizeBoxesParty: PCText_ReturnToPrevMenu: .string "Return to the previous menu.$" -gUnknown_08410C1C:: @ 8410C1C -PCText_OnlyOne: +gPCText_OnlyOne:: @ 8410C1C .string "There is just one POKéMON with you.$" -gUnknown_08410C40:: @ 8410C40 -PCText_PartyFull2: +gPCText_PartyFull2:: @ 8410C40 .string "Your party is full!$" -gUnknown_08410C54:: @ 8410C54 -PCText_BOX: +gPCText_BOX:: @ 8410C54 .string "BOX$" + PCText_CheckMap: .string "{CLEAR 0}Check the map of the HOENN region.$" PCText_CheckPoke: @@ -30006,41 +29739,33 @@ PCText_FindTough: PCText_ReturnToCondition: .string "{CLEAR 0}Return to the CONDITION menu.$" -gUnknown_08410E22:: @ 8410E22 -OtherText_NumberRegistered: +gOtherText_NumberRegistered:: @ 8410E22 .string "No. registered$" -gUnknown_08410E31:: @ 8410E31 -OtherText_NumberBattles: +gOtherText_NumberBattles:: @ 8410E31 .string "No. of battles$" -gUnknown_08410E40:: @ 8410E40 -OtherText_Strategy: +gOtherText_Strategy:: @ 8410E40 .string "{PALETTE 5}STRATEGY$" -gUnknown_08410E4C:: @ 8410E4C -OtherText_TrainersPokemon: +gOtherText_TrainersPokemon:: @ 8410E4C .string "{PALETTE 5}TRAINER’S POKéMON$" -gUnknown_08410E61:: @ 8410E61 -OtherText_SelfIntroduction: +gOtherText_SelfIntroduction:: @ 8410E61 .string "{PALETTE 5}SELF-INTRODUCTION$" -gUnknown_08410E76:: @ 8410E76 -OtherText_Nature2: +gOtherText_Nature2:: @ 8410E76 .string "NATURE/$" -gUnknown_08410E7E:: @ 8410E7E -OtherText_InParty: +gOtherText_InParty:: @ 8410E7E .string "IN PARTY$" -gUnknown_08410E87:: @ 8410E87 -OtherText_Number: +gOtherText_Number:: @ 8410E87 .string "No. $" -gUnknown_08410E8C:: @ 8410E8C -OtherText_Ribbons:: +gOtherText_Ribbons:: @ 8410E8C .string "RIBBONS$" + OtherText_MakeProfilePage1:: .string "Make your profile by combining$" OtherText_MakeProfilePage2:: @@ -30092,89 +29817,69 @@ OtherText_HipsterPage1:: OtherText_HipsterPage2:: .string "teach you a good saying.$" -gUnknown_084110EE:: @ 84110EE -OtherText_TextDeletedConfirmPage1: +gOtherText_TextDeletedConfirmPage1:: @ 84110EE .string "All the text being edited will$" -gUnknown_0841110D:: @ 841110D -OtherText_TextDeletedConfirmPage2: +gOtherText_TextDeletedConfirmPage2:: @ 841110D .string "be deleted. Is that okay?$" -gUnknown_08411127:: @ 8411127 -OtherText_QuitEditing: +gOtherText_QuitEditing:: @ 8411127 .string "Quit editing?$" -gUnknown_08411135:: @ 8411135 -OtherText_EditedTextNoSavePage1: +gOtherText_EditedTextNoSavePage1:: @ 8411135 .string "The edited text will not be saved.$" -gUnknown_08411158:: @ 8411158 -OtherText_EditedTextNoSavePage2: +gOtherText_EditedTextNoSavePage2:: @ 8411158 .string "Is that okay?$" -gUnknown_08411166:: @ 8411166 -OtherText_EnterAPhraseOrWord: +gOtherText_EnterAPhraseOrWord:: @ 8411166 .string "Please enter a phrase or word.$" -gUnknown_08411185:: @ 8411185 -OtherText_TextNoDelete: +gOtherText_TextNoDelete:: @ 8411185 .string "The entire text can’t be deleted.$" -gUnknown_084111A7:: @ 84111A7 -OtherText_OnlyOnePhrase: +gOtherText_OnlyOnePhrase:: @ 84111A7 .string "Only one phrase may be changed.$" -gUnknown_084111C7:: @ 84111C7 -OtherText_OriginalSongRestored: +gOtherText_OriginalSongRestored:: @ 84111C7 .string "The original song will be restored.$" -gUnknown_084111EB:: @ 84111EB -OtherText_TrendyAlready: +gOtherText_TrendyAlready:: @ 84111EB .string "That’s trendy already!$" -gUnknown_08411202:: @ 8411202 -OtherText_CombineTwoPhrases: +gOtherText_CombineTwoPhrases:: @ 8411202 .string "Combine two words or phrases.$" -gUnknown_08411220:: @ 8411220 -OtherText_QuitGivingInfo: +gOtherText_QuitGivingInfo:: @ 8411220 .string "Quit giving information?$" -gUnknown_08411239:: @ 8411239 -OtherText_StopGivingMail: +gOtherText_StopGivingMail:: @ 8411239 .string "Stop giving the POKéMON MAIL?$" -gUnknown_08411257:: @ 8411257 -OtherText_Profile: +gOtherText_Profile:: @ 8411257 .string "PROFILE$" -gUnknown_0841125F:: @ 841125F -OtherText_AtBattleStart: +gOtherText_AtBattleStart:: @ 841125F .string "At the battle’s start.$" -gUnknown_08411276:: @ 8411276 -OtherText_UponWinningBattle: +gOtherText_UponWinningBattle:: @ 8411276 .string "Upon winning a battle.$" -gUnknown_0841128D:: @ 841128D -OtherText_UponLosingBattle: +gOtherText_UponLosingBattle:: @ 841128D .string "Upon losing a battle.$" -gUnknown_084112A3:: @ 84112A3 -OtherText_TheBardsSong: +gOtherText_TheBardsSong:: @ 84112A3 .string "The BARD’s Song$" -gUnknown_084112B3:: @ 84112B3 -OtherText_WhatsHipHappening: +gOtherText_WhatsHipHappening:: @ 84112B3 .string "What’s hip and happening?$" -gUnknown_084112CD:: @ 84112CD -OtherText_Interview: +gOtherText_Interview:: @ 84112CD .string "Interview$" -gUnknown_084112D7:: @ 84112D7 -OtherText_GoodSaying:: +gOtherText_GoodSaying:: @ 84112D7 .string "Good saying$" + OtherText_SoPretty:: .string " so pretty!$" OtherText_SoDarling:: @@ -30192,13 +29897,12 @@ OtherText_SoAmusing:: OtherText_SoMagical:: .string " so magical!$" -gUnknown_0841134B:: @ 841134B -OtherText_Is: +gOtherText_Is:: @ 841134B .string " is$" -gUnknown_0841134F:: @ 841134F -OtherText_DontYouAgree:: +gOtherText_DontYouAgree:: @ 841134F .string "\nDon’t you agree?$" + OtherText_WantVacationNicePlace:: .string "I so want to go on a vacation.\nWould you happen to know a nice place?$" OtherText_BoughtCrayonsIsNice:: @@ -30220,9 +29924,9 @@ OtherText_PokeLeague:: OtherText_PokeCenter:: .string "POKéMON CENTER$" -gUnknown_08411581:: @ 8411581 -OtherText_GetAPokeBlock:: +gOtherText_GetsAPokeBlock:: @ 8411581 .string " gets a {POKEBLOCK}?$" + OtherText_Coolness:: .string "Coolness $" OtherText_Beauty:: @@ -30234,92 +29938,70 @@ OtherText_Smartness:: OtherText_Toughness:: .string "Toughness $" -gUnknown_084115C2:: @ 84115C2 -SystemText_WasEnhanced: +gOtherText_WasEnhanced:: @ 84115C2 .string "was enhanced!$" -gUnknown_084115D0:: @ 84115D0 -SystemText_NothingChanged: +gOtherText_NothingChanged:: @ 84115D0 .string "Nothing changed!$" -gUnknown_084115E1:: @ 84115E1 -OtherText_WontEat: +gOtherText_WontEat:: @ 84115E1 .string "It won’t eat anymore...$" -gUnknown_084115F9:: @ 84115F9 -SystemText_SaveFailedBackupCheck: +gSystemText_SaveFailedBackupCheck:: @ 84115F9 .string "Save failed.\nChecking the backup memory...\nPlease wait.\n{COLOR RED}“Time required: 1 minute”$" -gUnknown_0841164E:: @ 841164E -SystemText_BackupDamagedGameContinue: +gSystemText_BackupDamagedGameContinue:: @ 841164E .string "The backup memory is damaged or\nthe internal battery has run dry.\nThe game can be played. However,\nprogress cannot be saved.$" -gUnknown_084116CB:: @ 84116CB -SystemText_GameplayEnded: +gSystemText_GameplayEnded:: @ 84116CB .string "{COLOR RED}“Gameplay cannot be continued.\nReturning to the title screen...”$" -gUnknown_0841170F:: @ 841170F -SystemText_CheckCompleteSaveAttempt: +gSystemText_CheckCompleteSaveAttempt:: @ 841170F .string "Check completed.\nAttempting to save again.\nPlease wait.$" -gUnknown_08411747:: @ 8411747 -SystemText_SaveCompletedGameEnd: +gSystemText_SaveCompletedGameEnd:: @ 8411747 .string "Save completed.\n{COLOR RED}“Gameplay cannot be continued.\nReturning to the title screen.”$" -gUnknown_08411799:: @ 8411799 -SystemText_SaveCompletedPressA: +gSystemText_SaveCompletedPressA:: @ 8411799 .string "Save completed.\n{COLOR RED}“Please press the A Button.”$" -gUnknown_084117C9:: @ 84117C9 -OtherText_Ferry: +gOtherText_Ferry:: @ 84117C9 .string "FERRY$" -gUnknown_084117CF:: @ 84117CF -OtherText_SecretBase: +gOtherText_SecretBase:: @ 84117CF .string "SECRET BASE$" -gUnknown_084117DB:: @ 84117DB -OtherText_Hideout: +gOtherText_Hideout:: @ 84117DB .string "HIDEOUT$" -gUnknown_084117E3:: @ 84117E3 -SystemText_ResetRTCPrompt: +gSystemText_ResetRTCPrompt:: @ 84117E3 .string "Reset RTC?\nA: Confirm, B: Cancel$" -gUnknown_08411804:: @ 8411804 -SystemText_PresentTime: +gSystemText_PresentTime:: @ 8411804 .string "Present time in game$" -gUnknown_08411819:: @ 8411819 -SystemText_PreviousTime: +gSystemText_PreviousTime:: @ 8411819 .string "Previous time in game$" -gUnknown_0841182F:: @ 841182F -SystemText_PleaseResetTime: +gSystemText_PleaseResetTime:: @ 841182F .string "Please reset the time.$" -gUnknown_08411846:: @ 8411846 -SystemText_ClockResetDataSave: +gSystemText_ClockResetDataSave:: @ 8411846 .string "The clock has been reset.\nData will be saved. Please wait.$" -gUnknown_08411881:: @ 8411881 -SystemText_SaveCompleted: +gSystemText_SaveCompleted:: @ 8411881 .string "Save completed.$" -gUnknown_08411891:: @ 8411891 -SystemText_SaveFailed: +gSystemText_SaveFailed:: @ 8411891 .string "Save failed...$" -gUnknown_084118A0:: @ 84118A0 -SystemText_NoSaveFileNoTime: +gSystemText_NoSaveFileNoTime:: @ 84118A0 .string "There is no save file, so the time\ncan’t be set.$" -gUnknown_084118D1:: @ 84118D1 -SystemText_ClockAdjustmentUsable: +gSystemText_ClockAdjustmentUsable:: @ 84118D1 .string "The in-game clock adjustment system\nis now useable.$" -gUnknown_08411905:: @ 8411905 -SystemText_Saving: +gSystemText_Saving:: @ 8411905 .string "SAVING...\nDON’T TURN OFF THE POWER.$" .align 2 @@ -31046,25 +30728,18 @@ gUnknown_084170F4:: @ 84170F4 UnknownString_1stRound: .string "1st round$" - UnknownString_2ndRound: .string "2nd round$" - UnknownString_3rdRound: .string "3rd round$" - UnknownString_4thRound: .string "4th round$" - UnknownString_5thRound: .string "5th round$" - UnknownString_6thRound: .string "6th round$" - UnknownString_7thRound: .string "7th round$" - UnknownString_8thRound: .string "8th round$" @@ -31079,112 +30754,88 @@ gUnknown_0842C29C:: @ 842C29C .4byte UnknownString_7thRound, sub_814A4B8 .4byte UnknownString_8thRound, sub_814A4B8 -OtherText_TopSpeed: + @ unused +gOtherText_TopSpeed:: .string "TOP SPEED$" -gUnknown_0842C2E6:: @ 842C2E6 -MultiText_BerryBlenderMaxSpeedRecord: +gMultiText_BerryBlenderMaxSpeedRecord:: @ 842C2E6 .string "BERRY BLENDER\nMAXIMUM SPEED RECORD!$" -gUnknown_0842C30A:: @ 842C30A -MultiText_2P3P4P: +gMultiText_2P3P4P:: @ 842C30A .string "2 PLAYERS\n3 PLAYERS\n4 PLAYERS$" -gUnknown_0842C328:: @ 842C328 -MultiText_Saving: +gMultiText_Saving:: @ 842C328 .string "SAVING...\nDON’T TURN OFF THE POWER.$" -gUnknown_0842C34C:: @ 842C34C -MultiText_LinkError: +gMultiText_LinkError:: @ 842C34C .string "{HIGHLIGHT TRANSPARENT}{COLOR WHITE2}Link error...\nCheck your Game Link cable connection,\nand turn the power off and on.$" -gUnknown_0842C3A6:: @ 842C3A6 -SystemText_OptionMenu: +gSystemText_OptionMenu:: @ 842C3A6 .string "{PALETTE 9}OPTION$" -gUnknown_0842C3B0:: @ 842C3B0 -SystemText_TextSpeed: +gSystemText_TextSpeed:: @ 842C3B0 .string "{PALETTE 9}TEXT SPEED$" -gUnknown_0842C3BE:: @ 842C3BE -SystemText_BattleScene: +gSystemText_BattleScene:: @ 842C3BE .string "{PALETTE 9}BATTLE SCENE$" -gUnknown_0842C3CE:: @ 842C3CE -SystemText_BattleStyle: +gSystemText_BattleStyle:: @ 842C3CE .string "{PALETTE 9}BATTLE STYLE$" -gUnknown_0842C3DE:: @ 842C3DE -SystemText_Sound: +gSystemText_Sound:: @ 842C3DE .string "{PALETTE 9}SOUND$" -gUnknown_0842C3E7:: @ 842C3E7 -SystemText_Frame: +gSystemText_Frame:: @ 842C3E7 .string "{PALETTE 9}FRAME$" -gUnknown_0842C3F0:: @ 842C3F0 -SystemText_Cancel: +gSystemText_Cancel:: @ 842C3F0 .string "{PALETTE 9}CANCEL$" -gUnknown_0842C3FA:: @ 842C3FA -SystemText_ButtonMode: +gSystemText_ButtonMode:: @ 842C3FA .string "{PALETTE 9}BUTTON MODE$" -gUnknown_0842C409:: @ 842C409 -SystemText_TextSpeedSlow: +gSystemText_Slow:: @ 842C409 .string "{PALETTE 15}SLOW$" -gUnknown_0842C411:: @ 842C411 -SystemText_Mid: +gSystemText_Mid:: @ 842C411 .string "{PALETTE 15}MID$" -gUnknown_0842C418:: @ 842C418 -SystemText_Fast: +gSystemText_Fast:: @ 842C418 .string "{PALETTE 15}FAST$" -gUnknown_0842C420:: @ 842C420 -SystemText_On: +gSystemText_On:: @ 842C420 .string "{PALETTE 15}ON$" -gUnknown_0842C426:: @ 842C426 -SystemText_Off: +gSystemText_Off:: @ 842C426 .string "{PALETTE 15}OFF$" -gUnknown_0842C42D:: @ 842C42D -SystemText_Shift: +gSystemText_Shift:: @ 842C42D .string "{PALETTE 15}SHIFT$" -gUnknown_0842C436:: @ 842C436 -SystemText_Set: +gSystemText_Set:: @ 842C436 .string "{PALETTE 15}SET$" -gUnknown_0842C43D:: @ 842C43D -SystemText_Mono: +gSystemText_Mono:: @ 842C43D .string "{PALETTE 15}MONO$" -gUnknown_0842C445:: @ 842C445 -SystemText_Stereo: +gSystemText_Stereo:: @ 842C445 .string "{PALETTE 15}STEREO$" -gUnknown_0842C44F:: @ 842C44F -SystemText_Type: +gSystemText_Type:: @ 842C44F .string "{PALETTE 15}TYPE$" -gUnknown_0842C457:: @ 842C457 -SystemText_Terminator: +gSystemText_Terminator:: @ 842C457 .string "{PALETTE 8}$" -gUnknown_0842C45B:: @ 842C45B -SystemText_Normal: +gSystemText_Normal:: @ 842C45B .string "{PALETTE 15}NORMAL$" -gUnknown_0842C465:: @ 842C465 -SystemText_LR: +gSystemText_LR:: @ 842C465 .string "{PALETTE 15}LR$" -gUnknown_0842C46B:: @ 842C46B -SystemText_LA: +gSystemText_LA:: @ 842C46B .string "{PALETTE 15}L=A$" + SystemText_Pokedex: .string "POKéDEX$" SystemText_Pokemon: @@ -31204,75 +30855,54 @@ SystemText_Exit: SystemText_Retire: @ safari zone? .string "RETIRE$" -gUnknown_0842C4A9:: @ 842C4A9 -OtherText_SafariStock: +gOtherText_SafariStock:: @ 842C4A9 .string "SAFARI BALLS\nStock: {STR_VAR_1}$" -gUnknown_0842C4C0:: @ 842C4C0 -SystemText_LinkStandby: +gSystemText_LinkStandby:: @ 842C4C0 .string "Link standby...\n... ... B Button: Cancel$" -gUnknown_0842C4E9:: @ 842C4E9 -SystemText_LoadEventPressA: +gSystemText_LoadEventPressA:: @ 842C4E9 .string "Press the A Button to load event.\n... ... B Button: Cancel$" -gUnknown_0842C524:: @ 842C524 -SystemText_LoadingEvent: +gSystemText_LoadingEvent:: @ 842C524 .string "Loading event...$" -gUnknown_0842C535:: @ 842C535 -SystemText_DontCutLink: +gSystemText_DontCutLink:: @ 842C535 .string "Don’t remove the Game Link cable.\nDon’t turn off the power.$" -gUnknown_0842C571:: @ 842C571 -SystemText_EventLoadSuccess: - .string "The event was safely loaded.$" -SystemText_Terminator2: - .string "$" +gSystemText_EventLoadSuccess:: @ 842C571 + .string "The event was safely loaded.$$" -gUnknown_0842C58F:: @ 842C58F -SystemText_LoadingError: - .string "Loading error.\nEnding session.$" -SystemText_Terminator3: - .string "$$$$$$$" +gSystemText_LoadingError:: @ 842C58F + .string "Loading error.\nEnding session.$$$$$$$$" -gUnknown_0842C5B5:: @ 842C5B5 -OtherText_Hoenn: +gOtherText_Hoenn:: @ 842C5B5 .string "HOENN$" -gUnknown_0842C5BB:: @ 842C5BB -OtherText_OhABite: +gOtherText_OhABite:: @ 842C5BB .string "Oh! A bite!$" -gUnknown_0842C5C7:: @ 842C5C7 -OtherText_PokeOnHook: +gOtherText_PokeOnHook:: @ 842C5C7 .string "A POKéMON’s on the hook!{PAUSE_UNTIL_PRESS}$" -gUnknown_0842C5E2:: @ 842C5E2 -OtherText_NotANibble: +gOtherText_NotEvenANibble:: @ 842C5E2 .string "Not even a nibble...{PAUSE_UNTIL_PRESS}$" -gUnknown_0842C5F9:: @ 842C5F9 -OtherText_ItGotAway: - .string "It got away...{PAUSE_UNTIL_PRESS}$" -OtherText_Terminator: - .string "$" +gOtherText_ItGotAway:: @ 842C5F9 + .string "It got away...{PAUSE_UNTIL_PRESS}$$" -gUnknown_0842C60B:: @ 842C60B -TradeText_WillBeSent: +gTradeText_WillBeSent:: @ 842C60B .string "{STR_VAR_2} will be sent to {STR_VAR_1}.$" -gUnknown_0842C622:: @ 842C622 -TradeText_ByeBye: +gTradeText_ByeBye:: @ 842C622 .string "Bye-bye, {STR_VAR_2}!$" -gUnknown_0842C62F:: @ 842C62F -TradeText_SentOverPoke: +gTradeText_SentOverPoke:: @ 842C62F .string "{STR_VAR_1} sent over {STR_VAR_3}.$" -gUnknown_0842C640:: @ 842C640 -TradeText_TakeGoodCare: +gTradeText_TakeGoodCare:: @ 842C640 .string "Take good care of {STR_VAR_3}!$" + TradeText_Cancel: .string "CANCEL$" TradeText_ChoosePoke: @@ -31301,190 +30931,146 @@ TradeText_WaitingForFriend: .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Waiting for your\nfriend to finish...$" TradeText_WantToTrade: .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Your friend wants\nto trade POKéMON.$" -TradeText_Terminator: .string "$" -gUnknown_0842C7B6:: -TradeText_TradeOkayPrompt: +gTradeText_TradeOkayPrompt:: @ 842C7B6 .string "Is this trade okay?$" -gUnknown_0842C7CA:: -OtherText_Terminator2: +gOtherText_Terminator2:: @ 842C7CA .string "$" -gUnknown_0842C7CB:: -OtherText_NewLine: +gOtherText_ControlAndMiscText:: @ 842C7CB .string "\n$" -OtherText_Escape: .string "/$" -OtherText_Level: .string "Lv$" -OtherText_ThreeDashes: .string "---$" -gUnknown_0842C7D6:: -OtherText_FourQuestions: +gOtherText_FourQuestions:: @ 842C7D6 .string "????$" @ 842C7DB .include "data/text/easy_chat/group_name_strings.s" -gUnknown_0842C890:: @ 842C890 -OtherText_ThreeQuestions:: +gOtherText_ThreeQuestions:: @ 842C890 .string "???$" -gUnknown_0842C894:: @ 842C894 -OtherText_From:: +gOtherText_From:: @ 842C894 .string "From $" -gUnknown_0842C89A:: @ 842C89A -OtherText_MixingRecordsWithFriend:: +gOtherText_MixingRecordsWithFriend:: @ 842C89A .string "Mixing records...$" -gUnknown_0842C8AC:: @ 842C8AC -OtherText_MixingComplete:: +gOtherText_MixingComplete:: @ 842C8AC .string "Record mixing completed.\nThank you for waiting.$" -gUnknown_0842C8DC:: @ 842C8DC -OtherText_TrainersTrainerCard:: @ redundant but couldnt think of a better desc +gOtherText_TrainersTrainerCard:: @ 842C8DC .string "’s TRAINER CARD$" -gUnknown_0842C8EC:: @ 842C8EC -OtherText_FirstHOF:: +gOtherText_FirstHOF:: @ 842C8EC .string "FIRST HALL OF FAME$" -gUnknown_0842C8FF:: @ 842C8FF -OtherText_LinkCableBattles:: +gOtherText_LinkCableBattles:: @ 842C8FF .string "LINK CABLE BATTLES W/ L/$" -gUnknown_0842C924:: @ 842C924 -OtherText_BattleTowerWinRecord:: +gOtherText_BattleTowerWinRecord:: @ 842C924 .string "BATTLE TOWER W/{CLEAR_TO 0x72}&{CLEAR_TO 0x98}STRAIGHT$" -gUnknown_0842C943:: @ 842C943 -OtherText_ContestRecord:: +gOtherText_ContestRecord:: @ 842C943 .string "CONTESTS W/FRIENDS W/$" -gUnknown_0842C959:: @ 842C959 -OtherText_MixingRecord:: +gOtherText_MixingRecord:: @ 842C959 .string "{POKEBLOCK}S W/FRIENDS$" -gUnknown_0842C96A:: @ 842C96A -OtherText_TradeRecord:: +gOtherText_TradeRecord:: @ 842C96A .string "POKéMON TRADES$" -gUnknown_0842C979:: @ 842C979 -OtherText_Boy:: +gOtherText_Boy:: @ 842C979 .string "BOY$" -gUnknown_0842C97D:: @ 842C97D -OtherText_Girl:: +gOtherText_Girl:: @ 842C97D .string "GIRL$" -OtherText_Terminator3:: .string "$" -gUnknown_0842C983:: @ 842C983 -OtherText_Player:: +gOtherText_Player:: @ 842C983 .string "PLAYER$" -gUnknown_0842C98A:: @ 842C98A -OtherText_Badges:: +gOtherText_Badges:: @ 842C98A .string "BADGES$" .string "$" -gUnknown_0842C992:: @ 842C992 -OtherText_Pokedex:: +gOtherText_Pokedex:: @ 842C992 .string "POKéDEX$" -gUnknown_0842C99A:: @ 842C99A -OtherText_PlayTime:: +gOtherText_PlayTime:: @ 842C99A .string "PLAY TIME$" -gUnknown_0842C9A4:: @ 842C9A4 -OtherText_SentToPc:: +gOtherText_SentToPC:: @ 842C9A4 .string "{STR_VAR_1} was sent to\nthe PC.{PAUSE_UNTIL_PRESS}$" -OtherText_YourName:: + +OtherText_YourName: .string "YOUR NAME?$" -OtherText_BoxName:: +OtherText_BoxName: .string "BOX NAME?$" -OtherText_PokeName:: +OtherText_PokeName: .string "{STR_VAR_1}’s nickname?$" -gUnknown_0842C9E1:: @ 842C9E1 -OtherText_Marco: +gOtherText_Marco:: @ 842C9E1 .string "MARCO$" @ polo -gUnknown_0842C9E7:: @ 842C9E7 -OtherText_Coins: +gOtherText_Coins:: @ 842C9E7 .string "{STR_VAR_1} COINS$" -gUnknown_0842C9F0:: @ 842C9F0 -OtherText_BattleResults: +gOtherText_BattleResults:: @ 842C9F0 .string "{PLAYER}’s BATTLE RESULTS$" -gUnknown_0842CA04:: @ 842CA04 -OtherText_WinRecord: +gOtherText_WinRecord:: @ 842CA04 .string "TOTAL RECORD W/{STR_VAR_1} L/{STR_VAR_2} D/{STR_VAR_3}$" -gUnknown_0842CA20:: @ 842CA20 -OtherText_WinLoseDraw: +gOtherText_WinLoseDraw:: @ 842CA20 .string "WIN LOSE DRAW$" -gUnknown_0842CA3C:: @ 842CA3C -OtherText_SevenDashes: +gOtherText_SevenDashes:: @ 842CA3C .string "-------$" -gUnknown_0842CA44:: @ 842CA44 -OtherText_FourDashes: +gOtherText_FourDashes:: @ 842CA44 .string "----$" -gUnknown_0842CA49:: @ 842CA49 -OtherText_BattleTowerResults: +gOtherText_BattleTowerResults:: @ 842CA49 .string "{PLAYER}’s BATTLE TOWER RESULTS$" -gUnknown_0842CA63:: @ 842CA63 -OtherText_Lv50: +gOtherText_Lv50:: @ 842CA63 .string "LV 50$" -gUnknown_0842CA69:: @ 842CA69 -OtherText_Lv100: +gOtherText_Lv100:: @ 842CA69 .string "LV 100$" -gUnknown_0842CA70:: @ 842CA70 -OtherText_WinStreak: +gOtherText_WinStreak:: @ 842CA70 .string "{STR_VAR_1}W STREAK$" -gUnknown_0842CA7B:: @ 842CA7B -OtherText_Current: +gOtherText_Current:: @ 842CA7B .string "CURRENT$" -gUnknown_0842CA83:: @ 842CA83 -OtherText_Record: +gOtherText_Record:: @ 842CA83 .string "RECORD$" -gUnknown_0842CA8A:: @ 842CA8A -OtherText_Prev: +gOtherText_Prev:: @ 842CA8A .string "PREV.$" -gUnknown_0842CA90:: @ 842CA90 -OtherText_QuitGamePrompt: +gOtherText_QuitGamePrompt:: @ 842CA90 .string "Quit the game?$" -gUnknown_0842CA9F:: @ 842CA9F -OtherText_MaxCoins: +gOtherText_MaxCoins:: @ 842CA9F .string "You’ve got 9,999 COINS.$" -gUnknown_0842CAB7:: @ 842CAB7 -OtherText_OutOfCoins: +gOtherText_OutOfCoins:: @ 842CAB7 .string "You’ve run out of COINS.\nGame over!$" -gUnknown_0842CADB:: @ 842CADB -OtherText_DontHaveThreeCoins: +gOtherText_DontHaveThreeCoins:: @ 842CADB .string "You don’t have three COINS.$" -gUnknown_0842CAF7:: @ 842CAF7 -OtherText_ReelTime:: +gOtherText_ReelTime:: @ 842CAF7 .string "REEL TIME\nHere’s your chance to take\naim and nail marks!\nThe Reel Time continues for\nas often as the drawn number.\nIt all ends on a Big Bonus.$" + DaycareText_GetAlongVeryWell:: .string "The two seem to get along very well.$" DaycareText_GetAlong:: @@ -31494,26 +31080,22 @@ DaycareText_DontLikeOther:: DaycareText_PlayOther:: .string "The two prefer to play with other\nPOKéMON than each other.$" -gUnknown_0842CC28:: @ 842CC28 -OtherText_NewLine2:: +gOtherText_NewLine2:: @ 842CC28 .string "\n$" -gUnknown_0842CC2A:: @ 842CC2A -OtherText_Cancel:: +gOtherText_CancelAndLv:: @ 842CC2A .string "CANCEL$" -OtherText_Lv:: .string "LV$" gEggNickname:: @ 842CC34 .string "EGG$" -gUnknown_0842CC38:: @ 842CC38 -OtherText_HatchedFromEgg: +gOtherText_HatchedFromEgg:: @ 842CC38 .string "{COLOR WHITE2}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}{STR_VAR_1} hatched from the EGG!$" -gUnknown_0842CC5A:: @ 842CC5A -OtherText_NickHatchPrompt: +gOtherText_NickHatchPrompt:: @ 842CC5A .string "{COLOR WHITE2}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}Would you like to nickname the newly\nhatched {STR_VAR_1}?$" + OtherText_Battle:: .string "BATTLE$" OtherText_Contest:: @@ -31531,263 +31113,195 @@ OtherText_Appeal:: OtherText_Jam:: .string "JAM$" -gUnknown_0842CCC7:: @ 842CCC7 -OtherText_TeachWhichMove: +gOtherText_TeachWhichMove:: @ 842CCC7 .string "Teach which move to {STR_VAR_1}?$" -gUnknown_0842CCDF:: @ 842CCDF -OtherText_TeachSpecificMove: +gOtherText_TeachSpecificMove:: @ 842CCDF .string "Teach {STR_VAR_2}?$" -gUnknown_0842CCE9:: @ 842CCE9 -OtherText_PokeLearnedMove: +gOtherText_PokeLearnedMove:: @ 842CCE9 .string "{STR_VAR_1} learned {STR_VAR_2}.$" -gUnknown_0842CCF8:: @ 842CCF8 -OtherText_DeleteOlderMove: +gOtherText_DeleteOlderMove:: @ 842CCF8 .string "{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can’t learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?$" -gUnknown_0842CD65:: @ 842CD65 -OtherText_StopLearningMove: +gOtherText_StopLearningMove:: @ 842CD65 .string "Stop learning {STR_VAR_2}?$" -gUnknown_0842CD77:: @ 842CD77 -OtherText_ForgotMove123: +gOtherText_ForgotMove123:: @ 842CD77 .string "{PAUSE 32}1, {PAUSE 15}2 {PAUSE 15}...{PAUSE 15}...{PAUSE 15}...{PAUSE 15} {PLAY_SE 0x0038}Poof!\p$" -gUnknown_0842CDA3:: @ 842CDA3 -OtherText_ForgotMove: +gOtherText_ForgotOrDidNotLearnMove:: @ 842CDA3 .string "{STR_VAR_1} forgot {STR_VAR_3}.\pAnd...\p{STR_VAR_1} learned {STR_VAR_2}.$" -OtherText_DidNotLearnMove: .string "{STR_VAR_1} did not learn\n{STR_VAR_2}.$" -gUnknown_0842CDDC:: @ 842CDDC -OtherText_GiveUpTeachingMove: +gOtherText_GiveUpTeachingMove:: @ 842CDDC .string "Give up trying to teach a new move\nto {STR_VAR_1}?$" -gUnknown_0842CE06:: @ 842CE06 -OtherText_WhichMoveToForget: +gOtherText_WhichMoveToForget:: @ 842CE06 .string "Which move should be forgotten?\p$" -gUnknown_0842CE27:: @ 842CE27 -OtherText_ClearAllSaveDataPrompt: +gSystemText_ClearAllSaveDataPrompt:: @ 842CE27 .string "Clear all save data areas?$" -gUnknown_0842CE42:: @ 842CE42 -OtherText_ClearingData: +gSystemText_ClearingData:: @ 842CE42 .string "Clearing data...\nPlease wait.$" -gUnknown_0842CE60:: @ 842CE60 -ContestText_AnnounceResults: +gContestText_AnnounceResults:: @ 842CE60 .string "Announcing the results!$" -gUnknown_0842CE78:: @ 842CE78 -ContestText_PreliminaryResults: +gContestText_PreliminaryResults:: @ 842CE78 .string "The preliminary results!$" -gUnknown_0842CE91:: @ 842CE91 -ContestText_Round2Results: +gContestText_Round2Results:: @ 842CE91 .string "Round 2 results!$" -gUnknown_0842CEA2:: @ 842CEA2 -ContestText_PokeWon: +gContestText_PokeWon:: @ 842CEA2 .string "{STR_VAR_1}’s {STR_VAR_2} won!$" -gUnknown_0842CEAF:: @ 842CEAF -OtherText_LinkStandby: +gOtherText_LinkStandby:: @ 842CEAF .string "Link standby...$" @ 842CEBF .include "data/text/landmarks.s" -gUnknown_0842D0E6:: @ 842D0E6 -OtherText_Terminator4: +gOtherText_Terminator4:: @ 842D0E6 .string "$" -gUnknown_0842D0E7:: @ 842D0E7 -OtherText_Nature: +gOtherText_Nature:: @ 842D0E7 .string " nature, $" -gUnknown_0842D0F1:: @ 842D0F1 -OtherText_Comma: +gOtherText_Comma:: @ 842D0F1 .string ",$" -gUnknown_0842D0F3:: @ 842D0F3 -OtherText_Met: +gOtherText_Met:: @ 842D0F3 .string " (met).$" -gUnknown_0842D0FB:: @ 842D0FB -OtherText_Egg2: +gOtherText_Egg2:: @ 842D0FB .string " (EGG).$" -gUnknown_0842D103:: @ 842D103 -OtherText_ObtainedInTrade: +gOtherText_ObtainedInTrade:: @ 842D103 .string "obtained in a trade.$" -gUnknown_0842D118:: @ 842D118 -OtherText_FatefulEncounter: +gOtherText_FatefulEncounter:: @ 842D118 .string "fateful encounter.$" -gUnknown_0842D12B:: @ 842D12B -OtherText_Met2: +gOtherText_Met2:: @ 842D12B .string " (met).$" -gUnknown_0842D133:: @ 842D133 -OtherText_EggDayCare: +gOtherText_EggDayCare:: @ 842D133 .string "An odd POKéMON EGG found\nby the DAY CARE couple.$" -gUnknown_0842D164:: @ 842D164 -OtherText_EggNicePlace: +gOtherText_EggNicePlace:: @ 842D164 .string "A peculiar POKéMON EGG\nobtained at the nice place.$" -gUnknown_0842D197:: @ 842D197 -OtherText_EggObtainedInTrade: +gOtherText_EggObtainedInTrade:: @ 842D197 .string "A peculiar POKéMON EGG\nobtained in a trade.$" -gUnknown_0842D1C3:: @ 842D1C3 -OtherText_EggHotSprings: +gOtherText_EggHotSprings:: @ 842D1C3 .string "A POKéMON EGG obtained\nat the hot springs.$" -gUnknown_0842D1EE:: @ 842D1EE -OtherText_LinkStandby2: +gOtherText_LinkStandby2:: @ 842D1EE .string "Link standby...$" -gUnknown_0842D1FE:: @ 842D1FE -OtherText_YesNo: +gOtherText_YesNoAndPlayer:: @ 842D1FE .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}YES\nNO$" -OtherText_Player2: .string "{HIGHLIGHT TRANSPARENT}PLAYER$" -OtherText_Terminator5: .string "{HIGHLIGHT TRANSPARENT}$" -gUnknown_0842D21C:: @ 842D21C -OtherText_HoennDex: +gOtherText_HoennDex:: @ 842D21C .string "HOENN$" -gUnknown_0842D222:: @ 842D222 -OtherText_NationalDex: +gOtherText_NationalDex:: @ 842D222 .string "NATIONAL$" -gUnknown_0842D22B:: @ 842D22B -OtherText_DiplomaCertification: +gOtherText_DiplomaCertificationGameFreak:: @ 842D22B .string "{HIGHLIGHT TRANSPARENT}Player: {CLEAR 0x10}{COLOR RED}{PLAYER}\n\n{COLOR DARK_GREY}{STR_VAR_1} POKéDEX\nThis document certifies\nthat you have successfully\ncompleted your POKéDEX.\n\n{CLEAR_TO 0x42}{COLOR RED}GAME FREAK$" -OtherText_DiplomaGameFreak: .string "{COLOR RED}{HIGHLIGHT TRANSPARENT}GAME FREAK$" -gUnknown_0842D2BC:: @ 842D2BC -OtherText_PLink: +gOtherText_PLink:: @ 842D2BC .string "{STR_VAR_1}P LINK$" -gUnknown_0842D2C5:: @ 842D2C5 -OtherText_YesNo2: +gOtherText_YesNoTerminating:: @ 842D2C5 .string "YES\nNO$" -OtherText_Terminating: .string "Terminating.$" -gUnknown_0842D2D9:: @ 842D2D9 -OtherText_LinkNotFound: +gOtherText_LinkNotFound:: @ 842D2D9 .string "Link partner(s) not found.\nPlease try again.\p$" -gUnknown_0842D307:: @ 842D307 -OtherText_BerryBlenderChoose: +gOtherText_BlenderChooseBerry:: @ 842D307 .string "Starting up the BERRY BLENDER.\pPlease select a BERRY from your BAG\nto put in the BERRY BLENDER.\p$" -gUnknown_0842D368:: @ 842D368 -OtherText_PokeBlockMade: +gOtherText_PokeBlockMade:: @ 842D368 .string " was made!$" -gUnknown_0842D373:: @ 842D373 -OtherText_PressAToStart: +gOtherText_PressAToStart:: @ 842D373 .string "Press the A Button to start.$" -gUnknown_0842D390:: @ 842D390 -OtherText_PleaseWait: +gOtherText_PleaseWait:: @ 842D390 .string "Please wait a while.$" -gUnknown_0842D3A5:: @ 842D3A5 -OtherText_LinkStandby3: +gOtherText_LinkStandby3:: @ 842D3A5 .string "Link standby...$" -gUnknown_0842D3B5:: @ 842D3B5 -OtherText_BlendAnotherBerryPrompt: +gOtherText_BlendAnotherBerryPrompt:: @ 842D3B5 .string "Would you like to blend another BERRY?$" -gUnknown_0842D3DC:: @ 842D3DC -OtherText_OutOfBerries: +gOtherText_OutOfBerries:: @ 842D3DC .string "You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p$" -gUnknown_0842D41A:: @ 842D41A -OtherText_CaseIsFull: +gOtherText_CaseIsFull:: @ 842D41A .string "Your {POKEBLOCK} CASE is full.\p$" -gUnknown_0842D434:: @ 842D434 -OtherText_NoBerriesForBlend: +gOtherText_NoBerriesForBlend:: @ 842D434 .string " has no BERRIES to put in\nthe BERRY BLENDER.$" -gUnknown_0842D461:: @ 842D461 -OtherText_OtherCaseIsFull: +gOtherText_OtherCaseIsFull:: @ 842D461 .string "’s {POKEBLOCK} CASE is full.\p$" -gUnknown_0842D479:: @ 842D479 -OtherText_ResultOfBlending: +gOtherText_ResultsOfBlending:: @ 842D479 .string "RESULTS OF BLENDING$" -OtherText_BerryUsed: .string "BERRY USED$" -gUnknown_0842D498:: @ 842D498 -OtherText_Berry: +gOtherText_Berry:: @ 842D498 .string " BERRY$" -gUnknown_0842D49F:: @ 842D49F -OtherText_RequiredTime: +gOtherText_RequiredTime:: @ 842D49F .string "REQUIRED TIME$" -gUnknown_0842D4AD:: @ 842D4AD -OtherText_Min: +gOtherText_Min:: @ 842D4AD .string "MIN.$" -gUnknown_0842D4B2:: @ 842D4B2 -OtherText_Sec: +gOtherText_Sec:: @ 842D4B2 .string "SEC.$" -gUnknown_0842D4B7:: @ 842D4B7 -OtherText_MaxSpeed: +gOtherText_MaxSpeed:: @ 842D4B7 .string "MAXIMUM SPEED$" -gUnknown_0842D4C5:: @ 842D4C5 -OtherText_RPM: +gOtherText_RPM:: @ 842D4C5 .string "RPM$" -OtherText_RPMPeriod: .string ".$" -gUnknown_0842D4CB:: @ 842D4CB -OtherText_Ranking: +gOtherText_Ranking:: @ 842D4CB .string "RANKING$" -gUnknown_0842D4D3:: @ 842D4D3 -OtherText_BlockLevelIs: +gOtherText_BlockLevelIs:: @ 842D4D3 .string "The level is $" -gUnknown_0842D4E1:: @ 842D4E1 -OtherText_BlockFeelIs: +gOtherText_BlockFeelIs:: @ 842D4E1 .string ", and the feel is $" -gUnknown_0842D4F4:: @ 842D4F4 -OtherText_Period: +gOtherText_Period:: @ 842D4F4 .string ".$" -gUnknown_0842D4F6:: @ 842D4F6 -OtherText_Day: +gOtherText_Day:: @ 842D4F6 .string "DAY$" -OtherText_DayColon: .string ":$" -gUnknown_0842D4FC:: @ 842D4FC -OtherText_OK: +gOtherText_OK:: @ 842D4FC .string "OK$" -gUnknown_0842D4FF:: @ 842D4FF -OtherText_CorrectTimePrompt: +gOtherText_CorrectTimePrompt:: @ 842D4FF .string "Is this the correct time?$" .align 2 @@ -32080,44 +31594,33 @@ gUnknown_0842F788:: @ 842F788 gUnknown_0842F790:: @ 842F790 .incbin "baserom.gba", 0x0042f790, 0x8 -gUnknown_0842F798:: @ 842F798 -OtherText_BerryObtainedDadHasIt: +gOtherText_BerryObtainedDadHasIt:: @ 842F798 .string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$" -gUnknown_0842F7CA:: @ 842F7CA -OtherText_BerryTransformed: +gOtherText_BerryTransformed:: @ 842F7CA .string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$" -gUnknown_0842F7F6:: @ 842F7F6 -OtherText_BerryAlreadyObtained: +gOtherText_BerryAlreadyObtained:: @ 842F7F6 .string "The {STR_VAR_1} BERRY has already been\nobtained.$" -gUnknown_0842F81E:: @ 842F81E -OtherText_SpecialRibbonReceived: +gOtherText_SpecialRibbonReceived:: @ 842F81E .string "A special RIBBON was awarded to your\nparty POKéMON.$" -gUnknown_0842F852:: @ 842F852 -OtherText_DexUpgraded: +gOtherText_DexUpgraded:: @ 842F852 .string "The POKéDEX has been upgraded with\nthe NATIONAL MODE.$" -gUnknown_0842F888:: @ 842F888 -OtherText_RareWordAdded: +gOtherText_RareWordAdded:: @ 842F888 .string "A rare word has been added.$" -gUnknown_0842F8A4:: @ 842F8A4 -OtherText_PokeWasSentOver: +gOtherText_PokeWasSentOver:: @ 842F8A4 .string "{STR_VAR_1} was sent over!$" -gUnknown_0842F8B6:: @ 842F8B6 -OtherText_PartyIsFull: +gOtherText_PartyIsFull:: @ 842F8B6 .string "Your party is full.\n{STR_VAR_1} could not be sent over.$" -gUnknown_0842F8E5:: @ 842F8E5 -OtherText_NewTrainerInHoenn: +gOtherText_NewTrainerInHoenn:: @ 842F8E5 .string "A new TRAINER has arrived in HOENN.$" -OtherText_BattleTowerNewAdversary: .string "A new adversary has arrived in the\nBATTLE TOWER.$" -gUnknown_0842F93A:: @ 842F93A -OtherText_DataCannotUseVersion: +gOtherText_DataCannotUseVersion:: @ 842F93A .string "This data cannot be used in\nthis version.$" diff --git a/data/multichoice.s b/data/multichoice.s index 0d4ed7d00..256038c23 100644 --- a/data/multichoice.s +++ b/data/multichoice.s @@ -2,20 +2,20 @@ MultichoiceList_00: .4byte OtherText_Petalburg, 0 .4byte OtherText_Slateport, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_02: .4byte OtherText_Enter, 0 .4byte OtherText_Info3, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_03: .4byte OtherText_WhatsAContest, 0 .4byte OtherText_TypesOfContest, 0 .4byte OtherText_Ranks, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_04: @@ -24,27 +24,27 @@ MultichoiceList_04: .4byte OtherText_CuteContest, 0 .4byte OtherText_SmartContest, 0 .4byte OtherText_ToughContest, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_06: .4byte OtherText_Decoration, 0 .4byte OtherText_PackUp, 0 .4byte OtherText_Registry, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_05: .4byte OtherText_Decoration, 0 .4byte OtherText_PackUp, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_07: .4byte OtherText_Register, 0 .4byte OtherText_Registry, 0 .4byte OtherText_Information, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_12: @@ -58,12 +58,12 @@ MultichoiceList_13: .4byte OtherText_Sleep, 0 .4byte OtherText_Burn, 0 .4byte OtherText_Frozen, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_14: .4byte OtherText_Dewford, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_16: @@ -81,7 +81,7 @@ MultichoiceList_18: .4byte OtherText_SingleBattle, 0 .4byte OtherText_DoubleBattle, 0 .4byte OtherText_MultiBattle, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_19: @@ -99,13 +99,13 @@ MultichoiceList_20: MultichoiceList_23: .4byte OtherText_MakeAChallenge, 0 .4byte OtherText_ObtainInformation, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_24: .4byte OtherText_Lv50_2, 0 .4byte OtherText_Lv100_2, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_25: @@ -202,21 +202,21 @@ MultichoiceList_42: .4byte OtherText_FreshWater, 0 .4byte OtherText_SodaPop, 0 .4byte OtherText_Lemonade, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_43: .4byte OtherText_HowToRide, 0 .4byte OtherText_HowToTurn, 0 .4byte OtherText_SandySlopes, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_44: .4byte OtherText_Wheelies, 0 .4byte OtherText_BunnyHops, 0 .4byte OtherText_Jumping, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_45: @@ -227,7 +227,7 @@ MultichoiceList_45: MultichoiceList_46: .4byte OtherText_Deepseatooth, 0 .4byte OtherText_Deepseascale, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_47: @@ -238,14 +238,14 @@ MultichoiceList_47: .4byte OtherText_BlackFlute2, 0 .4byte OtherText_GlassChair, 0 .4byte OtherText_GlassDesk, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_48: .4byte OtherText_TreeckoDoll, 0 .4byte OtherText_TorchicDoll, 0 .4byte OtherText_MudkipDoll, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_55: @@ -254,13 +254,13 @@ MultichoiceList_55: .4byte OtherText_TM35, 0 .4byte OtherText_TM24, 0 .4byte OtherText_TM13, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_49: .4byte OtherText_50Coins, 0 .4byte OtherText_500Coins, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_50: @@ -271,13 +271,13 @@ MultichoiceList_50: MultichoiceList_52: .4byte OtherText_Lilycove, 0 .4byte OtherText_BattleTower, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_53: .4byte OtherText_Slateport, 0 .4byte OtherText_Lilycove, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_54: @@ -288,7 +288,7 @@ MultichoiceList_54: MultichoiceList_56: .4byte OtherText_Slateport, 0 .4byte OtherText_BattleTower, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_57: @@ -301,86 +301,86 @@ MultichoiceList_57: .align 2 MultichoiceList_58: .4byte OtherText_RedShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_59: .4byte OtherText_YellowShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_60: .4byte OtherText_RedShard, 0 .4byte OtherText_YellowShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_61: .4byte OtherText_BlueShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_62: .4byte OtherText_RedShard, 0 .4byte OtherText_BlueShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_63: .4byte OtherText_YellowShard, 0 .4byte OtherText_BlueShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_64: .4byte OtherText_RedShard, 0 .4byte OtherText_YellowShard, 0 .4byte OtherText_BlueShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_65: .4byte OtherText_GreenShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_66: .4byte OtherText_RedShard, 0 .4byte OtherText_GreenShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_67: .4byte OtherText_YellowShard, 0 .4byte OtherText_GreenShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_68: .4byte OtherText_RedShard, 0 .4byte OtherText_YellowShard, 0 .4byte OtherText_GreenShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_69: .4byte OtherText_BlueShard, 0 .4byte OtherText_GreenShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_70: .4byte OtherText_RedShard, 0 .4byte OtherText_BlueShard, 0 .4byte OtherText_GreenShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_71: .4byte OtherText_YellowShard, 0 .4byte OtherText_BlueShard, 0 .4byte OtherText_GreenShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_72: @@ -388,11 +388,11 @@ MultichoiceList_72: .4byte OtherText_YellowShard, 0 .4byte OtherText_BlueShard, 0 .4byte OtherText_GreenShard, 0 - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 MultichoiceList_01: - .4byte gUnknown_0840E645, 0 + .4byte gOtherText_CancelNoTerminator, 0 .align 2 gMultichoiceLists:: @ 83CDE00 diff --git a/src/link.c b/src/link.c index 13fcf8c05..fb168e08b 100644 --- a/src/link.c +++ b/src/link.c @@ -37,7 +37,7 @@ extern u16 word_203855E; extern u16 word_3004858; -extern u8 gUnknown_0842C34C[]; +extern u8 gMultiText_LinkError[]; static void InitLinkTestBG(u8, u8, u8, u8); static void InitLinkTestBG_Unused(u8, u8, u8, u8); @@ -1247,7 +1247,7 @@ static void CB2_PrintErrorMessage(void) switch (gMain.state) { case 0: - sub_80729D8(gUnknown_0842C34C, 20, 56, 1); + sub_80729D8(gMultiText_LinkError, 20, 56, 1); break; case 30: case 60: diff --git a/src/main_menu.c b/src/main_menu.c index 692267c64..9b8a135e7 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -659,7 +659,7 @@ extern const u8 gUnknown_081E764C[]; extern const u8 gUnknown_081E768C[]; extern const u8 gUnknown_081E7834[]; extern const u8 gUnknown_081E796C[]; -extern const u8 gUnknown_0840DFF7[]; +extern const u8 gSystemText_NewPara[]; extern u8 gSpriteAffineAnimTable_81E79AC[]; @@ -843,7 +843,7 @@ void task_new_game_prof_birch_speech_7(u8 taskId) if (task->data[7] > 0x5F) { - MenuSetText((u32)&gUnknown_0840DFF7); + MenuSetText((u32)&gSystemText_NewPara); task->func = task_new_game_prof_birch_speech_8; } } |