From 9ed9f7de941d5b89a1c6d6241b3bbb5726aa99e8 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 20 Sep 2017 14:38:05 -0500 Subject: [PATCH] Finish renaming strings in strings.s --- asm/battle_frontier_2.s | 236 +++--- asm/battle_interface.s | 8 +- asm/battle_message.s | 4 +- asm/battle_records.s | 6 +- asm/berry_blender.s | 6 +- asm/berry_tag_screen.s | 10 +- asm/cable_club.s | 2 +- asm/clear_save_data_screen.s | 4 +- asm/contest.s | 10 +- asm/contest_link_80F57C4.s | 14 +- asm/daycare.s | 10 +- asm/decoration.s | 42 +- asm/diploma.s | 6 +- asm/easy_chat.s | 36 +- asm/egg_hatch.s | 4 +- asm/evolution_scene.s | 2 +- asm/field_player_avatar.s | 8 +- asm/field_poison.s | 2 +- asm/field_region_map.s | 2 +- asm/fldeff_80F9BCC.s | 4 +- asm/fldeff_softboiled.s | 4 +- asm/item_menu.s | 20 +- asm/item_use.s | 4 +- asm/learn_move.s | 20 +- asm/lilycove_lady.s | 2 +- asm/link.s | 250 +++--- asm/mail.s | 4 +- asm/main_menu.s | 8 +- asm/mauville_old_man.s | 6 +- asm/menu.s | 8 +- asm/money.s | 2 +- asm/mystery_event_menu.s | 12 +- asm/mystery_event_script.s | 2 +- asm/naming_screen.s | 2 +- asm/option_menu.s | 30 +- asm/party_menu.s | 186 ++--- asm/player_pc.s | 28 +- asm/pokeblock_feed.s | 6 +- asm/pokemon_storage_system.s | 6 +- asm/pokemon_summary_screen.s | 92 +-- asm/pokenav.s | 50 +- asm/record_mixing.s | 4 +- asm/region_map.s | 6 +- asm/reset_rtc_screen.s | 22 +- asm/rom6.s | 50 +- asm/save_failed_screen.s | 16 +- asm/script_menu.s | 28 +- asm/secret_base.s | 8 +- asm/shop.s | 34 +- asm/slot_machine.s | 10 +- asm/start_menu.s | 8 +- asm/trade.s | 20 +- asm/trader.s | 4 +- asm/trainer_card.s | 58 +- asm/tv.s | 86 +- asm/use_pokeblock.s | 10 +- asm/walda_phrase.s | 2 +- asm/wallclock.s | 6 +- data/battle_message.s | 4 +- data/link.s | 130 +-- data/strings.s | 1436 ++++++++++++++++++---------------- src/item.c | 12 +- src/pokemon_size_record.c | 8 +- src/start_menu.c | 8 +- 64 files changed, 1600 insertions(+), 1528 deletions(-) diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index 40f084a0f..8a9b0ba24 100755 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -2398,7 +2398,7 @@ sub_819B9B4: @ 819B9B4 movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EEBB2 + ldr r2, =gText_RentalPkmn2 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -2481,20 +2481,20 @@ sub_819BA64: @ 819BA64 ldrb r0, [r0, 0x5] cmp r0, 0x1 bne _0819BA88 - ldr r2, =gUnknown_085EEBC1 + ldr r2, =gText_SelectFirstPkmn b _0819BA9C .pool _0819BA88: cmp r0, 0x2 bne _0819BA94 - ldr r2, =gUnknown_085EEBDB + ldr r2, =gText_SelectSecondPkmn b _0819BA9C .pool _0819BA94: - ldr r2, =gUnknown_085EEC2D + ldr r2, =gText_TheseThreePkmnOkay cmp r0, 0x3 bne _0819BA9C - ldr r2, =gUnknown_085EEBF6 + ldr r2, =gText_SelectThirdPkmn _0819BA9C: movs r0, 0x5 str r0, [sp] @@ -2521,7 +2521,7 @@ sub_819BAC8: @ 819BAC8 movs r0, 0x2 movs r1, 0 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EEC50 + ldr r2, =gText_CantSelectSamePkmn movs r0, 0x5 str r0, [sp] movs r0, 0 @@ -2560,7 +2560,7 @@ sub_819BAFC: @ 819BAFC str r4, [sp] movs r6, 0 str r6, [sp, 0x4] - ldr r0, =gUnknown_085EEC15 + ldr r0, =gText_Summary str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -2571,7 +2571,7 @@ sub_819BAFC: @ 819BAFC beq _0819BB60 str r4, [sp] str r6, [sp, 0x4] - ldr r0, =gUnknown_085EEC24 + ldr r0, =gText_Deselect str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -2583,7 +2583,7 @@ sub_819BAFC: @ 819BAFC _0819BB60: str r4, [sp] str r5, [sp, 0x4] - ldr r0, =gUnknown_085EEC10 + ldr r0, =gText_Rent str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -2595,7 +2595,7 @@ _0819BB74: str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085EEC1D + ldr r0, =gText_Others2 str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -2625,7 +2625,7 @@ sub_819BBA8: @ 819BBA8 str r5, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, =gUnknown_085EEC49 + ldr r0, =gText_Yes2 str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -2634,7 +2634,7 @@ sub_819BBA8: @ 819BBA8 bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, =gUnknown_085EEC4D + ldr r0, =gText_No2 str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -4584,7 +4584,7 @@ sub_819CC24: @ 819CC24 ldrsh r5, [r4, r0] cmp r5, 0 bne _0819CC5A - ldr r0, =gUnknown_085EECBB + ldr r0, =gText_QuitSwapping bl sub_819EBEC ldr r0, =gUnknown_03001284 ldr r0, [r0] @@ -4670,7 +4670,7 @@ sub_819CCD4: @ 819CCD4 adds r1, 0x30 movs r2, 0x1 bl sub_819F2B4 - ldr r0, =gUnknown_085EECF0 + ldr r0, =gText_AcceptThisPkmn bl sub_819EBEC ldr r0, [r4] adds r0, 0x20 @@ -6176,12 +6176,12 @@ _0819D948: ldrb r0, [r0, 0x14] cmp r0, 0 bne _0819D964 - ldr r0, =gUnknown_085EEC73 + ldr r0, =gText_SelectPkmnToSwap bl sub_819EBEC b _0819D96A .pool _0819D964: - ldr r0, =gUnknown_085EEC8B + ldr r0, =gText_SelectPkmnToAccept bl sub_819EBEC _0819D96A: ldr r0, =gUnknown_03001284 @@ -6765,7 +6765,7 @@ _0819DF02: b _0819E006 .pool _0819DF10: - ldr r0, =gUnknown_085EEC73 + ldr r0, =gText_SelectPkmnToSwap bl sub_819EBEC movs r0, 0x2 bl PutWindowTilemap @@ -8272,7 +8272,7 @@ sub_819EB18: @ 819EB18 movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EEC66 + ldr r2, =gText_PkmnSwap movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -8402,7 +8402,7 @@ sub_819EC20: @ 819EC20 str r5, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, =gUnknown_085EECAA + ldr r0, =gText_Summary2 str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -8411,7 +8411,7 @@ sub_819EC20: @ 819EC20 bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, =gUnknown_085EECA5 + ldr r0, =gText_Swap str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -8420,7 +8420,7 @@ sub_819EC20: @ 819EC20 bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, =gUnknown_085EECB2 + ldr r0, =gText_Rechoose str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -8450,7 +8450,7 @@ sub_819EC94: @ 819EC94 str r5, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, =gUnknown_085EECCA + ldr r0, =gText_Yes3 str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -8459,7 +8459,7 @@ sub_819EC94: @ 819EC94 bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, =gUnknown_085EECCE + ldr r0, =gText_No3 str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -8523,12 +8523,12 @@ sub_819ED34: @ 819ED34 beq _0819ED56 cmp r0, 0x1 bne _0819ED60 - ldr r0, =gUnknown_085EECD1 + ldr r0, =gText_PkmnForSwap movs r1, 0 movs r2, 0x5 bl sub_819ECF0 _0819ED56: - ldr r0, =gUnknown_085EECDD + ldr r0, =gText_Cancel3 movs r1, 0x18 movs r2, 0x5 bl sub_819ECF0 @@ -8554,12 +8554,12 @@ sub_819ED78: @ 819ED78 beq _0819ED9A cmp r0, 0x1 bne _0819EDA4 - ldr r0, =gUnknown_085EECD1 + ldr r0, =gText_PkmnForSwap movs r1, 0x8 movs r2, 0x3 bl sub_819ECF0 _0819ED9A: - ldr r0, =gUnknown_085EECDD + ldr r0, =gText_Cancel3 movs r1, 0x20 movs r2, 0x3 bl sub_819ECF0 @@ -8588,14 +8588,14 @@ _0819EDCC: ldrb r0, [r0, 0x14] cmp r0, 0x1 bne _0819EDF6 - ldr r0, =gUnknown_085EECD1 + ldr r0, =gText_PkmnForSwap movs r1, 0x8 movs r2, 0x3 bl sub_819ECF0 b _0819EDF6 .pool _0819EDEC: - ldr r0, =gUnknown_085EECDD + ldr r0, =gText_Cancel3 movs r1, 0x20 movs r2, 0x3 bl sub_819ECF0 @@ -9401,7 +9401,7 @@ _0819F4C8: .4byte _0819F548 .4byte _0819F568 _0819F4DC: - ldr r0, =gUnknown_085EED0A + ldr r0, =gText_SamePkmnInPartyAlready bl sub_819EBEC ldr r0, =gUnknown_03001284 ldr r0, [r0] @@ -9446,7 +9446,7 @@ _0819F52C: bl CopyWindowToVram b _0819F54E _0819F548: - ldr r0, =gUnknown_085EEC8B + ldr r0, =gText_SelectPkmnToAccept bl sub_819EBEC _0819F54E: ldr r0, =gTasks @@ -11469,9 +11469,9 @@ _081A0528: movs r0, 0x12 mov r10, r0 movs r6, 0x8 - ldr r0, =gUnknown_085EAEB1 + ldr r0, =gText_Lv50 str r0, [sp, 0xC] - ldr r0, =gUnknown_085EAEB8 + ldr r0, =gText_OpenLevel str r0, [sp, 0x10] b _081A0652 .pool @@ -11580,9 +11580,9 @@ _081A061C: movs r0, 0x12 mov r10, r0 movs r6, 0x8 - ldr r0, =gUnknown_085ED193 + ldr r0, =gText_Give str r0, [sp, 0xC] - ldr r0, =gUnknown_085ED198 + ldr r0, =gText_NoNeed str r0, [sp, 0x10] b _081A0652 .pool @@ -11590,9 +11590,9 @@ _081A0634: movs r1, 0x14 mov r10, r1 movs r6, 0x8 - ldr r0, =gUnknown_085EAE62 + ldr r0, =gText_Yes str r0, [sp, 0xC] - ldr r0, =gUnknown_085EAE66 + ldr r0, =gText_No str r0, [sp, 0x10] b _081A0652 .pool @@ -12950,11 +12950,11 @@ _081A1140: ands r0, r1 cmp r0, 0x1 bne _081A115C - ldr r1, =gUnknown_085EAEB1 + ldr r1, =gText_Lv50 b _081A1174 .pool _081A115C: - ldr r1, =gUnknown_085EAEB8 + ldr r1, =gText_OpenLevel b _081A1174 .pool _081A1164: @@ -14386,7 +14386,7 @@ _081A1D24: movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE302 + ldr r1, =gText_WinStreak adds r0, r4, 0 bl StringExpandPlaceholders mov r1, r10 @@ -14434,7 +14434,7 @@ sub_81A1D78: @ 81A1D78 adds r4, r0 adds r4, r1 ldrh r1, [r4] - ldr r0, =gUnknown_085EE319 + ldr r0, =gText_Record str r5, [sp] bl sub_81A1CD8 add sp, 0x4 @@ -14545,7 +14545,7 @@ _081A1E66: lsrs r0, 24 cmp r0, 0x1 bne _081A1E88 - ldr r0, =gUnknown_085EE311 + ldr r0, =gText_Current str r7, [sp] adds r1, r4, 0 mov r2, r8 @@ -14554,7 +14554,7 @@ _081A1E66: b _081A1E96 .pool _081A1E88: - ldr r0, =gUnknown_085EE320 + ldr r0, =gText_Prev str r7, [sp] adds r1, r4, 0 mov r2, r8 @@ -14593,7 +14593,7 @@ sub_81A1EA8: @ 81A1EA8 cmp r7, 0 bne _081A1EF0 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE158 + ldr r1, =gText_SingleBattleRoomResults bl StringExpandPlaceholders b _081A1F28 .pool @@ -14601,7 +14601,7 @@ _081A1EF0: cmp r7, 0x1 bne _081A1F08 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE178 + ldr r1, =gText_DoubleBattleRoomResults bl StringExpandPlaceholders b _081A1F28 .pool @@ -14609,13 +14609,13 @@ _081A1F08: cmp r7, 0x2 bne _081A1F20 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE198 + ldr r1, =gText_MultiBattleRoomResults bl StringExpandPlaceholders b _081A1F28 .pool _081A1F20: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE1B7 + ldr r1, =gText_LinkMultiBattleRoomResults bl StringExpandPlaceholders _081A1F28: ldr r0, =gStringVar4 @@ -14623,7 +14623,7 @@ _081A1F28: bl sub_81A1C4C ldr r6, =gUnknown_0203AB74 ldrb r0, [r6] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r1, 0x31 mov r8, r1 str r1, [sp] @@ -14635,7 +14635,7 @@ _081A1F28: movs r3, 0x10 bl PrintTextOnWindow ldrb r0, [r6] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 mov r9, r1 str r1, [sp] @@ -14830,8 +14830,8 @@ _081A20E6: lsrs r0, 24 cmp r0, 0x1 bne _081A210C - ldr r0, =gUnknown_085EE311 - ldr r1, =gUnknown_085EE338 + ldr r0, =gText_Current + ldr r1, =gText_ClearStreak str r7, [sp] str r4, [sp, 0x4] mov r2, r8 @@ -14840,8 +14840,8 @@ _081A20E6: b _081A211C .pool _081A210C: - ldr r0, =gUnknown_085EE320 - ldr r1, =gUnknown_085EE338 + ldr r0, =gText_Prev + ldr r1, =gText_ClearStreak str r7, [sp] str r4, [sp, 0x4] mov r2, r8 @@ -14881,13 +14881,13 @@ sub_81A2134: @ 81A2134 cmp r7, 0 bne _081A217C ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE1DB + ldr r1, =gText_SingleBattleTourneyResults bl StringExpandPlaceholders b _081A2184 .pool _081A217C: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE1FE + ldr r1, =gText_DoubleBattleTourneyResults bl StringExpandPlaceholders _081A2184: ldr r0, =gStringVar4 @@ -14895,7 +14895,7 @@ _081A2184: bl sub_81A1C4C ldr r1, =gUnknown_0203AB74 ldrb r0, [r1] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r6, 0x21 str r6, [sp] movs r5, 0xFF @@ -14907,7 +14907,7 @@ _081A2184: bl PrintTextOnWindow ldr r1, =gUnknown_0203AB74 ldrb r0, [r1] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 str r1, [sp] str r5, [sp, 0x4] @@ -14935,13 +14935,13 @@ _081A2184: str r0, [sp] movs r0, 0x31 str r0, [sp, 0x4] - ldr r0, =gUnknown_085EE319 - ldr r1, =gUnknown_085EE338 + ldr r0, =gText_Record + ldr r1, =gText_ClearStreak movs r3, 0x40 bl sub_81A2008 - ldr r1, =gUnknown_085EE332 + ldr r1, =gText_Total mov r10, r1 - ldr r0, =gUnknown_085EE349 + ldr r0, =gText_Championships mov r8, r0 ldr r0, [r4] ldr r1, =0x00000d1c @@ -14972,8 +14972,8 @@ _081A2184: str r0, [sp] movs r0, 0x71 str r0, [sp, 0x4] - ldr r0, =gUnknown_085EE319 - ldr r1, =gUnknown_085EE338 + ldr r0, =gText_Record + ldr r1, =gText_ClearStreak movs r3, 0x40 bl sub_81A2008 ldr r0, [r4] @@ -15052,7 +15052,7 @@ _081A2304: movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE302 + ldr r1, =gText_WinStreak adds r0, r4, 0 bl StringExpandPlaceholders mov r1, r10 @@ -15100,7 +15100,7 @@ sub_81A2358: @ 81A2358 adds r4, r0 adds r4, r1 ldrh r1, [r4] - ldr r0, =gUnknown_085EE319 + ldr r0, =gText_Record str r5, [sp] bl sub_81A22B8 add sp, 0x4 @@ -15186,7 +15186,7 @@ _081A241E: lsrs r0, 24 cmp r0, 0x1 bne _081A2440 - ldr r0, =gUnknown_085EE311 + ldr r0, =gText_Current str r7, [sp] adds r1, r4, 0 mov r2, r8 @@ -15195,7 +15195,7 @@ _081A241E: b _081A244E .pool _081A2440: - ldr r0, =gUnknown_085EE320 + ldr r0, =gText_Prev str r7, [sp] adds r1, r4, 0 mov r2, r8 @@ -15234,13 +15234,13 @@ sub_81A2460: @ 81A2460 cmp r7, 0 bne _081A24A8 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE221 + ldr r1, =gText_SingleBattleHallResults bl StringExpandPlaceholders b _081A24B0 .pool _081A24A8: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE241 + ldr r1, =gText_DoubleBattleHallResults bl StringExpandPlaceholders _081A24B0: ldr r0, =gStringVar4 @@ -15248,7 +15248,7 @@ _081A24B0: bl sub_81A1C4C ldr r6, =gUnknown_0203AB74 ldrb r0, [r6] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r1, 0x31 mov r8, r1 str r1, [sp] @@ -15260,7 +15260,7 @@ _081A24B0: movs r3, 0x10 bl PrintTextOnWindow ldrb r0, [r6] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 mov r9, r1 str r1, [sp] @@ -15434,8 +15434,8 @@ _081A264C: lsrs r0, 24 cmp r0, 0x1 bne _081A2674 - ldr r0, =gUnknown_085EE311 - ldr r1, =gUnknown_085EE35B + ldr r0, =gText_Current + ldr r1, =gText_RoomsCleared str r5, [sp] str r6, [sp, 0x4] adds r2, r7, 0 @@ -15444,8 +15444,8 @@ _081A264C: b _081A2684 .pool _081A2674: - ldr r0, =gUnknown_085EE320 - ldr r1, =gUnknown_085EE35B + ldr r0, =gText_Prev + ldr r1, =gText_RoomsCleared str r5, [sp] str r6, [sp, 0x4] adds r2, r7, 0 @@ -15480,14 +15480,14 @@ sub_81A2698: @ 81A2698 movs r1, 0x11 bl FillWindowPixelBuffer ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE261 + ldr r1, =gText_BattleChoiceResults adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0 bl sub_81A1C4C ldrb r0, [r6] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r1, 0x21 str r1, [sp] movs r5, 0xFF @@ -15498,7 +15498,7 @@ sub_81A2698: @ 81A2698 movs r3, 0x8 bl PrintTextOnWindow ldrb r0, [r6] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 str r1, [sp] str r5, [sp, 0x4] @@ -15513,9 +15513,9 @@ sub_81A2698: @ 81A2698 movs r2, 0x72 movs r3, 0x21 bl sub_81A2618 - ldr r0, =gUnknown_085EE319 + ldr r0, =gText_Record mov r10, r0 - ldr r7, =gUnknown_085EE35B + ldr r7, =gText_RoomsCleared ldr r5, =gSaveBlock2Ptr ldr r0, [r5] ldr r1, =0x00000e08 @@ -15529,9 +15529,9 @@ sub_81A2698: @ 81A2698 adds r1, r7, 0 movs r3, 0x40 bl sub_81A258C - ldr r0, =gUnknown_085EE332 + ldr r0, =gText_Total mov r8, r0 - ldr r1, =gUnknown_085EE36D + ldr r1, =gText_TimesCleared mov r9, r1 ldr r0, [r5] ldr r1, =0x00000e0c @@ -15633,7 +15633,7 @@ _081A2834: movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE381 + ldr r1, =gText_KOsInARow adds r0, r4, 0 bl StringExpandPlaceholders mov r1, r10 @@ -15678,7 +15678,7 @@ sub_81A2888: @ 81A2888 adds r1, r2 adds r1, r0 ldrh r1, [r1] - ldr r0, =gUnknown_085EE319 + ldr r0, =gText_Record str r3, [sp] adds r2, r4, 0 adds r3, r5, 0 @@ -15743,7 +15743,7 @@ _081A2928: lsrs r0, 24 cmp r0, 0x1 bne _081A2948 - ldr r0, =gUnknown_085EE311 + ldr r0, =gText_Current str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 @@ -15752,7 +15752,7 @@ _081A2928: b _081A2956 .pool _081A2948: - ldr r0, =gUnknown_085EE320 + ldr r0, =gText_Prev str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 @@ -15785,14 +15785,14 @@ sub_81A2968: @ 81A2968 movs r0, 0xA bl sub_81A1C90 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE27C + ldr r1, =gText_SetKOTourneyResults adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x2 bl sub_81A1C4C ldrb r0, [r5] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r1, 0x31 str r1, [sp] movs r6, 0xFF @@ -15803,7 +15803,7 @@ sub_81A2968: @ 81A2968 movs r3, 0x10 bl PrintTextOnWindow ldrb r0, [r5] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 str r1, [sp] str r6, [sp, 0x4] @@ -15896,7 +15896,7 @@ _081A2A80: movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE302 + ldr r1, =gText_WinStreak adds r0, r4, 0 bl StringExpandPlaceholders mov r1, r10 @@ -15915,7 +15915,7 @@ _081A2A80: movs r2, 0x1 movs r3, 0x4 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085EE392 + ldr r1, =gText_TimesVar1 adds r0, r4, 0 bl StringExpandPlaceholders mov r1, r10 @@ -15973,7 +15973,7 @@ sub_81A2B04: @ 81A2B04 adds r2, r0 adds r2, r1 ldrh r2, [r2] - ldr r0, =gUnknown_085EE319 + ldr r0, =gText_Record str r3, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -16102,7 +16102,7 @@ _081A2C3E: lsrs r0, 24 cmp r0, 0x1 bne _081A2C68 - ldr r0, =gUnknown_085EE311 + ldr r0, =gText_Current mov r1, r8 str r1, [sp] mov r1, r9 @@ -16116,7 +16116,7 @@ _081A2C3E: b _081A2C80 .pool _081A2C68: - ldr r0, =gUnknown_085EE320 + ldr r0, =gText_Prev mov r1, r8 str r1, [sp] mov r1, r9 @@ -16160,13 +16160,13 @@ sub_81A2C94: @ 81A2C94 cmp r7, 0 bne _081A2CD8 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE298 + ldr r1, =gText_BattleSwapSingleResults bl StringExpandPlaceholders b _081A2CE0 .pool _081A2CD8: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE2B8 + ldr r1, =gText_BattleSwapDoubleResults bl StringExpandPlaceholders _081A2CE0: ldr r0, =gStringVar4 @@ -16175,7 +16175,7 @@ _081A2CE0: ldr r0, =gUnknown_0203AB74 mov r8, r0 ldrb r0, [r0] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r6, 0x21 str r6, [sp] movs r5, 0xFF @@ -16187,7 +16187,7 @@ _081A2CE0: bl PrintTextOnWindow mov r1, r8 ldrb r0, [r1] - ldr r2, =gUnknown_085EE326 + ldr r2, =gText_RentalSwap str r6, [sp] str r5, [sp, 0x4] str r4, [sp, 0x8] @@ -16196,7 +16196,7 @@ _081A2CE0: bl PrintTextOnWindow mov r1, r8 ldrb r0, [r1] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 str r1, [sp] str r5, [sp, 0x4] @@ -16301,7 +16301,7 @@ _081A2E00: movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE39C + ldr r1, =gText_FloorsCleared adds r0, r4, 0 bl StringExpandPlaceholders mov r1, r10 @@ -16346,7 +16346,7 @@ sub_81A2E54: @ 81A2E54 adds r1, r2 adds r1, r0 ldrh r1, [r1] - ldr r0, =gUnknown_085EE319 + ldr r0, =gText_Record str r3, [sp] adds r2, r4, 0 adds r3, r5, 0 @@ -16413,7 +16413,7 @@ _081A2EF8: lsrs r0, 24 cmp r0, 0x1 bne _081A2F18 - ldr r0, =gUnknown_085EE311 + ldr r0, =gText_Current str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 @@ -16422,7 +16422,7 @@ _081A2EF8: b _081A2F26 .pool _081A2F18: - ldr r0, =gUnknown_085EE320 + ldr r0, =gText_Prev str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 @@ -16453,14 +16453,14 @@ sub_81A2F38: @ 81A2F38 movs r1, 0x11 bl FillWindowPixelBuffer ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE2D8 + ldr r1, =gText_BattleQuestResults adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x2 bl sub_81A1C4C ldrb r0, [r5] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r1, 0x31 str r1, [sp] movs r6, 0xFF @@ -16471,7 +16471,7 @@ sub_81A2F38: @ 81A2F38 movs r3, 0x8 bl PrintTextOnWindow ldrb r0, [r5] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 str r1, [sp] str r6, [sp, 0x4] @@ -16532,7 +16532,7 @@ sub_81A2FF8: @ 81A2FF8 bl FillWindowPixelBuffer ldr r0, =gStringVar4 mov r9, r0 - ldr r1, =gUnknown_085EDF86 + ldr r1, =gText_LinkContestResults bl StringExpandPlaceholders movs r0, 0x1 mov r1, r9 @@ -16550,7 +16550,7 @@ sub_81A2FF8: @ 81A2FF8 str r5, [sp, 0x8] mov r2, r9 bl PrintTextOnWindow - ldr r7, =gUnknown_085EDFA0 + ldr r7, =gText_1st movs r0, 0x1 adds r1, r7, 0 movs r2, 0x26 @@ -16568,7 +16568,7 @@ sub_81A2FF8: @ 81A2FF8 movs r1, 0x1 adds r2, r7, 0 bl PrintTextOnWindow - ldr r7, =gUnknown_085EDFA4 + ldr r7, =gText_2nd movs r0, 0x1 adds r1, r7, 0 movs r2, 0x26 @@ -16585,7 +16585,7 @@ sub_81A2FF8: @ 81A2FF8 movs r1, 0x1 adds r2, r7, 0 bl PrintTextOnWindow - ldr r7, =gUnknown_085EDFA8 + ldr r7, =gText_3rd movs r0, 0x1 adds r1, r7, 0 movs r2, 0x26 @@ -16602,7 +16602,7 @@ sub_81A2FF8: @ 81A2FF8 movs r1, 0x1 adds r2, r7, 0 bl PrintTextOnWindow - ldr r7, =gUnknown_085EDFAC + ldr r7, =gText_4th movs r0, 0x1 adds r1, r7, 0 movs r2, 0x26 @@ -16620,7 +16620,7 @@ sub_81A2FF8: @ 81A2FF8 adds r2, r7, 0 bl PrintTextOnWindow ldrb r0, [r4] - ldr r2, =gUnknown_085EB0E8 + ldr r2, =gText_Cool movs r1, 0x29 str r1, [sp] str r6, [sp, 0x4] @@ -16629,7 +16629,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl PrintTextOnWindow ldrb r0, [r4] - ldr r2, =gUnknown_085EB0ED + ldr r2, =gText_Beauty movs r1, 0x39 str r1, [sp] str r6, [sp, 0x4] @@ -16638,7 +16638,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl PrintTextOnWindow ldrb r0, [r4] - ldr r2, =gUnknown_085EB0F4 + ldr r2, =gText_Cute movs r1, 0x49 str r1, [sp] str r6, [sp, 0x4] @@ -16647,7 +16647,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl PrintTextOnWindow ldrb r0, [r4] - ldr r2, =gUnknown_085EB0F9 + ldr r2, =gText_Smart movs r1, 0x59 str r1, [sp] str r6, [sp, 0x4] @@ -16656,7 +16656,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl PrintTextOnWindow ldrb r0, [r4] - ldr r2, =gUnknown_085EB0FF + ldr r2, =gText_Tough movs r1, 0x69 str r1, [sp] str r6, [sp, 0x4] @@ -18966,7 +18966,7 @@ sub_81A4594: @ 81A4594 ldrb r5, [r1] lsls r4, r0, 1 adds r4, r0 - ldr r1, =gUnknown_085EE424 + ldr r1, =gText_1Dot adds r4, r1 mov r1, r8 lsls r3, r1, 27 @@ -19076,7 +19076,7 @@ sub_81A4684: @ 81A4684 ldrb r0, [r1] lsls r2, r6, 1 adds r2, r6 - ldr r1, =gUnknown_085EE424 + ldr r1, =gText_1Dot adds r2, r1 lsls r3, r7, 27 lsrs r3, 24 diff --git a/asm/battle_interface.s b/asm/battle_interface.s index e5f031962..489366fe8 100755 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -3760,7 +3760,7 @@ sub_80741E8: @ 80741E8 lsls r0, 24 lsrs r7, r0, 24 ldr r5, =gDisplayedStringBattle - ldr r1, =gUnknown_085ED228 + ldr r1, =gText_HighlightDarkGrey adds r0, r5, 0 bl StringCopy adds r0, r4, 0 @@ -3802,15 +3802,15 @@ _0807424A: beq _08074268 cmp r6, 0xFE beq _08074270 - ldr r1, =gUnknown_085ED238 + ldr r1, =gText_DynColor2 b _08074272 .pool _08074268: - ldr r1, =gUnknown_085ED22E + ldr r1, =gText_DynColor2Male b _08074272 .pool _08074270: - ldr r1, =gUnknown_085ED233 + ldr r1, =gText_DynColor1Female _08074272: adds r0, r5, 0 bl StringCopy diff --git a/asm/battle_message.s b/asm/battle_message.s index ef5ecbf9c..dfbf069b3 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -2051,12 +2051,12 @@ _0814F3C4: ldr r0, =0x000008ab bl FlagGet lsls r0, 24 - ldr r4, =gText_SomeonesPC + ldr r4, =gText_Someones cmp r0, 0 bne _0814F3D4 b _0814F5C0 _0814F3D4: - ldr r4, =gText_LanettesPC + ldr r4, =gText_Lanettes b _0814F5C0 .pool _0814F3E4: diff --git a/asm/battle_records.s b/asm/battle_records.s index 2c7b1d830..c961aefe3 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -488,7 +488,7 @@ sub_813C2F4: @ 813C2F4 movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF6A1 + ldr r1, =gText_TotalRecordWLD adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x1 @@ -672,7 +672,7 @@ sub_813C4BC: @ 813C4BC movs r1, 0x11 bl FillWindowPixelBuffer ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EF68D + ldr r1, =gText_PlayersBattleResults adds r0, r5, 0 bl StringExpandPlaceholders movs r0, 0x1 @@ -697,7 +697,7 @@ sub_813C4BC: @ 813C4BC mov r9, r1 add r0, r9 bl sub_813C2F4 - ldr r1, =gUnknown_085EF6BD + ldr r1, =gText_WinLoseDraw adds r0, r5, 0 bl StringExpandPlaceholders ldrb r0, [r6] diff --git a/asm/berry_blender.s b/asm/berry_blender.s index 73ff40796..0599fa153 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -5627,7 +5627,7 @@ _080827AA: ldr r0, [r6] ldr r1, =0x000011b8 adds r0, r1 - ldr r1, =gUnknown_085EE42D + ldr r1, =gText_SavingDontTurnOff2 movs r2, 0 bl sub_808417C bl sub_800ADF8 @@ -8350,7 +8350,7 @@ ShowBerryBlenderRecordWindow: @ 8083E24 ldrb r0, [r5] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r6, =gUnknown_085EE44F + ldr r6, =gText_BlenderMaxSpeedRecord movs r0, 0x1 adds r1, r6, 0 movs r2, 0x90 @@ -8367,7 +8367,7 @@ ShowBerryBlenderRecordWindow: @ 8083E24 adds r2, r6, 0 bl PrintTextOnWindow ldrb r0, [r5] - ldr r2, =gUnknown_085EE473 + ldr r2, =gText_234Players movs r1, 0x29 str r1, [sp] str r4, [sp, 0x4] diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s index b21a249bd..9622f0508 100644 --- a/asm/berry_tag_screen.s +++ b/asm/berry_tag_screen.s @@ -511,7 +511,7 @@ sub_8178090: @ 8178090 movs r0, 0x3 movs r1, 0xFF bl FillWindowPixelBuffer - ldr r4, =gUnknown_085E926B + ldr r4, =gText_BerryTag movs r0, 0x1 adds r1, r4, 0 movs r2, 0x40 @@ -573,7 +573,7 @@ sub_8178110: @ 8178110 adds r1, r6, 0 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9263 + ldr r1, =gText_UnkF908Var1Var2 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -602,7 +602,7 @@ sub_8178174: @ 8178174 ldrb r0, [r0] bl GetBerryInfo adds r4, r0, 0 - ldr r2, =gUnknown_085E9225 + ldr r2, =gText_SizeSlash movs r7, 0x1 str r7, [sp] movs r0, 0xFF @@ -652,7 +652,7 @@ _081781C8: movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9233 + ldr r1, =gText_Var1DotVar2 adds r0, r4, 0 bl StringExpandPlaceholders str r7, [sp] @@ -694,7 +694,7 @@ itemid_copy_name: @ 8178250 ldrb r0, [r0] bl GetBerryInfo adds r6, r0, 0 - ldr r2, =gUnknown_085E922C + ldr r2, =gText_FirmSlash movs r5, 0x11 str r5, [sp] movs r0, 0xFF diff --git a/asm/cable_club.s b/asm/cable_club.s index 76d1dca06..80d9a0916 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -55,7 +55,7 @@ sub_80B23B0: @ 80B23B0 movs r1, 0 bl SetStandardWindowBorderStyle ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EE667 + ldr r1, =gText_XPLink adds r0, r5, 0 bl StringExpandPlaceholders movs r0, 0x1 diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index 27c32feb5..5efff250c 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -33,7 +33,7 @@ sub_817ACE4: @ 817ACE4 movs r2, 0x2 movs r3, 0xE bl SetWindowBorderStyle - ldr r2, =gUnknown_085EFA8F + ldr r2, =gText_ClearAllSaveData movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -87,7 +87,7 @@ _0817AD68: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EFAAA + ldr r2, =gText_ClearingData movs r0, 0x1 str r0, [sp] str r4, [sp, 0x4] diff --git a/asm/contest.s b/asm/contest.s index 76effb4e7..493cc3733 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -1579,7 +1579,7 @@ _080D84B8: cmp r0, 0 beq _080D853C add r0, sp, 0x4 - ldr r1, =gUnknown_085ED1A0 + ldr r1, =gText_ColorLightShadowDarkGrey b _080D8566 .pool _080D853C: @@ -1603,7 +1603,7 @@ _080D853C: cmp r0, 0x3 beq _080D856C add r0, sp, 0x4 - ldr r1, =gUnknown_085ED1A7 + ldr r1, =gText_ColorBlue _080D8566: bl StringCopy adds r5, r0, 0 @@ -6407,7 +6407,7 @@ sub_80DAED4: @ 80DAED4 lsls r4, r1, 24 lsrs r4, 24 ldr r0, =gDisplayedStringBattle - ldr r1, =gUnknown_085ED1AB + ldr r1, =gText_ColorTransparent bl StringCopy adds r1, r0, 0 subs r0, r1, 0x1 @@ -15507,7 +15507,7 @@ _080DF784: mov r9, r0 _080DF7AE: add r0, sp, 0x4 - ldr r1, =gUnknown_085ED1B2 + ldr r1, =gText_CDot bl StringCopy adds r5, r0, 0 ldr r0, =gUnknown_02039F26 @@ -15604,7 +15604,7 @@ _080DF874: mov r10, r1 _080DF884: add r0, sp, 0x4 - ldr r1, =gUnknown_085ED1B5 + ldr r1, =gText_BDot bl StringCopy ldr r0, =gUnknown_02039F34 ldr r0, [r0] diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s index bf7a88eb8..864f16c5e 100644 --- a/asm/contest_link_80F57C4.s +++ b/asm/contest_link_80F57C4.s @@ -283,7 +283,7 @@ sub_80F5A74: @ 80F5A74 ldrb r0, [r0] cmp r5, r0 bne _080F5A96 - ldr r1, =gUnknown_085ED21E + ldr r1, =gText_ColorDarkGrey adds r0, r6, 0 bl StringCopy adds r6, r0, 0 @@ -655,7 +655,7 @@ _080F5E2E: ands r0, r1 cmp r0, 0 beq _080F5E78 - ldr r0, =gUnknown_085ED207 + ldr r0, =gText_CommunicationStandby bl sub_80F707C ldr r0, =sub_80F5ED8 b _080F5EB8 @@ -784,7 +784,7 @@ sub_80F5F74: @ 80F5F74 ldr r0, =sub_80F68F0 movs r1, 0x14 bl CreateTask - ldr r0, =gUnknown_085ED1B8 + ldr r0, =gText_AnnouncingResults ldr r1, =gUnknown_0203A034 ldr r1, [r1] ldr r1, [r1] @@ -828,7 +828,7 @@ _080F5FF0: _080F5FF8: cmp r0, 0x3 bne _080F6030 - ldr r0, =gUnknown_085ED1D0 + ldr r0, =gText_PreliminaryResults ldr r1, =gUnknown_0203A034 ldr r1, [r1] ldr r1, [r1] @@ -970,7 +970,7 @@ sub_80F60F0: @ 80F60F0 cmp r0, 0x15 bne _080F615E strh r3, [r1, 0xA] - ldr r0, =gUnknown_085ED1E9 + ldr r0, =gText_Round2Results ldr r1, [r5] ldrb r1, [r1] bl sub_80F6B78 @@ -1265,7 +1265,7 @@ _080F636E: adds r4, r1 adds r1, r4, 0 bl StringCopy - ldr r1, =gUnknown_085ED1FA + ldr r1, =gText_Var1sVar2Won mov r0, sp bl StringExpandPlaceholders ldr r0, =gUnknown_0203A034 @@ -1679,7 +1679,7 @@ sub_80F671C: @ 80F671C ldrsh r0, [r4, r1] cmp r0, 0 bne _080F676E - ldr r0, =gUnknown_085ED207 + ldr r0, =gText_CommunicationStandby bl sub_80F707C bl sub_800AC34 ldr r0, =sub_80F677C diff --git a/asm/daycare.s b/asm/daycare.s index 711d63e42..792ab66ff 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -2800,7 +2800,7 @@ _08070FCC: adds r0, r7, 0 mov r1, sp bl StringCopy - ldr r4, =gUnknown_085EF881 + ldr r4, =gText_NewLine2 adds r0, r7, 0 adds r1, r4, 0 bl StringAppend @@ -2810,7 +2810,7 @@ _08070FCC: adds r0, r7, 0 adds r1, r4, 0 bl StringAppend - ldr r1, =gUnknown_085EF883 + ldr r1, =gText_Exit4 adds r0, r7, 0 bl StringAppend add sp, 0x28 @@ -2834,7 +2834,7 @@ sub_8071038: @ 8071038 movs r5, 0 _08071046: adds r0, r4, 0 - ldr r1, =gUnknown_085EF888 + ldr r1, =gText_Lv bl StringAppend movs r0, 0x8C adds r2, r5, 0 @@ -2856,7 +2856,7 @@ _08071046: mov r1, sp bl StringAppend adds r0, r4, 0 - ldr r1, =gUnknown_085EF881 + ldr r1, =gText_NewLine2 bl StringAppend adds r0, r5, 0x1 lsls r0, 24 @@ -2971,7 +2971,7 @@ sub_8071148: @ 8071148 mov r8, r3 lsls r5, 24 lsrs r5, 24 - ldr r1, =gUnknown_085EF888 + ldr r1, =gText_Lv mov r0, sp bl StringCopy movs r0, 0x8C diff --git a/asm/decoration.s b/asm/decoration.s index 4efc70e04..3aa7a0784 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -336,7 +336,7 @@ sub_8126C48: @ 8126C48 cmp r0, 0 bne _08126C7C ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA83D + ldr r1, =gText_NoDecorations adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8126DA4 @@ -376,7 +376,7 @@ sub_8126CA4: @ 8126CA4 cmp r0, 0 bne _08126CD8 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAAEC + ldr r1, =gText_NoDecorationsInUse adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8126DA4 @@ -420,7 +420,7 @@ sub_8126D10: @ 8126D10 cmp r0, 0 bne _08126D44 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA83D + ldr r1, =gText_NoDecorations adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8126DA4 @@ -656,7 +656,7 @@ _08126F0C: ldr r2, =gText_Cancel cmp r0, 0x2 bne _08126F2C - ldr r2, =gUnknown_085EB7EA + ldr r2, =gText_Exit _08126F2C: lsls r0, r4, 4 adds r0, 0x1 @@ -798,7 +798,7 @@ sub_8127058: @ 8127058 adds r5, r0, 0 lsls r4, r1, 24 lsrs r4, 24 - ldr r1, =gUnknown_085EA7C8 + ldr r1, =gText_Color161Shadow161 bl StringCopy cmp r4, 0x1 bne _08127078 @@ -909,7 +909,7 @@ _08127154: movs r0, 0x1 bl sub_8126A58 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA83D + ldr r1, =gText_NoDecorations adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8127180 @@ -2637,7 +2637,7 @@ sub_8127F68: @ 8127F68 cmp r0, 0x7 beq _08127FAC ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA9AE + ldr r1, =gText_CantPlaceInRoom adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8127A5C @@ -2682,13 +2682,13 @@ _08127FE8: cmp r0, 0 bne _08128018 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA8EA + ldr r1, =gText_NoMoreDecorations bl StringExpandPlaceholders b _08128020 .pool _08128018: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA931 + ldr r1, =gText_NoMoreDecorations2 bl StringExpandPlaceholders _08128020: ldr r1, =gStringVar4 @@ -2699,7 +2699,7 @@ _08128020: .pool _08128038: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA8D2 + ldr r1, =gText_InUseAlready adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8127A5C @@ -3169,7 +3169,7 @@ sub_8128414: @ 8128414 strh r2, [r0, 0x3C] bl sub_8128DE0 ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EA8BF + ldr r1, =gText_CancelDecorating adds r0, r5, 0 bl StringExpandPlaceholders ldr r2, =sub_8128B80 @@ -3835,7 +3835,7 @@ sub_8128950: @ 8128950 cmp r0, 0x1 bne _081289A4 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA897 + ldr r1, =gText_PlaceItHere adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_81289D0 @@ -3848,7 +3848,7 @@ _081289A4: movs r0, 0x20 bl PlaySE ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA8A6 + ldr r1, =gText_CantBePlacedHere adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8129020 @@ -5810,7 +5810,7 @@ _08129968: cmp r0, 0x1 bne _08129994 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAAC5 + ldr r1, =gText_DecorationReturnedToPC adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8129D64 @@ -6137,7 +6137,7 @@ sub_8129BF8: @ 8129BF8 ldr r1, =SpriteCallbackDummy str r1, [r0] ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EAA62 + ldr r1, =gText_StopPuttingAwayDecorations adds r0, r5, 0 bl StringExpandPlaceholders ldr r2, =sub_812A1F0 @@ -6162,7 +6162,7 @@ sub_8129C74: @ 8129C74 cmp r0, 0 beq _08129CA8 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAAA3 + ldr r1, =gText_ReturnDecorationToPC adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_812A1A0 @@ -6216,7 +6216,7 @@ _08129CDE: ldr r1, =SpriteCallbackDummy str r1, [r0] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAA62 + ldr r1, =gText_StopPuttingAwayDecorations adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_812A1F0 @@ -6228,7 +6228,7 @@ _08129D14: .pool _08129D3C: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAA81 + ldr r1, =gText_NoDecorationHere adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8129D64 @@ -7087,7 +7087,7 @@ sub_812A3D4: @ 812A3D4 adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAA14 + ldr r1, =gText_DecorationWillBeDiscarded adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_812A458 @@ -7098,7 +7098,7 @@ sub_812A3D4: @ 812A3D4 .pool _0812A430: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA9E0 + ldr r1, =gText_CantThrowAwayInUse adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8127A5C @@ -7151,7 +7151,7 @@ sub_812A478: @ 812A478 adds r0, r4, 0 bl sub_8127814 ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EAA3D + ldr r1, =gText_DecorationThrownAway adds r0, r5, 0 bl StringExpandPlaceholders ldr r2, =sub_8127A5C diff --git a/asm/diploma.s b/asm/diploma.s index 6d303d860..4f21fe39d 100644 --- a/asm/diploma.s +++ b/asm/diploma.s @@ -262,7 +262,7 @@ pokedex_diploma_something: @ 8177AD4 movs r0, 0x14 bl SetGpuReg ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EE855 + ldr r1, =gText_DexNational bl StringCopy b _08177B0C .pool @@ -271,11 +271,11 @@ _08177AFC: movs r1, 0 bl SetGpuReg ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EE84F + ldr r1, =gText_DexHoenn bl StringCopy _08177B0C: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE85E + ldr r1, =gText_PokedexDiploma adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 565d9fcc6..20bf327ac 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -3296,7 +3296,7 @@ sub_811BB40: @ 811BB40 ldrb r0, [r0] cmp r0, 0x4 bne _0811BB5C - ldr r0, =gUnknown_085EC3B4 + ldr r0, =gText_StopGivingPkmnMail b _0811BB7A .pool _0811BB5C: @@ -3306,13 +3306,13 @@ _0811BB5C: bgt _0811BB78 cmp r0, 0xF blt _0811BB78 - ldr r0, =gUnknown_085EC706 + ldr r0, =gText_LikeToQuitQuiz str r0, [r2] - ldr r0, =gUnknown_085EC727 + ldr r0, =gText_ChallengeQuestionMark b _0811BB7E .pool _0811BB78: - ldr r0, =gUnknown_085EC3A6 + ldr r0, =gText_QuitEditing _0811BB7A: str r0, [r2] movs r0, 0 @@ -3325,9 +3325,9 @@ _0811BB7E: thumb_func_start sub_811BB88 sub_811BB88: @ 811BB88 - ldr r2, =gUnknown_085EC410 + ldr r2, =gText_AllTextBeingEditedWill str r2, [r0] - ldr r0, =gUnknown_085EC42F + ldr r0, =gText_BeDeletedThatOkay str r0, [r1] bx lr .pool @@ -3711,11 +3711,11 @@ sub_811BDF0: @ 811BDF0 b _0811BE3C .pool _0811BE34: - ldr r1, =gUnknown_085EC6B2 + ldr r1, =gText_Lady movs r0, 0 bl sub_81AFC0C _0811BE3C: - ldr r1, =gUnknown_085EC6A8 + ldr r1, =gText_F700sQuiz adds r0, r6, 0 bl sub_81AFC28 add sp, 0x20 @@ -6054,35 +6054,35 @@ _0811D16A: bl sub_811BB88 b _0811D1BC _0811D174: - ldr r0, =gUnknown_085EC743 + ldr r0, =gText_CreateAQuiz str r0, [sp, 0xC] b _0811D1BC .pool _0811D180: - ldr r0, =gUnknown_085EC752 + ldr r0, =gText_SelectTheAnswer str r0, [sp, 0xC] b _0811D1BC .pool _0811D18C: - ldr r0, =gUnknown_085EC4C9 + ldr r0, =gText_OnlyOnePhrase str r0, [sp, 0xC] - ldr r0, =gUnknown_085EC4E9 + ldr r0, =gText_OriginalSongWillBeUsed b _0811D1BA .pool _0811D19C: - ldr r0, =gUnknown_085EC765 + ldr r0, =gText_LyricsCantBeDeleted str r0, [sp, 0xC] b _0811D1BC .pool _0811D1A8: - ldr r0, =gUnknown_085EC520 + ldr r0, =gText_CombineTwoWordsOrPhrases str r0, [sp, 0xC] b _0811D1BC .pool _0811D1B4: - ldr r0, =gUnknown_085EC672 + ldr r0, =gText_YouCannotQuitHere str r0, [sp, 0xC] - ldr r0, =gUnknown_085EC688 + ldr r0, =gText_SectionMustBeCompleted _0811D1BA: str r0, [sp, 0x10] _0811D1BC: @@ -9442,7 +9442,7 @@ CopyEasyChatWord: @ 811EBBC lsls r0, 24 cmp r0, 0 beq _0811EBD8 - ldr r1, =gUnknown_085EEA42 + ldr r1, =gText_ThreeQuestionMarks b _0811EBEA .pool _0811EBD8: @@ -9693,7 +9693,7 @@ _0811ED94: b _0811EDB2 .pool _0811EDB0: - ldr r0, =gUnknown_085EEA42 + ldr r0, =gText_ThreeQuestionMarks _0811EDB2: bl StringLength lsls r0, 16 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index d646dbb73..54695cdd2 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -971,7 +971,7 @@ _08071C24: ldr r1, =gStringVar1 bl pokemon_get_nick ldr r4, =gStringVar4 - ldr r1, =gUnknown_085ED5A5 + ldr r1, =gText_PkmnHatchedFromEgg adds r0, r4, 0 bl StringExpandPlaceholders ldr r0, [r5] @@ -1023,7 +1023,7 @@ _08071CA4: ldr r1, =gStringVar1 bl pokemon_get_nick ldr r4, =gStringVar4 - ldr r1, =gUnknown_085ED5BE + ldr r1, =gText_NameHatchedPkmn adds r0, r4, 0 bl StringExpandPlaceholders ldr r0, [r5] diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index f66ec736c..efae2f07c 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -2913,7 +2913,7 @@ _0813F5F0: _0813F5FC: ldr r0, =0x00000179 bl PlayBGM - ldr r1, =gUnknown_085EF6D2 + ldr r1, =gText_CommunicationStandby5 movs r0, 0 movs r2, 0x1 bl sub_807F1A8 diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 3cf5a70da..aaca9b2ba 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -4396,7 +4396,7 @@ fish6: @ 808CB6C sub sp, 0xC adds r5, r0, 0 bl sub_808CF78 - ldr r2, =gUnknown_085EE8F7 + ldr r2, =gText_OhABite movs r0, 0x11 str r0, [sp] movs r4, 0 @@ -4526,7 +4526,7 @@ fish9: @ 808CC64 movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EE903 + ldr r2, =gText_PokemonOnHook movs r5, 0 str r5, [sp] movs r0, 0x2 @@ -4683,7 +4683,7 @@ fishB: @ 808CD94 movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EE91E + ldr r2, =gText_NotEvenANibble movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -4731,7 +4731,7 @@ fishC: @ 808CE04 movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EE933 + ldr r2, =gText_ItGotAway movs r0, 0 str r0, [sp] movs r0, 0x2 diff --git a/asm/field_poison.s b/asm/field_poison.s index 8948b2762..5b1e24719 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -216,7 +216,7 @@ _080F96F0: _080F96FC: ldrb r0, [r4, 0x2] bl sub_80F95C0 - ldr r0, =gUnknown_085ECF5D + ldr r0, =gText_PkmnFainted3 bl box_related_two__2 ldrh r0, [r4] adds r0, 0x1 diff --git a/asm/field_region_map.s b/asm/field_region_map.s index fc0a38de6..512dfb151 100644 --- a/asm/field_region_map.s +++ b/asm/field_region_map.s @@ -157,7 +157,7 @@ _08170300: movs r2, 0x27 movs r3, 0xD bl SetWindowBorderStyle - ldr r5, =gUnknown_085EE8F1 + ldr r5, =gText_Hoenn movs r0, 0x1 adds r1, r5, 0 movs r2, 0x38 diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s index 784da5b1f..3bc667754 100644 --- a/asm/fldeff_80F9BCC.s +++ b/asm/fldeff_80F9BCC.s @@ -2061,7 +2061,7 @@ _080FACC2: movs r3, 0x3 bl ConvertIntToDecimalStringN ldr r0, =gStringVar2 - ldr r1, =gUnknown_085EA88B + ldr r1, =gText_Gold bl StringCopy ldr r1, =gScriptResult movs r0, 0 @@ -2085,7 +2085,7 @@ _080FAD14: movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r0, =gStringVar2 - ldr r1, =gUnknown_085EA890 + ldr r1, =gText_Silver bl StringCopy ldr r1, =gScriptResult movs r0, 0 diff --git a/asm/fldeff_softboiled.s b/asm/fldeff_softboiled.s index 2de098970..48d968d20 100755 --- a/asm/fldeff_softboiled.s +++ b/asm/fldeff_softboiled.s @@ -221,7 +221,7 @@ sub_81616C0: @ 81616C0 ldr r1, =gStringVar1 bl GetMonNickname ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9C17 + ldr r1, =gText_PkmnHPRestoredByVar2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -318,7 +318,7 @@ sub_81617B8: @ 81617B8 lsrs r4, 24 movs r0, 0x5 bl PlaySE - ldr r0, =gUnknown_085E9712 + ldr r0, =gText_CantBeUsedOnPkmn movs r1, 0 bl sub_81B1B5C movs r0, 0x2 diff --git a/asm/item_menu.s b/asm/item_menu.s index 914fdf2b3..fbb84bf03 100755 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -437,7 +437,7 @@ _081AAF0C: b _081AB012 .pool _081AAF1C: - ldr r1, =gPocketNames + ldr r1, =gPocketNamesStringsTable ldr r4, =gUnknown_0203CE58 ldrb r0, [r4, 0x5] lsls r0, 2 @@ -972,7 +972,7 @@ _081AB3C0: movs r2, 0x2 movs r3, 0x1 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085E921A + ldr r1, =gText_ClearTo11Var1Clear5Var2 b _081AB438 .pool _081AB408: @@ -995,7 +995,7 @@ _081AB420: adds r0, r5, 0 bl CopyItemName _081AB436: - ldr r1, =gUnknown_085E9210 + ldr r1, =gText_UnkF908Var1Clear7Var2 _081AB438: adds r0, r6, 0 bl StringExpandPlaceholders @@ -1297,7 +1297,7 @@ bag_menu_print_description_box_text: @ 81AB6B0 .pool _081AB6E0: ldr r0, =gStringVar1 - ldr r2, =gUnknown_085E9180 + ldr r2, =gReturnToXStringsTable ldr r1, =gUnknown_0203CE58 ldrb r1, [r1, 0x4] lsls r1, 2 @@ -2423,7 +2423,7 @@ _081AC026: adds r5, r0, 0 cmp r1, 0x1 bne _081AC07C - ldr r2, =gPocketNames + ldr r2, =gPocketNamesStringsTable ldrb r0, [r4, 0x5] lsls r0, 2 adds r0, r2 @@ -2439,7 +2439,7 @@ _081AC026: b _081AC09A .pool _081AC07C: - ldr r2, =gPocketNames + ldr r2, =gPocketNamesStringsTable add r0, sp, 0x8 ldrb r0, [r0] lsls r0, 2 @@ -4808,7 +4808,7 @@ display_sell_item_ask_str: @ 81AD5DC ldr r1, =gStringVar2 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E960F + ldr r1, =gText_CantBuyKeyItem adds r0, r4, 0 bl StringExpandPlaceholders ldr r3, =bag_menu_inits_lists_menu @@ -4834,7 +4834,7 @@ _081AD64C: ldr r1, =gStringVar2 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E962F + ldr r1, =gText_HowManyToSell adds r0, r4, 0 bl StringExpandPlaceholders ldr r3, =sub_81AD730 @@ -4874,7 +4874,7 @@ sub_81AD680: @ 81AD680 movs r3, 0x6 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9654 + ldr r1, =gText_ICanPayVar1 adds r0, r4, 0 bl StringExpandPlaceholders ldr r3, =sub_81AD6E4 @@ -5079,7 +5079,7 @@ sub_81AD84C: @ 81AD84C movs r3, 0x6 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9677 + ldr r1, =gText_TurnedOverVar1ForVar2 adds r0, r4, 0 bl StringExpandPlaceholders ldr r3, =sub_81AD8C8 diff --git a/asm/item_use.s b/asm/item_use.s index a2488b6df..b8eb1d1c4 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -2510,7 +2510,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8 lsls r0, 24 cmp r0, 0 bne _080FE518 - ldr r2, =gUnknown_085E96F6 + ldr r2, =gText_WontHaveEffect ldr r3, =bag_menu_inits_lists_menu adds r0, r4, 0 movs r1, 0x1 @@ -2518,7 +2518,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8 b _080FE53C .pool _080FE518: - ldr r1, =gUnknown_085E96F6 + ldr r1, =gText_WontHaveEffect ldr r2, =sub_81C6714 adds r0, r4, 0 bl DisplayItemMessageInBattlePyramid diff --git a/asm/learn_move.s b/asm/learn_move.s index c2ef76350..d8a52ba39 100755 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -377,7 +377,7 @@ _081609A8: ldr r1, =0xffff0000 cmp r0, r1 beq _08160A04 - ldr r0, =gUnknown_085EF8E4 + ldr r0, =gText_PkmnLearnedMove4 bl sub_816084C ldr r1, =gSpecialVar_0x8004 movs r0, 0x1 @@ -471,7 +471,7 @@ _08160AAA: b _08160E88 .pool _08160AB8: - ldr r0, =gUnknown_085EF8F3 + ldr r0, =gText_PkmnTryingToLearnMove bl sub_816084C ldr r0, =gUnknown_0203BC34 ldr r1, [r0] @@ -498,7 +498,7 @@ _08160AEC: asrs r1, r0, 24 cmp r1, 0 bne _08160B10 - ldr r0, =gUnknown_085EFA10 + ldr r0, =gText_WhichMoveToForget2 bl sub_816084C ldr r0, =gUnknown_0203BC34 ldr r1, [r0] @@ -528,7 +528,7 @@ _08160B2C: adds r1, r0 adds r0, r4, 0 bl StringCopy - ldr r0, =gUnknown_085EF960 + ldr r0, =gText_StopTryingToTeachMove bl sub_816084C ldr r0, =gUnknown_0203BC34 ldr r1, [r0] @@ -819,7 +819,7 @@ _08160D6C: adds r1, r6 adds r0, r4, 0 bl StringCopy - ldr r0, =gUnknown_085EF979 + ldr r0, =gText_12AndPoof bl sub_816084C ldr r1, [r7] movs r0, 0x1E @@ -834,7 +834,7 @@ _08160E0C: lsls r0, 16 cmp r0, 0 bne _08160E8A - ldr r0, =gUnknown_085EF9A6 + ldr r0, =gText_PkmnForgotMoveAndLearnedNew bl sub_816084C ldr r0, =gUnknown_0203BC34 ldr r1, [r0] @@ -946,7 +946,7 @@ _08160EF0: cmp r5, 0 bne _08160F38 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF8C2 + ldr r1, =gText_TeachWhichMoveToPkmn adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x3 @@ -1042,7 +1042,7 @@ _08160FE4: movs r0, 0xC strb r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF9E6 + ldr r1, =gText_GiveUpTeachingNewMove adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -1063,7 +1063,7 @@ _08161010: adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF8DA + ldr r1, =gText_TeachX adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -1100,7 +1100,7 @@ sub_8161074: @ 8161074 cmp r5, 0 bne _081610A6 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF8C2 + ldr r1, =gText_TeachWhichMoveToPkmn adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x3 diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index fca8cb29b..5845ea8fb 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -940,7 +940,7 @@ sub_818E13C: @ 818E13C cmp r0, 0xFF bne _0818E174 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EEB7E + ldr r1, =gText_Lady2 bl StringCopy7 movs r7, 0 b _0818E1DC diff --git a/asm/link.s b/asm/link.s index b6eddf2b4..0278c7445 100644 --- a/asm/link.s +++ b/asm/link.s @@ -3482,7 +3482,7 @@ sub_800B080: @ 800B080 ldr r4, =gUnknown_082ED224 str r4, [sp] str r5, [sp, 0x4] - ldr r0, =gUnknown_085EE4F7 + ldr r0, =gText_CommErrorEllipsis str r0, [sp, 0x8] movs r0, 0 movs r1, 0x3 @@ -3491,7 +3491,7 @@ sub_800B080: @ 800B080 bl box_print str r4, [sp] str r5, [sp, 0x4] - ldr r0, =gUnknown_085EE50C + ldr r0, =gText_MoveCloserToLinkPartner str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0x3 @@ -3534,7 +3534,7 @@ sub_800B138: @ 800B138 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085EE4A4 + ldr r0, =gText_CommErrorCheckConnections str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x3 @@ -3623,7 +3623,7 @@ _0800B214: str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085EE572 + ldr r0, =gText_ABtnTitleScreen str r0, [sp, 0x8] movs r0, 0 movs r1, 0x3 @@ -3639,7 +3639,7 @@ _0800B244: str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085EE553 + ldr r0, =gText_ABtnRegistrationCounter str r0, [sp, 0x8] movs r0, 0 movs r1, 0x3 @@ -28887,16 +28887,16 @@ sub_80186EC: @ 80186EC bl FillWindowPixelBuffer cmp r4, 0 bne _0801871C - ldr r0, =gUnknown_085EF654 - ldr r7, =gUnknown_085EF678 + ldr r0, =gText_MysteryGift + ldr r7, =gText_PickOKCancel cmp r5, 0 bne _08018720 - ldr r7, =gUnknown_085EF664 + ldr r7, =gText_PickOKExit b _08018720 .pool _0801871C: - ldr r0, =gUnknown_085EDFBF - ldr r7, =gUnknown_085EDFC9 + ldr r0, =gJPText_MysteryGift + ldr r7, =gJPText_DecideStop _08018720: movs r4, 0 str r4, [sp] @@ -29571,13 +29571,13 @@ _08018C6C: cmp r2, 0 bne _08018C84 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EF2FC + ldr r1, =gText_WhatToDoWithCards bl StringExpandPlaceholders b _08018C8C .pool _08018C84: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EF330 + ldr r1, =gText_WhatToDoWithNews bl StringExpandPlaceholders _08018C8C: ldr r0, =gUnknown_082F05D8 @@ -29801,11 +29801,11 @@ sub_8018E50: @ 8018E50 push {lr} cmp r2, 0 beq _08018E60 - ldr r3, =gUnknown_085EF55C + ldr r3, =gText_OkayToDiscardNews b _08018E62 .pool _08018E60: - ldr r3, =gUnknown_085EF520 + ldr r3, =gText_IfThrowAwayCardEventWontHappen _08018E62: movs r2, 0x1 bl sub_8018B08 @@ -29821,11 +29821,11 @@ mevent_message_was_thrown_away: @ 8018E74 push {lr} cmp r1, 0 beq _08018E84 - ldr r1, =gUnknown_085EF630 + ldr r1, =gText_WonderNewsThrownAway b _08018E86 .pool _08018E84: - ldr r1, =gUnknown_085EF60C + ldr r1, =gText_WonderCardThrownAway _08018E86: bl mevent_0814257C pop {r1} @@ -29854,7 +29854,7 @@ _08018EAC: .4byte _08018EE0 .4byte _08018EF8 _08018EC0: - ldr r0, =gUnknown_085EF5BC + ldr r0, =gText_DataWillBeSaved bl sub_8018884 b _08018EEC .pool @@ -29863,7 +29863,7 @@ _08018ECC: bl TrySavingData b _08018EEC _08018ED4: - ldr r0, =gUnknown_085EF5E0 + ldr r0, =gText_SaveCompletedPressA bl sub_8018884 b _08018EEC .pool @@ -29934,88 +29934,88 @@ _08018F30: _08018F6C: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF2E4 + ldr r2, =gText_NothingSentOver b _08019034 .pool _08018F78: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF244 + ldr r2, =gText_RecordUploadedViaWireless b _08019034 .pool _08018F84: movs r0, 0x1 str r0, [r4] - ldr r2, =gUnknown_085EF0C8 + ldr r2, =gText_WonderCardReceivedFrom cmp r5, 0 bne _08019034 - ldr r2, =gUnknown_085EF124 + ldr r2, =gText_WonderCardReceived b _08019034 .pool _08018F9C: movs r0, 0x1 str r0, [r4] - ldr r2, =gUnknown_085EF0F4 + ldr r2, =gText_WonderNewsReceivedFrom cmp r5, 0 bne _08019034 - ldr r2, =gUnknown_085EF14C + ldr r2, =gText_WonderNewsReceived b _08019034 .pool _08018FB4: movs r0, 0x1 str r0, [r4] - ldr r2, =gUnknown_085EF178 + ldr r2, =gText_NewStampReceived b _08019034 .pool _08018FC0: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF1B4 + ldr r2, =gText_AlreadyHadCard b _08019034 .pool _08018FCC: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF200 + ldr r2, =gText_AlreadyHadStamp b _08019034 .pool _08018FD8: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF1D8 + ldr r2, =gText_AlreadyHadNews b _08019034 .pool _08018FE4: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF21C + ldr r2, =gText_NoMoreRoomForStamps b _08019034 .pool _08018FF0: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF02C + ldr r2, =gText_CommunicationCanceled b _08019034 .pool _08018FFC: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF2B4 + ldr r2, =gText_CantAcceptNewsFromTrainer cmp r6, 0 bne _08019034 - ldr r2, =gUnknown_085EF280 + ldr r2, =gText_CantAcceptCardFromTrainer b _08019034 .pool _08019014: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF014 + ldr r2, =gText_CommunicationError b _08019034 .pool _08019020: movs r0, 0x1 str r0, [r4] - ldr r2, =gUnknown_085EF198 + ldr r2, =gText_NewTrainerReceived b _08019034 .pool _0801902C: @@ -30095,7 +30095,7 @@ _0801909C: mevent_message_stamp_card_etc_send_status: @ 80190A4 push {r4,lr} adds r3, r0, 0 - ldr r1, =gUnknown_085EF014 + ldr r1, =gText_CommunicationError movs r0, 0 str r0, [r3] adds r4, r1, 0 @@ -30125,57 +30125,57 @@ _080190C8: .4byte _0801915C .4byte _08019164 _08019104: - ldr r1, =gUnknown_085EF2E4 + ldr r1, =gText_NothingSentOver b _08019166 .pool _0801910C: - ldr r1, =gUnknown_085EF244 + ldr r1, =gText_RecordUploadedViaWireless b _08019166 .pool _08019114: - ldr r1, =gUnknown_085EF39C + ldr r1, =gText_WonderCardSentTo b _0801911E .pool _0801911C: - ldr r1, =gUnknown_085EF3C4 + ldr r1, =gText_WonderNewsSentTo _0801911E: movs r0, 0x1 str r0, [r3] b _08019166 .pool _08019128: - ldr r1, =gUnknown_085EF3F0 + ldr r1, =gText_StampSentTo b _08019166 .pool _08019130: - ldr r1, =gUnknown_085EF42C + ldr r1, =gText_OtherTrainerHasCard b _08019166 .pool _08019138: - ldr r1, =gUnknown_085EF494 + ldr r1, =gText_OtherTrainerHasStamp b _08019166 .pool _08019140: - ldr r1, =gUnknown_085EF460 + ldr r1, =gText_OtherTrainerHasNews b _08019166 .pool _08019148: - ldr r1, =gUnknown_085EF21C + ldr r1, =gText_NoMoreRoomForStamps b _08019166 .pool _08019150: - ldr r1, =gUnknown_085EF4C4 + ldr r1, =gText_OtherTrainerCanceled b _08019166 .pool _08019158: adds r1, r4, 0 b _08019166 _0801915C: - ldr r1, =gUnknown_085EF410 + ldr r1, =gText_GiftSentTo b _08019166 .pool _08019164: - ldr r1, =gUnknown_085EF4F0 + ldr r1, =gText_CantSendGiftToTrainer _08019166: adds r0, r1, 0 pop {r4} @@ -30357,13 +30357,13 @@ _08019300: bne _08019314 adds r0, r5, 0 adds r0, 0x9 - ldr r1, =gUnknown_085EEEF0 + ldr r1, =gText_DontHaveCardNewOneInput b _0801931A .pool _08019314: adds r0, r5, 0 adds r0, 0x9 - ldr r1, =gUnknown_085EEF2C + ldr r1, =gText_DontHaveNewsNewOneInput _0801931A: bl mevent_0814257C cmp r0, 0 @@ -30381,12 +30381,12 @@ _08019338: ldrb r0, [r5, 0xC] cmp r0, 0 bne _0801934C - ldr r0, =gUnknown_085EEF68 + ldr r0, =gText_WhereShouldCardBeAccessed bl sub_8018884 b _08019352 .pool _0801934C: - ldr r0, =gUnknown_085EEF94 + ldr r0, =gText_WhereShouldNewsBeAccessed bl sub_8018884 _08019352: movs r0, 0x4 @@ -30502,7 +30502,7 @@ _08019436: b _080197C0 .pool _08019444: - ldr r0, =gUnknown_085EEFE8 + ldr r0, =gText_Communicating bl sub_8018884 movs r0, 0x8 strb r0, [r5, 0x8] @@ -30593,7 +30593,7 @@ _08019506: _08019508: adds r0, r5, 0 adds r0, 0x9 - ldr r3, =gUnknown_085EF050 + ldr r3, =gText_ThrowAwayWonderCard adds r1, r5, 0 movs r2, 0 bl sub_8018B08 @@ -30616,7 +30616,7 @@ _08019534: _08019538: adds r0, r5, 0 adds r0, 0x9 - ldr r3, =gUnknown_085EF084 + ldr r3, =gText_HaventReceivedCardsGift adds r1, r5, 0 movs r2, 0 bl sub_8018B08 @@ -30660,7 +30660,7 @@ _0801957E: _0801958C: adds r0, r5, 0 adds r0, 0x9 - ldr r1, =gUnknown_085EEFF8 + ldr r1, =gText_CommunicationCompleted bl sub_8018A1C cmp r0, 0 bne _0801959C @@ -30876,7 +30876,7 @@ _0801971A: _0801972E: adds r0, r5, 0 adds r0, 0x9 - ldr r3, =gUnknown_085EF584 + ldr r3, =gText_HaventReceivedGiftOkayToDiscard adds r1, r5, 0 movs r2, 0x1 bl sub_8018B08 @@ -31016,13 +31016,13 @@ _0801982C: ldrb r0, [r5, 0xC] cmp r0, 0 bne _0801985C - ldr r0, =gUnknown_085EF360 + ldr r0, =gText_SendingWonderCard bl sub_8018884 bl mevent_srv_new_wcard b _08019866 .pool _0801985C: - ldr r0, =gUnknown_085EF37C + ldr r0, =gText_SendingWonderNews bl sub_8018884 bl mevent_srv_init_wnews _08019866: @@ -31084,7 +31084,7 @@ _080198DC: _080198EC: adds r0, r5, 0 adds r0, 0x9 - ldr r1, =gUnknown_085EF014 + ldr r1, =gText_CommunicationError bl mevent_0814257C _080198F6: cmp r0, 0 @@ -33685,7 +33685,7 @@ _0801AD8C: _0801ADFC: ldr r0, =gUnknown_02022C6C ldr r0, [r0] - ldr r1, =gUnknown_085EFBD2 + ldr r1, =gText_CommStandbyAwaitingOtherPlayer movs r2, 0 bl sub_801ABDC cmp r0, 0 @@ -33832,7 +33832,7 @@ _0801AF40: _0801AF58: ldr r0, =gUnknown_02022C6C ldr r0, [r0] - ldr r1, =gUnknown_085EFC27 + ldr r1, =gText_RefusedBattle movs r2, 0x1 bl sub_801ABDC cmp r0, 0 @@ -33858,7 +33858,7 @@ _0801AF8A: _0801AF98: ldr r0, =gUnknown_02022C6C ldr r0, [r0] - ldr r1, =gUnknown_085EFC0C + ldr r1, =gText_BattleWasRefused movs r2, 0x1 bl sub_801ABDC cmp r0, 0 @@ -41940,7 +41940,7 @@ _0801F020: movs r0, 0 adds r1, r4, 0 bl sub_81AFC0C - ldr r1, =gUnknown_085ED2A9 + ldr r1, =gText_F700JoinedChat b _0801F094 .pool _0801F044: @@ -41980,7 +41980,7 @@ _0801F07A: movs r0, 0 adds r1, r4, 0 bl sub_81AFC0C - ldr r1, =gUnknown_085ED2BD + ldr r1, =gText_F700LeftChat _0801F094: adds r0, r6, 0 bl sub_81AFC28 @@ -42190,52 +42190,52 @@ copy_strings_to_sav1: @ 801F1DC ldr r0, [r4] ldr r1, =0x00003c88 adds r0, r1 - ldr r1, =gUnknown_085ED40F + ldr r1, =gText_Hello bl StringCopy ldr r0, [r4] ldr r1, =0x00003c9d adds r0, r1 - ldr r1, =gUnknown_085ED415 + ldr r1, =gText_Pokemon2 bl StringCopy ldr r0, [r4] ldr r1, =0x00003cb2 adds r0, r1 - ldr r1, =gUnknown_085ED41D + ldr r1, =gText_Trade bl StringCopy ldr r0, [r4] ldr r1, =0x00003cc7 adds r0, r1 - ldr r1, =gUnknown_085ED423 + ldr r1, =gText_Battle bl StringCopy ldr r0, [r4] ldr r1, =0x00003cdc adds r0, r1 - ldr r1, =gUnknown_085ED42A + ldr r1, =gText_Lets bl StringCopy ldr r0, [r4] ldr r1, =0x00003cf1 adds r0, r1 - ldr r1, =gUnknown_085ED430 + ldr r1, =gText_Ok bl StringCopy ldr r0, [r4] ldr r1, =0x00003d06 adds r0, r1 - ldr r1, =gUnknown_085ED434 + ldr r1, =gText_Sorry bl StringCopy ldr r0, [r4] ldr r1, =0x00003d1b adds r0, r1 - ldr r1, =gUnknown_085ED43A + ldr r1, =gText_YayUnkF9F9 bl StringCopy ldr r0, [r4] ldr r1, =0x00003d30 adds r0, r1 - ldr r1, =gUnknown_085ED440 + ldr r1, =gText_ThankYou bl StringCopy ldr r0, [r4] ldr r1, =0x00003d45 adds r0, r1 - ldr r1, =gUnknown_085ED44A + ldr r1, =gText_ByeBye bl StringCopy pop {r4} pop {r0} @@ -43754,7 +43754,7 @@ sub_801FDDC: @ 801FDDC bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, 0x18] - ldr r2, =gUnknown_085EAE62 + ldr r2, =gText_Yes movs r1, 0x1 str r1, [sp] movs r4, 0xFF @@ -43764,7 +43764,7 @@ sub_801FDDC: @ 801FDDC bl PrintTextOnWindow ldr r0, [r5] ldrb r0, [r0, 0x18] - ldr r2, =gUnknown_085EAE66 + ldr r2, =gText_No movs r1, 0x11 str r1, [sp] str r4, [sp, 0x4] @@ -47446,13 +47446,13 @@ _08021C5E: cmp r3, r2 bne _08021CC0 ldr r0, =gStringVar3 - ldr r1, =gUnknown_085ED7D4 + ldr r1, =gText_1DotBlueF700 bl StringCopy b _08021CC8 .pool _08021CC0: ldr r0, =gStringVar3 - ldr r1, =gUnknown_085ED7E0 + ldr r1, =gText_1DotF700 bl StringCopy _08021CC8: ldr r4, =gStringVar3 @@ -47541,13 +47541,13 @@ sub_8021D34: @ 8021D34 ldr r4, =gUnknown_082F32D8 str r4, [sp] str r6, [sp, 0x4] - ldr r1, =gUnknown_085ED808 + ldr r1, =gText_TimeColon str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0 adds r3, r7, 0 bl box_print - ldr r4, =gUnknown_085ED840 + ldr r4, =gText_SpaceSec movs r0, 0x2 adds r1, r4, 0 movs r2, 0x1 @@ -47587,7 +47587,7 @@ sub_8021D34: @ 8021D34 movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r5, =gStringVar4 - ldr r1, =gUnknown_085ED838 + ldr r1, =gText_XDotY2 adds r0, r5, 0 bl StringExpandPlaceholders movs r0, 0x2 @@ -47609,7 +47609,7 @@ sub_8021D34: @ 8021D34 adds r2, r6, 0 adds r3, r7, 0 bl box_print - ldr r4, =gUnknown_085ED830 + ldr r4, =gText_SpaceMin movs r0, 0x2 adds r1, r4, 0 movs r2, 0x1 @@ -47638,7 +47638,7 @@ sub_8021D34: @ 8021D34 movs r2, 0x2 movs r3, 0x1 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085ED82C + ldr r1, =gText_StrVar1 adds r0, r5, 0 bl StringExpandPlaceholders movs r0, 0x2 @@ -47669,13 +47669,13 @@ sub_8021D34: @ 8021D34 str r4, [sp] mov r1, r10 str r1, [sp, 0x4] - ldr r1, =gUnknown_085ED810 + ldr r1, =gText_PressingSpeed str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0 adds r3, r7, 0 bl box_print - ldr r4, =gUnknown_085ED850 + ldr r4, =gText_TimesPerSec movs r0, 0x2 adds r1, r4, 0 movs r2, 0x1 @@ -47745,7 +47745,7 @@ _08021F0A: movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085ED848 + ldr r1, =gText_XDotY3 adds r0, r4, 0 bl StringExpandPlaceholders movs r2, 0x1 @@ -47808,7 +47808,7 @@ _08021FDE: str r2, [sp] movs r5, 0 str r5, [sp, 0x4] - ldr r1, =gUnknown_085ED820 + ldr r1, =gText_Silkiness str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0 @@ -47821,7 +47821,7 @@ _08021FDE: movs r3, 0x3 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085ED85C + ldr r1, =gText_Var1Percent adds r0, r4, 0 bl StringExpandPlaceholders movs r2, 0x1 @@ -47961,7 +47961,7 @@ _0802214E: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] - ldr r3, =gUnknown_085ED860 + ldr r3, =gText_PressesRankings movs r1, 0x14 movs r2, 0x3 bl sub_80219C8 @@ -48012,7 +48012,7 @@ _080221C8: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] - ldr r3, =gUnknown_085ED878 + ldr r3, =gText_CrushingResults movs r1, 0x16 movs r2, 0x3 bl sub_80219C8 @@ -48140,7 +48140,7 @@ _08022296: b _080224BA .pool _080222D0: - ldr r0, =gUnknown_085ED8D0 + ldr r0, =gText_BerryCrush2 mov r10, r0 movs r1, 0x1 negs r1, r1 @@ -48165,7 +48165,7 @@ _080222D0: adds r2, r7, 0 movs r3, 0x1 bl box_print - ldr r0, =gUnknown_085ED8DC + ldr r0, =gText_PressingSpeedRankings mov r10, r0 movs r0, 0x1 mov r1, r10 @@ -48195,7 +48195,7 @@ _08022336: movs r3, 0x1 bl ConvertIntToDecimalStringN ldr r0, =gStringVar4 - ldr r1, =gUnknown_085ED8F4 + ldr r1, =gText_Var1Players bl StringExpandPlaceholders ldrb r0, [r6, 0x2] ldr r1, =gUnknown_082F32D8 @@ -48209,7 +48209,7 @@ _08022336: mov r3, r10 bl box_print movs r0, 0x1 - ldr r1, =gUnknown_085ED850 + ldr r1, =gText_TimesPerSec movs r2, 0x1 negs r2, r2 bl GetStringWidth @@ -48222,7 +48222,7 @@ _08022336: str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r1, =gUnknown_085ED850 + ldr r1, =gText_TimesPerSec str r1, [sp, 0x8] movs r1, 0x1 adds r2, r7, 0 @@ -48280,7 +48280,7 @@ _080223CA: movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r0, =gStringVar4 - ldr r1, =gUnknown_085ED848 + ldr r1, =gText_XDotY3 bl StringExpandPlaceholders movs r0, 0x1 ldr r1, =gStringVar4 @@ -52907,7 +52907,7 @@ sub_802482C: @ 802482C adds r2, r4, 0 adds r3, r5, 0 bl SetWindowBorderStyle - ldr r2, =gUnknown_085EDCDE + ldr r2, =gText_Powder movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -59274,7 +59274,7 @@ _08027AFE: ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] - ldr r1, =gUnknown_085EDCE5 + ldr r1, =gText_BerryPickingRecords movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -59414,7 +59414,7 @@ sub_8027BEC: @ 8027BEC adds r0, r7, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r4, =gUnknown_085EDCE5 + ldr r4, =gText_BerryPickingRecords ldr r0, [sp, 0x18] lsls r2, r0, 3 movs r0, 0x1 @@ -62799,7 +62799,7 @@ _08029728: bcc _08029700 _0802972E: movs r5, 0 - ldr r4, =gUnknown_085EDE5D + ldr r4, =gText_SpacePoints cmp r5, r7 bcs _08029754 add r1, sp, 0x34 @@ -62939,7 +62939,7 @@ _080297CC: movs r1, 0 str r1, [sp, 0x8] movs r1, 0x1 - ldr r2, =gUnknown_085EDE5D + ldr r2, =gText_SpacePoints lsrs r3, 24 bl PrintTextOnWindow adds r0, r5, 0x1 @@ -63057,7 +63057,7 @@ _0802996C: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EDD49 + ldr r2, =gText_BerryPickingResults mov r8, r2 movs r2, 0x1 negs r2, r2 @@ -63084,7 +63084,7 @@ _0802996C: ldr r0, [r4] add r0, r9 ldrb r0, [r0] - ldr r2, =gUnknown_085EDD6B + ldr r2, =gText_10P30P50P50P movs r1, 0x11 str r1, [sp] str r6, [sp, 0x4] @@ -63324,7 +63324,7 @@ _08029BFC: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r6, =gUnknown_085EDD86 + ldr r6, =gText_AnnouncingRankings movs r2, 0x1 negs r2, r2 movs r0, 0x1 @@ -63488,7 +63488,7 @@ _08029DA0: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r5, =gUnknown_085EDD9B + ldr r5, =gText_AnnouncingPrizes movs r2, 0x1 negs r2, r2 movs r0, 0x1 @@ -63525,7 +63525,7 @@ _08029DA0: adds r1, r5, 0 bl sub_81AFC0C ldr r7, =gStringVar4 - ldr r1, =gUnknown_085EDDBD + ldr r1, =gText_FirstPlacePrize adds r0, r7, 0 bl sub_81AFC28 ldr r0, [r4] @@ -63559,7 +63559,7 @@ _08029DA0: bl sub_81AFC0C cmp r4, 0x2 bne _08029E9C - ldr r1, =gUnknown_085EDDE2 + ldr r1, =gText_CantHoldAnyMore adds r0, r7, 0 bl sub_81AFC28 b _08029EA8 @@ -63567,7 +63567,7 @@ _08029DA0: _08029E9C: cmp r6, 0x1 bne _08029EA8 - ldr r1, =gUnknown_085EDDFB + ldr r1, =gText_FilledStorageSpace adds r0, r7, 0 bl sub_81AFC28 _08029EA8: @@ -63809,7 +63809,7 @@ _0802A0CC: ldr r0, [r7] add r0, r8 ldrb r0, [r0] - ldr r2, =gUnknown_085EDE18 + ldr r2, =gText_WantToPlayAgain movs r1, 0x5 str r1, [sp] movs r3, 0xFF @@ -63823,7 +63823,7 @@ _0802A0CC: ldr r0, [r7] add r0, r10 ldrb r0, [r0] - ldr r2, =gUnknown_085EAE62 + ldr r2, =gText_Yes str r6, [sp] mov r3, r9 str r3, [sp, 0x4] @@ -63835,7 +63835,7 @@ _0802A0CC: ldr r0, [r7] add r0, r10 ldrb r0, [r0] - ldr r2, =gUnknown_085EAE66 + ldr r2, =gText_No movs r1, 0x11 str r1, [sp] mov r3, r9 @@ -63912,7 +63912,7 @@ _0802A1DC: ldr r0, [r7] add r0, r8 ldrb r0, [r0] - ldr r2, =gUnknown_085EAE62 + ldr r2, =gText_Yes movs r1, 0x1 str r1, [sp] movs r3, 0xFF @@ -63927,7 +63927,7 @@ _0802A1DC: ldr r0, [r7] add r0, r8 ldrb r0, [r0] - ldr r2, =gUnknown_085EAE66 + ldr r2, =gText_No movs r1, 0x11 str r1, [sp] mov r3, r10 @@ -64234,7 +64234,7 @@ _0802A4AC: ldr r0, [r5] adds r0, r4 ldrb r0, [r0] - ldr r2, =gUnknown_085EDE65 + ldr r2, =gText_CommunicationStandby3 movs r1, 0x5 str r1, [sp] movs r1, 0xFF @@ -64394,7 +64394,7 @@ _0802A610: ldr r0, [r6] adds r0, r4 ldrb r0, [r0] - ldr r2, =gUnknown_085EDE2C + ldr r2, =gText_SomeoneDroppedOut movs r1, 0x5 str r1, [sp] movs r1, 0xFF @@ -70271,7 +70271,7 @@ _0802D46A: strh r0, [r1, 0x12] lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_085EDF2A + ldr r2, =gText_WantToPlayAgain2 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -70473,7 +70473,7 @@ _0802D606: strh r0, [r1, 0x12] lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_085EDF3E + ldr r2, =gText_SomeoneDroppedOut2 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -70553,7 +70553,7 @@ _0802D6AA: strh r0, [r1, 0x12] lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_085EDF6F + ldr r2, =gText_CommunicationStandby4 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -70740,7 +70740,7 @@ sub_802D7E8: @ 802D7E8 bl sub_81AFC0C ldr r0, [r5] adds r0, 0xA6 - ldr r1, =gUnknown_085EDED3 + ldr r1, =gText_AwesomeWonF701F700 bl sub_81AFC28 movs r0, 0x4 movs r1, 0x8 @@ -70793,7 +70793,7 @@ sub_802D884: @ 802D884 bl sub_81AFC0C ldr r0, [r4] adds r0, 0xA6 - ldr r1, =gUnknown_085EDEF4 + ldr r1, =gText_FilledStorageSpace2 bl sub_81AFC28 movs r0, 0x4 movs r1, 0x8 @@ -70846,7 +70846,7 @@ sub_802D8FC: @ 802D8FC bl sub_81AFC0C ldr r0, [r4] adds r0, 0xA6 - ldr r1, =gUnknown_085EDF11 + ldr r1, =gText_CantHoldMore bl sub_81AFC28 movs r0, 0x4 movs r1, 0x9 @@ -71167,7 +71167,7 @@ sub_802DB8C: @ 802DB8C str r0, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, =gUnknown_085EDE7C + ldr r0, =gText_SpacePoints2 str r0, [sp, 0x8] movs r0, 0 movs r1, 0 @@ -71177,7 +71177,7 @@ sub_802DB8C: @ 802DB8C add r0, sp, 0xC str r0, [sp] str r4, [sp, 0x4] - ldr r0, =gUnknown_085EDE84 + ldr r0, =gText_SpaceTimes3 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0 @@ -72272,7 +72272,7 @@ _0802E416: ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] - ldr r1, =gUnknown_085EDE8D + ldr r1, =gText_PkmnJumpRecords movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -72407,7 +72407,7 @@ sub_802E500: @ 802E500 adds r0, r4, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r5, =gUnknown_085EDE8D + ldr r5, =gText_PkmnJumpRecords ldr r1, [sp, 0x1C] lsls r2, r1, 3 movs r0, 0x1 diff --git a/asm/mail.s b/asm/mail.s index 77cbc4e83..5f76a5ef0 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -691,7 +691,7 @@ _08121A8A: ldrb r0, [r0] cmp r0, 0 bne _08121AF0 - ldr r1, =gUnknown_085EEA78 + ldr r1, =gText_FromSpace adds r0, r2, 0 bl StringCopy ldr r0, [r4] @@ -825,7 +825,7 @@ _08121BB8: cmp r6, r0 bcc _08121B60 _08121BCC: - ldr r1, =gUnknown_085EEA78 + ldr r1, =gText_FromSpace add r0, sp, 0xC bl StringCopy ldr r4, =gUnknown_0203A134 diff --git a/asm/main_menu.s b/asm/main_menu.s index ed04ba6f3..883bd0cb4 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -4547,7 +4547,7 @@ fmt_time: @ 8031E94 push {r4-r6,lr} sub sp, 0xC ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EDCC3 + ldr r1, =gText_ContinueMenuPlayer adds r0, r4, 0 bl StringExpandPlaceholders ldr r6, =gUnknown_082FF0E3 @@ -4589,7 +4589,7 @@ fmt_player: @ 8031EF8 push {r4-r6,lr} sub sp, 0x2C ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EDCCA + ldr r1, =gText_ContinueMenuTime adds r0, r4, 0 bl StringExpandPlaceholders ldr r6, =gUnknown_082FF0E3 @@ -4664,7 +4664,7 @@ _08031FAA: lsls r0, 16 lsrs r7, r0, 16 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EDCCF + ldr r1, =gText_ContinueMenuPokedex adds r0, r4, 0 bl StringExpandPlaceholders ldr r6, =gUnknown_082FF0E3 @@ -4728,7 +4728,7 @@ _08032030: cmp r4, r0 bls _0803201C ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EDCD7 + ldr r1, =gText_ContinueMenuBadges adds r0, r4, 0 bl StringExpandPlaceholders ldr r6, =gUnknown_082FF0E3 diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s index 05d15601c..7b21e19e7 100644 --- a/asm/mauville_old_man.s +++ b/asm/mauville_old_man.s @@ -1400,7 +1400,7 @@ _08120BB0: movs r2, 0x8 bl memset mov r0, sp - ldr r1, =gUnknown_085EDFB0 + ldr r1, =gText_Friend bl StringCopy adds r0, r5, 0 mov r1, sp @@ -2218,7 +2218,7 @@ sub_8121178: @ 8121178 sub_81211EC: @ 81211EC push {r4,r5,lr} sub sp, 0xC - ldr r1, =gUnknown_085EB7EA + ldr r1, =gText_Exit movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -2309,7 +2309,7 @@ _08121272: _081212AA: ldr r5, =gUnknown_0203A130 ldrb r0, [r5] - ldr r2, =gUnknown_085EB7EA + ldr r2, =gText_Exit lsls r1, r4, 4 adds r1, 0x1 lsls r1, 24 diff --git a/asm/menu.s b/asm/menu.s index 553161d40..8bb9dc436 100755 --- a/asm/menu.s +++ b/asm/menu.s @@ -1250,7 +1250,7 @@ RedrawMenuCursor: @ 8198448 bl FillWindowPixelRect ldrb r0, [r5, 0x5] ldrb r1, [r5, 0x6] - ldr r2, =gUnknown_085EE498 + ldr r2, =gText_SelectorArrow3 ldrb r3, [r5] ldrb r4, [r5, 0x8] mov r6, r8 @@ -2139,7 +2139,7 @@ sub_8198AF8: @ 8198AF8 adds r2, r4, 0 adds r3, r5, 0 bl SetWindowBorderStyle - ldr r0, =gUnknown_085EE491 + ldr r0, =gText_YesNo str r0, [sp, 0xC] add r1, sp, 0xC ldrb r0, [r7] @@ -2877,7 +2877,7 @@ sub_8199060: @ 8199060 lsrs r3, 24 ldrb r0, [r5, 0x5] ldrb r1, [r5, 0x6] - ldr r2, =gUnknown_085EE498 + ldr r2, =gText_SelectorArrow3 str r3, [sp] movs r3, 0 str r3, [sp, 0x4] @@ -3668,7 +3668,7 @@ CreateYesNoMenu: @ 81996C0 adds r2, r4, 0 adds r3, r5, 0 bl SetWindowBorderStyle - ldr r0, =gUnknown_085EE491 + ldr r0, =gText_YesNo str r0, [sp] mov r1, sp mov r2, r8 diff --git a/asm/money.s b/asm/money.s index 0d7cf569f..53e795714 100644 --- a/asm/money.s +++ b/asm/money.s @@ -105,7 +105,7 @@ _080E5258: cmp r0, 0 bgt _080E5258 _080E5264: - ldr r1, =gUnknown_085E969C + ldr r1, =gText_PokedollarVar1 adds r0, r2, 0 bl StringExpandPlaceholders ldr r2, =gStringVar4 diff --git a/asm/mystery_event_menu.s b/asm/mystery_event_menu.s index 27ab158ad..49de57848 100644 --- a/asm/mystery_event_menu.s +++ b/asm/mystery_event_menu.s @@ -115,7 +115,7 @@ sub_8178A40: @ 8178A40 movs r5, 0x1 cmp r4, 0 bne _08178A54 - ldr r1, =gUnknown_085EE80A + ldr r1, =gText_EventSafelyLoaded bl StringCopy movs r5, 0 _08178A54: @@ -125,7 +125,7 @@ _08178A54: _08178A5A: cmp r4, 0x1 bne _08178A66 - ldr r1, =gUnknown_085EE827 + ldr r1, =gText_LoadErrorEndingSession adds r0, r6, 0 bl StringCopy _08178A66: @@ -204,7 +204,7 @@ _08178B12: beq _08178B20 b _08178E58 _08178B20: - ldr r1, =gUnknown_085EE765 + ldr r1, =gText_LinkStandby2 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -256,7 +256,7 @@ _08178B8E: _08178B98: movs r0, 0x15 bl PlaySE - ldr r1, =gUnknown_085EE788 + ldr r1, =gText_PressAToLoadEvent movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -301,7 +301,7 @@ _08178BDC: movs r2, 0x1 movs r3, 0xD bl SetWindowBorderStyle - ldr r1, =gUnknown_085EE7BF + ldr r1, =gText_LoadingEvent movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -373,7 +373,7 @@ _08178CAC: lsls r0, 24 cmp r0, 0 beq _08178CCC - ldr r1, =gUnknown_085EE7CE + ldr r1, =gText_DontRemoveCableTurnOff movs r0, 0x1 str r0, [sp] movs r0, 0 diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index d481c2a3b..d544f689f 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -782,7 +782,7 @@ sub_8153E1C: @ 8153E1C adds r4, r0, 0 bl EnableResetRTC ldr r0, =gStringVar4 - ldr r1, =gUnknown_085ECAD8 + ldr r1, =gText_InGameClockUsable bl StringExpandPlaceholders movs r0, 0x2 str r0, [r4, 0x6C] diff --git a/asm/naming_screen.s b/asm/naming_screen.s index 2d79e464a..b241d3009 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -4033,7 +4033,7 @@ sub_80E4EF0: @ 80E4EF0 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r1, =gUnknown_085EEAF6 + ldr r1, =gText_MoveOkBack str r1, [sp, 0x8] movs r1, 0 movs r2, 0x2 diff --git a/asm/option_menu.s b/asm/option_menu.s index 214e23094..1c554e26f 100644 --- a/asm/option_menu.s +++ b/asm/option_menu.s @@ -906,7 +906,7 @@ sub_80BAC38: @ 80BAC38 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r4, =gUnknown_085EE5D4 + ldr r4, =gText_TextSpeedSlow mov r0, sp ldrb r3, [r0] adds r0, r4, 0 @@ -917,14 +917,14 @@ sub_80BAC38: @ 80BAC38 movs r2, 0 bl GetStringWidth adds r4, r0, 0 - ldr r0, =gUnknown_085EE5DF + ldr r0, =gText_TextSpeedMid mov r8, r0 movs r0, 0x1 mov r1, r8 movs r2, 0 bl GetStringWidth adds r5, r0, 0 - ldr r6, =gUnknown_085EE5E9 + ldr r6, =gText_TextSpeedFast movs r0, 0x1 adds r1, r6, 0 movs r2, 0 @@ -1000,13 +1000,13 @@ sub_80BAD08: @ 80BAD08 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r0, =gUnknown_085EE5F4 + ldr r0, =gText_BattleSceneOn mov r1, sp ldrb r3, [r1] movs r1, 0x68 movs r2, 0x10 bl sub_80BAB68 - ldr r4, =gUnknown_085EE5FD + ldr r4, =gText_BattleSceneOff movs r0, 0x1 adds r1, r4, 0 movs r2, 0xC6 @@ -1061,13 +1061,13 @@ sub_80BAD84: @ 80BAD84 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r0, =gUnknown_085EE607 + ldr r0, =gText_BattleStyleShift mov r1, sp ldrb r3, [r1] movs r1, 0x68 movs r2, 0x20 bl sub_80BAB68 - ldr r4, =gUnknown_085EE613 + ldr r4, =gText_BattleStyleSet movs r0, 0x1 adds r1, r4, 0 movs r2, 0xC6 @@ -1125,13 +1125,13 @@ sub_80BAE08: @ 80BAE08 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r0, =gUnknown_085EE61D + ldr r0, =gText_SoundMono mov r1, sp ldrb r3, [r1] movs r1, 0x68 movs r2, 0x30 bl sub_80BAB68 - ldr r4, =gUnknown_085EE628 + ldr r4, =gText_SoundStereo movs r0, 0x1 adds r1, r4, 0 movs r2, 0xC6 @@ -1243,9 +1243,9 @@ sub_80BAF0C: @ 80BAF0C adds r0, r1 lsrs r6, r0, 24 movs r5, 0 - ldr r1, =gUnknown_085EE640 + ldr r1, =gText_FrameTypeNumber ldrb r0, [r1] - ldr r7, =gUnknown_085EE635 + ldr r7, =gText_FrameType cmp r0, 0xFF beq _080BAF44 adds r2, r1, 0 @@ -1394,7 +1394,7 @@ sub_80BB028: @ 80BB028 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r4, =gUnknown_085EE647 + ldr r4, =gText_ButtonTypeNormal mov r0, sp ldrb r3, [r0] adds r0, r4, 0 @@ -1406,14 +1406,14 @@ sub_80BB028: @ 80BB028 movs r2, 0 bl GetStringWidth adds r4, r0, 0 - ldr r0, =gUnknown_085EE654 + ldr r0, =gText_ButtonTypeLR mov r8, r0 movs r0, 0x1 mov r1, r8 movs r2, 0 bl GetStringWidth adds r5, r0, 0 - ldr r6, =gUnknown_085EE65D + ldr r6, =gText_ButtonTypeLEqualsA movs r0, 0x1 adds r1, r6, 0 movs r2, 0 @@ -1461,7 +1461,7 @@ sub_80BB0D0: @ 80BB0D0 movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EE589 + ldr r2, =gText_Option movs r0, 0x1 str r0, [sp] movs r0, 0xFF diff --git a/asm/party_menu.s b/asm/party_menu.s index bb4ad4e31..3621dd0ee 100755 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -2484,7 +2484,7 @@ sub_81B1660: @ 81B1660 ands r1, r0 cmp r1, 0x2 bne _081B1680 - ldr r5, =gUnknown_085EA110 + ldr r5, =gText_CancelParticipation b _081B168A .pool _081B1680: @@ -3290,7 +3290,7 @@ sub_81B1C84: @ 81B1C84 adds r0, r4, 0 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E991B + ldr r1, =gText_PkmnWasGivenItem adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -3319,7 +3319,7 @@ sub_81B1CD0: @ 81B1CD0 adds r0, r4, 0 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E999D + ldr r1, =gText_RecievedItemFromPkmn adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -3348,7 +3348,7 @@ sub_81B1D1C: @ 81B1D1C adds r0, r4, 0 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E993A + ldr r1, =gText_SwitchPkmnItem adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -3379,7 +3379,7 @@ sub_81B1D68: @ 81B1D68 adds r0, r4, 0 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E99DB + ldr r1, =gText_SwitchedPkmnItem adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -3474,7 +3474,7 @@ _081B1E3E: pokemon_item_not_removed: @ 81B1E48 push {lr} ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9A69 + ldr r1, =gText_BagFullCouldNotRemoveItem bl StringExpandPlaceholders pop {r0} bx r0 @@ -3937,7 +3937,7 @@ sub_81B21AC: @ 81B21AC _081B21DC: movs r0, 0x20 bl PlaySE - ldr r0, =gUnknown_085EA0EE + ldr r0, =gText_PkmnCantParticipate movs r1, 0 bl sub_81B1B5C movs r0, 0x2 @@ -3962,7 +3962,7 @@ sub_81B2210: @ 81B2210 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_085EA110 + ldr r0, =gText_CancelParticipation movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -6407,7 +6407,7 @@ _081B3674: cmp r6, 0 bne _081B36C0 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9980 + ldr r1, =gText_PkmnNotHolding adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -8348,7 +8348,7 @@ _081B4788: adds r0, r5, 0 bl GetMonNickname ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9980 + ldr r1, =gText_PkmnNotHolding adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -8409,7 +8409,7 @@ sub_81B47E0: @ 81B47E0 adds r0, r7, 0 bl GetMonNickname ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9980 + ldr r1, =gText_PkmnNotHolding adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -8428,7 +8428,7 @@ _081B4864: adds r0, r5, 0 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9E00 + ldr r1, =gText_ThrowAwayItem adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -8511,7 +8511,7 @@ _081B491A: ldr r1, =gStringVar1 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9E14 + ldr r1, =gText_ItemThrownAway adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -8731,7 +8731,7 @@ brm_take_2: @ 81B4B20 ldr r0, [r5] adds r0, 0xC bl sub_81B302C - ldr r0, =gUnknown_085E9855 + ldr r0, =gText_SendMailToPC movs r1, 0x1 bl sub_81B1B5C ldr r1, =gTasks @@ -8806,7 +8806,7 @@ _081B4BC6: lsrs r0, 24 cmp r0, 0xFF beq _081B4C0C - ldr r0, =gUnknown_085E9877 + ldr r0, =gText_MailSentToPC movs r1, 0 bl sub_81B1B5C ldr r1, =gTasks @@ -8818,7 +8818,7 @@ _081B4BC6: b _081B4C4A .pool _081B4C0C: - ldr r0, =gUnknown_085E9897 + ldr r0, =gText_PCMailboxFull movs r1, 0 bl sub_81B1B5C ldr r1, =gTasks @@ -8833,7 +8833,7 @@ _081B4C30: movs r0, 0x5 bl PlaySE _081B4C36: - ldr r0, =gUnknown_085E98B4 + ldr r0, =gText_MailMessageWillBeLost movs r1, 0x1 bl sub_81B1B5C ldr r1, =gTasks @@ -8926,7 +8926,7 @@ _081B4CBE: muls r0, r7 adds r0, r6 bl sub_80D4680 - ldr r0, =gUnknown_085E99B8 + ldr r0, =gText_MailTakenFromPkmn movs r1, 0 bl sub_81B1B5C ldr r1, =gTasks @@ -9167,7 +9167,7 @@ _081B4F36: movs r3, 0x1 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9830 + ldr r1, =gText_NoMoreThanVar1Pkmn adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x20 @@ -9411,13 +9411,13 @@ sub_81B50C8: @ 81B50C8 .pool _081B515C: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA210 + ldr r1, =gText_PkmnCantBeTradedNow bl StringExpandPlaceholders b _081B5178 .pool _081B5170: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA234 + ldr r1, =gText_EggCantBeTradedNow bl StringExpandPlaceholders _081B5178: movs r0, 0x20 @@ -9430,7 +9430,7 @@ _081B5178: adds r0, 0xD bl sub_81B302C ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA1CA + ldr r1, =gText_PauseUntilPress adds r0, r4, 0 bl StringAppend adds r0, r4, 0 @@ -9530,7 +9530,7 @@ brm_trade_1: @ 81B51D4 ldr r0, [r4] adds r0, 0xD bl sub_81B302C - ldr r1, =gUnknown_085EA1CA + ldr r1, =gText_PauseUntilPress adds r0, r5, 0 bl StringAppend adds r0, r5, 0 @@ -9594,19 +9594,19 @@ _081B5328: b _081B5368 _081B532E: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA1E8 + ldr r1, =gText_OnlyPkmnForBattle bl StringExpandPlaceholders b _081B53C0 .pool _081B5340: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA210 + ldr r1, =gText_PkmnCantBeTradedNow bl StringExpandPlaceholders b _081B53C0 .pool _081B5354: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA234 + ldr r1, =gText_EggCantBeTradedNow bl StringExpandPlaceholders b _081B53C0 .pool @@ -9623,7 +9623,7 @@ _081B5368: ldr r1, =gStringVar1 bl GetMonNickname ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA1CD + ldr r1, =gJPText_PutVar1IntoSpinner adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -9641,7 +9641,7 @@ _081B53C0: movs r0, 0x20 bl PlaySE ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA1CA + ldr r1, =gText_PauseUntilPress adds r0, r4, 0 bl StringAppend adds r0, r4, 0 @@ -9787,7 +9787,7 @@ _081B54E8: lsrs r0, 24 cmp r0, 0x1 beq _081B5524 - ldr r0, =gUnknown_085E97FC + ldr r0, =gText_CantUseUntilNewBadge movs r1, 0x1 bl sub_81B1B5C ldr r1, =gTasks @@ -9852,7 +9852,7 @@ _081B557C: ldrb r1, [r1, 0x14] bl sub_81245DC ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA196 + ldr r1, =gText_ReturnToHealingSpot b _081B55E8 .pool _081B55B8: @@ -9877,7 +9877,7 @@ _081B55B8: ldrb r1, [r1, 0x14] bl sub_81245DC ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA16B + ldr r1, =gText_EscapeFromHere _081B55E8: bl StringExpandPlaceholders adds r0, r6, 0 @@ -11562,102 +11562,102 @@ _081B6334: .4byte _081B64A8 _081B6380: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9C3E + ldr r1, =gText_PkmnCuredOfPoison bl StringExpandPlaceholders b _081B64C4 .pool _081B6394: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9C7C + ldr r1, =gText_PkmnWokeUp2 bl StringExpandPlaceholders b _081B64C4 .pool _081B63A8: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9C8A + ldr r1, =gText_PkmnBurnHealed bl StringExpandPlaceholders b _081B64C4 .pool _081B63BC: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9CA2 + ldr r1, =gText_PkmnThawedOut bl StringExpandPlaceholders b _081B64C4 .pool _081B63D0: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9C5F + ldr r1, =gText_PkmnCuredOfParalysis bl StringExpandPlaceholders b _081B64C4 .pool _081B63E4: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9DBE + ldr r1, =gText_PkmnSnappedOutOfConfusion bl StringExpandPlaceholders b _081B64C4 .pool _081B63F8: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9DE1 + ldr r1, =gText_PkmnGotOverInfatuation bl StringExpandPlaceholders b _081B64C4 .pool _081B640C: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9CE0 + ldr r1, =gText_PkmnBecameHealthy bl StringExpandPlaceholders b _081B64C4 .pool _081B6420: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085E96E3 + ldr r1, =gText_HP3 b _081B6474 .pool _081B6430: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085EA33C + ldr r1, =gText_Attack3 b _081B6474 .pool _081B6440: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085EA343 + ldr r1, =gText_Defense3 b _081B6474 .pool _081B6450: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085EA35B + ldr r1, =gText_Speed2 b _081B6474 .pool _081B6460: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085E96E6 + ldr r1, =gText_SpAtk3 b _081B6474 .pool _081B6470: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085E96EE + ldr r1, =gText_SpDef3 _081B6474: bl StringCopy ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9D25 + ldr r1, =gText_PkmnBaseVar2StatIncreased bl StringExpandPlaceholders b _081B64C4 .pool _081B6494: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9CF5 + ldr r1, =gText_MovesPPIncreased bl StringExpandPlaceholders b _081B64C4 .pool _081B64A8: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9CB7 + ldr r1, =gText_PPWasRestored bl StringExpandPlaceholders b _081B64C4 .pool _081B64BC: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E96F6 + ldr r1, =gText_WontHaveEffect bl StringExpandPlaceholders _081B64C4: pop {r0} @@ -11830,7 +11830,7 @@ _081B6600: strb r0, [r1] movs r0, 0x5 bl PlaySE - ldr r0, =gUnknown_085E96F6 + ldr r0, =gText_WontHaveEffect b _081B66F4 .pool _081B6624: @@ -11964,7 +11964,7 @@ sub_81B672C: @ 81B672C ldr r1, =gStringVar1 bl GetMonNickname ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9C17 + ldr r1, =gText_PkmnHPRestoredByVar2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -12083,7 +12083,7 @@ _081B6850: strb r0, [r1] movs r0, 0x5 bl PlaySE - ldr r0, =gUnknown_085E96F6 + ldr r0, =gText_WontHaveEffect b _081B68E2 .pool _081B6874: @@ -12108,19 +12108,19 @@ _081B6874: cmp r0, r8 beq _081B68C4 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9D45 + ldr r1, =gText_PkmnFriendlyBaseVar2Fell bl StringExpandPlaceholders b _081B68E0 .pool _081B68C4: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9D90 + ldr r1, =gText_PkmnFriendlyBaseVar2CantFall bl StringExpandPlaceholders b _081B68E0 .pool _081B68D8: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9D6D + ldr r1, =gText_PkmnAdoresBaseVar2Fell bl StringExpandPlaceholders _081B68E0: ldr r0, =gStringVar4 @@ -12239,30 +12239,30 @@ _081B69B8: .4byte _081B69E8 .4byte _081B69E0 _081B69D0: - ldr r1, =gUnknown_085E96E3 + ldr r1, =gText_HP3 b _081B69F2 .pool _081B69D8: - ldr r1, =gUnknown_085EA33C + ldr r1, =gText_Attack3 b _081B69F2 .pool _081B69E0: - ldr r1, =gUnknown_085EA343 + ldr r1, =gText_Defense3 b _081B69F2 .pool _081B69E8: - ldr r1, =gUnknown_085EA35B + ldr r1, =gText_Speed2 b _081B69F2 .pool _081B69F0: - ldr r1, =gUnknown_085E96E6 + ldr r1, =gText_SpAtk3 _081B69F2: adds r0, r2, 0 bl StringCopy b _081B6A08 .pool _081B6A00: - ldr r1, =gUnknown_085E96EE + ldr r1, =gText_SpDef3 adds r0, r2, 0 bl StringCopy _081B6A08: @@ -12517,7 +12517,7 @@ ether_effect_related: @ 81B6BEC strb r4, [r0] movs r0, 0x5 bl PlaySE - ldr r0, =gUnknown_085E96F6 + ldr r0, =gText_WontHaveEffect b _081B6C7E .pool _081B6C34: @@ -12775,18 +12775,18 @@ sub_81B6DC4: @ 81B6DC4 b _081B6E9C .pool _081B6E70: - ldr r1, =gUnknown_085E9AB4 + ldr r1, =gText_PkmnCantLearnMove b _081B6E7A .pool _081B6E78: - ldr r1, =gUnknown_085E9C00 + ldr r1, =gText_PkmnAlreadyKnows _081B6E7A: adds r0, r6, 0 bl sub_81B6D98 b _081B6E9C .pool _081B6E88: - ldr r0, =gUnknown_085E9AE9 + ldr r0, =gText_PkmnNeedsToReplaceMove bl sub_81B6D74 ldr r1, =gTasks lsls r0, r6, 2 @@ -12847,7 +12847,7 @@ _081B6EF0: adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9AA5 + ldr r1, =gText_PkmnLearnedMove3 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -12987,7 +12987,7 @@ _081B7048: beq _081B707A b _081B7080 _081B704E: - ldr r0, =gUnknown_085E9B96 + ldr r0, =gText_WhichMoveToForget movs r1, 0x1 bl sub_81B1B5C ldr r1, =gTasks @@ -13142,7 +13142,7 @@ sub_81B7154: @ 81B7154 ldr r2, =gMoveNames adds r1, r2 bl StringCopy - ldr r0, =gUnknown_085E9BB8 + ldr r0, =gText_12PoofForgotMove bl sub_81B6D74 ldr r1, =gTasks lsls r0, r6, 2 @@ -13214,7 +13214,7 @@ sub_81B7230: @ 81B7230 adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9B5D + ldr r1, =gText_StopLearningMove2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -13302,7 +13302,7 @@ _081B7306: adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9B76 + ldr r1, =gText_MoveNotLearned adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -13352,7 +13352,7 @@ _081B7392: ldr r2, =gMoveNames adds r1, r2 bl StringCopy - ldr r0, =gUnknown_085E9AE9 + ldr r0, =gText_PkmnNeedsToReplaceMove bl sub_81B6D74 ldr r1, =gTasks lsls r0, r6, 2 @@ -13444,7 +13444,7 @@ _081B747A: ldr r1, =gUnknown_0203CEE8 movs r0, 0 strb r0, [r1] - ldr r0, =gUnknown_085E96F6 + ldr r0, =gText_WontHaveEffect movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -13484,7 +13484,7 @@ _081B74B4: movs r3, 0x3 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9D0A + ldr r1, =gText_PkmnElevatedToLvVar2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -13915,7 +13915,7 @@ sub_81B787C: @ 81B787C adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9AE9 + ldr r1, =gText_PkmnNeedsToReplaceMove adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -13969,7 +13969,7 @@ sub_81B7910: @ 81B7910 adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9AA5 + ldr r1, =gText_PkmnLearnedMove3 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -14225,7 +14225,7 @@ _081B7B82: bne _081B7BC8 ldr r0, =gUnknown_0203CEE8 strb r1, [r0] - ldr r0, =gUnknown_085E96F6 + ldr r0, =gText_WontHaveEffect movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -14278,7 +14278,7 @@ sub_81B7C10: @ 81B7C10 ldr r1, =gStringVar1 bl GetMonNickname ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9C17 + ldr r1, =gText_PkmnHPRestoredByVar2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -14322,7 +14322,7 @@ sub_81B7C74: @ 81B7C74 ldr r1, =gUnknown_0203CEE8 movs r0, 0 strb r0, [r1] - ldr r0, =gUnknown_085E96F6 + ldr r0, =gText_WontHaveEffect movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -14613,18 +14613,18 @@ sub_81B7E4C: @ 81B7E4C b _081B7F1C .pool _081B7EF0: - ldr r1, =gUnknown_085E9AB4 + ldr r1, =gText_PkmnCantLearnMove b _081B7EFA .pool _081B7EF8: - ldr r1, =gUnknown_085E9C00 + ldr r1, =gText_PkmnAlreadyKnows _081B7EFA: adds r0, r6, 0 bl sub_81B6D98 b _081B7F1C .pool _081B7F08: - ldr r0, =gUnknown_085E9AE9 + ldr r0, =gText_PkmnNeedsToReplaceMove bl sub_81B6D74 ldr r1, =gTasks lsls r0, r6, 2 @@ -15152,7 +15152,7 @@ sub_81B83B8: @ 81B83B8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_085E98EC + ldr r0, =gText_RemoveMailBeforeItem movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -15273,7 +15273,7 @@ sub_81B8474: @ 81B8474 bl GetMonData cmp r0, 0 beq _081B84DC - ldr r0, =gUnknown_085E9A08 + ldr r0, =gText_PkmnHoldingItemCantHoldMail movs r1, 0x1 bl sub_81B1B5C b _081B84F2 @@ -15284,7 +15284,7 @@ _081B84DC: bl sub_80D460C adds r0, r4, 0 bl sub_80D439C - ldr r0, =gUnknown_085E9A40 + ldr r0, =gText_MailTransferredFromMailbox movs r1, 0x1 bl sub_81B1B5C _081B84F2: @@ -15785,7 +15785,7 @@ sub_81B88BC: @ 81B88BC lsrs r0, 24 cmp r0, 0x1 bhi _081B88E0 - ldr r0, =gUnknown_085EA126 + ldr r0, =gText_CancelBattle b _081B88FA .pool _081B88E0: @@ -15795,11 +15795,11 @@ _081B88E0: ldrh r0, [r0] cmp r0, 0x2 bne _081B88F8 - ldr r0, =gUnknown_085EA139 + ldr r0, =gText_ReturnToWaitingRoom b _081B88FA .pool _081B88F8: - ldr r0, =gUnknown_085EA155 + ldr r0, =gText_CancelChallenge _081B88FA: pop {r1} bx r1 @@ -16015,7 +16015,7 @@ _081B8AA2: adds r0, r4, 0 bl StringCopy ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E97B2 + ldr r1, =gText_CantSwitchWithAlly b _081B8C42 .pool _081B8AC4: @@ -16033,7 +16033,7 @@ _081B8AC4: adds r0, r4, 0 bl GetMonNickname ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E978F + ldr r1, =gText_PkmnHasNoEnergy b _081B8C42 .pool _081B8AF8: @@ -16076,7 +16076,7 @@ _081B8B24: cmp r0, 0 beq _081B8B60 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E97E5 + ldr r1, =gText_EggCantBattle b _081B8C42 .pool _081B8B60: @@ -16094,7 +16094,7 @@ _081B8B60: adds r0, r6, 0 bl GetMonNickname ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E976F + ldr r1, =gText_PkmnAlreadySelected b _081B8C42 .pool _081B8B94: @@ -16144,7 +16144,7 @@ _081B8BFC: ldr r1, =gStringVar1 bl GetMonNickname ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9754 + ldr r1, =gText_PkmnAlreadyInBattle b _081B8C42 .pool _081B8C20: @@ -16162,7 +16162,7 @@ _081B8C20: ldr r1, =gStringVar1 bl GetMonNickname ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9738 + ldr r1, =gText_PkmnCantSwitchOut _081B8C42: bl StringExpandPlaceholders _081B8C46: diff --git a/asm/player_pc.s b/asm/player_pc.s index 7f4ab354c..8d74f118c 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -309,7 +309,7 @@ sub_816B0A8: @ 816B0A8 lsls r0, 24 cmp r0, 0 bne _0816B0D8 - ldr r1, =gUnknown_085EAC4B + ldr r1, =gText_NoMailHere ldr r2, =sub_816B060 adds r0, r4, 0 bl DisplayItemMessageOnField @@ -344,7 +344,7 @@ _0816B0D8: b _0816B12A .pool _0816B120: - ldr r1, =gUnknown_085EAC4B + ldr r1, =gText_NoMailHere ldr r2, =sub_816B060 adds r0, r6, 0 bl DisplayItemMessageOnField @@ -661,7 +661,7 @@ sub_816B398: @ 816B398 _0816B3C4: adds r0, r5, 0 bl sub_816B4DC - ldr r1, =gUnknown_085EABD1 + ldr r1, =gText_NoItems ldr r2, =task_pc_itemstorage adds r0, r5, 0 bl DisplayItemMessageOnField @@ -696,7 +696,7 @@ sub_816B3E4: @ 816B3E4 _0816B410: adds r0, r5, 0 bl sub_816B4DC - ldr r1, =gUnknown_085EABD1 + ldr r1, =gText_NoItems ldr r2, =task_pc_itemstorage adds r0, r5, 0 bl DisplayItemMessageOnField @@ -950,7 +950,7 @@ sub_816B5F8: @ 816B5F8 lsrs r4, 24 movs r0, 0x1 bl sub_81D1C84 - ldr r6, =gUnknown_085EAB4E + ldr r6, =gText_Mailbox movs r0, 0x1 adds r1, r6, 0 movs r2, 0x40 @@ -1098,7 +1098,7 @@ sub_816B730: @ 816B730 movs r1, 0 bl sub_81DB554 ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EAC63 + ldr r1, =gText_WhatToDoWithVar1sMail adds r0, r5, 0 bl StringExpandPlaceholders ldr r2, =sub_816B7DC @@ -1345,7 +1345,7 @@ sub_816B994: @ 816B994 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_085EAC8D + ldr r1, =gText_MessageWillBeLost ldr r2, =sub_816B9B0 bl DisplayItemMessageOnField pop {r0} @@ -1432,14 +1432,14 @@ sub_816BA18: @ 816BA18 lsls r0, 24 cmp r0, 0 bne _0816BA68 - ldr r1, =gUnknown_085EACB5 + ldr r1, =gText_BagIsFull ldr r2, =sub_816BBD4 adds r0, r6, 0 bl DisplayItemMessageOnField b _0816BA9C .pool _0816BA68: - ldr r1, =gUnknown_085EACC8 + ldr r1, =gText_MailToBagMessageErased ldr r2, =sub_816BBD4 adds r0, r6, 0 bl DisplayItemMessageOnField @@ -2293,10 +2293,10 @@ _0816C16C: bls _0816C16C movs r1, 0x6 ldrsh r0, [r7, r1] - ldr r5, =gUnknown_085EAB71 + ldr r5, =gText_TossItem cmp r0, 0 bne _0816C186 - ldr r5, =gUnknown_085EAB63 + ldr r5, =gText_WithdrawItem _0816C186: movs r0, 0x1 adds r1, r5, 0 @@ -2383,11 +2383,11 @@ _0816C26C: b _0816C2BA .pool _0816C274: - ldr r0, =gUnknown_085EAC09 + ldr r0, =gText_WithdrawHowManyItems b _0816C2BA .pool _0816C27C: - ldr r0, =gUnknown_085EAC22 + ldr r0, =gText_WithdrawXItems b _0816C2BA .pool _0816C284: @@ -2399,7 +2399,7 @@ _0816C28C: b _0816C2BA .pool _0816C294: - ldr r0, =gUnknown_085EABE7 + ldr r0, =gText_NoRoomInBag b _0816C2BA .pool _0816C29C: diff --git a/asm/pokeblock_feed.s b/asm/pokeblock_feed.s index bd348ec34..d82c5df07 100644 --- a/asm/pokeblock_feed.s +++ b/asm/pokeblock_feed.s @@ -718,7 +718,7 @@ sub_817A1C4: @ 817A1C4 cmp r0, 0 bne _0817A248 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E937F + ldr r1, =gText_Var1AteTheVar2 bl StringExpandPlaceholders b _0817A268 .pool @@ -726,13 +726,13 @@ _0817A248: cmp r0, 0 ble _0817A260 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9390 + ldr r1, =gText_Var1HappilyAteVar2 bl StringExpandPlaceholders b _0817A268 .pool _0817A260: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E93A9 + ldr r1, =gText_Var1DisdainfullyAteVar2 bl StringExpandPlaceholders _0817A268: ldr r2, =gTextFlags diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index df90540e8..83332e538 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -586,7 +586,7 @@ _080C73F6: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EBCAD + ldr r2, =gText_PartyFull str r4, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -609,7 +609,7 @@ _080C7428: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EBC89 + ldr r2, =gText_JustOnePkmn movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -1020,7 +1020,7 @@ _080C779E: lsls r0, r5, 24 lsrs r0, 24 bl sav3_get_box_name - ldr r1, =gUnknown_085EBCC1 + ldr r1, =gText_Box bl StringCopy adds r4, r5, 0x1 adds r1, r4, 0 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 3fb412477..2ad67ba5a 100755 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -5413,7 +5413,7 @@ _081C284A: sub_81C286C: @ 81C286C push {r4-r7,lr} sub sp, 0x8 - ldr r1, =gUnknown_085EA3CF + ldr r1, =gText_PkmnInfo movs r5, 0 str r5, [sp] movs r6, 0x1 @@ -5422,21 +5422,21 @@ sub_81C286C: @ 81C286C movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA3DC + ldr r1, =gText_PkmnSkills str r5, [sp] str r6, [sp, 0x4] movs r0, 0x1 movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA3EB + ldr r1, =gText_BattleMoves str r5, [sp] str r6, [sp, 0x4] movs r0, 0x2 movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA3F8 + ldr r1, =gText_ContestMoves str r5, [sp] str r6, [sp, 0x4] movs r0, 0x3 @@ -5466,7 +5466,7 @@ _081C28CC: adds r1, r7, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r7, =gUnknown_085EA406 + ldr r7, =gText_Info movs r0, 0x1 adds r1, r7, 0 movs r2, 0x3E @@ -5489,7 +5489,7 @@ _081C28FE: adds r1, r7, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r7, =gUnknown_085EA3C8 + ldr r7, =gText_Switch movs r0, 0x1 adds r1, r7, 0 movs r2, 0x3E @@ -5512,21 +5512,21 @@ _081C2930: adds r1, r7, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA369 + ldr r1, =gText_RentalPkmn str r5, [sp] str r6, [sp, 0x4] movs r0, 0x8 movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA378 + ldr r1, =gText_TypeSlash str r5, [sp] str r5, [sp, 0x4] movs r0, 0x9 movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r4, =gUnknown_085EA361 + ldr r4, =gText_HP4 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x2A @@ -5540,7 +5540,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r4, =gUnknown_085EA33C + ldr r4, =gText_Attack3 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x2A @@ -5554,7 +5554,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x11 bl sub_81C25A4 - ldr r4, =gUnknown_085EA343 + ldr r4, =gText_Defense3 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x2A @@ -5568,7 +5568,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x21 bl sub_81C25A4 - ldr r4, =gUnknown_085EA34B + ldr r4, =gText_SpAtk4 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x24 @@ -5582,7 +5582,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r4, =gUnknown_085EA353 + ldr r4, =gText_SpDef4 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x24 @@ -5596,7 +5596,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x11 bl sub_81C25A4 - ldr r4, =gUnknown_085EA35B + ldr r4, =gText_Speed2 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x24 @@ -5610,49 +5610,49 @@ _081C2930: adds r1, r4, 0 movs r3, 0x21 bl sub_81C25A4 - ldr r1, =gUnknown_085EA39F + ldr r1, =gText_ExpPoints str r5, [sp] str r6, [sp, 0x4] movs r0, 0xC movs r2, 0x6 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA3AB + ldr r1, =gText_NextLv str r5, [sp] str r6, [sp, 0x4] movs r0, 0xC movs r2, 0x6 movs r3, 0x11 bl sub_81C25A4 - ldr r1, =gUnknown_085EA398 + ldr r1, =gText_Status str r5, [sp] str r6, [sp, 0x4] movs r0, 0xD movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA37E + ldr r1, =gText_Power str r5, [sp] str r6, [sp, 0x4] movs r0, 0xE movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA384 + ldr r1, =gText_Accuracy2 str r5, [sp] str r6, [sp, 0x4] movs r0, 0xE movs r2, 0 movs r3, 0x11 bl sub_81C25A4 - ldr r1, =gUnknown_085EA38D + ldr r1, =gText_Appeal str r5, [sp] str r6, [sp, 0x4] movs r0, 0xF movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA394 + ldr r1, =gText_Jam str r5, [sp] str r6, [sp, 0x4] movs r0, 0xF @@ -6126,7 +6126,7 @@ sub_81C2EC4: @ 81C2EC4 bl sub_81C2D2C lsls r0, 24 lsrs r5, r0, 24 - ldr r4, =gUnknown_085EA365 + ldr r4, =gText_OTSlash movs r6, 0 str r6, [sp] movs r0, 0x1 @@ -6335,7 +6335,7 @@ sub_81C307C: @ 81C307C bne _081C30E0 _081C30C2: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA5DB + ldr r1, =gText_XNature bl sub_81AFC28 b _081C3182 .pool @@ -6367,25 +6367,25 @@ _081C310C: cmp r0, 0 bne _081C3134 ldrb r0, [r4, 0x9] - ldr r1, =gUnknown_085EA516 + ldr r1, =gText_XNatureHatchedAtYZ cmp r0, 0xD4 bls _081C3170 - ldr r1, =gUnknown_085EA617 + ldr r1, =gText_XNatureHatchedSomewhereAt b _081C3170 .pool _081C3134: ldrb r0, [r4, 0x9] - ldr r1, =gUnknown_085EA4EC + ldr r1, =gText_XNatureMetAtYZ cmp r0, 0xD4 bls _081C3170 - ldr r1, =gUnknown_085EA5EB + ldr r1, =gText_XNatureMetSomewhereAt b _081C3170 .pool _081C3148: ldrb r0, [r4, 0x9] cmp r0, 0xFF bne _081C3158 - ldr r1, =gUnknown_085EA56A + ldr r1, =gText_XNatureFatefulEncounter b _081C3170 .pool _081C3158: @@ -6396,11 +6396,11 @@ _081C3158: cmp r0, 0 beq _081C316E ldrb r0, [r4, 0x9] - ldr r1, =gUnknown_085EA5A8 + ldr r1, =gText_XNatureProbablyMetAt cmp r0, 0xD4 bls _081C3170 _081C316E: - ldr r1, =gUnknown_085EA544 + ldr r1, =gText_XNatureObtainedInTrade _081C3170: ldr r0, =gStringVar4 bl sub_81AFC28 @@ -6449,7 +6449,7 @@ sub_81C31C0: @ 81C31C0 ldr r1, [r0] movs r0, 0x2 bl sub_81AFC0C - ldr r1, =gUnknown_085EA3C0 + ldr r1, =gText_EmptyString5 movs r0, 0x5 bl sub_81AFC0C pop {r0} @@ -6649,7 +6649,7 @@ sub_81C335C: @ 81C335C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_085EA365 + ldr r0, =gText_OTSlash mov r8, r0 movs r0, 0x1 mov r1, r8 @@ -6736,27 +6736,27 @@ sub_81C3428: @ 81C3428 ldrb r0, [r0] cmp r0, 0x1 bne _081C3448 - ldr r4, =gUnknown_085EA40B + ldr r4, =gText_EggWillTakeALongTime b _081C346C .pool _081C3448: ldrh r0, [r1, 0x30] cmp r0, 0x5 bhi _081C3458 - ldr r4, =gUnknown_085EA4A2 + ldr r4, =gText_EggAboutToHatch b _081C346C .pool _081C3458: cmp r0, 0xA bhi _081C3464 - ldr r4, =gUnknown_085EA475 + ldr r4, =gText_EggWillHatchSoon b _081C346C .pool _081C3464: - ldr r4, =gUnknown_085EA40B + ldr r4, =gText_EggWillTakeALongTime cmp r0, 0x28 bhi _081C346C - ldr r4, =gUnknown_085EA442 + ldr r4, =gText_EggWillTakeSomeTime _081C346C: ldr r0, =gUnknown_0861CCCC movs r1, 0x2 @@ -6792,7 +6792,7 @@ sub_81C349C: @ 81C349C ldrb r0, [r4, 0x9] cmp r0, 0xFF bne _081C34C4 - ldr r4, =gUnknown_085EA678 + ldr r4, =gText_PeculiarEggNicePlace b _081C3502 .pool _081C34C4: @@ -6805,7 +6805,7 @@ _081C34C4: cmp r0, 0 bne _081C34E0 _081C34D8: - ldr r4, =gUnknown_085EA6AB + ldr r4, =gText_PeculiarEggTrade b _081C3502 .pool _081C34E0: @@ -6815,14 +6815,14 @@ _081C34E0: bl sub_81C32E0 lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_085EA702 + ldr r4, =gText_EggFromTraveler cmp r0, 0x1 bne _081C3502 - ldr r4, =gUnknown_085EA6D7 + ldr r4, =gText_EggFromHotSprings b _081C3502 .pool _081C3500: - ldr r4, =gUnknown_085EA647 + ldr r4, =gText_OddEggFoundByCouple _081C3502: ldr r0, =gUnknown_0861CCCC movs r1, 0x3 @@ -7021,7 +7021,7 @@ _081C36B0: movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA3B4 + ldr r1, =gText_RibbonsVar1 adds r0, r4, 0 bl StringExpandPlaceholders adds r5, r4, 0 @@ -8201,7 +8201,7 @@ sub_81C4154: @ 81C4154 adds r0, r4, 0 movs r1, 0 bl FillWindowPixelBuffer - ldr r1, =gUnknown_085EA4CB + ldr r1, =gText_HMMovesCantBeForgotten2 movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -10430,7 +10430,7 @@ sub_81C540C: @ 81C540C ldr r1, =gStringVar2 adds r0, r4, 0 bl CopyItemName - ldr r1, =gUnknown_085E9210 + ldr r1, =gText_UnkF908Var1Clear7Var2 adds r0, r5, 0 bl StringExpandPlaceholders b _081C5458 @@ -10635,7 +10635,7 @@ sub_81C55D8: @ 81C55D8 .pool _081C561C: ldr r0, =gStringVar1 - ldr r2, =gUnknown_085E91B0 + ldr r2, =gReturnToXStringsTable2 ldr r1, =gUnknown_0203CF30 ldrb r1, [r1, 0x4] lsls r1, 2 diff --git a/asm/pokenav.s b/asm/pokenav.s index eee6e2f6a..6ae25b362 100755 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -6860,7 +6860,7 @@ sub_81CA770: @ 81CA770 movs r0, 0x2 bl sub_81C763C adds r5, r0, 0 - ldr r6, =gUnknown_085EBD4A + ldr r6, =gText_NoRibbonWinners movs r2, 0x1 negs r2, r2 movs r0, 0x1 @@ -7928,7 +7928,7 @@ sub_81CAF78: @ 81CAF78 lsls r0, 24 cmp r0, 0 bne _081CAFA4 - ldr r0, =gUnknown_085EEB0B + ldr r0, =gText_CallCantBeMadeHere b _081CAFCE .pool _081CAFA4: @@ -9748,7 +9748,7 @@ sub_81CBDF4: @ 81CBDF4 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r1, =gUnknown_085EBE5F + ldr r1, =gText_NumberRegistered movs r2, 0 bl sub_81CBE88 pop {r0} @@ -9784,7 +9784,7 @@ sub_81CBE38: @ 81CBE38 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r1, =gUnknown_085EBE6E + ldr r1, =gText_NumberOfBattles movs r2, 0x2 bl sub_81CBE88 pop {r0} @@ -9900,7 +9900,7 @@ sub_81CBEF8: @ 81CBEF8 bl GetMapName b _081CBF24 _081CBF1C: - ldr r1, =gUnknown_085EC00F + ldr r1, =gText_Unknown add r0, sp, 0xC bl StringCopy _081CBF24: @@ -10168,7 +10168,7 @@ sub_81CC11C: @ 81CC11C push {lr} sub sp, 0xC ldrb r0, [r0, 0x14] - ldr r2, =gUnknown_085EBF95 + ldr r2, =gText_TrainerCloseBy movs r1, 0x1 str r1, [sp] str r1, [sp, 0x4] @@ -13128,7 +13128,7 @@ _081CD862: adds r0, r4, r5 ldr r1, =0x00006325 adds r0, r1 - ldr r1, =gUnknown_085EBFCE + ldr r1, =gText_InParty b _081CD8F4 .pool _081CD8E4: @@ -14829,7 +14829,7 @@ sub_81CE738: @ 81CE738 movs r2, 0x1 movs r3, 0x4 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085EBFD7 + ldr r1, =gText_Number2 bl StringCopy pop {r1} bx r1 @@ -14957,7 +14957,7 @@ _081CE80C: strb r0, [r1, 0x4] mov r5, sp adds r5, 0x11 - ldr r1, =gUnknown_085EBFD7 + ldr r1, =gText_Number2 adds r0, r5, 0 bl StringCopy ldr r0, =0x00001821 @@ -16949,7 +16949,7 @@ sub_81CF7F4: @ 81CF7F4 movs r0, 0xFF strb r0, [r4] ldr r5, =gStringVar2 - ldr r1, =gUnknown_085EC029 + ldr r1, =gText_NumberF700 adds r0, r5, 0 bl sub_81AFC28 mov r1, r8 @@ -19859,7 +19859,7 @@ sub_81D0E84: @ 81D0E84 adds r1, r4, 0 bl sub_81AFC0C ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EC030 + ldr r1, =gText_RibbonsF700 adds r0, r4, 0 bl sub_81AFC28 ldrb r0, [r5, 0xA] @@ -23412,7 +23412,7 @@ sub_81D28FC: @ 81D28FC movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r5, =gUnknown_085EFA31 + ldr r5, =gText_BattleMoves2 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x80 @@ -23431,7 +23431,7 @@ sub_81D28FC: @ 81D28FC movs r1, 0x1 adds r2, r5, 0 bl PrintTextOnWindow - ldr r5, =gUnknown_085EFA52 + ldr r5, =gText_PPSlash movs r1, 0x29 mov r10, r1 str r1, [sp] @@ -23443,7 +23443,7 @@ sub_81D28FC: @ 81D28FC adds r2, r5, 0 movs r3, 0x4 bl PrintTextOnWindow - ldr r5, =gUnknown_085EFA56 + ldr r5, =gText_PowerSlash movs r0, 0x1 adds r1, r5, 0 movs r2, 0x6A @@ -23460,7 +23460,7 @@ sub_81D28FC: @ 81D28FC movs r1, 0x1 adds r2, r5, 0 bl PrintTextOnWindow - ldr r5, =gUnknown_085EFA5D + ldr r5, =gText_AccuracySlash movs r0, 0x1 adds r1, r5, 0 movs r2, 0x6A @@ -23508,7 +23508,7 @@ _081D29C4: adds r2, r5, 0 movs r3, 0x4 bl PrintTextOnWindow - ldr r1, =gUnknown_085EFA52 + ldr r1, =gText_PPSlash movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -23616,7 +23616,7 @@ sub_81D2ACC: @ 81D2ACC movs r0, 0x1 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r5, =gUnknown_085EFA3E + ldr r5, =gText_ContestMoves2 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x80 @@ -23632,7 +23632,7 @@ sub_81D2ACC: @ 81D2ACC movs r1, 0x1 adds r2, r5, 0 bl PrintTextOnWindow - ldr r5, =gUnknown_085EFA67 + ldr r5, =gText_Appeal2 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x5C @@ -23648,7 +23648,7 @@ sub_81D2ACC: @ 81D2ACC movs r1, 0x1 adds r2, r5, 0 bl PrintTextOnWindow - ldr r5, =gUnknown_085EFA6E + ldr r5, =gText_Jam2 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x5C @@ -24157,7 +24157,7 @@ _081D2EFC: cmp r7, 0xE bne _081D2F2C adds r0, r5, 0x5 - ldr r1, =gUnknown_085EBFCE + ldr r1, =gText_InParty b _081D2F3A .pool _081D2F2C: @@ -25214,10 +25214,10 @@ _081D36CA: adds r4, 0xC movs r1, 0 ldrsh r0, [r4, r1] - ldr r1, =gUnknown_085EEA76 + ldr r1, =gText_Dash cmp r0, 0 blt _081D3704 - ldr r1, =gUnknown_085EEA73 + ldr r1, =gText_UnkCtrlF904 _081D3704: adds r0, r6, 0 bl StringCopy @@ -29757,7 +29757,7 @@ sub_81D5C8C: @ 81D5C8C movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer - ldr r5, =gUnknown_085EF88A + ldr r5, =gText_TimeBoard movs r0, 0x1 adds r1, r5, 0 movs r2, 0xD0 @@ -29842,9 +29842,9 @@ _081D5CD6: movs r3, 0x2 bl ConvertIntToDecimalStringN mov r0, r9 - ldr r1, =gUnknown_085EF895 + ldr r1, =gText_TimeCleared bl StringCopy - ldr r1, =gUnknown_085EF8A3 + ldr r1, =gText_XMinYDotZSec bl StringExpandPlaceholders movs r0, 0x1 mov r1, r9 diff --git a/asm/record_mixing.s b/asm/record_mixing.s index a28af9a9a..a62022cc7 100644 --- a/asm/record_mixing.s +++ b/asm/record_mixing.s @@ -630,7 +630,7 @@ _080E726C: lsrs r0, 24 strh r0, [r5, 0x14] _080E7296: - ldr r0, =gUnknown_085EEA8E + ldr r0, =gText_RecordMixingComplete bl sub_80E70F4 strh r4, [r5, 0x10] b _080E730A @@ -739,7 +739,7 @@ _080E7370: b _080E7566 .pool _080E7384: - ldr r0, =gUnknown_085EEA7E + ldr r0, =gText_MixingRecords bl sub_80E70F4 movs r0, 0xE1 lsls r0, 3 diff --git a/asm/region_map.s b/asm/region_map.s index 1b1dfb4bd..150b4893e 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -3212,12 +3212,12 @@ sub_81245DC: @ 81245DC beq _081245F8 cmp r1, 0x57 bne _08124604 - ldr r1, =gUnknown_085EC9D2 + ldr r1, =gText_Ferry bl StringCopy b _0812460A .pool _081245F8: - ldr r1, =gUnknown_085EC9D8 + ldr r1, =gText_SecretBase bl StringCopy b _0812460A .pool @@ -3239,7 +3239,7 @@ sub_8124610: @ 8124610 bl sub_81245DC b _08124626 _08124620: - ldr r1, =gUnknown_085EC9E4 + ldr r1, =gText_Hideout bl StringCopy _08124626: pop {r1} diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s index 076ddbf0b..ac2c1181c 100644 --- a/asm/reset_rtc_screen.s +++ b/asm/reset_rtc_screen.s @@ -414,7 +414,7 @@ sub_809EBC4: @ 809EBC4 adds r1, r4, 0 bl StringCopy adds r7, r0, 0 - ldr r1, =gUnknown_085EE68A + ldr r1, =gText_Day bl StringCopy adds r7, r0, 0 adds r0, r4, 0 @@ -426,7 +426,7 @@ sub_809EBC4: @ 809EBC4 adds r1, r4, 0 bl StringCopy adds r7, r0, 0 - ldr r5, =gUnknown_085EE68E + ldr r5, =gText_Colon3 adds r1, r5, 0 bl StringCopy adds r7, r0, 0 @@ -514,7 +514,7 @@ sub_809ECB4: @ 809ECB4 movs r2, 0x1 mov r3, r9 bl sub_809EBC4 - ldr r2, =gUnknown_085EE690 + ldr r2, =gText_Confirm2 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -1011,7 +1011,7 @@ _0809F11C: movs r1, 0 movs r3, 0xE bl SetWindowBorderStyle - ldr r2, =gUnknown_085ECA0D + ldr r2, =gText_PresentTime movs r0, 0x1 str r0, [sp] movs r4, 0xFF @@ -1033,7 +1033,7 @@ _0809F11C: movs r1, 0 movs r2, 0x11 bl sub_809EBC4 - ldr r2, =gUnknown_085ECA22 + ldr r2, =gText_PreviousTime movs r0, 0x21 str r0, [sp] str r4, [sp, 0x4] @@ -1062,7 +1062,7 @@ _0809F11C: movs r1, 0 movs r2, 0x31 bl sub_809EBC4 - ldr r0, =gUnknown_085EC9EC + ldr r0, =gText_ResetRTCConfirmCancel bl sub_809F0C0 movs r0, 0 movs r1, 0x2 @@ -1161,7 +1161,7 @@ _0809F276: cmp r0, 0x2 bne _0809F29C _0809F282: - ldr r0, =gUnknown_085ECAA7 + ldr r0, =gText_NoSaveFileCantSetTime bl sub_809F0C0 movs r0, 0x5 strh r0, [r5] @@ -1193,7 +1193,7 @@ _0809F2CA: movs r0, 0 movs r1, 0 bl sub_8198070 - ldr r0, =gUnknown_085ECA38 + ldr r0, =gText_PleaseResetTime bl sub_809F0C0 ldr r2, =gLocalTime ldr r0, =gSaveBlock2Ptr @@ -1261,7 +1261,7 @@ _0809F340: ldrh r1, [r4] bl VarSet bl DisableResetRTC - ldr r0, =gUnknown_085ECA4F + ldr r0, =gText_ClockHasBeenReset bl sub_809F0C0 movs r0, 0x4 strh r0, [r5] @@ -1274,14 +1274,14 @@ _0809F398: lsrs r0, 24 cmp r0, 0x1 bne _0809F3B8 - ldr r0, =gUnknown_085ECA8A + ldr r0, =gText_SaveCompleted bl sub_809F0C0 movs r0, 0x49 bl PlaySE b _0809F3C4 .pool _0809F3B8: - ldr r0, =gUnknown_085ECA9A + ldr r0, =gText_SaveFailed bl sub_809F0C0 movs r0, 0x16 bl PlaySE diff --git a/asm/rom6.s b/asm/rom6.s index bfa19101a..4bad6e35d 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -1064,23 +1064,23 @@ sub_8135DAC: @ 8135DAC movs r0, 0 adds r1, r4, 0 bl sub_8135D7C - ldr r1, =gUnknown_085E931D + ldr r1, =gText_Spicy movs r0, 0x2 movs r2, 0 bl sub_8135D7C - ldr r1, =gUnknown_085E9323 + ldr r1, =gText_Dry movs r0, 0x3 movs r2, 0 bl sub_8135D7C - ldr r1, =gUnknown_085E9327 + ldr r1, =gText_Sweet movs r0, 0x4 movs r2, 0 bl sub_8135D7C - ldr r1, =gUnknown_085E932D + ldr r1, =gText_Bitter movs r0, 0x5 movs r2, 0 bl sub_8135D7C - ldr r1, =gUnknown_085E9334 + ldr r1, =gText_Sour movs r0, 0x6 movs r2, 0 bl sub_8135D7C @@ -1148,7 +1148,7 @@ _08135E7C: adds r4, r7 ldr r0, [r5] adds r0, r4 - ldr r1, =gUnknown_085E9344 + ldr r1, =gText_StowCase bl StringCopy ldr r1, [r5] lsls r2, r6, 3 @@ -1231,7 +1231,7 @@ sub_8135F04: @ 8135F04 movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085E934F + ldr r1, =gText_LvVar1 adds r0, r4, 0 bl StringExpandPlaceholders pop {r4-r6} @@ -2598,7 +2598,7 @@ sub_8136AB4: @ 8136AB4 ldr r1, [r1] bl StringCopy ldr r5, =gStringVar4 - ldr r1, =gUnknown_085E9353 + ldr r1, =gText_ThrowAwayVar1 adds r0, r5, 0 bl StringExpandPlaceholders bl sav2_get_text_speed @@ -2654,7 +2654,7 @@ sub_8136B78: @ 8136B78 lsls r4, 24 lsrs r4, 24 ldr r5, =gStringVar4 - ldr r1, =gUnknown_085E9367 + ldr r1, =gText_Var1ThrownAway adds r0, r5, 0 bl StringExpandPlaceholders bl sav2_get_text_speed @@ -4796,14 +4796,14 @@ sub_8137D5C: @ 8137D5C movs r2, 0 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085EB5EE + ldr r1, =gText_SpaceTimes adds r0, r4, 0 bl StringAppend b _08137D90 .pool _08137D88: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB5CF + ldr r1, =gText_99TimesPlus bl StringCopy _08137D90: ldr r0, =0x00000e0f @@ -4833,14 +4833,14 @@ _08137D90: movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085EB5E5 + ldr r1, =gText_SpaceSeconds adds r0, r4, 0 bl StringAppend b _08137DF8 .pool _08137DF0: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085EB5DA + ldr r1, =gText_1MinutePlus bl StringCopy _08137DF8: movs r4, 0 @@ -6425,13 +6425,13 @@ sub_8138B10: @ 8138B10 cmp r0, 0 bne _08138B34 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB5F9 + ldr r1, =gText_BigGuy bl StringCopy b _08138B3C .pool _08138B34: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB601 + ldr r1, =gText_BigGirl bl StringCopy _08138B3C: pop {r0} @@ -6448,13 +6448,13 @@ sub_8138B48: @ 8138B48 cmp r0, 0 bne _08138B6C ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB60E + ldr r1, =gText_Daughter bl StringCopy b _08138B74 .pool _08138B6C: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB60A + ldr r1, =gText_Son bl StringCopy _08138B74: pop {r0} @@ -8511,7 +8511,7 @@ sub_8139B60: @ 8139B60 ldrb r0, [r5] movs r1, 0 bl SetStandardWindowBorderStyle - ldr r4, =gUnknown_085EB6A5 + ldr r4, =gText_ElevatorNowOn movs r0, 0x1 adds r1, r4, 0 movs r2, 0x40 @@ -10131,7 +10131,7 @@ sub_813A8FC: @ 813A8FC movs r2, 0x1 movs r3, 0x4 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085EB6AD + ldr r1, =gText_BP bl StringCopy movs r0, 0x1 add r1, sp, 0xC @@ -12650,37 +12650,37 @@ _0813BE58: .4byte _0813BEC0 _0813BE70: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD14 + ldr r1, =gText_Steven bl StringCopy b _0813BF04 .pool _0813BE84: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD1B + ldr r1, =gText_Brawly bl StringCopy b _0813BF04 .pool _0813BE98: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD22 + ldr r1, =gText_Winona bl StringCopy b _0813BF04 .pool _0813BEAC: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD29 + ldr r1, =gText_Phoebe bl StringCopy b _0813BF04 .pool _0813BEC0: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD30 + ldr r1, =gText_Glacia bl StringCopy b _0813BF04 .pool _0813BED4: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD0C + ldr r1, =gText_Wallace bl StringCopy b _0813BF04 .pool diff --git a/asm/save_failed_screen.s b/asm/save_failed_screen.s index 247c765b6..182ff8954 100644 --- a/asm/save_failed_screen.s +++ b/asm/save_failed_screen.s @@ -268,7 +268,7 @@ _08178FF8: ldrb r0, [r4] movs r1, 0x1 bl CopyWindowToVram - ldr r0, =gUnknown_085EC816 + ldr r0, =gText_SaveFailedCheckingBackup movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -340,7 +340,7 @@ _0817929C: ldrb r0, [r4] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC917 + ldr r0, =gText_CheckCompleted movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -353,7 +353,7 @@ _0817929C: ldrb r0, [r4] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC816 + ldr r0, =gText_SaveFailedCheckingBackup movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -373,7 +373,7 @@ _081792EC: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC86F + ldr r0, =gText_BackupMemoryDamaged b _08179330 .pool _0817931C: @@ -385,7 +385,7 @@ _0817931C: ldr r0, [r0] cmp r0, 0 bne _08179370 - ldr r0, =gUnknown_085EC94F + ldr r0, =gText_SaveCompleteGameCannotContinue _08179330: movs r1, 0x1 movs r2, 0 @@ -397,7 +397,7 @@ _08179348: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC86F + ldr r0, =gText_BackupMemoryDamaged movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -406,7 +406,7 @@ _08179348: b _08179380 .pool _08179370: - ldr r0, =gUnknown_085EC9A2 + ldr r0, =gText_SaveCompletePressA movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -436,7 +436,7 @@ sub_8179390: @ 8179390 ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC8D4 + ldr r0, =gText_GamePlayCannotBeContinued movs r1, 0x1 movs r2, 0 bl sub_8178F44 diff --git a/asm/script_menu.s b/asm/script_menu.s index 6c5e6d2bd..8aecbf696 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -724,7 +724,7 @@ _080E23AC: lsls r0, 24 cmp r0, 0 beq _080E23D4 - ldr r0, =gUnknown_085EB18B + ldr r0, =gText_HallOfFame adds r1, r5, 0 bl display_text_and_get_width adds r5, r0, 0 @@ -751,7 +751,7 @@ _080E23D4: adds r0, r6, 0 movs r1, 0 bl SetStandardWindowBorderStyle - ldr r2, =gUnknown_085EB18B + ldr r2, =gText_HallOfFame movs r0, 0x21 str r0, [sp] movs r5, 0xFF @@ -762,7 +762,7 @@ _080E23D4: movs r1, 0x1 adds r3, r7, 0 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB198 + ldr r2, =gText_LogOff movs r0, 0x31 str r0, [sp] str r5, [sp, 0x4] @@ -786,7 +786,7 @@ _080E2448: adds r0, r6, 0 movs r1, 0 bl SetStandardWindowBorderStyle - ldr r2, =gUnknown_085EB198 + ldr r2, =gText_LogOff movs r0, 0x21 str r0, [sp] movs r0, 0xFF @@ -803,7 +803,7 @@ _080E247A: lsrs r1, r0, 24 cmp r1, 0 beq _080E24B0 - ldr r2, =gUnknown_085EB176 + ldr r2, =gText_LanettesPC movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -817,7 +817,7 @@ _080E247A: b _080E24C6 .pool _080E24B0: - ldr r2, =gUnknown_085EB169 + ldr r2, =gText_SomeonesPC movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -829,7 +829,7 @@ _080E24B0: bl PrintTextOnWindow _080E24C6: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EB183 + ldr r1, =gText_PlayersPC adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r6, 0 @@ -1677,7 +1677,7 @@ CreateStartMenu: @ 80E2BAC adds r0, r4, 0 movs r1, 0 bl SetStandardWindowBorderStyle - ldr r2, =gUnknown_085EB25C + ldr r2, =gText_MenuOptionPokedex movs r0, 0x9 str r0, [sp] movs r5, 0xFF @@ -1688,7 +1688,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB264 + ldr r2, =gText_MenuOptionPokemon movs r0, 0x19 str r0, [sp] str r5, [sp, 0x4] @@ -1697,7 +1697,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB26C + ldr r2, =gText_MenuOptionBag movs r0, 0x29 str r0, [sp] str r5, [sp, 0x4] @@ -1706,7 +1706,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB270 + ldr r2, =gText_MenuOptionPokenav movs r0, 0x39 str r0, [sp] str r5, [sp, 0x4] @@ -1725,7 +1725,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB279 + ldr r2, =gText_MenuOptionSave movs r0, 0x59 str r0, [sp] str r5, [sp, 0x4] @@ -1734,7 +1734,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB27E + ldr r2, =gText_MenuOptionOption movs r0, 0x69 str r0, [sp] str r5, [sp, 0x4] @@ -1743,7 +1743,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB285 + ldr r2, =gText_MenuOptionExit movs r0, 0x79 str r0, [sp] str r5, [sp, 0x4] diff --git a/asm/secret_base.s b/asm/secret_base.s index 5cf0f3697..fd4fe6701 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -1576,7 +1576,7 @@ sub_80E9780: @ 80E9780 ldrb r1, [r0] adds r0, r6, 0 bl ConvertInternationalString - ldr r1, =gUnknown_085EA72F + ldr r1, =gText_ApostropheSBase adds r0, r6, 0 bl StringAppend pop {r3} @@ -2204,7 +2204,7 @@ sub_80E9C9C: @ 80E9C9C b _080E9D1A .pool _080E9D10: - ldr r1, =gUnknown_085EA785 + ldr r1, =gText_NoRegistry ldr r2, =task_pc_turn_off adds r0, r6, 0 bl DisplayItemMessageOnField @@ -2583,7 +2583,7 @@ sub_80E9FFC: @ 80E9FFC ldrb r1, [r4, 0x8] bl sub_80E9780 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA737 + ldr r1, =gText_OkayToDeleteFromRegistry adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_80EA06C @@ -2683,7 +2683,7 @@ sub_80EA120: @ 80EA120 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_085EA762 + ldr r1, =gText_RegisteredDataDeleted ldr r2, =sub_80EA08C bl DisplayItemMessageOnField pop {r0} diff --git a/asm/shop.s b/asm/shop.s index 9e03399fc..646390732 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -325,14 +325,14 @@ Task_ExitSellMenu: @ 80DFCF8 ldrb r0, [r0, 0xF] cmp r0, 0x2 bne _080DFD2C - ldr r1, =gUnknown_085E95C7 + ldr r1, =gText_CanIHelpWithAnythingElse ldr r2, =ReturnToShopMenuAfterExitingSellMenu adds r0, r4, 0 bl DisplayItemMessageOnField b _080DFD36 .pool _080DFD2C: - ldr r1, =gUnknown_085E959B + ldr r1, =gText_AnythingElseICanHelp ldr r2, =ReturnToShopMenuAfterExitingSellMenu adds r0, r5, 0 bl DisplayItemMessageOnField @@ -748,7 +748,7 @@ _080E00D8: b _080E00EA .pool _080E00E8: - ldr r4, =gUnknown_085E93E0 + ldr r4, =gText_QuitShopping _080E00EA: movs r0, 0x2 movs r1, 0 @@ -817,7 +817,7 @@ _080E0164: bl ConvertIntToDecimalStringN _080E0176: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E969C + ldr r1, =gText_PokedollarVar1 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x7 @@ -2060,7 +2060,7 @@ _080E0B92: lsls r0, 24 cmp r0, 0 bne _080E0BD0 - ldr r1, =gUnknown_085E9539 + ldr r1, =gText_YouDontHaveMoney ldr r2, =BuyMenuReturnToItemList b _080E0C28 .pool @@ -2091,11 +2091,11 @@ _080E0BD0: adds r1, r0 adds r0, r4, 0 bl StringCopy - ldr r1, =gUnknown_085E9417 + ldr r1, =gText_Var1CertainlyHowMany2 b _080E0C26 .pool _080E0C24: - ldr r1, =gUnknown_085E93EF + ldr r1, =gText_Var1CertainlyHowMany _080E0C26: ldr r2, =Task_BuyHowManyDialogueInit _080E0C28: @@ -2121,13 +2121,13 @@ _080E0C38: cmp r0, 0x1 bne _080E0C7C ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9468 + ldr r1, =gText_Var1IsItThatllBeVar2 bl StringExpandPlaceholders b _080E0C84 .pool _080E0C7C: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9493 + ldr r1, =gText_YouWantedVar1ThatllBeVar2 bl StringExpandPlaceholders _080E0C84: ldr r1, =gStringVar4 @@ -2171,7 +2171,7 @@ Task_BuyHowManyDialogueInit: @ 80E0CA4 movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E93D5 + ldr r1, =gText_InBagVar1 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -2319,7 +2319,7 @@ _080E0DF0: movs r2, 0 movs r3, 0x6 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085E943F + ldr r1, =gText_Var1AndYouWantedVar2 ldr r2, =BuyMenuConfirmPurchase adds r0, r6, 0 bl BuyMenuDisplayMessage @@ -2400,7 +2400,7 @@ BuyMenuTryMakePurchase: @ 80E0EDC lsrs r0, 24 cmp r0, 0x1 bne _080E0F30 - ldr r1, =gUnknown_085E94C5 + ldr r1, =gText_HereYouGoThankYou ldr r2, =BuyMenuSubtractMoney adds r0, r5, 0 bl BuyMenuDisplayMessage @@ -2409,7 +2409,7 @@ BuyMenuTryMakePurchase: @ 80E0EDC b _080E0F7A .pool _080E0F30: - ldr r1, =gUnknown_085E9558 + ldr r1, =gText_NoMoreRoomForThis ldr r2, =BuyMenuReturnToItemList b _080E0F60 .pool @@ -2422,11 +2422,11 @@ _080E0F40: ldrb r0, [r6, 0xF] cmp r0, 0x1 bne _080E0F5C - ldr r1, =gUnknown_085E94E7 + ldr r1, =gText_ThankYouIllSendItHome b _080E0F5E .pool _080E0F5C: - ldr r1, =gUnknown_085E9510 + ldr r1, =gText_ThanksIllSendItHome _080E0F5E: ldr r2, =BuyMenuSubtractMoney _080E0F60: @@ -2435,7 +2435,7 @@ _080E0F60: b _080E0F7A .pool _080E0F70: - ldr r1, =gUnknown_085E957F + ldr r1, =gText_SpaceForVar1Full ldr r2, =BuyMenuReturnToItemList adds r0, r7, 0 bl BuyMenuDisplayMessage @@ -2536,7 +2536,7 @@ Task_ReturnToItemListAfterItemPurchase: @ 80E100C lsrs r0, 24 cmp r0, 0x1 bne _080E106C - ldr r1, =gUnknown_085E95EA + ldr r1, =gText_ThrowInPremierBall ldr r2, =BuyMenuReturnToItemList adds r0, r4, 0 bl BuyMenuDisplayMessage diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 6fdd1a214..6bd62ed9f 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -976,7 +976,7 @@ sub_812ACF4: @ 812ACF4 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, =gUnknown_085EF734 + ldr r2, =gText_YouDontHaveThreeCoins movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -1544,7 +1544,7 @@ sub_812B158: @ 812B158 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, =gUnknown_085EF6E9 + ldr r2, =gText_QuitTheGame movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -1634,7 +1634,7 @@ sub_812B214: @ 812B214 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, =gUnknown_085EF6F8 + ldr r2, =gText_YouveGot9999Coins movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -1687,7 +1687,7 @@ sub_812B280: @ 812B280 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, =gUnknown_085EF710 + ldr r2, =gText_YouveRunOutOfCoins movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -7209,7 +7209,7 @@ sub_812DD78: @ 812DD78 str r0, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, =gUnknown_085EF750 + ldr r0, =gText_ReelTimeHelp str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 diff --git a/asm/start_menu.s b/asm/start_menu.s index f71df1046..4f8544eea 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -1862,7 +1862,7 @@ _080A0710: bl PrintTextOnWindow movs r4, 0x11 ldrb r0, [r6] - ldr r2, =gUnknown_085EED26 + ldr r2, =gText_SavingPlayer str r4, [sp] mov r1, r8 str r1, [sp, 0x4] @@ -1887,7 +1887,7 @@ _080A0710: bl sub_819A024 movs r4, 0x21 ldrb r0, [r6] - ldr r2, =gUnknown_085EED2D + ldr r2, =gText_SavingBadges str r4, [sp] mov r1, r8 str r1, [sp, 0x4] @@ -1922,7 +1922,7 @@ _080A0710: bne _080A0802 movs r4, 0x31 ldrb r0, [r6] - ldr r2, =gUnknown_085EED34 + ldr r2, =gText_SavingPokedex str r4, [sp] mov r1, r8 str r1, [sp, 0x4] @@ -1952,7 +1952,7 @@ _080A0710: _080A0802: adds r4, 0x10 ldrb r0, [r6] - ldr r2, =gUnknown_085EED3C + ldr r2, =gText_SavingTime lsls r4, 24 lsrs r4, 24 str r4, [sp] diff --git a/asm/trade.s b/asm/trade.s index 3f9323971..77eaac095 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -9004,7 +9004,7 @@ _0807C0F8: .pool _0807C120: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE942 + ldr r1, =gText_XWillBeSentToY adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -9070,7 +9070,7 @@ _0807C178: adds r0, 0x1 strh r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE959 + ldr r1, =gText_ByeByeVar1 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -10471,7 +10471,7 @@ _0807CDDC: movs r0, 0 bl SetGpuReg ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE966 + ldr r1, =gText_XSentOverY adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -10542,7 +10542,7 @@ _0807CE70: movs r5, 0 strh r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE977 + ldr r1, =gText_TakeGoodCareOfX adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -11066,7 +11066,7 @@ _0807D4D4: .pool _0807D4FC: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE942 + ldr r1, =gText_XWillBeSentToY adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -11132,7 +11132,7 @@ _0807D554: adds r0, 0x1 strh r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE959 + ldr r1, =gText_ByeByeVar1 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -12576,7 +12576,7 @@ _0807E228: movs r0, 0 bl SetGpuReg ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE966 + ldr r1, =gText_XSentOverY adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -12647,7 +12647,7 @@ _0807E2BC: movs r5, 0 strh r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE977 + ldr r1, =gText_TakeGoodCareOfX adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -13751,7 +13751,7 @@ _0807ED10: adds r0, 0x1 strb r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF6D2 + ldr r1, =gText_CommunicationStandby5 b _0807EDA6 .pool _0807ED2C: @@ -14634,7 +14634,7 @@ _0807F4C0: movs r0, 0x1 strb r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF6D2 + ldr r1, =gText_CommunicationStandby5 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 diff --git a/asm/trader.s b/asm/trader.s index e93bceccb..877d17382 100644 --- a/asm/trader.s +++ b/asm/trader.s @@ -87,7 +87,7 @@ sub_8133A78: @ 8133A78 ldr r0, [r0] str r0, [sp, 0xC] str r1, [sp, 0x10] - ldr r1, =gUnknown_085EB7EA + ldr r1, =gText_Exit movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -193,7 +193,7 @@ _08133B94: cmp r5, 0x3 bls _08133B3C ldrb r0, [r7, 0x6] - ldr r2, =gUnknown_085EB7EA + ldr r2, =gText_Exit lsls r1, r5, 4 adds r1, 0x1 lsls r1, 24 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index ec0b58653..7552d7ace 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -410,7 +410,7 @@ _080C2A2C: movs r0, 0 movs r1, 0x1 bl sub_81973C4 - ldr r2, =gUnknown_085ED042 + ldr r2, =gText_WaitingTrainerFinishReading movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -1714,7 +1714,7 @@ sub_80C3548: @ 80C3548 sub_80C3574: @ 80C3574 push {r4,r5,lr} sub sp, 0x2C - ldr r1, =gUnknown_085ECF71 + ldr r1, =gText_TrainerCardName add r0, sp, 0xC bl StringCopy adds r5, r0, 0 @@ -1775,7 +1775,7 @@ _080C35FA: sub_80C3608: @ 80C3608 push {r4,lr} sub sp, 0x2C - ldr r1, =gUnknown_085ECF78 + ldr r1, =gText_TrainerCardIDNo add r0, sp, 0xC bl StringCopy ldr r4, =gUnknown_02039CE8 @@ -1842,7 +1842,7 @@ sub_80C3684: @ 80C3684 movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ECF7E + ldr r0, =gText_TrainerCardMoney str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -1857,7 +1857,7 @@ _080C36C4: movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ECF7E + ldr r0, =gText_TrainerCardMoney str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -1876,7 +1876,7 @@ _080C36DE: movs r3, 0x6 bl ConvertIntToDecimalStringN ldr r5, =gStringVar4 - ldr r1, =gUnknown_085E969C + ldr r1, =gText_PokedollarVar1 adds r0, r5, 0 bl StringExpandPlaceholders ldr r0, [r4] @@ -1958,7 +1958,7 @@ sub_80C378C: @ 80C378C movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ECF86 + ldr r0, =gText_TrainerCardPokedex str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -1973,7 +1973,7 @@ _080C37DC: movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ECF86 + ldr r0, =gText_TrainerCardPokedex str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -1992,7 +1992,7 @@ _080C37F6: movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085ECF8E + ldr r1, =gText_EmptyString6 bl StringCopy ldr r0, [r4] ldr r1, =0x0000052b @@ -2054,7 +2054,7 @@ sub_80C3880: @ 80C3880 movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ECF99 + ldr r0, =gText_TrainerCardTime str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -2069,7 +2069,7 @@ _080C38C8: movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ECF99 + ldr r0, =gText_TrainerCardTime str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -2105,7 +2105,7 @@ _080C391C: bls _080C3922 movs r6, 0x3B _080C3922: - ldr r1, =gUnknown_085ECF8F + ldr r1, =gText_Colon2 movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -2172,7 +2172,7 @@ _080C395C: ldr r0, [r0] str r0, [sp] str r5, [sp, 0x4] - ldr r0, =gUnknown_085ECF8F + ldr r0, =gText_Colon2 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -2331,7 +2331,7 @@ sub_80C3AF0: @ 80C3AF0 bl StringCopy ldr r0, [r4] adds r0, 0x4D - ldr r1, =gUnknown_085ECFA6 + ldr r1, =gText_Var1sTrainerCard bl StringExpandPlaceholders _080C3B30: pop {r4} @@ -2512,7 +2512,7 @@ sub_80C3CCC: @ 80C3CCC ldrb r0, [r2, 0xB] cmp r0, 0 beq _080C3CE4 - ldr r1, =gUnknown_085ECFB8 + ldr r1, =gText_HallOfFameDebut adds r2, 0x93 ldr r3, =gUnknown_0856FB0F movs r0, 0 @@ -2585,7 +2585,7 @@ sub_80C3D60: @ 80C3D60 adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085ECFED + ldr r1, =gText_WinsLosses adds r0, r4, 0 bl StringExpandPlaceholders ldr r1, [r5] @@ -2631,7 +2631,7 @@ sub_80C3DF0: @ 80C3DF0 ldrb r0, [r2, 0x10] cmp r0, 0 beq _080C3E0A - ldr r1, =gUnknown_085ED010 + ldr r1, =gText_PokemonTrades ldr r0, =0x00000237 adds r2, r0 ldr r3, =gUnknown_0856FB0F @@ -2685,7 +2685,7 @@ sub_80C3E58: @ 80C3E58 ldr r0, [r0] cmp r0, 0 beq _080C3E80 - ldr r1, =gUnknown_085ED036 + ldr r1, =gText_BerryCrush ldr r0, =0x000002c3 adds r2, r0 ldr r3, =gUnknown_0856FB0F @@ -2738,7 +2738,7 @@ sub_80C3ED4: @ 80C3ED4 ldr r0, [r0] cmp r0, 0 beq _080C3EFC - ldr r1, =gUnknown_085ED01F + ldr r1, =gText_UnionTradesAndBattles ldr r0, =0x0000034f adds r2, r0 ldr r3, =gUnknown_0856FB0F @@ -2773,7 +2773,7 @@ sub_80C3F14: @ 80C3F14 ldr r0, [r4] ldr r1, =0x00000395 adds r0, r1 - ldr r1, =gUnknown_085ED096 + ldr r1, =gText_Var1DarkGreyShadowLightGrey bl StringExpandPlaceholders _080C3F46: pop {r4} @@ -2797,7 +2797,7 @@ sub_80C3F64: @ 80C3F64 ldrh r0, [r0] cmp r0, 0 beq _080C3F8C - ldr r1, =gUnknown_085ED085 + ldr r1, =gText_PokeblocksWithFriends ldr r0, =0x00000395 adds r2, r0 ldr r3, =gUnknown_0856FB0F @@ -2852,7 +2852,7 @@ sub_80C3FE0: @ 80C3FE0 ldrh r0, [r0] cmp r0, 0 beq _080C4008 - ldr r1, =gUnknown_085ED09F + ldr r1, =gText_WonContestsWFriends ldr r0, =0x000003db adds r2, r0 ldr r3, =gUnknown_0856FB0F @@ -2902,7 +2902,7 @@ _080C4044: ldr r0, [r4] ldr r1, =0x00000421 adds r0, r1 - ldr r1, =gUnknown_085ED0E0 + ldr r1, =gText_WSlashStraightSlash bl StringExpandPlaceholders b _080C40B6 .pool @@ -2920,7 +2920,7 @@ _080C4094: ldr r0, [r4] ldr r1, =0x00000421 adds r0, r1 - ldr r1, =gUnknown_085ED0C8 + ldr r1, =gText_Var1DarkLightGreyBP bl StringExpandPlaceholders _080C40B6: pop {r4} @@ -2949,7 +2949,7 @@ _080C40F0: ldrb r0, [r2, 0xD] cmp r0, 0 beq _080C412C - ldr r1, =gUnknown_085ED0D3 + ldr r1, =gText_BattleTower ldr r0, =0x00000421 adds r2, r0 ldr r3, =gUnknown_0856FB0C @@ -2963,7 +2963,7 @@ _080C4114: ldrh r0, [r0] cmp r0, 0 beq _080C412C - ldr r1, =gUnknown_085ED0B6 + ldr r1, =gText_BattlePtsWon ldr r0, =0x00000421 adds r2, r0 ldr r3, =gUnknown_0856FB0F @@ -6346,7 +6346,7 @@ _080C5DC2: lsrs r4, r0, 24 cmp r4, 0x4 bls _080C5DC2 - ldr r4, =gUnknown_085ED8FF + ldr r4, =gText_SymbolsEarned movs r0, 0x1 adds r1, r4, 0 movs r2, 0x60 @@ -6362,7 +6362,7 @@ _080C5DC2: movs r1, 0x1 movs r3, 0x5 bl box_print - ldr r4, =gUnknown_085ED90E + ldr r4, =gText_BattleRecord movs r0, 0x1 adds r1, r4, 0 movs r2, 0x60 @@ -6380,7 +6380,7 @@ _080C5DC2: str r6, [sp] mov r0, r8 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ED91C + ldr r0, =gText_BattlePoints str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0x8 diff --git a/asm/tv.s b/asm/tv.s index 2ebdfc0a1..3d57b3dba 100644 --- a/asm/tv.s +++ b/asm/tv.s @@ -7811,7 +7811,7 @@ GetMomOrDadStringForTVMessage: @ 80F00A4 cmp r0, 0 bne _080F0104 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD08 + ldr r1, =gText_Mom bl StringCopy ldr r0, =0x00004003 movs r1, 0x1 @@ -7824,7 +7824,7 @@ _080F00EC: cmp r0, 0x2 bne _080F0104 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD08 + ldr r1, =gText_Mom bl StringCopy ldr r0, =0x00004003 movs r1, 0x1 @@ -7859,13 +7859,13 @@ _080F0104: bne _080F0158 _080F0142: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD08 + ldr r1, =gText_Mom bl StringCopy b _080F01A8 .pool _080F0158: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD04 + ldr r1, =gText_Dad bl StringCopy b _080F01A8 .pool @@ -7878,7 +7878,7 @@ _080F016C: cmp r0, 0 beq _080F0198 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD08 + ldr r1, =gText_Mom bl StringCopy adds r0, r4, 0 movs r1, 0x1 @@ -7887,7 +7887,7 @@ _080F016C: .pool _080F0198: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD04 + ldr r1, =gText_Dad bl StringCopy adds r0, r4, 0 movs r1, 0x2 @@ -10790,13 +10790,13 @@ _080F1A40: cmp r0, 0x32 bne _080F1A58 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAEB1 + ldr r1, =gText_Lv50 bl StringCopy b _080F1A60 .pool _080F1A58: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAEB8 + ldr r1, =gText_OpenLevel bl StringCopy _080F1A60: ldrh r1, [r4, 0x16] @@ -12536,31 +12536,31 @@ _080F2C08: .4byte _080F2C6C _080F2C1C: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB0E8 + ldr r1, =gText_Cool bl StringCopy b _080F2C74 .pool _080F2C30: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB0ED + ldr r1, =gText_Beauty bl StringCopy b _080F2C74 .pool _080F2C44: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB0F4 + ldr r1, =gText_Cute bl StringCopy b _080F2C74 .pool _080F2C58: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB0F9 + ldr r1, =gText_Smart bl StringCopy b _080F2C74 .pool _080F2C6C: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB0FF + ldr r1, =gText_Tough bl StringCopy _080F2C74: ldr r0, =gStringVar2 @@ -13154,13 +13154,13 @@ _080F31CA: cmp r0, 0 bne _080F3200 ldr r0, =gStringVar3 - ldr r1, =gUnknown_085ECB64 + ldr r1, =gText_Single bl StringCopy b _080F3208 .pool _080F3200: ldr r0, =gStringVar3 - ldr r1, =gUnknown_085ECB6B + ldr r1, =gText_Double bl StringCopy _080F3208: ldr r1, =gUnknown_0203A030 @@ -13369,38 +13369,38 @@ _080F3430: .4byte _080F3494 _080F3444: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB48 + ldr r1, =gText_Spicy2 bl StringCopy b _080F349C .pool _080F3458: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB4E + ldr r1, =gText_Dry2 bl StringCopy b _080F349C .pool _080F346C: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB52 + ldr r1, =gText_Sweet2 bl StringCopy b _080F349C .pool _080F3480: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB58 + ldr r1, =gText_Bitter2 bl StringCopy b _080F349C .pool _080F3494: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB5F + ldr r1, =gText_Sour2 bl StringCopy _080F349C: ldrb r0, [r4, 0x2] cmp r0, 0x18 bls _080F34BC ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB2A + ldr r1, =gText_Excellent bl StringCopy b _080F34DC .pool @@ -13408,13 +13408,13 @@ _080F34BC: cmp r0, 0x16 bls _080F34D4 ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB20 + ldr r1, =gText_VeryGood bl StringCopy b _080F34DC .pool _080F34D4: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB1B + ldr r1, =gText_Good bl StringCopy _080F34DC: ldr r0, =gStringVar3 @@ -13454,38 +13454,38 @@ _080F3524: .4byte _080F3588 _080F3538: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB48 + ldr r1, =gText_Spicy2 bl StringCopy b _080F3590 .pool _080F354C: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB4E + ldr r1, =gText_Dry2 bl StringCopy b _080F3590 .pool _080F3560: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB52 + ldr r1, =gText_Sweet2 bl StringCopy b _080F3590 .pool _080F3574: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB58 + ldr r1, =gText_Bitter2 bl StringCopy b _080F3590 .pool _080F3588: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB5F + ldr r1, =gText_Sour2 bl StringCopy _080F3590: ldrb r0, [r4, 0x2] cmp r0, 0x10 bls _080F35B0 ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB34 + ldr r1, =gText_SoSo bl StringCopy b _080F35D0 .pool @@ -13493,13 +13493,13 @@ _080F35B0: cmp r0, 0xD bls _080F35C8 ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB3A + ldr r1, =gText_Bad bl StringCopy b _080F35D0 .pool _080F35C8: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB3E + ldr r1, =gText_TheWorst bl StringCopy _080F35D0: ldr r0, =gStringVar3 @@ -14418,13 +14418,13 @@ _080F3ECC: .pool _080F3EE8: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB0C + ldr r1, =gText_Slots bl StringCopy b _080F3F04 .pool _080F3EFC: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB12 + ldr r1, =gText_Roulette bl StringCopy _080F3F04: ldrb r1, [r4, 0x2] @@ -14455,13 +14455,13 @@ _080F3F28: .pool _080F3F44: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB0C + ldr r1, =gText_Slots bl StringCopy b _080F3F60 .pool _080F3F58: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB12 + ldr r1, =gText_Roulette bl StringCopy _080F3F60: ldrh r1, [r4, 0x4] @@ -14485,13 +14485,13 @@ _080F3F78: .pool _080F3F94: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB0C + ldr r1, =gText_Slots bl StringCopy b _080F3FB0 .pool _080F3FA8: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB12 + ldr r1, =gText_Roulette bl StringCopy _080F3FB0: ldrh r1, [r4, 0x4] @@ -14517,13 +14517,13 @@ _080F3FCC: .pool _080F3FE8: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB12 + ldr r1, =gText_Roulette bl StringCopy b _080F4004 .pool _080F3FFC: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB0C + ldr r1, =gText_Slots bl StringCopy _080F4004: bl TVShowDone @@ -15097,7 +15097,7 @@ DoTVShowPokemonLotterWinnerFlashReport: @ 80F45A0 cmp r0, 0 bne _080F45FC ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB72 + ldr r1, =gText_Jackpot bl StringCopy b _080F4634 .pool @@ -15105,7 +15105,7 @@ _080F45FC: cmp r0, 0x1 bne _080F4614 ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB7A + ldr r1, =gText_First bl StringCopy b _080F4634 .pool @@ -15113,13 +15113,13 @@ _080F4614: cmp r0, 0x2 bne _080F462C ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB80 + ldr r1, =gText_Second bl StringCopy b _080F4634 .pool _080F462C: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB87 + ldr r1, =gText_Third bl StringCopy _080F4634: ldr r4, =gStringVar3 diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s index 67441ee8b..20d23a878 100755 --- a/asm/use_pokeblock.s +++ b/asm/use_pokeblock.s @@ -1196,7 +1196,7 @@ sub_8166D44: @ 8166D44 bl GetMonData add r0, sp, 0xC bl StringGetEnd10 - ldr r1, =gUnknown_085EC7A0 + ldr r1, =gText_GetsAPokeBlockQuestion add r0, sp, 0xC bl StringAppend ldr r4, =gStringVar4 @@ -1426,7 +1426,7 @@ sub_8166F50: @ 8166F50 movs r1, 0x97 movs r2, 0xE bl sub_8098858 - ldr r2, =gUnknown_085EC800 + ldr r2, =gText_WontEatAnymore movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -1503,13 +1503,13 @@ _08166FEC: ldr r1, [r0] adds r0, r4, 0 bl StringCopy - ldr r1, =gUnknown_085EC7E1 + ldr r1, =gText_WasEnhanced adds r0, r4, 0 bl StringAppend b _08167018 .pool _08167010: - ldr r1, =gUnknown_085EC7EF + ldr r1, =gText_NothingChanged adds r0, r4, 0 bl StringCopy _08167018: @@ -2895,7 +2895,7 @@ sub_8167BA0: @ 8167BA0 ldr r0, [r7] ldr r6, =0x0000804a adds r0, r6 - ldr r1, =gUnknown_085EBF8D + ldr r1, =gText_NatureSlash bl StringCopy ldr r1, =gNatureNamePointers lsls r4, 2 diff --git a/asm/walda_phrase.s b/asm/walda_phrase.s index 2f1f7da60..9b27b99cb 100755 --- a/asm/walda_phrase.s +++ b/asm/walda_phrase.s @@ -53,7 +53,7 @@ _081D9A44: bl sub_80D2578 cmp r0, 0 beq _081D9A5C - ldr r0, =gUnknown_085EE49A + ldr r0, =gText_Peekaboo bl sub_80D255C b _081D9A68 .pool diff --git a/asm/wallclock.s b/asm/wallclock.s index 0d6f05a23..f8cc87fe8 100644 --- a/asm/wallclock.s +++ b/asm/wallclock.s @@ -353,7 +353,7 @@ Cb2_StartWallClock: @ 81349F4 movs r0, 0x5A strh r0, [r1, 0x30] bl sub_813498C - ldr r2, =gUnknown_085EFAE0 + ldr r2, =gText_Confirm3 movs r0, 0x1 str r0, [sp] mov r1, r8 @@ -500,7 +500,7 @@ _08134BA4: ldrh r0, [r0, 0xC] strh r0, [r1, 0x30] bl sub_813498C - ldr r2, =gUnknown_085EFAE8 + ldr r2, =gText_Cancel4 movs r0, 0x1 str r0, [sp] mov r1, r9 @@ -683,7 +683,7 @@ sub_8134DC4: @ 8134DC4 adds r2, r5, 0 movs r3, 0xD bl SetWindowBorderStyle - ldr r2, =gUnknown_085EFAC6 + ldr r2, =gText_IsThisTheCorrectTime movs r0, 0x1 str r0, [sp] movs r0, 0 diff --git a/data/battle_message.s b/data/battle_message.s index 03e1baa12..9addf0879 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -1214,10 +1214,10 @@ gText_GiveNicknameCaptured:: @ 85CBFDB gText_PkmnSentToPC:: @ 85CBFFF .string "{RIVAL} was sent to\n{STRING 39} PC.$" -gText_SomeonesPC:: @ 85CC015 +gText_Someones:: @ 85CC015 .string "someone’s$" -gText_LanettesPC:: @ 85CC01F +gText_Lanettes:: @ 85CC01F .string "LANETTE’s$" gText_PkmnDataAddedToDex:: @ 85CC029 diff --git a/data/link.s b/data/link.s index 3aa87ef67..38be746d9 100644 --- a/data/link.s +++ b/data/link.s @@ -1633,7 +1633,7 @@ gUnknown_082F025C:: @ 82F025C window_template 0x00, 0x12, 0x07, 0x10, 0x06, 0x0f, 0x0001 gUnknown_082F0264:: @ 82F0264 - .4byte gUnknown_085EA333, 0x00000001 + .4byte gText_Register, 0x00000001 .4byte gUnknown_082EFD8C, 0x00000002 .4byte gUnknown_082EFD7C, 0x00000003 @@ -1913,14 +1913,14 @@ gUnknown_082F0600:: @ 82F0600 .align 2 gUnknown_082F0608:: @ 82F0608 - .4byte gUnknown_085EEDEC, 0x00000000 - .4byte gUnknown_085EEDFC, 0x00000001 - .4byte gUnknown_085EEE28, 0xfffffffe + .4byte gText_WonderCards, 0x00000000 + .4byte gText_WonderNews, 0x00000001 + .4byte gText_Exit3, 0xfffffffe .align 2 gUnknown_082F0620:: @ 82F0620 - .4byte gUnknown_085EEE08, 0x00000000 - .4byte gUnknown_085EEE20, 0x00000001 + .4byte gText_WirelessCommunication, 0x00000000 + .4byte gText_Friend2, 0x00000001 .4byte gText_Cancel2, 0xfffffffe .align 2 @@ -1933,26 +1933,26 @@ gUnknown_082F0638:: @ 82F0638 struct ListMenuTemplate .align 2 gUnknown_082F0650:: @ 82F0650 - .4byte gUnknown_085EEE30, 0x00000000 - .4byte gUnknown_085EEE38, 0x00000001 - .4byte gUnknown_085EEE40, 0x00000002 + .4byte gText_Receive, 0x00000000 + .4byte gText_Send, 0x00000001 + .4byte gText_Toss, 0x00000002 .4byte gText_Cancel2, 0xfffffffe .align 2 gUnknown_082F0670:: @ 82F0670 - .4byte gUnknown_085EEE30, 0x00000000 - .4byte gUnknown_085EEE40, 0x00000002 + .4byte gText_Receive, 0x00000000 + .4byte gText_Toss, 0x00000002 .4byte gText_Cancel2, 0xfffffffe .align 2 gUnknown_082F0688:: @ 82F0688 - .4byte gUnknown_085EEE30, 0x00000000 - .4byte gUnknown_085EEE38, 0x00000001 + .4byte gText_Receive, 0x00000000 + .4byte gText_Send, 0x00000001 .4byte gText_Cancel2, 0xfffffffe .align 2 gUnknown_082F06A0:: @ 82F06A0 - .4byte gUnknown_085EEE30, 0x00000000 + .4byte gText_Receive, 0x00000000 .4byte gText_Cancel2, 0xfffffffe .align 2 @@ -1988,10 +1988,10 @@ gUnknown_082F06F8:: @ 82F06F8 .byte 0x21, 0x31, 0x00, 0x01 .align 2 - .4byte gUnknown_085EEE48 - .4byte gUnknown_085EEE8C - .4byte gUnknown_085EEEB8 - .4byte gUnknown_085EEED4 + .4byte gText_VarietyOfEventsImportedWireless + .4byte gText_WonderCardsInPossession + .4byte gText_ReadNewsThatArrived + .4byte gText_ReturnToTitle .align 2 gUnknown_082F0720:: @ 82F0720 struct TextColor @@ -2065,11 +2065,11 @@ gUnknown_082F0D3C:: @ 82F0D3C .align 2 gUnknown_082F0D5C:: @ 82F0D5C - .4byte gUnknown_085EED41 - .4byte gUnknown_085EED5F - .4byte gUnknown_085EED6F - .4byte gUnknown_085EED80 - .4byte gUnknown_085EED9A + .4byte gText_WirelessCommStatus + .4byte gText_PeopleTrading + .4byte gText_PeopleBattling + .4byte gText_PeopleInUnionRoom + .4byte gText_PeopleCommunicating .align 2 gUnknown_082F0D70:: @ 82F0D70 @@ -2780,37 +2780,37 @@ gUnknown_082F2C98:: @ 82F2C98 .align 2 gUnknown_082F2D40:: @ 82F2D40 - .4byte gUnknown_085ED265 + .4byte gText_QuitChatting .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 - .4byte gUnknown_085ED274 + .4byte gText_RegisterTextWhere .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 - .4byte gUnknown_085ED289 + .4byte gText_RegisterTextHere .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 - .4byte gUnknown_085ED29D + .4byte gText_InputText .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 - .4byte gUnknown_085ED2E8 + .4byte gText_ExitingChat .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 - .4byte gUnknown_085ED2FA + .4byte gText_LeaderLeftEndingChat .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00 - .4byte gUnknown_085ED325 + .4byte gText_RegisteredTextChanged .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 - .4byte gUnknown_085ED368 + .4byte gText_AlreadySavedFile .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 - .4byte gUnknown_085ED3A3 + .4byte gText_SavingDontTurnOff .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 - .4byte gUnknown_085ED3C5 + .4byte gText_PlayerSavedGame .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 - .4byte gUnknown_085ED3D8 + .4byte gText_IfLeaderLeavesChatEnds .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 .align 2 @@ -2819,11 +2819,11 @@ gText_Ellipsis:: @ 82F2DC4 .align 2 gUnknown_082F2DC8:: @ 82F2DC8 - .4byte gUnknown_085ED23C, 0x00000000 - .4byte gUnknown_085ED242, 0x00000000 - .4byte gUnknown_085ED24F, 0x00000000 - .4byte gUnknown_085ED257, 0x00000000 - .4byte gUnknown_085ED260, 0x00000000 + .4byte gText_Upper, 0x00000000 + .4byte gText_Lower, 0x00000000 + .4byte gText_Symbols, 0x00000000 + .4byte gText_Register2, 0x00000000 + .4byte gText_Exit2, 0x00000000 .align 2 gUnknown_082F2DF0:: @ 82F2DF0 @@ -3002,15 +3002,15 @@ gUnknown_082F3290:: @ 82F3290 .align 2 gUnknown_082F32A4:: @ 82F32A4 - .4byte gUnknown_085ED5F0 - .4byte gUnknown_085ED62C - .4byte gUnknown_085ED65C - .4byte gUnknown_085ED6C8 - .4byte gUnknown_085ED704 - .4byte gUnknown_085ED724 - .4byte gUnknown_085ED754 - .4byte gUnknown_085ED788 - .4byte gUnknown_085ED7BC + .4byte gText_ReadyToBerryCrush + .4byte gText_WaitForAllChooseBerry + .4byte gText_EndedWithXUnitsPowder + .4byte gText_RecordingGameResults + .4byte gText_PlayBerryCrushAgain + .4byte gText_YouHaveNoBerries + .4byte gText_MemberDroppedOut + .4byte gText_TimesUpNoGoodPowder + .4byte gText_CommunicationStandby2 .align 2 gUnknown_082F32C8:: @ 82F32C8 struct BgTemplate @@ -3307,12 +3307,12 @@ gUnknown_082F4384:: @ 82F4384 .align 2 gUnknown_082F43B4:: @ 82F43B4 - .4byte gUnknown_085ED7E8 - .4byte gUnknown_085ED7F4 - .4byte gUnknown_085ED7FC - .4byte gUnknown_085ED88C - .4byte gUnknown_085ED8A0 - .4byte gUnknown_085ED8B8 + .4byte gText_SpaceTimes2 + .4byte gText_XDotY + .4byte gText_Var1Berry + .4byte gText_NeatnessRankings + .4byte gText_CoopRankings + .4byte gText_PressingPowerRankings .align 2 gUnknown_082F43CC:: @ 82F43CC @@ -3575,9 +3575,9 @@ gUnknown_082F7B2C:: @ 82F7B2C .align 2 gUnknown_082F7B34:: @ 82F7B34 - .4byte gUnknown_085EDD02 - .4byte gUnknown_085EDD12 - .4byte gUnknown_085EDD1E + .4byte gText_BerriesPicked + .4byte gText_BestScore + .4byte gText_BerriesInRowFivePlayers .align 2 gUnknown_082F7B40:: @ 82F7B40 @@ -4040,11 +4040,11 @@ gUnknown_082FB3C8:: @ 82FB3C8 .align 2 gUnknown_082FB3DC:: @ 82FB3DC - .4byte gUnknown_085EDDAE - .4byte gUnknown_085EDDB1 - .4byte gUnknown_085EDDB4 - .4byte gUnknown_085EDDB7 - .4byte gUnknown_085EDDBA + .4byte gText_1Colon + .4byte gText_2Colon + .4byte gText_3Colon + .4byte gText_4Colon + .4byte gText_5Colon .align 2 gUnknown_082FB3F0:: @ 82FB3F0 @@ -4632,9 +4632,9 @@ gUnknown_082FE270:: @ 82FE270 .align 2 gUnknown_082FE278:: @ 82FE278 - .4byte gUnknown_085EDEA2 - .4byte gUnknown_085EDEB2 - .4byte gUnknown_085EDEBE + .4byte gText_JumpsInARow + .4byte gText_BestScore2 + .4byte gText_ExcellentsInARow .align 2 gPkmnJump321StartPal1:: @ 82FE284 diff --git a/data/strings.s b/data/strings.s index 30143a91b..4d0183a4c 100644 --- a/data/strings.s +++ b/data/strings.s @@ -490,7 +490,7 @@ gText_ThePC:: @ 85E9178 .string "the PC$" .align 2 -gUnknown_085E9180:: @ 85E9180 +gReturnToXStringsTable:: @ 85E9180 .4byte gText_TheField .4byte gText_TheBattle .4byte gText_ThePokemonList @@ -505,7 +505,7 @@ gUnknown_085E9180:: @ 85E9180 .4byte gText_ThePC .align 2 -gUnknown_085E91B0:: @ 85E91B0 +gReturnToXStringsTable2:: @ 85E91B0 .4byte gText_TheField .4byte gText_TheBattle .4byte gText_ThePokemonList @@ -531,7 +531,7 @@ gText_KeyItemsPocket:: @ 85E91F1 .string "KEY ITEMS$" .align 2 -gPocketNames:: @ 85E91FC +gPocketNamesStringsTable:: @ 85E91FC .4byte gText_ItemsPocket .4byte gText_PokeBallsPocket .4byte gText_TMHMPocket @@ -539,29 +539,30 @@ gPocketNames:: @ 85E91FC .4byte gText_KeyItemsPocket .align 2 -gUnknown_085E9210:: @ 85E9210 +gText_UnkF908Var1Clear7Var2:: @ 85E9210 .string "{UNK_CTRL_F908}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}$" -gUnknown_085E921A:: @ 85E921A +gText_ClearTo11Var1Clear5Var2:: @ 85E921A .string "{CLEAR_TO 0x11}{STR_VAR_1}{CLEAR 0x05}{STR_VAR_2}$" -gUnknown_085E9225:: @ 85E9225 +gText_SizeSlash:: @ 85E9225 .string "SIZE /$" -gUnknown_085E922C:: @ 85E922C +gText_FirmSlash:: @ 85E922C .string "FIRM /$" -gUnknown_085E9233:: @ 85E9233 +gText_Var1DotVar2:: @ 85E9233 .string "{STR_VAR_1}.{STR_VAR_2}”$" .include "data/text/berry_firmness_strings.inc" -gUnknown_085E9263:: @ 85E9263 +gText_UnkF908Var1Var2:: @ 85E9263 .string "{UNK_CTRL_F908}{STR_VAR_1} {STR_VAR_2}$" -gUnknown_085E926B:: @ 85E926B +gText_BerryTag:: @ 85E926B .string "BERRY TAG$" + .string "RED {POKEBLOCK}$" .string "BLUE {POKEBLOCK}$" .string "PINK {POKEBLOCK}$" @@ -577,109 +578,112 @@ gUnknown_085E926B:: @ 85E926B .string "WHITE {POKEBLOCK}$" .string "GOLD {POKEBLOCK}$" -gUnknown_085E931D:: @ 85E931D +gText_Spicy:: @ 85E931D .string "SPICY$" -gUnknown_085E9323:: @ 85E9323 +gText_Dry:: @ 85E9323 .string "DRY$" -gUnknown_085E9327:: @ 85E9327 +gText_Sweet:: @ 85E9327 .string "SWEET$" -gUnknown_085E932D:: @ 85E932D +gText_Bitter:: @ 85E932D .string "BITTER$" -gUnknown_085E9334:: @ 85E9334 +gText_Sour:: @ 85E9334 .string "SOUR$" + .string "TASTY$" .string "FEEL$" -gUnknown_085E9344:: @ 85E9344 +gText_StowCase:: @ 85E9344 .string "Stow CASE.$" -gUnknown_085E934F:: @ 85E934F +gText_LvVar1:: @ 85E934F .string "{LV}{STR_VAR_1}$" -gUnknown_085E9353:: @ 85E9353 +gText_ThrowAwayVar1:: @ 85E9353 .string "Throw away this\n{STR_VAR_1}?$" -gUnknown_085E9367:: @ 85E9367 +gText_Var1ThrownAway:: @ 85E9367 .string "The {STR_VAR_1}\nwas thrown away.$" -gUnknown_085E937F:: @ 85E937F +gText_Var1AteTheVar2:: @ 85E937F .string "{STR_VAR_1} ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9390:: @ 85E9390 +gText_Var1HappilyAteVar2:: @ 85E9390 .string "{STR_VAR_1} happily ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E93A9:: @ 85E93A9 +gText_Var1DisdainfullyAteVar2:: @ 85E93A9 .string "{STR_VAR_1} disdainfully ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" + .string "BUY$" .string "SELL$" .string "QUIT$" -gUnknown_085E93D5:: @ 85E93D5 +gText_InBagVar1:: @ 85E93D5 .string "IN BAG: {STR_VAR_1}$" -gUnknown_085E93E0:: @ 85E93E0 +gText_QuitShopping:: @ 85E93E0 .string "Quit shopping.$" -gUnknown_085E93EF:: @ 85E93EF +gText_Var1CertainlyHowMany:: @ 85E93EF .string "{STR_VAR_1}? Certainly.\nHow many would you like?$" -gUnknown_085E9417:: @ 85E9417 +gText_Var1CertainlyHowMany2:: @ 85E9417 .string "{STR_VAR_1}? Certainly.\nHow many would you like?$" -gUnknown_085E943F:: @ 85E943F +gText_Var1AndYouWantedVar2:: @ 85E943F .string "{STR_VAR_1}? And you wanted {STR_VAR_2}?\nThat will be ¥{STR_VAR_3}.$" -gUnknown_085E9468:: @ 85E9468 +gText_Var1IsItThatllBeVar2:: @ 85E9468 .string "{STR_VAR_1}, is it?\nThat’ll be ¥{STR_VAR_2}. Do you want it?$" -gUnknown_085E9493:: @ 85E9493 +gText_YouWantedVar1ThatllBeVar2:: @ 85E9493 .string "You wanted {STR_VAR_1}?\nThat’ll be ¥{STR_VAR_2}. Will that be okay?$" -gUnknown_085E94C5:: @ 85E94C5 +gText_HereYouGoThankYou:: @ 85E94C5 .string "Here you go!\nThank you very much.$" -gUnknown_085E94E7:: @ 85E94E7 +gText_ThankYouIllSendItHome:: @ 85E94E7 .string "Thank you!\nI’ll send it to your home PC.$" -gUnknown_085E9510:: @ 85E9510 +gText_ThanksIllSendItHome:: @ 85E9510 .string "Thanks!\nI’ll send it to your PC at home.$" -gUnknown_085E9539:: @ 85E9539 +gText_YouDontHaveMoney:: @ 85E9539 .string "You don’t have enough money.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9558:: @ 85E9558 +gText_NoMoreRoomForThis:: @ 85E9558 .string "You have no more room for this\nitem.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E957F:: @ 85E957F +gText_SpaceForVar1Full:: @ 85E957F .string "The space for {STR_VAR_1} is full.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E959B:: @ 85E959B +gText_AnythingElseICanHelp:: @ 85E959B .string "Is there anything else I can help\nyou with?$" -gUnknown_085E95C7:: @ 85E95C7 +gText_CanIHelpWithAnythingElse:: @ 85E95C7 .string "Can I help you with anything else?$" -gUnknown_085E95EA:: @ 85E95EA +gText_ThrowInPremierBall:: @ 85E95EA .string "I’ll throw in a PREMIER BALL, too.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E960F:: @ 85E960F +gText_CantBuyKeyItem:: @ 85E960F .string "{STR_VAR_2}? Oh, no.\nI can’t buy that.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E962F:: @ 85E962F +gText_HowManyToSell:: @ 85E962F .string "{STR_VAR_2}?\nHow many would you like to sell?$" -gUnknown_085E9654:: @ 85E9654 +gText_ICanPayVar1:: @ 85E9654 .string "I can pay ¥{STR_VAR_1}.\nWould that be okay?$" -gUnknown_085E9677:: @ 85E9677 +gText_TurnedOverVar1ForVar2:: @ 85E9677 .string "Turned over the {STR_VAR_2}\nand received ¥{STR_VAR_1}.$" -gUnknown_085E969C:: @ 85E969C +gText_PokedollarVar1:: @ 85E969C .string "¥{STR_VAR_1}$" + .string "SHIFT$" .string "SEND OUT$" .string "SWITCH$" @@ -691,165 +695,167 @@ gUnknown_085E969C:: @ 85E969C .string "READ$" .string "TRADE$" -gUnknown_085E96E3:: @ 85E96E3 +gText_HP3:: @ 85E96E3 .string "HP$" -gUnknown_085E96E6:: @ 85E96E6 +gText_SpAtk3:: @ 85E96E6 .string "SP. ATK$" -gUnknown_085E96EE:: @ 85E96EE +gText_SpDef3:: @ 85E96EE .string "SP. DEF$" -gUnknown_085E96F6:: @ 85E96F6 +gText_WontHaveEffect:: @ 85E96F6 .string "It won’t have any effect.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9712:: @ 85E9712 +gText_CantBeUsedOnPkmn:: @ 85E9712 .string "This can’t be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9738:: @ 85E9738 +gText_PkmnCantSwitchOut:: @ 85E9738 .string "{STR_VAR_1} can’t be switched\nout!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9754:: @ 85E9754 +gText_PkmnAlreadyInBattle:: @ 85E9754 .string "{STR_VAR_1} is already\nin battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E976F:: @ 85E976F +gText_PkmnAlreadySelected:: @ 85E976F .string "{STR_VAR_1} has already been\nselected.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E978F:: @ 85E978F +gText_PkmnHasNoEnergy:: @ 85E978F .string "{STR_VAR_1} has no energy\nleft to battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E97B2:: @ 85E97B2 +gText_CantSwitchWithAlly:: @ 85E97B2 .string "You can’t switch {STR_VAR_1}’s\nPOKéMON with one of yours!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E97E5:: @ 85E97E5 +gText_EggCantBattle:: @ 85E97E5 .string "An EGG can’t battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E97FC:: @ 85E97FC +gText_CantUseUntilNewBadge:: @ 85E97FC .string "This can’t be used until a new\nBADGE is obtained.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9830:: @ 85E9830 +gText_NoMoreThanVar1Pkmn:: @ 85E9830 .string "No more than {STR_VAR_1} POKéMON\nmay enter.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9855:: @ 85E9855 +gText_SendMailToPC:: @ 85E9855 .string "Send the removed MAIL to\nyour PC?$" -gUnknown_085E9877:: @ 85E9877 +gText_MailSentToPC:: @ 85E9877 .string "The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9897:: @ 85E9897 +gText_PCMailboxFull:: @ 85E9897 .string "Your PC’s MAILBOX is full.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E98B4:: @ 85E98B4 +gText_MailMessageWillBeLost:: @ 85E98B4 .string "If the MAIL is removed, the\nmessage will be lost. Okay?$" -gUnknown_085E98EC:: @ 85E98EC +gText_RemoveMailBeforeItem:: @ 85E98EC .string "MAIL must be removed before\nholding an item.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E991B:: @ 85E991B +gText_PkmnWasGivenItem:: @ 85E991B .string "{STR_VAR_1} was given the\n{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E993A:: @ 85E993A +gText_SwitchPkmnItem:: @ 85E993A .string "{STR_VAR_1} is already holding\none {STR_VAR_2}.\pWould you like to switch the\ntwo items?$" -gUnknown_085E9980:: @ 85E9980 +gText_PkmnNotHolding:: @ 85E9980 .string "{STR_VAR_1} isn’t holding\nanything.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E999D:: @ 85E999D +gText_RecievedItemFromPkmn:: @ 85E999D .string "Received the {STR_VAR_2}\nfrom {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E99B8:: @ 85E99B8 +gText_MailTakenFromPkmn:: @ 85E99B8 .string "MAIL was taken from the\nPOKéMON.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E99DB:: @ 85E99DB +gText_SwitchedPkmnItem:: @ 85E99DB .string "The {STR_VAR_2} was taken and\nreplaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9A08:: @ 85E9A08 +gText_PkmnHoldingItemCantHoldMail:: @ 85E9A08 .string "This POKéMON is holding an\nitem. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9A40:: @ 85E9A40 +gText_MailTransferredFromMailbox:: @ 85E9A40 .string "MAIL was transferred from\nthe MAILBOX.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9A69:: @ 85E9A69 +gText_BagFullCouldNotRemoveItem:: @ 85E9A69 .string "The BAG is full. The POKéMON’s\nitem could not be removed.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9AA5:: @ 85E9AA5 +gText_PkmnLearnedMove3:: @ 85E9AA5 .string "{STR_VAR_1} learned\n{STR_VAR_2}!$" -gUnknown_085E9AB4:: @ 85E9AB4 +gText_PkmnCantLearnMove:: @ 85E9AB4 .string "{STR_VAR_1} and {STR_VAR_2}\nare not compatible.\p{STR_VAR_2} can’t be\nlearned.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9AE9:: @ 85E9AE9 +gText_PkmnNeedsToReplaceMove:: @ 85E9AE9 .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_085E9B5D:: @ 85E9B5D +gText_StopLearningMove2:: @ 85E9B5D .string "Stop trying to teach\n{STR_VAR_2}?$" -gUnknown_085E9B76:: @ 85E9B76 +gText_MoveNotLearned:: @ 85E9B76 .string "{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9B96:: @ 85E9B96 +gText_WhichMoveToForget:: @ 85E9B96 .string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9BB8:: @ 85E9BB8 +gText_12PoofForgotMove:: @ 85E9BB8 .string "1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd…{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9C00:: @ 85E9C00 +gText_PkmnAlreadyKnows:: @ 85E9C00 .string "{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9C17:: @ 85E9C17 +gText_PkmnHPRestoredByVar2:: @ 85E9C17 .string "{STR_VAR_1}’s HP was restored\nby {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9C3E:: @ 85E9C3E +gText_PkmnCuredOfPoison:: @ 85E9C3E .string "{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9C5F:: @ 85E9C5F +gText_PkmnCuredOfParalysis:: @ 85E9C5F .string "{STR_VAR_1} was cured of\nparalysis.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9C7C:: @ 85E9C7C +gText_PkmnWokeUp2:: @ 85E9C7C .string "{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9C8A:: @ 85E9C8A +gText_PkmnBurnHealed:: @ 85E9C8A .string "{STR_VAR_1}’s burn was healed.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9CA2:: @ 85E9CA2 +gText_PkmnThawedOut:: @ 85E9CA2 .string "{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9CB7:: @ 85E9CB7 +gText_PPWasRestored:: @ 85E9CB7 .string "PP was restored.{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} regained health.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9CE0:: @ 85E9CE0 +gText_PkmnBecameHealthy:: @ 85E9CE0 .string "{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9CF5:: @ 85E9CF5 +gText_MovesPPIncreased:: @ 85E9CF5 .string "{STR_VAR_1}’s PP increased.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9D0A:: @ 85E9D0A +gText_PkmnElevatedToLvVar2:: @ 85E9D0A .string "{STR_VAR_1} was elevated to\nLv. {STR_VAR_2}.$" -gUnknown_085E9D25:: @ 85E9D25 +gText_PkmnBaseVar2StatIncreased:: @ 85E9D25 .string "{STR_VAR_1}’s base {STR_VAR_2}\nstat was raised.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9D45:: @ 85E9D45 +gText_PkmnFriendlyBaseVar2Fell:: @ 85E9D45 .string "{STR_VAR_1} turned friendly.\nThe base {STR_VAR_2} fell!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9D6D:: @ 85E9D6D +gText_PkmnAdoresBaseVar2Fell:: @ 85E9D6D .string "{STR_VAR_1} adores you!\nThe base {STR_VAR_2} fell!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9D90:: @ 85E9D90 +gText_PkmnFriendlyBaseVar2CantFall:: @ 85E9D90 .string "{STR_VAR_1} turned friendly.\nThe base {STR_VAR_2} can’t fall!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9DBE:: @ 85E9DBE +gText_PkmnSnappedOutOfConfusion:: @ 85E9DBE .string "{STR_VAR_1} snapped out of its\nconfusion.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9DE1:: @ 85E9DE1 +gText_PkmnGotOverInfatuation:: @ 85E9DE1 .string "{STR_VAR_1} got over its\ninfatuation.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9E00:: @ 85E9E00 +gText_ThrowAwayItem:: @ 85E9E00 .string "Throw away this\n{STR_VAR_1}?$" -gUnknown_085E9E14:: @ 85E9E14 +gText_ItemThrownAway:: @ 85E9E14 .string "The {STR_VAR_1}\nwas thrown away.{PAUSE_UNTIL_PRESS}$" + .string "Teach which POKéMON?$" .string "Choose a POKéMON.$" .string "Move to where?$" @@ -891,43 +897,43 @@ gUnknown_085E9E14:: @ 85E9E14 .string "DON’T HAVE$" .string "FOURTH$" -gUnknown_085EA0EE:: @ 85EA0EE +gText_PkmnCantParticipate:: @ 85EA0EE .string "That POKéMON can’t participate.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EA110:: @ 85EA110 +gText_CancelParticipation:: @ 85EA110 .string "Cancel participation?$" -gUnknown_085EA126:: @ 85EA126 +gText_CancelBattle:: @ 85EA126 .string "Cancel the battle?$" -gUnknown_085EA139:: @ 85EA139 +gText_ReturnToWaitingRoom:: @ 85EA139 .string "Return to the WAITING ROOM?$" -gUnknown_085EA155:: @ 85EA155 +gText_CancelChallenge:: @ 85EA155 .string "Cancel the challenge?$" -gUnknown_085EA16B:: @ 85EA16B +gText_EscapeFromHere:: @ 85EA16B .string "Want to escape from here and return\nto {STR_VAR_1}?$" -gUnknown_085EA196:: @ 85EA196 +gText_ReturnToHealingSpot:: @ 85EA196 .string "Want to return to the healing spot\nused last in {STR_VAR_1}?$" -gUnknown_085EA1CA:: @ 85EA1CA +gText_PauseUntilPress:: @ 85EA1CA .string "{PAUSE_UNTIL_PRESS}$" -gUnknown_085EA1CD:: @ 85EA1CD +gJPText_PutVar1IntoSpinner:: @ 85EA1CD .string "{STR_VAR_1}を ぐるぐるこうかんに\nだして よろしいですか？$" @ "{STR_VAR_1}wo gurugurukoukanni\ndashite yoroshiidesuka?" ("do you want to put {STR_VAR_1} into the spinner?" in Japanese) .align 2 -gUnknown_085EA1E8:: @ 85EA1E8 +gText_OnlyPkmnForBattle:: @ 85EA1E8 .string "That’s your only\nPOKéMON for battle.$" .align 2 -gUnknown_085EA210:: @ 85EA210 +gText_PkmnCantBeTradedNow:: @ 85EA210 .string "That POKéMON can’t be traded\nnow.$" .align 2 -gUnknown_085EA234:: @ 85EA234 +gText_EggCantBeTradedNow:: @ 85EA234 .string "An EGG can’t be traded now.$" .align 2 @@ -945,162 +951,167 @@ gUnknown_085EA234:: @ 85EA234 .align 2 .string "That isn’t an EGG.$" -gUnknown_085EA333:: @ 85EA333 +gText_Register:: @ 85EA333 .string "REGISTER$" -gUnknown_085EA33C:: @ 85EA33C +gText_Attack3:: @ 85EA33C .string "ATTACK$" -gUnknown_085EA343:: @ 85EA343 +gText_Defense3:: @ 85EA343 .string "DEFENSE$" -gUnknown_085EA34B:: @ 85EA34B +gText_SpAtk4:: @ 85EA34B .string "SP. ATK$" -gUnknown_085EA353:: @ 85EA353 +gText_SpDef4:: @ 85EA353 .string "SP. DEF$" -gUnknown_085EA35B:: @ 85EA35B +gText_Speed2:: @ 85EA35B .string "SPEED$" -gUnknown_085EA361:: @ 85EA361 +gText_HP4:: @ 85EA361 .string "HP$" + .string "$" -gUnknown_085EA365:: @ 85EA365 +gText_OTSlash:: @ 85EA365 .string "OT/$" -gUnknown_085EA369:: @ 85EA369 +gText_RentalPkmn:: @ 85EA369 .string "RENTAL POKéMON$" -gUnknown_085EA378:: @ 85EA378 +gText_TypeSlash:: @ 85EA378 .string "TYPE/$" -gUnknown_085EA37E:: @ 85EA37E +gText_Power:: @ 85EA37E .string "POWER$" -gUnknown_085EA384:: @ 85EA384 +gText_Accuracy2:: @ 85EA384 .string "ACCURACY$" -gUnknown_085EA38D:: @ 85EA38D +gText_Appeal:: @ 85EA38D .string "APPEAL$" -gUnknown_085EA394:: @ 85EA394 +gText_Jam:: @ 85EA394 .string "JAM$" -gUnknown_085EA398:: @ 85EA398 +gText_Status:: @ 85EA398 .string "STATUS$" -gUnknown_085EA39F:: @ 85EA39F +gText_ExpPoints:: @ 85EA39F .string "EXP. POINTS$" -gUnknown_085EA3AB:: @ 85EA3AB +gText_NextLv:: @ 85EA3AB .string "NEXT LV.$" -gUnknown_085EA3B4:: @ 85EA3B4 +gText_RibbonsVar1:: @ 85EA3B4 .string "RIBBONS: {STR_VAR_1}$" -gUnknown_085EA3C0:: @ 85EA3C0 +gText_EmptyString5:: @ 85EA3C0 .string "$" + .string "EVENTS$" -gUnknown_085EA3C8:: @ 85EA3C8 +gText_Switch:: @ 85EA3C8 .string "SWITCH$" -gUnknown_085EA3CF:: @ 85EA3CF +gText_PkmnInfo:: @ 85EA3CF .string "POKéMON INFO$" -gUnknown_085EA3DC:: @ 85EA3DC +gText_PkmnSkills:: @ 85EA3DC .string "POKéMON SKILLS$" -gUnknown_085EA3EB:: @ 85EA3EB +gText_BattleMoves:: @ 85EA3EB .string "BATTLE MOVES$" -gUnknown_085EA3F8:: @ 85EA3F8 +gText_ContestMoves:: @ 85EA3F8 .string "C0NTEST MOVES$" -gUnknown_085EA406:: @ 85EA406 +gText_Info:: @ 85EA406 .string "INFO$" -gUnknown_085EA40B:: @ 85EA40B +gText_EggWillTakeALongTime:: @ 85EA40B .string "It looks like this EGG will\ntake a long time to hatch.$" -gUnknown_085EA442:: @ 85EA442 +gText_EggWillTakeSomeTime:: @ 85EA442 .string "What will hatch from this?\nIt will take some time.$" -gUnknown_085EA475:: @ 85EA475 +gText_EggWillHatchSoon:: @ 85EA475 .string "It moves occasionally.\nIt should hatch soon.$" -gUnknown_085EA4A2:: @ 85EA4A2 +gText_EggAboutToHatch:: @ 85EA4A2 .string "It’s making sounds.\nIt’s about to hatch!$" -gUnknown_085EA4CB:: @ 85EA4CB +gText_HMMovesCantBeForgotten2:: @ 85EA4CB .string "HM moves can’t be\nforgotten now.$" -gUnknown_085EA4EC:: @ 85EA4EC +gText_XNatureMetAtYZ:: @ 85EA4EC .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$" -gUnknown_085EA516:: @ 85EA516 +gText_XNatureHatchedAtYZ:: @ 85EA516 .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$" -gUnknown_085EA544:: @ 85EA544 +gText_XNatureObtainedInTrade:: @ 85EA544 .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a trade.$" -gUnknown_085EA56A:: @ 85EA56A +gText_XNatureFatefulEncounter:: @ 85EA56A .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a fateful\nencounter at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$" -gUnknown_085EA5A8:: @ 85EA5A8 +gText_XNatureProbablyMetAt:: @ 85EA5A8 .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nprobably met at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$" -gUnknown_085EA5DB:: @ 85EA5DB +gText_XNature:: @ 85EA5DB .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature$" -gUnknown_085EA5EB:: @ 85EA5EB +gText_XNatureMetSomewhereAt:: @ 85EA5EB .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet somewhere at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$" -gUnknown_085EA617:: @ 85EA617 +gText_XNatureHatchedSomewhereAt:: @ 85EA617 .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched somewhere at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$" -gUnknown_085EA647:: @ 85EA647 +gText_OddEggFoundByCouple:: @ 85EA647 .string "An odd POKéMON EGG found\nby the DAY CARE couple.$" -gUnknown_085EA678:: @ 85EA678 +gText_PeculiarEggNicePlace:: @ 85EA678 .string "A peculiar POKéMON EGG\nobtained at the nice place.$" -gUnknown_085EA6AB:: @ 85EA6AB +gText_PeculiarEggTrade:: @ 85EA6AB .string "A peculiar POKéMON EGG\nobtained in a trade.$" -gUnknown_085EA6D7:: @ 85EA6D7 +gText_EggFromHotSprings:: @ 85EA6D7 .string "A POKéMON EGG obtained\nat the hot springs.$" -gUnknown_085EA702:: @ 85EA702 +gText_EggFromTraveler:: @ 85EA702 .string "An odd POKéMON EGG\nobtained from a traveler.$" -gUnknown_085EA72F:: @ 85EA72F +gText_ApostropheSBase:: @ 85EA72F .string "’s BASE$" -gUnknown_085EA737:: @ 85EA737 +gText_OkayToDeleteFromRegistry:: @ 85EA737 .string "Is it okay to delete {STR_VAR_1}\nfrom the REGISTRY?$" -gUnknown_085EA762:: @ 85EA762 +gText_RegisteredDataDeleted:: @ 85EA762 .string "The registered data was deleted.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EA785:: @ 85EA785 +gText_NoRegistry:: @ 85EA785 .string "There is no REGISTRY.{PAUSE_UNTIL_PRESS}$" + .string "DEL REGIST.$" .string "{STR_VAR_3}{STR_VAR_1}/{STR_VAR_2}$" .string "DECORATE$" .string "PUT AWAY$" .string "TOSS$" -gUnknown_085EA7C8:: @ 85EA7C8 +gText_Color161Shadow161:: @ 85EA7C8 .string "{COLOR 161}{SHADOW 161}$" + .string "Put out the selected decoration item.$" .string "Store the chosen decoration in the PC.$" .string "Throw away unwanted decorations.$" -gUnknown_085EA83D:: @ 85EA83D +gText_NoDecorations:: @ 85EA83D .string "There are no decorations.{PAUSE_UNTIL_PRESS}$" + .string "DESK$" .string "CHAIR$" .string "PLANT$" @@ -1110,57 +1121,59 @@ gUnknown_085EA83D:: @ 85EA83D .string "DOLL$" .string "CUSHION$" -gUnknown_085EA88B:: @ 85EA88B +gText_Gold:: @ 85EA88B .string "GOLD$" -gUnknown_085EA890:: @ 85EA890 +gText_Silver:: @ 85EA890 .string "SILVER$" -gUnknown_085EA897:: @ 85EA897 +gText_PlaceItHere:: @ 85EA897 .string "Place it here?$" -gUnknown_085EA8A6:: @ 85EA8A6 +gText_CantBePlacedHere:: @ 85EA8A6 .string "It can’t be placed here.$" -gUnknown_085EA8BF:: @ 85EA8BF +gText_CancelDecorating:: @ 85EA8BF .string "Cancel decorating?$" -gUnknown_085EA8D2:: @ 85EA8D2 +gText_InUseAlready:: @ 85EA8D2 .string "This is in use already.$" -gUnknown_085EA8EA:: @ 85EA8EA +gText_NoMoreDecorations:: @ 85EA8EA .string "No more decorations can be placed.\nThe most that can be placed are {STR_VAR_1}.$" -gUnknown_085EA931:: @ 85EA931 +gText_NoMoreDecorations2:: @ 85EA931 .string "No more decorations can be placed.\nThe most that can be placed are {STR_VAR_1}.$" + .string "This can’t be placed here.\nIt must be on a DESK, etc.$" -gUnknown_085EA9AE:: @ 85EA9AE +gText_CantPlaceInRoom:: @ 85EA9AE .string "This decoration can’t be placed in\nyour own room.$" -gUnknown_085EA9E0:: @ 85EA9E0 +gText_CantThrowAwayInUse:: @ 85EA9E0 .string "This decoration is in use.\nIt can’t be thrown away.$" -gUnknown_085EAA14:: @ 85EAA14 +gText_DecorationWillBeDiscarded:: @ 85EAA14 .string "This {STR_VAR_1} will be discarded.\nIs that okay?$" -gUnknown_085EAA3D:: @ 85EAA3D +gText_DecorationThrownAway:: @ 85EAA3D .string "The decoration item was thrown away.$" -gUnknown_085EAA62:: @ 85EAA62 +gText_StopPuttingAwayDecorations:: @ 85EAA62 .string "Stop putting away decorations?$" -gUnknown_085EAA81:: @ 85EAA81 +gText_NoDecorationHere:: @ 85EAA81 .string "There is no decoration item here.$" -gUnknown_085EAAA3:: @ 85EAAA3 +gText_ReturnDecorationToPC:: @ 85EAAA3 .string "Return this decoration to the PC?$" -gUnknown_085EAAC5:: @ 85EAAC5 +gText_DecorationReturnedToPC:: @ 85EAAC5 .string "The decoration was returned to the PC.$" -gUnknown_085EAAEC:: @ 85EAAEC +gText_NoDecorationsInUse:: @ 85EAAEC .string "There are no decorations in use.{PAUSE_UNTIL_PRESS}$" + .string "TRISTAN$" .string "PHILIP$" .string "DENNIS$" @@ -1169,72 +1182,76 @@ gUnknown_085EAAEC:: @ 85EAAEC .string "DECORATION$" .string "ITEM STORAGE$" -gUnknown_085EAB4E:: @ 85EAB4E +gText_Mailbox:: @ 85EAB4E .string "MAILBOX$" + .string "DEPOSIT ITEM$" -gUnknown_085EAB63:: @ 85EAB63 +gText_WithdrawItem:: @ 85EAB63 .string "WITHDRAW ITEM$" -gUnknown_085EAB71:: @ 85EAB71 +gText_TossItem:: @ 85EAB71 .string "TOSS ITEM$" + .string "Store items in the PC.$" .string "Take out items from the PC.$" .string "Throw away items stored in the PC.$" -gUnknown_085EABD1:: @ 85EABD1 +gText_NoItems:: @ 85EABD1 .string "There are no items.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EABE7:: @ 85EABE7 +gText_NoRoomInBag:: @ 85EABE7 .string "There is no more\nroom in the BAG.$" -gUnknown_085EAC09:: @ 85EAC09 +gText_WithdrawHowManyItems:: @ 85EAC09 .string "Withdraw how many\n{STR_VAR_1}(s)?$" -gUnknown_085EAC22:: @ 85EAC22 +gText_WithdrawXItems:: @ 85EAC22 .string "Withdrew {STR_VAR_2}\n{STR_VAR_1}(s).$" + .string "READ$" .string "MOVE TO BAG$" .string "GIVE$" -gUnknown_085EAC4B:: @ 85EAC4B +gText_NoMailHere:: @ 85EAC4B .string "There’s no MAIL here.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EAC63:: @ 85EAC63 +gText_WhatToDoWithVar1sMail:: @ 85EAC63 .string "What would you like to do with\n{STR_VAR_1}’s MAIL?$" -gUnknown_085EAC8D:: @ 85EAC8D +gText_MessageWillBeLost:: @ 85EAC8D .string "The message will be lost.\nIs that okay?$" -gUnknown_085EACB5:: @ 85EACB5 +gText_BagIsFull:: @ 85EACB5 .string "The BAG is full.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EACC8:: @ 85EACC8 +gText_MailToBagMessageErased:: @ 85EACC8 .string "The MAIL was returned to the BAG\nwith its message erased.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EAD04:: @ 85EAD04 +gText_Dad:: @ 85EAD04 .string "DAD$" -gUnknown_085EAD08:: @ 85EAD08 +gText_Mom:: @ 85EAD08 .string "MOM$" -gUnknown_085EAD0C:: @ 85EAD0C +gText_Wallace:: @ 85EAD0C .string "WALLACE$" -gUnknown_085EAD14:: @ 85EAD14 +gText_Steven:: @ 85EAD14 .string "STEVEN$" -gUnknown_085EAD1B:: @ 85EAD1B +gText_Brawly:: @ 85EAD1B .string "BRAWLY$" -gUnknown_085EAD22:: @ 85EAD22 +gText_Winona:: @ 85EAD22 .string "WINONA$" -gUnknown_085EAD29:: @ 85EAD29 +gText_Phoebe:: @ 85EAD29 .string "PHOEBE$" -gUnknown_085EAD30:: @ 85EAD30 +gText_Glacia:: @ 85EAD30 .string "GLACIA$" + .string "PETALBURG$" .string "SLATEPORT$" .string "LITTLEROOT$" @@ -1269,11 +1286,12 @@ gUnknown_085EAD30:: @ 85EAD30 .string "Saw it$" .string "Not yet$" -gUnknown_085EAE62:: @ 85EAE62 +gText_Yes:: @ 85EAE62 .string "YES$" -gUnknown_085EAE66:: @ 85EAE66 +gText_No:: @ 85EAE66 .string "NO$" + .string "INFO$" .string "SINGLE BATTLE$" .string "DOUBLE BATTLE$" @@ -1282,11 +1300,12 @@ gUnknown_085EAE66:: @ 85EAE66 .string "CHALLENGE$" .string "INFO$" -gUnknown_085EAEB1:: @ 85EAEB1 +gText_Lv50:: @ 85EAEB1 .string "LV. 50$" -gUnknown_085EAEB8:: @ 85EAEB8 +gText_OpenLevel:: @ 85EAEB8 .string "OPEN LEVEL$" + .string "FRESH WATER{CLEAR_TO 0x48}¥200$" .string "SODA POP{CLEAR_TO 0x48}¥300$" .string "LEMONADE{CLEAR_TO 0x48}¥350$" @@ -1327,20 +1346,21 @@ gUnknown_085EAEB8:: @ 85EAEB8 .string "TM24{CLEAR_TO 0x48}4,000 COINS$" .string "TM13{CLEAR_TO 0x48}4,000 COINS$" -gUnknown_085EB0E8:: @ 85EB0E8 +gText_Cool:: @ 85EB0E8 .string "COOL$" -gUnknown_085EB0ED:: @ 85EB0ED +gText_Beauty:: @ 85EB0ED .string "BEAUTY$" -gUnknown_085EB0F4:: @ 85EB0F4 +gText_Cute:: @ 85EB0F4 .string "CUTE$" -gUnknown_085EB0F9:: @ 85EB0F9 +gText_Smart:: @ 85EB0F9 .string "SMART$" -gUnknown_085EB0FF:: @ 85EB0FF +gText_Tough:: @ 85EB0FF .string "TOUGH$" + .string "NORMAL$" .string "SUPER$" .string "HYPER$" @@ -1356,20 +1376,21 @@ gUnknown_085EB0FF:: @ 85EB0FF .string "TMs & HMs$" .string "BERRIES$" -gUnknown_085EB169:: @ 85EB169 +gText_SomeonesPC:: @ 85EB169 .string "SOMEONE’S PC$" -gUnknown_085EB176:: @ 85EB176 +gText_LanettesPC:: @ 85EB176 .string "LANETTE’S PC$" -gUnknown_085EB183:: @ 85EB183 +gText_PlayersPC:: @ 85EB183 .string "{PLAYER}’s PC$" -gUnknown_085EB18B:: @ 85EB18B +gText_HallOfFame:: @ 85EB18B .string "HALL OF FAME$" -gUnknown_085EB198:: @ 85EB198 +gText_LogOff:: @ 85EB198 .string "LOG OFF$" + .string "OPPONENT$" .string "TOURNEY TREE$" .string "READY TO START$" @@ -1389,28 +1410,31 @@ gUnknown_085EB198:: @ 85EB198 .string "E-MODE$" .string "G-MODE$" -gUnknown_085EB25C:: @ 85EB25C +gText_MenuOptionPokedex:: @ 85EB25C .string "POKéDEX$" -gUnknown_085EB264:: @ 85EB264 +gText_MenuOptionPokemon:: @ 85EB264 .string "POKéMON$" -gUnknown_085EB26C:: @ 85EB26C +gText_MenuOptionBag:: @ 85EB26C .string "BAG$" -gUnknown_085EB270:: @ 85EB270 +gText_MenuOptionPokenav:: @ 85EB270 .string "POKéNAV$" + .string "$" -gUnknown_085EB279:: @ 85EB279 +gText_MenuOptionSave:: @ 85EB279 .string "SAVE$" -gUnknown_085EB27E:: @ 85EB27E +gText_MenuOptionOption:: @ 85EB27E .string "OPTION$" -gUnknown_085EB285:: @ 85EB285 +gText_MenuOptionExit:: @ 85EB285 .string "EXIT$" - .string " 5BP$" + + .align 2 + .string "5BP$" .string "10BP$" .string "15BP$" .string "RED TENT$" @@ -1482,30 +1506,32 @@ gUnknown_085EB285:: @ 85EB285 .string "REST$" .string "RETIRE$" -gUnknown_085EB5CF:: @ 85EB5CF +gText_99TimesPlus:: @ 85EB5CF .string "99 times +$" -gUnknown_085EB5DA:: @ 85EB5DA +gText_1MinutePlus:: @ 85EB5DA .string "1 minute +$" -gUnknown_085EB5E5:: @ 85EB5E5 +gText_SpaceSeconds:: @ 85EB5E5 .string " seconds$" -gUnknown_085EB5EE:: @ 85EB5EE +gText_SpaceTimes:: @ 85EB5EE .string " time(s)$" + .string ".$" -gUnknown_085EB5F9:: @ 85EB5F9 +gText_BigGuy:: @ 85EB5F9 .string "Big guy$" -gUnknown_085EB601:: @ 85EB601 +gText_BigGirl:: @ 85EB601 .string "Big girl$" -gUnknown_085EB60A:: @ 85EB60A +gText_Son:: @ 85EB60A .string "son$" -gUnknown_085EB60E:: @ 85EB60E +gText_Daughter:: @ 85EB60E .string "daughter$" + .string "BLUE FLUTE$" .string "YELLOW FLUTE$" .string "RED FLUTE$" @@ -1530,11 +1556,12 @@ gUnknown_085EB60E:: @ 85EB60E .string "B4F$" .string "ROOFTOP$" -gUnknown_085EB6A5:: @ 85EB6A5 +gText_ElevatorNowOn:: @ 85EB6A5 .string "Now on:$" -gUnknown_085EB6AD:: @ 85EB6AD +gText_BP:: @ 85EB6AD .string "BP$" + .string "ENERGYPOWDER{CLEAR_TO 0x72}{SIZE 0}50$" .string "ENERGY ROOT{CLEAR_TO 0x72}{SIZE 0}80$" .string "HEAL POWDER{CLEAR_TO 0x72}{SIZE 0}50$" @@ -1555,8 +1582,9 @@ gUnknown_085EB6AD:: @ 85EB6AD .string "SKY PILLAR$" .string "Don’t remember$" -gUnknown_085EB7EA:: @ 85EB7EA +gText_Exit:: @ 85EB7EA .string "EXIT$" + .string "Exit from the BOX?$" .string "What do you want to do?$" .string "Please pick a theme.$" @@ -1637,22 +1665,24 @@ gUnknown_085EB7EA:: @ 85EB7EA .string "Move items held by any POKéMON\nin a BOX or your party.$" .string "Return to the previous menu.$" -gUnknown_085EBC89:: @ 85EBC89 +gText_JustOnePkmn:: @ 85EBC89 .string "There is just one POKéMON with you.$" -gUnknown_085EBCAD:: @ 85EBCAD +gText_PartyFull:: @ 85EBCAD .string "Your party is full!$" -gUnknown_085EBCC1:: @ 85EBCC1 +gText_Box:: @ 85EBCC1 .string "BOX$" + .string "Check the map of the HOENN region.$" .string "Check POKéMON in detail.$" .string "Call a registered TRAINER.$" .string "Check obtained RIBBONS.$" .string "Put away the POKéNAV.$" -gUnknown_085EBD4A:: @ 85EBD4A +gText_NoRibbonWinners:: @ 85EBD4A .string "There are no RIBBON winners.$" + .string "No TRAINERS are registered.$" .string "Check party POKéMON in detail.$" .string "Check all POKéMON in detail.$" @@ -1664,11 +1694,12 @@ gUnknown_085EBD4A:: @ 85EBD4A .string "Find tough POKéMON.$" .string "Return to the CONDITION menu.$" -gUnknown_085EBE5F:: @ 85EBE5F +gText_NumberRegistered:: @ 85EBE5F .string "No. registered$" -gUnknown_085EBE6E:: @ 85EBE6E +gText_NumberOfBattles:: @ 85EBE6E .string "No. of battles$" + .string "DETAIL$" .string "CALL$" .string "EXIT$" @@ -1689,33 +1720,36 @@ gUnknown_085EBE6E:: @ 85EBE6E .string "{UNK_CTRL_F800}CHECK {UNK_CTRL_F801}CANCEL$" .string "{UNK_CTRL_F801}CANCEL$" -gUnknown_085EBF8D:: @ 85EBF8D +gText_NatureSlash:: @ 85EBF8D .string "NATURE/$" -gUnknown_085EBF95:: @ 85EBF95 +gText_TrainerCloseBy:: @ 85EBF95 .string "That TRAINER is close by.\nTalk to the TRAINER in person!$" -gUnknown_085EBFCE:: @ 85EBFCE +gText_InParty:: @ 85EBFCE .string "IN PARTY$" -gUnknown_085EBFD7:: @ 85EBFD7 +gText_Number2:: @ 85EBFD7 .string "No. $" + .string "RIBBONS$" .string "{SPECIAL_F7 0x00}{COLOR_HIGHLIGHT_SHADOW LIGHT_RED WHITE GREEN}♂{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{SPECIAL_F7 0x01}$" .string "{SPECIAL_F7 0x00}{COLOR_HIGHLIGHT_SHADOW LIGHT_GREEN WHITE BLUE}♀{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{SPECIAL_F7 0x01}$" .string "{SPECIAL_F7 0x00}/{LV}{SPECIAL_F7 0x01}$" -gUnknown_085EC00F:: @ 85EC00F +gText_Unknown:: @ 85EC00F .string "UNKNOWN$" + .string "CALL$" .string "CHECK$" .string "CANCEL$" -gUnknown_085EC029:: @ 85EC029 +gText_NumberF700:: @ 85EC029 .string "No. {SPECIAL_F7 0x00}$" -gUnknown_085EC030:: @ 85EC030 +gText_RibbonsF700:: @ 85EC030 .string "RIBBONS {SPECIAL_F7 0x00}$" + .string "{SPECIAL_F7 0x00}{COLOR_HIGHLIGHT_SHADOW LIGHT_RED WHITE GREEN}♂{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{SPECIAL_F7 0x01}{SPECIAL_F7 0x02}$" .string "{SPECIAL_F7 0x00}{COLOR_HIGHLIGHT_SHADOW LIGHT_GREEN WHITE BLUE}♀{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{SPECIAL_F7 0x01}{SPECIAL_F7 0x02}$" .string "{SPECIAL_F7 0x00}/{LV}{SPECIAL_F7 0x01}{SPECIAL_F7 0x02}$" @@ -1756,34 +1790,38 @@ gUnknown_085EC030:: @ 85EC030 .string "The quiz:$" .string "Apprentice’s phrase:$" -gUnknown_085EC3A6:: @ 85EC3A6 +gText_QuitEditing:: @ 85EC3A6 .string "Quit editing?$" -gUnknown_085EC3B4:: @ 85EC3B4 +gText_StopGivingPkmnMail:: @ 85EC3B4 .string "Stop giving the POKéMON MAIL?$" + .string "and fill out the questionnaire.$" .string "Let’s reply to the interview!$" -gUnknown_085EC410:: @ 85EC410 +gText_AllTextBeingEditedWill:: @ 85EC410 .string "All the text being edited will$" -gUnknown_085EC42F:: @ 85EC42F +gText_BeDeletedThatOkay:: @ 85EC42F .string "be deleted. Is that okay?$" + .string "Quit editing?$" .string "The edited text will not be saved.$" .string "Is that okay?$" .string "Please enter a phrase or word.$" .string "The entire text can’t be deleted.$" -gUnknown_085EC4C9:: @ 85EC4C9 +gText_OnlyOnePhrase:: @ 85EC4C9 .string "Only one phrase may be changed.$" -gUnknown_085EC4E9:: @ 85EC4E9 +gText_OriginalSongWillBeUsed:: @ 85EC4E9 .string "The original song will be used.$" + .string "That’s trendy already!$" -gUnknown_085EC520:: @ 85EC520 +gText_CombineTwoWordsOrPhrases:: @ 85EC520 .string "Combine two words or phrases.$" + .string "Quit giving information?$" .string "Stop giving the POKéMON MAIL?$" .string "Create a quiz!$" @@ -1802,166 +1840,171 @@ gUnknown_085EC520:: @ 85EC520 .string "Apprentice’s phrase$" .string "QUESTIONNAIRE$" -gUnknown_085EC672:: @ 85EC672 +gText_YouCannotQuitHere:: @ 85EC672 .string "You cannot quit here.$" -gUnknown_085EC688:: @ 85EC688 +gText_SectionMustBeCompleted:: @ 85EC688 .string "This section must be completed.$" -gUnknown_085EC6A8:: @ 85EC6A8 +gText_F700sQuiz:: @ 85EC6A8 .string "{SPECIAL_F7 0x00}’s quiz$" -gUnknown_085EC6B2:: @ 85EC6B2 +gText_Lady:: @ 85EC6B2 .string "Lady$" + .string "After you have read the quiz$" .string "question, press the A Button.$" .string "The quiz answer is?$" -gUnknown_085EC706:: @ 85EC706 +gText_LikeToQuitQuiz:: @ 85EC706 .string "Would you like to quit this quiz$" -gUnknown_085EC727:: @ 85EC727 +gText_ChallengeQuestionMark:: @ 85EC727 .string "challenge?$" + .string "Is this quiz OK?$" -gUnknown_085EC743:: @ 85EC743 +gText_CreateAQuiz:: @ 85EC743 .string "Create a quiz!$" -gUnknown_085EC752:: @ 85EC752 +gText_SelectTheAnswer:: @ 85EC752 .string "Select the answer!$" -gUnknown_085EC765:: @ 85EC765 +gText_LyricsCantBeDeleted:: @ 85EC765 .string "The lyrics can’t be deleted.$" + .string "POKéMON LEAGUE$" .string "POKéMON CENTER$" -gUnknown_085EC7A0:: @ 85EC7A0 +gText_GetsAPokeBlockQuestion:: @ 85EC7A0 .string " gets a {POKEBLOCK}?$" + .string "Coolness $" .string "Beauty $" .string "Cuteness $" .string "Smartness $" .string "Toughness $" -gUnknown_085EC7E1:: @ 85EC7E1 +gText_WasEnhanced:: @ 85EC7E1 .string "was enhanced!$" -gUnknown_085EC7EF:: @ 85EC7EF +gText_NothingChanged:: @ 85EC7EF .string "Nothing changed!$" -gUnknown_085EC800:: @ 85EC800 +gText_WontEatAnymore:: @ 85EC800 .string "It won’t eat anymore…$" -gUnknown_085EC816:: @ 85EC816 +gText_SaveFailedCheckingBackup:: @ 85EC816 .string "Save failed. Checking the backup\nmemory… Please wait.\n{COLOR RED}“Time required: about 1 minute”$" -gUnknown_085EC86F:: @ 85EC86F +gText_BackupMemoryDamaged:: @ 85EC86F .string "The backup memory is damaged, or\nthe internal battery has run dry.\nYou can still play, but not save.$" -gUnknown_085EC8D4:: @ 85EC8D4 +gText_GamePlayCannotBeContinued:: @ 85EC8D4 .string "{COLOR RED}“Game play cannot be continued.\nReturning to the title screen…”$" -gUnknown_085EC917:: @ 85EC917 +gText_CheckCompleted:: @ 85EC917 .string "Check completed.\nAttempting to save again.\nPlease wait.$" -gUnknown_085EC94F:: @ 85EC94F +gText_SaveCompleteGameCannotContinue:: @ 85EC94F .string "Save completed.\n{COLOR RED}“Game play cannot be continued.\nReturning to the title screen.”$" -gUnknown_085EC9A2:: @ 85EC9A2 +gText_SaveCompletePressA:: @ 85EC9A2 .string "Save completed.\n{COLOR RED}“Please press the A Button.”$" -gUnknown_085EC9D2:: @ 85EC9D2 +gText_Ferry:: @ 85EC9D2 .string "FERRY$" -gUnknown_085EC9D8:: @ 85EC9D8 +gText_SecretBase:: @ 85EC9D8 .string "SECRET BASE$" -gUnknown_085EC9E4:: @ 85EC9E4 +gText_Hideout:: @ 85EC9E4 .string "HIDEOUT$" -gUnknown_085EC9EC:: @ 85EC9EC +gText_ResetRTCConfirmCancel:: @ 85EC9EC .string "Reset RTC?\nA: Confirm, B: Cancel$" -gUnknown_085ECA0D:: @ 85ECA0D +gText_PresentTime:: @ 85ECA0D .string "Present time in game$" -gUnknown_085ECA22:: @ 85ECA22 +gText_PreviousTime:: @ 85ECA22 .string "Previous time in game$" -gUnknown_085ECA38:: @ 85ECA38 +gText_PleaseResetTime:: @ 85ECA38 .string "Please reset the time.$" -gUnknown_085ECA4F:: @ 85ECA4F +gText_ClockHasBeenReset:: @ 85ECA4F .string "The clock has been reset.\nData will be saved. Please wait.$" -gUnknown_085ECA8A:: @ 85ECA8A +gText_SaveCompleted:: @ 85ECA8A .string "Save completed.$" -gUnknown_085ECA9A:: @ 85ECA9A +gText_SaveFailed:: @ 85ECA9A .string "Save failed…$" -gUnknown_085ECAA7:: @ 85ECAA7 +gText_NoSaveFileCantSetTime:: @ 85ECAA7 .string "There is no save file, so the time\ncan’t be set.$" -gUnknown_085ECAD8:: @ 85ECAD8 +gText_InGameClockUsable:: @ 85ECAD8 .string "The in-game clock adjustment system\nis now useable.$" -gUnknown_085ECB0C:: @ 85ECB0C +gText_Slots:: @ 85ECB0C .string "SLOTS$" -gUnknown_085ECB12:: @ 85ECB12 +gText_Roulette:: @ 85ECB12 .string "ROULETTE$" -gUnknown_085ECB1B:: @ 85ECB1B +gText_Good:: @ 85ECB1B .string "Good$" -gUnknown_085ECB20:: @ 85ECB20 +gText_VeryGood:: @ 85ECB20 .string "Very good$" -gUnknown_085ECB2A:: @ 85ECB2A +gText_Excellent:: @ 85ECB2A .string "Excellent$" -gUnknown_085ECB34:: @ 85ECB34 +gText_SoSo:: @ 85ECB34 .string "So-so$" -gUnknown_085ECB3A:: @ 85ECB3A +gText_Bad:: @ 85ECB3A .string "Bad$" -gUnknown_085ECB3E:: @ 85ECB3E +gText_TheWorst:: @ 85ECB3E .string "The worst$" -gUnknown_085ECB48:: @ 85ECB48 +gText_Spicy2:: @ 85ECB48 .string "spicy$" -gUnknown_085ECB4E:: @ 85ECB4E +gText_Dry2:: @ 85ECB4E .string "dry$" -gUnknown_085ECB52:: @ 85ECB52 +gText_Sweet2:: @ 85ECB52 .string "sweet$" -gUnknown_085ECB58:: @ 85ECB58 +gText_Bitter2:: @ 85ECB58 .string "bitter$" -gUnknown_085ECB5F:: @ 85ECB5F +gText_Sour2:: @ 85ECB5F .string "sour$" -gUnknown_085ECB64:: @ 85ECB64 +gText_Single:: @ 85ECB64 .string "SINGLE$" -gUnknown_085ECB6B:: @ 85ECB6B +gText_Double:: @ 85ECB6B .string "DOUBLE$" -gUnknown_085ECB72:: @ 85ECB72 +gText_Jackpot:: @ 85ECB72 .string "jackpot$" -gUnknown_085ECB7A:: @ 85ECB7A +gText_First:: @ 85ECB7A .string "first$" -gUnknown_085ECB80:: @ 85ECB80 +gText_Second:: @ 85ECB80 .string "second$" -gUnknown_085ECB87:: @ 85ECB87 +gText_Third:: @ 85ECB87 .string "third$" + .string "0 pts$" .string "10 pts$" .string "20 pts$" @@ -2025,79 +2068,84 @@ gUnknown_085ECB87:: @ 85ECB87 .string "THUNDERPUNCH{CLEAR_TO 0x4E}48BP$" .string "FIRE PUNCH{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECF5D:: @ 85ECF5D +gText_PkmnFainted3:: @ 85ECF5D .string "{STR_VAR_1} fainted…\p\n$" -gOtherText_Marco:: @ 85ECF6B +gText_Marco:: @ 85ECF6B .string "MARCO$" -gUnknown_085ECF71:: @ 85ECF71 +gText_TrainerCardName:: @ 85ECF71 .string "NAME: $" -gUnknown_085ECF78:: @ 85ECF78 +gText_TrainerCardIDNo:: @ 85ECF78 .string "IDNo.$" -gUnknown_085ECF7E:: @ 85ECF7E +gText_TrainerCardMoney:: @ 85ECF7E .string "MONEY$" + .string "¥$" -gUnknown_085ECF86:: @ 85ECF86 +gText_TrainerCardPokedex:: @ 85ECF86 .string "POKéDEX$" -gUnknown_085ECF8E:: @ 85ECF8E +gText_EmptyString6:: @ 85ECF8E .string "$" -gUnknown_085ECF8F:: @ 85ECF8F +gText_Colon2:: @ 85ECF8F .string ":$" + .string " points$" -gUnknown_085ECF99:: @ 85ECF99 +gText_TrainerCardTime:: @ 85ECF99 .string "TIME$" + .string "ゲ-ムポイント$" @ "geemupointo" ("game point" in Japanese) -gUnknown_085ECFA6:: @ 85ECFA6 +gText_Var1sTrainerCard:: @ 85ECFA6 .string "{STR_VAR_1}’s TRAINER CARD$" -gUnknown_085ECFB8:: @ 85ECFB8 +gText_HallOfFameDebut:: @ 85ECFB8 .string "HALL OF FAME DEBUT $" + .string "LINK BATTLES$" .string "LINK CABLE BATTLES$" -gUnknown_085ECFED:: @ 85ECFED +gText_WinsLosses:: @ 85ECFED .string "W:{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY} L:{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_2}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}$" -gUnknown_085ED010:: @ 85ED010 +gText_PokemonTrades:: @ 85ED010 .string "POKéMON TRADES$" -gUnknown_085ED01F:: @ 85ED01F +gText_UnionTradesAndBattles:: @ 85ED01F .string "UNION TRADES & BATTLES$" -gUnknown_085ED036:: @ 85ED036 +gText_BerryCrush:: @ 85ED036 .string "BERRY CRUSH$" -gUnknown_085ED042:: @ 85ED042 +gText_WaitingTrainerFinishReading:: @ 85ED042 .string "Waiting for the other TRAINER to\nfinish reading your TRAINER CARD.$" -gUnknown_085ED085:: @ 85ED085 +gText_PokeblocksWithFriends:: @ 85ED085 .string "{POKEBLOCK}S W/FRIENDS$" -gUnknown_085ED096:: @ 85ED096 +gText_Var1DarkGreyShadowLightGrey:: @ 85ED096 .string "{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}$" -gUnknown_085ED09F:: @ 85ED09F +gText_WonContestsWFriends:: @ 85ED09F .string "WON CONTESTS W/FRIENDS$" -gUnknown_085ED0B6:: @ 85ED0B6 +gText_BattlePtsWon:: @ 85ED0B6 .string "BATTLE POINTS WON$" -gUnknown_085ED0C8:: @ 85ED0C8 +gText_Var1DarkLightGreyBP:: @ 85ED0C8 .string "{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}BP$" -gUnknown_085ED0D3:: @ 85ED0D3 +gText_BattleTower:: @ 85ED0D3 .string "BATTLE TOWER$" -gUnknown_085ED0E0:: @ 85ED0E0 +gText_WSlashStraightSlash:: @ 85ED0E0 .string "W/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY} STRAIGHT/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_2}$" + .string "BATTLE TOWER$" .string "BATTLE DOME$" .string "BATTLE PALACE$" @@ -2121,147 +2169,151 @@ gUnknown_085ED0E0:: @ 85ED0E0 .align 2 .string "{STR_VAR_1}$" -gUnknown_085ED193:: @ 85ED193 +gText_Give:: @ 85ED193 .string "Give$" -gUnknown_085ED198:: @ 85ED198 +gText_NoNeed:: @ 85ED198 .string "No need$" -gUnknown_085ED1A0:: @ 85ED1A0 +gText_ColorLightShadowDarkGrey:: @ 85ED1A0 .string "{COLOR LIGHT_GREY}{SHADOW DARK_GREY}$" -gUnknown_085ED1A7:: @ 85ED1A7 +gText_ColorBlue:: @ 85ED1A7 .string "{COLOR BLUE}$" -gUnknown_085ED1AB:: @ 85ED1AB +gText_ColorTransparent:: @ 85ED1AB .string "{HIGHLIGHT TRANSPARENT}{COLOR TRANSPARENT}$" -gUnknown_085ED1B2:: @ 85ED1B2 +gText_CDot:: @ 85ED1B2 .string "C.$" -gUnknown_085ED1B5:: @ 85ED1B5 +gText_BDot:: @ 85ED1B5 .string "B.$" -gUnknown_085ED1B8:: @ 85ED1B8 +gText_AnnouncingResults:: @ 85ED1B8 .string "Announcing the results!$" -gUnknown_085ED1D0:: @ 85ED1D0 +gText_PreliminaryResults:: @ 85ED1D0 .string "The preliminary results!$" -gUnknown_085ED1E9:: @ 85ED1E9 +gText_Round2Results:: @ 85ED1E9 .string "Round 2 results!$" -gUnknown_085ED1FA:: @ 85ED1FA +gText_Var1sVar2Won:: @ 85ED1FA .string "{STR_VAR_1}’s {STR_VAR_2} won!$" -gUnknown_085ED207:: @ 85ED207 +gText_CommunicationStandby:: @ 85ED207 .string "Communication standby…$" -gUnknown_085ED21E:: @ 85ED21E +gText_ColorDarkGrey:: @ 85ED21E .string "{COLOR DARK_GREY}$" + .string "{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR6 WHITE DYNAMIC_COLOR5}$" -gUnknown_085ED228:: @ 85ED228 +gText_HighlightDarkGrey:: @ 85ED228 .string "{HIGHLIGHT DARK_GREY}$" + .string " $" -gUnknown_085ED22E:: @ 85ED22E +gText_DynColor2Male:: @ 85ED22E .string "{COLOR DYNAMIC_COLOR2}♂$" -gUnknown_085ED233:: @ 85ED233 +gText_DynColor1Female:: @ 85ED233 .string "{COLOR DYNAMIC_COLOR1}♀$" -gUnknown_085ED238:: @ 85ED238 +gText_DynColor2:: @ 85ED238 .string "{COLOR DYNAMIC_COLOR2}$" -gUnknown_085ED23C:: @ 85ED23C +gText_Upper:: @ 85ED23C .string "UPPER$" -gUnknown_085ED242:: @ 85ED242 +gText_Lower:: @ 85ED242 .string "lower$" -gUnknown_085ED248:: @ 85ED248 +gText_Others:: @ 85ED248 .string "OTHERS$" -gUnknown_085ED24F:: @ 85ED24F +gText_Symbols:: @ 85ED24F .string "SYMBOLS$" -gUnknown_085ED257:: @ 85ED257 +gText_Register2:: @ 85ED257 .string "REGISTER$" -gUnknown_085ED260:: @ 85ED260 +gText_Exit2:: @ 85ED260 .string "EXIT$" -gUnknown_085ED265:: @ 85ED265 +gText_QuitChatting:: @ 85ED265 .string "Quit chatting?$" -gUnknown_085ED274:: @ 85ED274 +gText_RegisterTextWhere:: @ 85ED274 .string "Register text where?$" -gUnknown_085ED289:: @ 85ED289 +gText_RegisterTextHere:: @ 85ED289 .string "Register text here?$" -gUnknown_085ED29D:: @ 85ED29D +gText_InputText:: @ 85ED29D .string "Input text.$" -gUnknown_085ED2A9:: @ 85ED2A9 +gText_F700JoinedChat:: @ 85ED2A9 .string "{SPECIAL_F7 0x00} joined the chat!$" -gUnknown_085ED2BD:: @ 85ED2BD +gText_F700LeftChat:: @ 85ED2BD .string "{SPECIAL_F7 0x00} left the chat.$" + .string "{SPECIAL_F7 0x00}の{SPECIAL_F7 0x01}ひきめ:$" @ "{SPECIAL_F7 0x00}'s {SPECIAL_F7 0x01}hikime" .string "{SPECIAL_F7 0x00}の{SPECIAL_F7 0x01}ひきめは いません$" @ "{SPECIAL_F7 0x00}'s {SPECIAL_F7 0x01}hikimeha imasen" -gUnknown_085ED2E8:: @ 85ED2E8 +gText_ExitingChat:: @ 85ED2E8 .string "Exiting the chat…$" -gUnknown_085ED2FA:: @ 85ED2FA +gText_LeaderLeftEndingChat:: @ 85ED2FA .string "The LEADER, {SPECIAL_F7 0x00}, has\nleft, ending the chat.$" -gUnknown_085ED325:: @ 85ED325 +gText_RegisteredTextChanged:: @ 85ED325 .string "The registered text has been changed.\nIs it okay to save the game?$" -gUnknown_085ED368:: @ 85ED368 +gText_AlreadySavedFile:: @ 85ED368 .string "There is already a saved file.\nIs it okay to overwrite it?$" -gUnknown_085ED3A3:: @ 85ED3A3 +gText_SavingDontTurnOff:: @ 85ED3A3 .string "SAVING…\nDON’T TURN OFF THE POWER.$" -gUnknown_085ED3C5:: @ 85ED3C5 +gText_PlayerSavedGame:: @ 85ED3C5 .string "{SPECIAL_F7 0x00} saved the game.$" -gUnknown_085ED3D8:: @ 85ED3D8 +gText_IfLeaderLeavesChatEnds:: @ 85ED3D8 .string "If the LEADER leaves, the chat\nwill end. Is that okay?$" -gUnknown_085ED40F:: @ 85ED40F +gText_Hello:: @ 85ED40F .string "HELLO$" -gUnknown_085ED415:: @ 85ED415 +gText_Pokemon2:: @ 85ED415 .string "POKéMON$" -gUnknown_085ED41D:: @ 85ED41D +gText_Trade:: @ 85ED41D .string "TRADE$" -gUnknown_085ED423:: @ 85ED423 +gText_Battle:: @ 85ED423 .string "BATTLE$" -gUnknown_085ED42A:: @ 85ED42A +gText_Lets:: @ 85ED42A .string "LET’S$" -gUnknown_085ED430:: @ 85ED430 +gText_Ok:: @ 85ED430 .string "OK!$" -gUnknown_085ED434:: @ 85ED434 +gText_Sorry:: @ 85ED434 .string "SORRY$" -gUnknown_085ED43A:: @ 85ED43A +gText_YayUnkF9F9:: @ 85ED43A .string "YAY{UNK_CTRL_F9F9}$" -gUnknown_085ED440:: @ 85ED440 +gText_ThankYou:: @ 85ED440 .string "THANK YOU$" -gUnknown_085ED44A:: @ 85ED44A +gText_ByeBye:: @ 85ED44A .string "BYE-BYE!$" + .string "Attack the weak points!$" .string "Ultimate STEEL POKéMON.$" .string "I’d climb even waterfalls$" @@ -2277,145 +2329,146 @@ gUnknown_085ED44A:: @ 85ED44A .string "My POKéMON and I help$" .string "my father’s research.$" -gUnknown_085ED5A5:: @ 85ED5A5 +gText_PkmnHatchedFromEgg:: @ 85ED5A5 .string "{STR_VAR_1} hatched from the EGG!$" -gUnknown_085ED5BE:: @ 85ED5BE +gText_NameHatchedPkmn:: @ 85ED5BE .string "Would you like to nickname the newly\nhatched {STR_VAR_1}?$" .align 2 -gUnknown_085ED5F0:: @ 85ED5F0 +gText_ReadyToBerryCrush:: @ 85ED5F0 .string "Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p$" .align 2 -gUnknown_085ED62C:: @ 85ED62C +gText_WaitForAllChooseBerry:: @ 85ED62C .string "Please wait while each member\nchooses a BERRY.$" .align 2 -gUnknown_085ED65C:: @ 85ED65C +gText_EndedWithXUnitsPowder:: @ 85ED65C .string "{PAUSE_MUSIC}{PLAY_BGM BGM_FANFA1}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p$" .align 2 -gUnknown_085ED6C8:: @ 85ED6C8 +gText_RecordingGameResults:: @ 85ED6C8 .string "Recording your game results in the\nsave file.\lPlease wait.$" .align 2 -gUnknown_085ED704:: @ 85ED704 +gText_PlayBerryCrushAgain:: @ 85ED704 .string "Want to play BERRY CRUSH again?$" .align 2 -gUnknown_085ED724:: @ 85ED724 +gText_YouHaveNoBerries:: @ 85ED724 .string "You have no BERRIES.\nThe game will be canceled.$" .align 2 -gUnknown_085ED754:: @ 85ED754 +gText_MemberDroppedOut:: @ 85ED754 .string "A member dropped out.\nThe game will be canceled.$" .align 2 -gUnknown_085ED788:: @ 85ED788 +gText_TimesUpNoGoodPowder:: @ 85ED788 .string "Time’s up.\pGood BERRY POWDER could not be\nmade…\p$" .align 2 -gUnknown_085ED7BC:: @ 85ED7BC +gText_CommunicationStandby2:: @ 85ED7BC .string "Communication standby…$" .align 2 -gUnknown_085ED7D4:: @ 85ED7D4 +gText_1DotBlueF700:: @ 85ED7D4 .string "1. {COLOR BLUE}{SHADOW LIGHT_BLUE}{SPECIAL_F7 0x00}$" .align 2 -gUnknown_085ED7E0:: @ 85ED7E0 +gText_1DotF700:: @ 85ED7E0 .string "1. {SPECIAL_F7 0x00}$" .align 2 -gUnknown_085ED7E8:: @ 85ED7E8 +gText_SpaceTimes2:: @ 85ED7E8 .string " time(s)$" .align 2 -gUnknown_085ED7F4:: @ 85ED7F4 +gText_XDotY:: @ 85ED7F4 .string "{STR_VAR_1}.{STR_VAR_2}$" .align 2 -gUnknown_085ED7FC:: @ 85ED7FC +gText_Var1Berry:: @ 85ED7FC .string "{STR_VAR_1} BERRY$" .align 2 -gUnknown_085ED808:: @ 85ED808 +gText_TimeColon:: @ 85ED808 .string "Time:$" .align 2 -gUnknown_085ED810:: @ 85ED810 +gText_PressingSpeed:: @ 85ED810 .string "Pressing Speed:$" .align 2 -gUnknown_085ED820:: @ 85ED820 +gText_Silkiness:: @ 85ED820 .string "Silkiness:$" .align 2 -gUnknown_085ED82C:: @ 85ED82C +gText_StrVar1:: @ 85ED82C .string "{STR_VAR_1}$" .align 2 -gUnknown_085ED830:: @ 85ED830 +gText_SpaceMin:: @ 85ED830 .string " min. $" .align 2 -gUnknown_085ED838:: @ 85ED838 +gText_XDotY2:: @ 85ED838 .string "{STR_VAR_1}.{STR_VAR_2}$" .align 2 -gUnknown_085ED840:: @ 85ED840 +gText_SpaceSec:: @ 85ED840 .string " sec.$" .align 2 -gUnknown_085ED848:: @ 85ED848 +gText_XDotY3:: @ 85ED848 .string "{STR_VAR_1}.{STR_VAR_2}$" .align 2 -gUnknown_085ED850:: @ 85ED850 +gText_TimesPerSec:: @ 85ED850 .string " Times/sec.$" .align 2 -gUnknown_085ED85C:: @ 85ED85C +gText_Var1Percent:: @ 85ED85C .string "{STR_VAR_1}%$" .align 2 -gUnknown_085ED860:: @ 85ED860 +gText_PressesRankings:: @ 85ED860 .string "No. of Presses Rankings$" .align 2 -gUnknown_085ED878:: @ 85ED878 +gText_CrushingResults:: @ 85ED878 .string "Crushing Results$" .align 2 -gUnknown_085ED88C:: @ 85ED88C +gText_NeatnessRankings:: @ 85ED88C .string "Neatness Rankings$" .align 2 -gUnknown_085ED8A0:: @ 85ED8A0 +gText_CoopRankings:: @ 85ED8A0 .string "Cooperative Rankings$" .align 2 -gUnknown_085ED8B8:: @ 85ED8B8 +gText_PressingPowerRankings:: @ 85ED8B8 .string "Pressing-Power Rankings$" -gUnknown_085ED8D0:: @ 85ED8D0 +gText_BerryCrush2:: @ 85ED8D0 .string "BERRY CRUSH$" -gUnknown_085ED8DC:: @ 85ED8DC +gText_PressingSpeedRankings:: @ 85ED8DC .string "Pressing-Speed Rankings$" -gUnknown_085ED8F4:: @ 85ED8F4 +gText_Var1Players:: @ 85ED8F4 .string "{STR_VAR_1} PLAYERS$" -gUnknown_085ED8FF:: @ 85ED8FF +gText_SymbolsEarned:: @ 85ED8FF .string "Symbols Earned$" -gUnknown_085ED90E:: @ 85ED90E +gText_BattleRecord:: @ 85ED90E .string "Battle Record$" -gUnknown_085ED91C:: @ 85ED91C +gText_BattlePoints:: @ 85ED91C .string "Battle Points$" + .string "CANCEL$" .string "$" .string "Check BATTLE FRONTIER MAP.$" @@ -2447,140 +2500,141 @@ gUnknown_085ED91C:: @ 85ED91C .string "Select one of three paths to battle!\nYour luck will be tested.$" .string "Aim for the top with exploration!\nYour bravery will be tested.$" -gUnknown_085EDCC3:: @ 85EDCC3 +gText_ContinueMenuPlayer:: @ 85EDCC3 .string "PLAYER$" -gUnknown_085EDCCA:: @ 85EDCCA +gText_ContinueMenuTime:: @ 85EDCCA .string "TIME$" -gUnknown_085EDCCF:: @ 85EDCCF +gText_ContinueMenuPokedex:: @ 85EDCCF .string "POKéDEX$" -gUnknown_085EDCD7:: @ 85EDCD7 +gText_ContinueMenuBadges:: @ 85EDCD7 .string "BADGES$" -gUnknown_085EDCDE:: @ 85EDCDE +gText_Powder:: @ 85EDCDE .string "POWDER$" -gUnknown_085EDCE5:: @ 85EDCE5 +gText_BerryPickingRecords:: @ 85EDCE5 .string "DODRIO BERRY-PICKING RECORDS$" -gUnknown_085EDD02:: @ 85EDD02 +gText_BerriesPicked:: @ 85EDD02 .string "BERRIES picked:$" -gUnknown_085EDD12:: @ 85EDD12 +gText_BestScore:: @ 85EDD12 .string "Best score:$" -gUnknown_085EDD1E:: @ 85EDD1E +gText_BerriesInRowFivePlayers:: @ 85EDD1E .string "BERRIES picked in a row with\nfive players:$" -gUnknown_085EDD49:: @ 85EDD49 +gText_BerryPickingResults:: @ 85EDD49 .string "Announcing BERRY-PICKING results!$" -gUnknown_085EDD6B:: @ 85EDD6B +gText_10P30P50P50P:: @ 85EDD6B .string "{CLEAR_TO 0x03}10P{CLEAR_TO 0x2B}30P{CLEAR_TO 0x53}50P{CLEAR_TO 0x77}{UNK_CTRL_F9DD}50P$" -gUnknown_085EDD86:: @ 85EDD86 +gText_AnnouncingRankings:: @ 85EDD86 .string "Announcing rankings!$" -gUnknown_085EDD9B:: @ 85EDD9B +gText_AnnouncingPrizes:: @ 85EDD9B .string "Announcing prizes!$" -gUnknown_085EDDAE:: @ 85EDDAE +gText_1Colon:: @ 85EDDAE .string "1:$" -gUnknown_085EDDB1:: @ 85EDDB1 +gText_2Colon:: @ 85EDDB1 .string "2:$" -gUnknown_085EDDB4:: @ 85EDDB4 +gText_3Colon:: @ 85EDDB4 .string "3:$" -gUnknown_085EDDB7:: @ 85EDDB7 +gText_4Colon:: @ 85EDDB7 .string "4:$" -gUnknown_085EDDBA:: @ 85EDDBA +gText_5Colon:: @ 85EDDBA .string "5:$" -gUnknown_085EDDBD:: @ 85EDDBD +gText_FirstPlacePrize:: @ 85EDDBD .string "The first-place winner gets\nthis {SPECIAL_F7 0x00}!$" -gUnknown_085EDDE2:: @ 85EDDE2 +gText_CantHoldAnyMore:: @ 85EDDE2 .string "You can’t hold any more!$" -gUnknown_085EDDFB:: @ 85EDDFB +gText_FilledStorageSpace:: @ 85EDDFB .string "It filled its storage space.$" -gUnknown_085EDE18:: @ 85EDE18 +gText_WantToPlayAgain:: @ 85EDE18 .string "Want to play again?$" -gUnknown_085EDE2C:: @ 85EDE2C +gText_SomeoneDroppedOut:: @ 85EDE2C .string "Somebody dropped out.\nThe link will be canceled.$" -gUnknown_085EDE5D:: @ 85EDE5D +gText_SpacePoints:: @ 85EDE5D .string " points$" -gUnknown_085EDE65:: @ 85EDE65 +gText_CommunicationStandby3:: @ 85EDE65 .string "Communication standby…$" -gUnknown_085EDE7C:: @ 85EDE7C +gText_SpacePoints2:: @ 85EDE7C .string " points$" -gUnknown_085EDE84:: @ 85EDE84 +gText_SpaceTimes3:: @ 85EDE84 .string " time(s)$" -gUnknown_085EDE8D:: @ 85EDE8D +gText_PkmnJumpRecords:: @ 85EDE8D .string "POKéMON JUMP RECORDS$" -gUnknown_085EDEA2:: @ 85EDEA2 +gText_JumpsInARow:: @ 85EDEA2 .string "Jumps in a row:$" -gUnknown_085EDEB2:: @ 85EDEB2 +gText_BestScore2:: @ 85EDEB2 .string "Best score:$" -gUnknown_085EDEBE:: @ 85EDEBE +gText_ExcellentsInARow:: @ 85EDEBE .string "EXCELLENTS in a row:$" -gUnknown_085EDED3:: @ 85EDED3 +gText_AwesomeWonF701F700:: @ 85EDED3 .string "Awesome score! You’ve\nwon {SPECIAL_F7 0x01} {SPECIAL_F7 0x00}!$" -gUnknown_085EDEF4:: @ 85EDEF4 +gText_FilledStorageSpace2:: @ 85EDEF4 .string "It filled its storage space.$" -gUnknown_085EDF11:: @ 85EDF11 +gText_CantHoldMore:: @ 85EDF11 .string "You can’t hold any more!$" -gUnknown_085EDF2A:: @ 85EDF2A +gText_WantToPlayAgain2:: @ 85EDF2A .string "Want to play again?$" -gUnknown_085EDF3E:: @ 85EDF3E +gText_SomeoneDroppedOut2:: @ 85EDF3E .string "Somebody dropped out.\nThe link will be canceled.$" -gUnknown_085EDF6F:: @ 85EDF6F +gText_CommunicationStandby4:: @ 85EDF6F .string "Communication standby…$" -gUnknown_085EDF86:: @ 85EDF86 +gText_LinkContestResults:: @ 85EDF86 .string "{PLAYER}’s Link Contest Results$" -gUnknown_085EDFA0:: @ 85EDFA0 +gText_1st:: @ 85EDFA0 .string "1st$" -gUnknown_085EDFA4:: @ 85EDFA4 +gText_2nd:: @ 85EDFA4 .string "2nd$" -gUnknown_085EDFA8:: @ 85EDFA8 +gText_3rd:: @ 85EDFA8 .string "3rd$" -gUnknown_085EDFAC:: @ 85EDFAC +gText_4th:: @ 85EDFAC .string "4th$" -gUnknown_085EDFB0:: @ 85EDFB0 +gText_Friend:: @ 85EDFB0 .string "Friend$" + .string "POKeMON$" -gUnknown_085EDFBF:: @ 85EDFBF +gJPText_MysteryGift:: @ 85EDFBF .string "ふしぎなもらいもの$" @ "fushiginamoraimono" ("Mystery Gift" in Japanese) -gUnknown_085EDFC9:: @ 85EDFC9 +gJPText_DecideStop:: @ 85EDFC9 .string "{UNK_CTRL_F800}けってい {UNK_CTRL_F801}やめる$" @ "{UNK_CTRL_F800}kettei {UNK_CTRL_F801}yameru" ("{UNK_CTRL_F800}decide {UNK_CTRL_F801}stop" in Japanese) @ A bunch of Japanese strings here, waiting for updated datadump to dump properly @@ -2630,89 +2684,88 @@ gUnknown_085EE12D:: @ 85EE12D .string "BLUE$" .string "---$" -gUnknown_085EE158:: @ 85EE158 +gText_SingleBattleRoomResults:: @ 85EE158 .string "{PLAYER}’s Single Battle Room Results$" -gUnknown_085EE178:: @ 85EE178 +gText_DoubleBattleRoomResults:: @ 85EE178 .string "{PLAYER}’s Double Battle Room Results$" -gUnknown_085EE198:: @ 85EE198 +gText_MultiBattleRoomResults:: @ 85EE198 .string "{PLAYER}’s Multi Battle Room Results$" -gUnknown_085EE1B7:: @ 85EE1B7 +gText_LinkMultiBattleRoomResults:: @ 85EE1B7 .string "{PLAYER}’s Link Multi Battle Room Results$" -gUnknown_085EE1DB:: @ 85EE1DB +gText_SingleBattleTourneyResults:: @ 85EE1DB .string "{PLAYER}’s Single Battle Tourney Results$" -gUnknown_085EE1FE:: @ 85EE1FE +gText_DoubleBattleTourneyResults:: @ 85EE1FE .string "{PLAYER}’s Double Battle Tourney Results$" -gUnknown_085EE221:: @ 85EE221 +gText_SingleBattleHallResults:: @ 85EE221 .string "{PLAYER}’s Single Battle Hall Results$" -gUnknown_085EE241:: @ 85EE241 +gText_DoubleBattleHallResults:: @ 85EE241 .string "{PLAYER}’s Double Battle Hall Results$" -gUnknown_085EE261:: @ 85EE261 +gText_BattleChoiceResults:: @ 85EE261 .string "{PLAYER}’s Battle Choice Results$" -gUnknown_085EE27C:: @ 85EE27C +gText_SetKOTourneyResults:: @ 85EE27C .string "{PLAYER}’s Set KO Tourney Results$" -gUnknown_085EE298:: @ 85EE298 +gText_BattleSwapSingleResults:: @ 85EE298 .string "{PLAYER}’s Battle Swap Single Results$" -gUnknown_085EE2B8:: @ 85EE2B8 +gText_BattleSwapDoubleResults:: @ 85EE2B8 .string "{PLAYER}’s Battle Swap Double Results$" -gUnknown_085EE2D8:: @ 85EE2D8 +gText_BattleQuestResults:: @ 85EE2D8 .string "{PLAYER}’s Battle Quest Results$" -gUnknown_085EE2F2:: @ 85EE2F2 +gText_Lv502:: @ 85EE2F2 .string "LV. 50$" -gUnknown_085EE2F9:: @ 85EE2F9 +gText_OpenLv:: @ 85EE2F9 .string "OPEN LV.$" -gUnknown_085EE302:: @ 85EE302 +gText_WinStreak:: @ 85EE302 .string "Win streak: {STR_VAR_1}$" -gUnknown_085EE311:: @ 85EE311 +gText_Current:: @ 85EE311 .string "CURRENT$" -gUnknown_085EE319:: @ 85EE319 +gText_Record:: @ 85EE319 .string "RECORD$" -gUnknown_085EE320:: @ 85EE320 +gText_Prev:: @ 85EE320 .string "PREV.$" -gUnknown_085EE326:: @ 85EE326 +gText_RentalSwap:: @ 85EE326 .string "Rental/Swap$" -gUnknown_085EE332:: @ 85EE332 +gText_Total:: @ 85EE332 .string "Total$" -gUnknown_085EE338:: @ 85EE338 +gText_ClearStreak:: @ 85EE338 .string "Clear streak: {STR_VAR_1}$" -gUnknown_085EE349:: @ 85EE349 +gText_Championships:: @ 85EE349 .string "Championships: {STR_VAR_1}$" -gUnknown_085EE35B:: @ 85EE35B +gText_RoomsCleared:: @ 85EE35B .string "Rooms cleared: {STR_VAR_1}$" -gUnknown_085EE36D:: @ 85EE36D +gText_TimesCleared:: @ 85EE36D .string "Times cleared:{CLEAR 0x05}{STR_VAR_1}$" -gUnknown_085EE381:: @ 85EE381 +gText_KOsInARow:: @ 85EE381 .string "KOs in a row: {STR_VAR_1}$" -gUnknown_085EE392:: @ 85EE392 +gText_TimesVar1:: @ 85EE392 .string "Times: {STR_VAR_1}$" - - .align 2 -gUnknown_085EE39C:: @ 85EE39C + +gText_FloorsCleared:: @ 85EE39C .string "Floors cleared: {STR_VAR_1}$" .align 2 @@ -2737,46 +2790,48 @@ gUnknown_085EE39C:: @ 85EE39C .string "Floors cleared: {STR_VAR_2}$" .align 2 -gUnknown_085EE424:: @ 85EE424 +gText_1Dot:: @ 85EE424 .string "1.$" + .string "2.$" .string "3.$" -gUnknown_085EE42D:: @ 85EE42D +gText_SavingDontTurnOff2:: @ 85EE42D .string "SAVING…\nDON’T TURN OFF THE POWER.$" -gUnknown_085EE44F:: @ 85EE44F +gText_BlenderMaxSpeedRecord:: @ 85EE44F .string "BERRY BLENDER\nMAXIMUM SPEED RECORD!$" -gUnknown_085EE473:: @ 85EE473 +gText_234Players:: @ 85EE473 .string "2 PLAYERS\n3 PLAYERS\n4 PLAYERS$" -gUnknown_085EE491:: @ 85EE491 +gText_YesNo:: @ 85EE491 .string "YES\nNO$" -gUnknown_085EE498:: @ 85EE498 +gText_SelectorArrow3:: @ 85EE498 .string "▶$" -gUnknown_085EE49A:: @ 85EE49A +gText_Peekaboo:: @ 85EE49A .string "PEEKABOO!$" -gUnknown_085EE4A4:: @ 85EE4A4 +gText_CommErrorCheckConnections:: @ 85EE4A4 .string "Communication error…\nPlease check all connections,\nthen turn the power OFF and ON.$" -gUnknown_085EE4F7:: @ 85EE4F7 +gText_CommErrorEllipsis:: @ 85EE4F7 .string "Communication error…$" -gUnknown_085EE50C:: @ 85EE50C +gText_MoveCloserToLinkPartner:: @ 85EE50C .string "Move closer to your link partner(s).\nAvoid obstacles between partners.$" -gUnknown_085EE553:: @ 85EE553 +gText_ABtnRegistrationCounter:: @ 85EE553 .string "A Button: Registration Counter$" -gUnknown_085EE572:: @ 85EE572 +gText_ABtnTitleScreen:: @ 85EE572 .string "A Button: Title Screen$" -gUnknown_085EE589:: @ 85EE589 +gText_Option:: @ 85EE589 .string "OPTION$" + .string "TEXT SPEED$" .string "BATTLE SCENE$" .string "BATTLE STYLE$" @@ -2785,63 +2840,65 @@ gUnknown_085EE589:: @ 85EE589 .string "CANCEL$" .string "BUTTON MODE$" -gUnknown_085EE5D4:: @ 85EE5D4 +gText_TextSpeedSlow:: @ 85EE5D4 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}SLOW$" -gUnknown_085EE5DF:: @ 85EE5DF +gText_TextSpeedMid:: @ 85EE5DF .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}MID$" -gUnknown_085EE5E9:: @ 85EE5E9 +gText_TextSpeedFast:: @ 85EE5E9 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}FAST$" -gUnknown_085EE5F4:: @ 85EE5F4 +gText_BattleSceneOn:: @ 85EE5F4 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}ON$" -gUnknown_085EE5FD:: @ 85EE5FD +gText_BattleSceneOff:: @ 85EE5FD .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}OFF$" -gUnknown_085EE607:: @ 85EE607 +gText_BattleStyleShift:: @ 85EE607 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}SHIFT$" -gUnknown_085EE613:: @ 85EE613 +gText_BattleStyleSet:: @ 85EE613 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}SET$" -gUnknown_085EE61D:: @ 85EE61D +gText_SoundMono:: @ 85EE61D .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}MONO$" -gUnknown_085EE628:: @ 85EE628 +gText_SoundStereo:: @ 85EE628 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}STEREO$" -gUnknown_085EE635:: @ 85EE635 +gText_FrameType:: @ 85EE635 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}TYPE$" -gUnknown_085EE640:: @ 85EE640 +gText_FrameTypeNumber:: @ 85EE640 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}$" -gUnknown_085EE647:: @ 85EE647 +gText_ButtonTypeNormal:: @ 85EE647 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}NORMAL$" -gUnknown_085EE654:: @ 85EE654 +gText_ButtonTypeLR:: @ 85EE654 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}LR$" -gUnknown_085EE65D:: @ 85EE65D +gText_ButtonTypeLEqualsA:: @ 85EE65D .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}L=A$" -gUnknown_085EE667:: @ 85EE667 +gText_XPLink:: @ 85EE667 .string "{STR_VAR_1}P LINK$" + .string "BRONZE$" .string "COPPER$" .string "SILVER$" .string "GOLD$" -gUnknown_085EE68A:: @ 85EE68A +gText_Day:: @ 85EE68A .string "DAY$" -gUnknown_085EE68E:: @ 85EE68E +gText_Colon3:: @ 85EE68E .string ":$" -gUnknown_085EE690:: @ 85EE690 +gText_Confirm2:: @ 85EE690 .string "CONFIRM$" + .string "Days$" .string "Time:$" .string "Game time$" @@ -2858,11 +2915,12 @@ gUnknown_085EE690:: @ 85EE690 .string "RETIRE$" .string "REST$" -gOtherText_SafariStock:: @ 85EE6FF +gText_SafariBallStock:: @ 85EE6FF .string "SAFARI BALLS\nStock: {STR_VAR_1}$" -gOtherText_BattlePyramid_X:: @ 85EE716 +gText_BattlePyramidFloor:: @ 85EE716 .string "Battle Pyramid\n{STR_VAR_1}$" + .string "Floor 1$" .string "Floor 2$" .string "Floor 3$" @@ -2872,70 +2930,72 @@ gOtherText_BattlePyramid_X:: @ 85EE716 .string "Floor 7$" .string "Peak$" -gUnknown_085EE765:: @ 85EE765 +gText_LinkStandby2:: @ 85EE765 .string "Link standby…\n… … B Button: Cancel$" -gUnknown_085EE788:: @ 85EE788 +gText_PressAToLoadEvent:: @ 85EE788 .string "Press the A Button to load event.\n… … B Button: Cancel$" -gUnknown_085EE7BF:: @ 85EE7BF +gText_LoadingEvent:: @ 85EE7BF .string "Loading event…$" -gUnknown_085EE7CE:: @ 85EE7CE +gText_DontRemoveCableTurnOff:: @ 85EE7CE .string "Don’t remove the Game Link cable.\nDon’t turn off the power.$" -gUnknown_085EE80A:: @ 85EE80A +gText_EventSafelyLoaded:: @ 85EE80A .string "The event was safely loaded.$" -gUnknown_085EE827:: @ 85EE827 +gText_LoadErrorEndingSession:: @ 85EE827 .string "Loading error.\nEnding session.$" + .string "プレイヤー$" @ "pureiyaa" ("player" in Japanese) .string "さま$" @ "sama" (a very high honorific) -gUnknown_085EE84F:: @ 85EE84F +gText_DexHoenn:: @ 85EE84F .string "HOENN$" -gUnknown_085EE855:: @ 85EE855 +gText_DexNational:: @ 85EE855 .string "NATIONAL$" -gUnknown_085EE85E:: @ 85EE85E +gText_PokedexDiploma:: @ 85EE85E .string "PLAYER: {CLEAR 0x10}{COLOR RED}{SHADOW LIGHT_RED}{PLAYER}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}\n\nThis document certifies\nthat you have successfully\ncompleted your\n{STR_VAR_1} POKéDEX.\n\n{CLEAR_TO 0x42}{COLOR RED}{SHADOW LIGHT_RED}GAME FREAK$" .string "{COLOR RED}{SHADOW LIGHT_RED}ゲ-ムフリ-ク$" @ geemufuriku ("Game Freak" in Japanese) .string "{COLOR RED}{SHADOW LIGHT_RED}$" -gUnknown_085EE8F1:: @ 85EE8F1 +gText_Hoenn:: @ 85EE8F1 .string "HOENN$" -gUnknown_085EE8F7:: @ 85EE8F7 +gText_OhABite:: @ 85EE8F7 .string "Oh! A bite!$" -gUnknown_085EE903:: @ 85EE903 +gText_PokemonOnHook:: @ 85EE903 .string "A POKéMON’s on the hook!{PAUSE_UNTIL_PRESS}$" -gUnknown_085EE91E:: @ 85EE91E +gText_NotEvenANibble:: @ 85EE91E .string "Not even a nibble…{PAUSE_UNTIL_PRESS}$" -gUnknown_085EE933:: @ 85EE933 +gText_ItGotAway:: @ 85EE933 .string "It got away…{PAUSE_UNTIL_PRESS}$" -gUnknown_085EE942:: @ 85EE942 +gText_XWillBeSentToY:: @ 85EE942 .string "{STR_VAR_2} will be\nsent to {STR_VAR_1}.$" -gUnknown_085EE959:: @ 85EE959 +gText_ByeByeVar1:: @ 85EE959 .string "Bye-bye, {STR_VAR_2}!$" -gUnknown_085EE966:: @ 85EE966 +gText_XSentOverY:: @ 85EE966 .string "{STR_VAR_1} sent over {STR_VAR_3}.$" -gUnknown_085EE977:: @ 85EE977 +gText_TakeGoodCareOfX:: @ 85EE977 .string "Take good care of {STR_VAR_3}!$" .include "data/text/easy_chat/easy_chat_group_names.inc" -gUnknown_085EEA42:: @ 85EEA42 +gText_ThreeQuestionMarks:: @ 85EEA42 .string "???$" + .string "MAX. HP$" .string "ATTACK$" .string "DEFENSE$" @@ -2943,30 +3003,32 @@ gUnknown_085EEA42:: @ 85EEA42 .string "SP. ATK$" .string "SP. DEF$" -gUnknown_085EEA73:: @ 85EEA73 +gText_UnkCtrlF904:: @ 85EEA73 .string "{UNK_CTRL_F904}$" -gUnknown_085EEA76:: @ 85EEA76 +gText_Dash:: @ 85EEA76 .string "-$" -gUnknown_085EEA78:: @ 85EEA78 +gText_FromSpace:: @ 85EEA78 .string "From $" -gUnknown_085EEA7E:: @ 85EEA7E +gText_MixingRecords:: @ 85EEA7E .string "Mixing records…$" -gUnknown_085EEA8E:: @ 85EEA8E +gText_RecordMixingComplete:: @ 85EEA8E .string "Record mixing completed.\nThank you for waiting.$" + .string "YOUR NAME?$" .string "BOX NAME?$" .string "{STR_VAR_1}’s nickname?$" .string "Tell him the words.$" -gUnknown_085EEAF6:: @ 85EEAF6 +gText_MoveOkBack:: @ 85EEAF6 .string "{UNK_CTRL_F80C}MOVE {UNK_CTRL_F800}OK {UNK_CTRL_F801}BACK$" -gUnknown_085EEB0B:: @ 85EEB0B +gText_CallCantBeMadeHere:: @ 85EEB0B .string "A call can’t be made from here.$" + .string "HANDSOME$" .string "VINNY$" .string "MOREME$" @@ -2978,8 +3040,9 @@ gUnknown_085EEB0B:: @ 85EEB0B .string "smartness$" .string "toughness$" -gUnknown_085EEB7E:: @ 85EEB7E +gText_Lady2:: @ 85EEB7E .string "Lady$" + .string "slippery$" .string "roundish$" .string "wham-ish$" @@ -2987,473 +3050,480 @@ gUnknown_085EEB7E:: @ 85EEB7E .string "sticky$" .string "pointy$" -gUnknown_085EEBB2:: @ 85EEBB2 +gText_RentalPkmn2:: @ 85EEBB2 .string "RENTAL POKéMON$" -gUnknown_085EEBC1:: @ 85EEBC1 +gText_SelectFirstPkmn:: @ 85EEBC1 .string "Select the first POKéMON.$" -gUnknown_085EEBDB:: @ 85EEBDB +gText_SelectSecondPkmn:: @ 85EEBDB .string "Select the second POKéMON.$" -gUnknown_085EEBF6:: @ 85EEBF6 +gText_SelectThirdPkmn:: @ 85EEBF6 .string "Select the third POKéMON.$" -gUnknown_085EEC10:: @ 85EEC10 +gText_Rent:: @ 85EEC10 .string "RENT$" -gUnknown_085EEC15:: @ 85EEC15 +gText_Summary:: @ 85EEC15 .string "SUMMARY$" -gUnknown_085EEC1D:: @ 85EEC1D +gText_Others2:: @ 85EEC1D .string "OTHERS$" -gUnknown_085EEC24:: @ 85EEC24 +gText_Deselect:: @ 85EEC24 .string "DESELECT$" -gUnknown_085EEC2D:: @ 85EEC2D +gText_TheseThreePkmnOkay:: @ 85EEC2D .string "Are these three POKéMON OK?$" -gUnknown_085EEC49:: @ 85EEC49 +gText_Yes2:: @ 85EEC49 .string "YES$" -gUnknown_085EEC4D:: @ 85EEC4D +gText_No2:: @ 85EEC4D .string "NO$" -gUnknown_085EEC50:: @ 85EEC50 +gText_CantSelectSamePkmn:: @ 85EEC50 .string "Can’t select same {PKMN}.$" -gUnknown_085EEC66:: @ 85EEC66 +gText_PkmnSwap:: @ 85EEC66 .string "POKéMON SWAP$" -gUnknown_085EEC73:: @ 85EEC73 +gText_SelectPkmnToSwap:: @ 85EEC73 .string "Select POKéMON to swap.$" -gUnknown_085EEC8B:: @ 85EEC8B +gText_SelectPkmnToAccept:: @ 85EEC8B .string "Select POKéMON to accept.$" -gUnknown_085EECA5:: @ 85EECA5 +gText_Swap:: @ 85EECA5 .string "SWAP$" -gUnknown_085EECAA:: @ 85EECAA +gText_Summary2:: @ 85EECAA .string "SUMMARY$" -gUnknown_085EECB2:: @ 85EECB2 +gText_Rechoose:: @ 85EECB2 .string "RECHOOSE$" -gUnknown_085EECBB:: @ 85EECBB +gText_QuitSwapping:: @ 85EECBB .string "Quit swapping?$" -gUnknown_085EECCA:: @ 85EECCA +gText_Yes3:: @ 85EECCA .string "YES$" -gUnknown_085EECCE:: @ 85EECCE +gText_No3:: @ 85EECCE .string "NO$" -gUnknown_085EECD1:: @ 85EECD1 +gText_PkmnForSwap:: @ 85EECD1 .string "{PKMN} FOR SWAP$" -gUnknown_085EECDD:: @ 85EECDD +gText_Cancel3:: @ 85EECDD .string "CANCEL$" + .string "SWAP$" .string "ACCEPT$" -gUnknown_085EECF0:: @ 85EECF0 +gText_AcceptThisPkmn:: @ 85EECF0 .string "Accept this POKéMON?$" + .string " $" -gUnknown_085EED0A:: @ 85EED0A +gText_SamePkmnInPartyAlready:: @ 85EED0A .string "Same {PKMN} in party already.$" -gOtherText_DecimalPoint:: @ 85EED24 +gText_DecimalPoint:: @ 85EED24 .string ".$" -gUnknown_085EED26:: @ 85EED26 +gText_SavingPlayer:: @ 85EED26 .string "PLAYER$" -gUnknown_085EED2D:: @ 85EED2D +gText_SavingBadges:: @ 85EED2D .string "BADGES$" -gUnknown_085EED34:: @ 85EED34 +gText_SavingPokedex:: @ 85EED34 .string "POKéDEX$" -gUnknown_085EED3C:: @ 85EED3C +gText_SavingTime:: @ 85EED3C .string "TIME$" -gUnknown_085EED41:: @ 85EED41 +gText_WirelessCommStatus:: @ 85EED41 .string "Wireless Communication Status$" -gUnknown_085EED5F:: @ 85EED5F +gText_PeopleTrading:: @ 85EED5F .string "People trading:$" -gUnknown_085EED6F:: @ 85EED6F +gText_PeopleBattling:: @ 85EED6F .string "People battling:$" -gUnknown_085EED80:: @ 85EED80 +gText_PeopleInUnionRoom:: @ 85EED80 .string "People in the UNION ROOM:$" -gUnknown_085EED9A:: @ 85EED9A +gText_PeopleCommunicating:: @ 85EED9A .string "People communicating:$" -gUnknown_085EEDB0:: @ 85EEDB0 +gText_F700Players:: @ 85EEDB0 .string "{SPECIAL_F7 0} players$" -gUnknown_085EEDBB:: @ 85EEDBB +gText_F701Players:: @ 85EEDBB .string "{SPECIAL_F7 1} players$" -gUnknown_085EEDC6:: @ 85EEDC6 +gText_F702Players:: @ 85EEDC6 .string "{SPECIAL_F7 2} players$" -gUnknown_085EEDD1:: @ 85EEDD1 +gText_F703Players:: @ 85EEDD1 .string "{SPECIAL_F7 3} players$" .align 2 - .4byte gUnknown_085EEDB0 - .4byte gUnknown_085EEDBB - .4byte gUnknown_085EEDC6 - .4byte gUnknown_085EEDD1 + .4byte gText_F700Players + .4byte gText_F701Players + .4byte gText_F702Players + .4byte gText_F703Players .align 2 -gUnknown_085EEDEC:: @ 85EEDEC +gText_WonderCards:: @ 85EEDEC .string "WONDER CARDS$" .align 2 -gUnknown_085EEDFC:: @ 85EEDFC +gText_WonderNews:: @ 85EEDFC .string "WONDER NEWS$" .align 2 -gUnknown_085EEE08:: @ 85EEE08 +gText_WirelessCommunication:: @ 85EEE08 .string "WIRELESS COMMUNICATION$" .align 2 -gUnknown_085EEE20:: @ 85EEE20 +gText_Friend2:: @ 85EEE20 .string "FRIEND$" .align 2 -gUnknown_085EEE28:: @ 85EEE28 +gText_Exit3:: @ 85EEE28 .string "EXIT$" .align 2 -gUnknown_085EEE30:: @ 85EEE30 +gText_Receive:: @ 85EEE30 .string "RECEIVE$" .align 2 -gUnknown_085EEE38:: @ 85EEE38 +gText_Send:: @ 85EEE38 .string "SEND$" .align 2 -gUnknown_085EEE40:: @ 85EEE40 +gText_Toss:: @ 85EEE40 .string "TOSS$" .align 2 -gUnknown_085EEE48:: @ 85EEE48 +gText_VarietyOfEventsImportedWireless:: @ 85EEE48 .string "A variety of events will be imported\nover Wireless Communication.$" .align 2 -gUnknown_085EEE8C:: @ 85EEE40 +gText_WonderCardsInPossession:: @ 85EEE40 .string "Read the WONDER CARDS in your\npossession.$" .align 2 -gUnknown_085EEEB8:: @ 85EEEB8 +gText_ReadNewsThatArrived:: @ 85EEEB8 .string "Read the NEWS that arrived.$" .align 2 -gUnknown_085EEED4:: @ 85EEED4 +gText_ReturnToTitle:: @ 85EEED4 .string "Return to the title screen.$" .align 2 -gUnknown_085EEEF0:: @ 85EEEF0 +gText_DontHaveCardNewOneInput:: @ 85EEEF0 .string "You don’t have a WONDER CARD,\nso a new CARD will be input.$" .align 2 -gUnknown_085EEF2C:: @ 85EEF2C +gText_DontHaveNewsNewOneInput:: @ 85EEF2C .string "You don’t have any WONDER NEWS,\nso new NEWS will be input.$" .align 2 -gUnknown_085EEF68:: @ 85EEF68 +gText_WhereShouldCardBeAccessed:: @ 85EEF68 .string "Where should the WONDER CARD\nbe accessed?$" .align 2 -gUnknown_085EEF94:: @ 85EEF94 +gText_WhereShouldNewsBeAccessed:: @ 85EEF94 .string "Where should the WONDER NEWS\nbe accessed?$" .align 2 .string "Communication standby…\nB Button: Cancel$" .align 2 -gUnknown_085EEFE8:: @ 85EEFE8 +gText_Communicating:: @ 85EEFE8 .string "Communicating…$" .align 2 -gUnknown_085EEFF8:: @ 85EEFF8 +gText_CommunicationCompleted:: @ 85EEFF8 .string "Communication completed.$" .align 2 -gUnknown_085EF014:: @ 85EF014 +gText_CommunicationError:: @ 85EF014 .string "Communication error.$" .align 2 -gUnknown_085EF02C:: @ 85EF02C +gText_CommunicationCanceled:: @ 85EF02C .string "Communication has been canceled.$" .align 2 -gUnknown_085EF050:: @ 85EF050 +gText_ThrowAwayWonderCard:: @ 85EF050 .string "Throw away the WONDER CARD\nand input a new CARD?$" .align 2 -gUnknown_085EF084:: @ 85EF084 +gText_HaventReceivedCardsGift:: @ 85EF084 .string "You haven’t received the CARD’s gift\nyet. Input a new CARD anyway?$" .align 2 -gUnknown_085EF0C8:: @ 85EF0C8 +gText_WonderCardReceivedFrom:: @ 85EF0C8 .string "A WONDER CARD has been received\nfrom {STR_VAR_1}.$" .align 2 -gUnknown_085EF0F4:: @ 85EF0F4 +gText_WonderNewsReceivedFrom:: @ 85EF0F4 .string "A WONDER NEWS item has been\nreceived from {STR_VAR_1}.$" .align 2 -gUnknown_085EF124:: @ 85EF124 +gText_WonderCardReceived:: @ 85EF124 .string "A new WONDER CARD has been\nreceived.$" .align 2 -gUnknown_085EF14C:: @ 85EF14C +gText_WonderNewsReceived:: @ 85EF14C .string "A new WONDER NEWS item has been\nreceived.$" .align 2 -gUnknown_085EF178:: @ 85EF178 +gText_NewStampReceived:: @ 85EF178 .string "A new STAMP has been received.$" .align 2 -gUnknown_085EF198:: @ 85EF198 +gText_NewTrainerReceived:: @ 85EF198 .string "A new TRAINER has arrived.$" .align 2 -gUnknown_085EF1B4:: @ 85EF1B4 +gText_AlreadyHadCard:: @ 85EF1B4 .string "You already had that\nWONDER CARD.$" .align 2 -gUnknown_085EF1D8:: @ 85EF1D8 +gText_AlreadyHadNews:: @ 85EF1D8 .string "You already had that\nWONDER NEWS item.$" .align 2 -gUnknown_085EF200:: @ 85EF200 +gText_AlreadyHadStamp:: @ 85EF200 .string "You already had that\nSTAMP.$" .align 2 -gUnknown_085EF21C:: @ 85EF21C +gText_NoMoreRoomForStamps:: @ 85EF21C .string "There’s no more room for adding\nSTAMPS.$" .align 2 -gUnknown_085EF244:: @ 85EF244 +gText_RecordUploadedViaWireless:: @ 85EF244 .string "Your record has been uploaded via\nWIRELESS COMMUNICATION.$" .align 2 -gUnknown_085EF280:: @ 85EF280 +gText_CantAcceptCardFromTrainer:: @ 85EF280 .string "You can’t accept a WONDER CARD\nfrom this TRAINER.$" .align 2 -gUnknown_085EF2B4:: @ 85EF2B4 +gText_CantAcceptNewsFromTrainer:: @ 85EF2B4 .string "You can’t accept WONDER NEWS\nfrom this TRAINER.$" .align 2 -gUnknown_085EF2E4:: @ 85EF2E4 +gText_NothingSentOver:: @ 85EF2E4 .string "Nothing was sent over…$" .align 2 -gUnknown_085EF2FC:: @ 85EF2FC +gText_WhatToDoWithCards:: @ 85EF2FC .string "What would you like to do\nwith the WONDER CARDS?$" .align 2 -gUnknown_085EF330:: @ 85EF330 +gText_WhatToDoWithNews:: @ 85EF330 .string "What would you like to do\nwith the WONDER NEWS?$" .align 2 -gUnknown_085EF360:: @ 85EF360 +gText_SendingWonderCard:: @ 85EF360 .string "Sending your WONDER CARD…$" .align 2 -gUnknown_085EF37C:: @ 85EF37C +gText_SendingWonderNews:: @ 85EF37C .string "Sending your WONDER NEWS item…$" .align 2 -gUnknown_085EF39C:: @ 85EF39C +gText_WonderCardSentTo:: @ 85EF39C .string "Your WONDER CARD has been sent\nto {STR_VAR_1}.$" .align 2 -gUnknown_085EF3C4:: @ 85EF3C4 +gText_WonderNewsSentTo:: @ 85EF3C4 .string "Your WONDER NEWS item has been\nsent to {STR_VAR_1}.$" .align 2 -gUnknown_085EF3F0:: @ 85EF3F0 +gText_StampSentTo:: @ 85EF3F0 .string "A STAMP has been sent to {STR_VAR_1}.$" .align 2 -gUnknown_085EF410:: @ 85EF410 +gText_GiftSentTo:: @ 85EF410 .string "A GIFT has been sent to {STR_VAR_1}.$" .align 2 -gUnknown_085EF42C:: @ 85EF42C +gText_OtherTrainerHasCard:: @ 85EF42C .string "The other TRAINER has the same\nWONDER CARD already.$" .align 2 -gUnknown_085EF460:: @ 85EF460 +gText_OtherTrainerHasNews:: @ 85EF460 .string "The other TRAINER has the same\nWONDER NEWS already.$" .align 2 -gUnknown_085EF494:: @ 85EF494 +gText_OtherTrainerHasStamp:: @ 85EF494 .string "The other TRAINER has the same\nSTAMP already.$" .align 2 -gUnknown_085EF4C4:: @ 85EF4C4 +gText_OtherTrainerCanceled:: @ 85EF4C4 .string "The other TRAINER canceled\ncommunication.$" .align 2 -gUnknown_085EF4F0:: @ 85EF4F0 +gText_CantSendGiftToTrainer:: @ 85EF4F0 .string "You can’t send a MYSTERY GIFT to\nthis TRAINER.$" .align 2 -gUnknown_085EF520:: @ 85EF520 +gText_IfThrowAwayCardEventWontHappen:: @ 85EF520 .string "If you throw away the CARD,\nits event won’t happen. Okay?$" .align 2 -gUnknown_085EF55C:: @ 85EF55C +gText_OkayToDiscardNews:: @ 85EF55C .string "Is it okay to discard this\nNEWS item?$" .align 2 -gUnknown_085EF584:: @ 85EF584 +gText_HaventReceivedGiftOkayToDiscard:: @ 85EF584 .string "You haven’t received the\nGIFT. Is it okay to discard?$" .align 2 -gUnknown_085EF5BC:: @ 85EF5BC +gText_DataWillBeSaved:: @ 85EF5BC .string "Data will be saved.\nPlease wait.$" .align 2 -gUnknown_085EF5E0:: @ 85EF5E0 +gText_SaveCompletedPressA:: @ 85EF5E0 .string "Save completed.\nPlease press the A Button.$" .align 2 -gUnknown_085EF60C:: @ 85EF60C +gText_WonderCardThrownAway:: @ 85EF60C .string "The WONDER CARD was thrown away.$" .align 2 -gUnknown_085EF630:: @ 85EF630 +gText_WonderNewsThrownAway:: @ 85EF630 .string "The WONDER NEWS was thrown away.$" .align 2 -gUnknown_085EF654:: @ 85EF654 +gText_MysteryGift:: @ 85EF654 .string "MYSTERY GIFT$" .align 2 -gUnknown_085EF664:: @ 85EF664 +gText_PickOKExit:: @ 85EF664 .string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK {UNK_CTRL_F801}EXIT$" .align 2 -gUnknown_085EF678:: @ 85EF678 +gText_PickOKCancel:: @ 85EF678 .string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK {UNK_CTRL_F801}CANCEL$" -gUnknown_085EF68D:: @ 85EF68D +gText_PlayersBattleResults:: @ 85EF68D .string "{PLAYER}’s BATTLE RESULTS$" -gUnknown_085EF6A1:: @ 85EF6A1 +gText_TotalRecordWLD:: @ 85EF6A1 .string "TOTAL RECORD W:{STR_VAR_1} L:{STR_VAR_2} D:{STR_VAR_3}$" -gUnknown_085EF6BD:: @ 85EF6BD +gText_WinLoseDraw:: @ 85EF6BD .string "{CLEAR_TO 0x53}WIN{CLEAR_TO 0x80}LOSE{CLEAR_TO 0xB0}DRAW$" -gUnknown_085EF6D2:: @ 85EF6D2 +gText_CommunicationStandby5:: @ 85EF6D2 .string "Communication standby…$" -gUnknown_085EF6E9:: @ 85EF6E9 +gText_QuitTheGame:: @ 85EF6E9 .string "Quit the game?$" -gUnknown_085EF6F8:: @ 85EF6F8 +gText_YouveGot9999Coins:: @ 85EF6F8 .string "You’ve got 9,999 COINS.$" -gUnknown_085EF710:: @ 85EF710 +gText_YouveRunOutOfCoins:: @ 85EF710 .string "You’ve run out of COINS.\nGame over!$" -gUnknown_085EF734:: @ 85EF734 +gText_YouDontHaveThreeCoins:: @ 85EF734 .string "You don’t have three COINS.$" -gUnknown_085EF750:: @ 85EF750 +gText_ReelTimeHelp:: @ 85EF750 .string "REEL TIME\nHere’s your chance to take\naim and nail marks!\nReel Time continues for the\nawarded number of spins.\nIt all ends on a Big Bonus.$" + .string "The two seem to get along\nvery well.$" .string "The two seem to get along.$" .string "The two don’t seem to like\neach other much.$" .string "The two prefer to play with other\nPOKéMON than each other.$" -gUnknown_085EF881:: @ 85EF881 +gText_NewLine2:: @ 85EF881 .string "\n$" -gUnknown_085EF883:: @ 85EF883 +gText_Exit4:: @ 85EF883 .string "EXIT$" -gUnknown_085EF888:: @ 85EF888 +gText_Lv:: @ 85EF888 .string "{LV}$" -gUnknown_085EF88A:: @ 85EF88A +gText_TimeBoard:: @ 85EF88A .string "TIME BOARD$" -gUnknown_085EF895:: @ 85EF895 +gText_TimeCleared:: @ 85EF895 .string "TIME CLEARED $" -gUnknown_085EF8A3:: @ 85EF8A3 +gText_XMinYDotZSec:: @ 85EF8A3 .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$" + .string "1F$" .string "2F$" .string "3F$" .string "4F$" -gUnknown_085EF8C2:: @ 85EF8C2 +gText_TeachWhichMoveToPkmn:: @ 85EF8C2 .string "Teach which move to {STR_VAR_1}?$" -gUnknown_085EF8DA:: @ 85EF8DA +gText_TeachX:: @ 85EF8DA .string "Teach {STR_VAR_2}?$" -gUnknown_085EF8E4:: @ 85EF8E4 +gText_PkmnLearnedMove4:: @ 85EF8E4 .string "{STR_VAR_1} learned\n{STR_VAR_2}!$" -gUnknown_085EF8F3:: @ 85EF8F3 +gText_PkmnTryingToLearnMove:: @ 85EF8F3 .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_085EF960:: @ 85EF960 +gText_StopTryingToTeachMove:: @ 85EF960 .string "Stop trying to teach\n{STR_VAR_2}?$" -gUnknown_085EF979:: @ 85EF979 +gText_12AndPoof:: @ 85EF979 .string "{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p$" -gUnknown_085EF9A6:: @ 85EF9A6 +gText_PkmnForgotMoveAndLearnedNew:: @ 85EF9A6 .string "{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}.$" + .string "{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.$" -gUnknown_085EF9E6:: @ 85EF9E6 +gText_GiveUpTeachingNewMove:: @ 85EF9E6 .string "Give up trying to teach a new\nmove to {STR_VAR_1}?$" -gUnknown_085EFA10:: @ 85EFA10 +gText_WhichMoveToForget2:: @ 85EFA10 .string "Which move should be\nforgotten?\p$" -gUnknown_085EFA31:: @ 85EFA31 +gText_BattleMoves2:: @ 85EFA31 .string "BATTLE MOVES$" -gUnknown_085EFA3E:: @ 85EFA3E +gText_ContestMoves2:: @ 85EFA3E .string "CONTEST MOVES$" + .string "TYPE/$" -gUnknown_085EFA52:: @ 85EFA52 +gText_PPSlash:: @ 85EFA52 .string "PP/$" -gUnknown_085EFA56:: @ 85EFA56 +gText_PowerSlash:: @ 85EFA56 .string "POWER/$" -gUnknown_085EFA5D:: @ 85EFA5D +gText_AccuracySlash:: @ 85EFA5D .string "ACCURACY/$" -gUnknown_085EFA67:: @ 85EFA67 +gText_Appeal2:: @ 85EFA67 .string "APPEAL$" -gUnknown_085EFA6E:: @ 85EFA6E +gText_Jam2:: @ 85EFA6E .string "JAM$" + .string "KIRA$" .string "AMY$" .string "JOHN$" @@ -3461,20 +3531,21 @@ gUnknown_085EFA6E:: @ 85EFA6E .string "GABBY$" .string "ANNA$" -gUnknown_085EFA8F:: @ 85EFA8F +gText_ClearAllSaveData:: @ 85EFA8F .string "Clear all save data areas?$" -gUnknown_085EFAAA:: @ 85EFAAA +gText_ClearingData:: @ 85EFAAA .string "Clearing data…\nPlease wait.$" -gUnknown_085EFAC6:: @ 85EFAC6 +gText_IsThisTheCorrectTime:: @ 85EFAC6 .string "Is this the correct time?$" -gUnknown_085EFAE0:: @ 85EFAE0 +gText_Confirm3:: @ 85EFAE0 .string "CONFIRM$" -gUnknown_085EFAE8:: @ 85EFAE8 +gText_Cancel4:: @ 85EFAE8 .string "CANCEL$" + .string "DEVON PRES$" .string "MR. STONE$" .string "HARD AS ROCK$" @@ -3498,14 +3569,15 @@ gUnknown_085EFAE8:: @ 85EFAE8 .string "CHAMPION$" .string "{PKMN} PROF.$" -gUnknown_085EFBD2:: @ 85EFBD2 +gText_CommStandbyAwaitingOtherPlayer:: @ 85EFBD2 .string "Communication standby…\nAwaiting another player to choose.$" -gUnknown_085EFC0C:: @ 85EFC0C +gText_BattleWasRefused:: @ 85EFC0C .string "The battle was refused.{PAUSE 60}$" -gUnknown_085EFC27:: @ 85EFC27 +gText_RefusedBattle:: @ 85EFC27 .string "Refused the battle.{PAUSE 60}$" + .string "NO WEATHER$" .string "SUNNY$" .string "SUNNY2$" @@ -3527,12 +3599,12 @@ gUnknown_085EFC27:: @ 85EFC27 .string "QUIZ$" .string "ANSWER$" -gOtherText_PokeBalls:: @ 85EFCD4 +gText_PokeBalls:: @ 85EFCD4 .string "POKé BALLS$" -gOtherText_Berry:: @ 85EFCDF +gText_Berry:: @ 85EFCDF .string "BERRY$" -gOtherText_Berries:: @ 85EFCE5 +gText_Berries:: @ 85EFCE5 .string "BERRIES$" diff --git a/src/item.c b/src/item.c index c85e2fe1f..0114676b6 100644 --- a/src/item.c +++ b/src/item.c @@ -8,9 +8,9 @@ extern void ApplyNewEncyprtionKeyToHword(u16* hword, u32 newKey); extern bool8 InBattlePyramid(void); -extern const u8 gOtherText_PokeBalls[]; -extern const u8 gOtherText_Berries[]; -extern const u8 gOtherText_Berry[]; +extern const u8 gText_PokeBalls[]; +extern const u8 gText_Berries[]; +extern const u8 gText_Berry[]; extern const u8 gUnknown_085897E4[][28]; // not sure what this one is bool8 CheckPyramidBagHasItem(u16 itemId, u16 count); @@ -92,7 +92,7 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity) if (quantity < 2) StringCopy(string, ItemId_GetItem(ITEM_POKE_BALL)->name); else - StringCopy(string, gOtherText_PokeBalls); + StringCopy(string, gText_PokeBalls); } else { @@ -109,9 +109,9 @@ void GetBerryCountString(u8* dst, const u8* berryName, u32 quantity) u8* txtPtr; if (quantity < 2) - berryString = gOtherText_Berry; + berryString = gText_Berry; else - berryString = gOtherText_Berries; + berryString = gText_Berries; txtPtr = StringCopy(dst, berryName); *txtPtr = CHAR_SPACE; StringCopy(txtPtr + 1, berryString); diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index 804dbda74..12d98bfd8 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -45,8 +45,8 @@ static const u8 sGiftRibbonsMonDataIds[] = MON_DATA_GIFT_RIBBON_7 }; -extern const u8 gOtherText_DecimalPoint[]; -extern const u8 gOtherText_Marco[]; +extern const u8 gText_DecimalPoint[]; +extern const u8 gText_Marco[]; extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; #define CM_PER_INCH 2.54 @@ -103,7 +103,7 @@ static void FormatMonSizeRecord(u8 *string, u32 size) #endif string = ConvertIntToDecimalStringN(string, size / 10, 0, 8); - string = StringAppend(string, gOtherText_DecimalPoint); + string = StringAppend(string, gText_DecimalPoint); ConvertIntToDecimalStringN(string, size % 10, 0, 1); } @@ -152,7 +152,7 @@ static void GetMonSizeRecordInfo(u16 species, u16 *sizeRecord) FormatMonSizeRecord(gStringVar3, size); StringCopy(gStringVar1, gSpeciesNames[species]); if (*sizeRecord == DEFAULT_MAX_SIZE) - StringCopy(gStringVar2, gOtherText_Marco); + StringCopy(gStringVar2, gText_Marco); else StringCopy(gStringVar2, gSaveBlock2Ptr->playerName); } diff --git a/src/start_menu.c b/src/start_menu.c index ffcab5220..ac393ce2e 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -151,7 +151,7 @@ static void BuildStartMenuActions_MultiBattleRoom(void) extern const struct WindowTemplate gSafariBallsWindowTemplate; extern const struct WindowTemplate gPyramidFloorWindowTemplate_1; extern const struct WindowTemplate gPyramidFloorWindowTemplate_2; -extern const u8 gOtherText_SafariStock[]; +extern const u8 gText_SafariBallStock[]; void DisplaySafariBallsWindow(void) { @@ -159,13 +159,13 @@ void DisplaySafariBallsWindow(void) PutWindowTilemap(sSafariBallsWindowId); sub_81973FC(sSafariBallsWindowId, 0); ConvertIntToDecimalStringN(gStringVar1, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2); - StringExpandPlaceholders(gStringVar4, gOtherText_SafariStock); + StringExpandPlaceholders(gStringVar4, gText_SafariBallStock); PrintTextOnWindow(sSafariBallsWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL); CopyWindowToVram(sSafariBallsWindowId, 2); } extern const u8* const gUnknown_08510510[]; -extern const u8 gOtherText_BattlePyramid_X[]; +extern const u8 gText_BattlePyramidFloor[]; void DisplayPyramidFloorWindow(void) { @@ -177,7 +177,7 @@ void DisplayPyramidFloorWindow(void) PutWindowTilemap(sBattlePyramidFloorWindowId); sub_81973FC(sBattlePyramidFloorWindowId, 0); StringCopy(gStringVar1, gUnknown_08510510[*(u16*)(&gSaveBlock2Ptr->field_CAA[8])]); - StringExpandPlaceholders(gStringVar4, gOtherText_BattlePyramid_X); + StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor); PrintTextOnWindow(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL); CopyWindowToVram(sBattlePyramidFloorWindowId, 2); }