diff options
| -rw-r--r-- | asm/dodrio_berry_picking.s | 16 | ||||
| -rw-r--r-- | asm/union_room_chat.s | 8 | ||||
| -rw-r--r-- | data/strings.s | 278 | ||||
| -rw-r--r-- | include/strings.h | 273 | ||||
| -rw-r--r-- | src/coins.c | 4 | ||||
| -rw-r--r-- | src/field_specials.c | 24 | ||||
| -rw-r--r-- | src/script_menu.c | 454 |
7 files changed, 526 insertions, 531 deletions
diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s index 8b2797dc8..ceccf74ff 100644 --- a/asm/dodrio_berry_picking.s +++ b/asm/dodrio_berry_picking.s @@ -10324,7 +10324,7 @@ _0815579C: ldr r0, [r3] adds r0, r7 ldrb r0, [r0] - ldr r2, _08155858 @ =gUnknown_8417938 + ldr r2, _08155858 @ =gText_Yes movs r1, 0x2 mov r9, r1 str r1, [sp] @@ -10336,7 +10336,7 @@ _0815579C: ldr r0, [r2] adds r0, r7 ldrb r0, [r0] - ldr r2, _0815585C @ =gUnknown_841793C + ldr r2, _0815585C @ =gText_No movs r1, 0x10 str r1, [sp] str r5, [sp, 0x4] @@ -10377,8 +10377,8 @@ _0815579C: _0815584C: .4byte 0x00003008 _08155850: .4byte 0x00003009 _08155854: .4byte gUnknown_841CDD7 -_08155858: .4byte gUnknown_8417938 -_0815585C: .4byte gUnknown_841793C +_08155858: .4byte gText_Yes +_0815585C: .4byte gText_No _08155860: .4byte gFameCheckerText_ListMenuCursor _08155864: .4byte 0x00003014 _08155868: @@ -10425,7 +10425,7 @@ _081558B0: ldr r0, [r2] adds r0, r4 ldrb r0, [r0] - ldr r2, _08155914 @ =gUnknown_8417938 + ldr r2, _08155914 @ =gText_Yes movs r3, 0x2 mov r8, r3 str r3, [sp] @@ -10440,7 +10440,7 @@ _081558B0: ldr r0, [r2] adds r0, r4 ldrb r0, [r0] - ldr r2, _08155918 @ =gUnknown_841793C + ldr r2, _08155918 @ =gText_No movs r6, 0x10 str r6, [sp] movs r3, 0xFF @@ -10462,8 +10462,8 @@ _081558B0: .align 2, 0 _0815590C: .4byte 0x00003020 _08155910: .4byte 0x00003009 -_08155914: .4byte gUnknown_8417938 -_08155918: .4byte gUnknown_841793C +_08155914: .4byte gText_Yes +_08155918: .4byte gText_No _0815591C: .4byte gFameCheckerText_ListMenuCursor _08155920: str r6, [sp] diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index 64cc9aa9f..0d1640699 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -4265,7 +4265,7 @@ sub_812A424: @ 812A424 bl PutWindowTilemap ldr r0, [r6] ldrb r0, [r0, 0x18] - ldr r2, _0812A514 @ =gUnknown_8417938 + ldr r2, _0812A514 @ =gText_Yes movs r5, 0x2 str r5, [sp] movs r4, 0xFF @@ -4276,7 +4276,7 @@ sub_812A424: @ 812A424 bl AddTextPrinterParameterized ldr r0, [r6] ldrb r0, [r0, 0x18] - ldr r2, _0812A518 @ =gUnknown_841793C + ldr r2, _0812A518 @ =gText_No movs r1, 0x10 str r1, [sp] str r4, [sp, 0x4] @@ -4314,8 +4314,8 @@ _0812A504: .4byte 0xff00ffff _0812A508: .4byte 0x00ffffff _0812A50C: .4byte 0x0000ffff _0812A510: .4byte gUnknown_203B0E4 -_0812A514: .4byte gUnknown_8417938 -_0812A518: .4byte gUnknown_841793C +_0812A514: .4byte gText_Yes +_0812A518: .4byte gText_No thumb_func_end sub_812A424 thumb_func_start sub_812A51C diff --git a/data/strings.s b/data/strings.s index 546f40899..ab93b95c5 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1358,34 +1358,34 @@ gUnknown_84178DA:: @ 84178DA gUnknown_84178DF:: @ 0x84178DF .string "さんか する$" -gUnknown_84178E6:: @ 0x84178E6 +gText_Info:: @ 0x84178E6 .string "INFO$" -gUnknown_84178EB:: @ 0x84178EB +gText_Eggs:: @ 0x84178EB .string "EGGS$" -gUnknown_84178F0:: @ 0x84178F0 +gText_HallOfFame:: @ 0x84178F0 .string "HALL OF FAME$" -gUnknown_84178FD:: @ 0x84178FD +gText_Victories:: @ 0x84178FD .string "VICTORIES$" -gUnknown_8417907:: @ 0x8417907 +gText_Quit:: @ 0x8417907 .string "QUIT$" -gUnknown_841790C:: @ 0x841790C +gText_Psn:: @ 0x841790C .string "PSN$" -gUnknown_8417910:: @ 0x8417910 +gText_Par:: @ 0x8417910 .string "PAR$" -gUnknown_8417914:: @ 0x8417914 +gText_Slp:: @ 0x8417914 .string "SLP$" -gUnknown_8417918:: @ 0x8417918 +gText_Brn:: @ 0x8417918 .string "BRN$" -gUnknown_841791C:: @ 0x841791C +gText_Frz:: @ 0x841791C .string "FRZ$" gUnknown_8417920:: @ 0x8417920 @@ -1403,247 +1403,247 @@ gUnknown_841792E:: @ 0x841792E gUnknown_8417933:: @ 0x8417933 .string "これから$" -gUnknown_8417938:: @ 8417938 +gText_Yes:: @ 8417938 .string "YES$" -gUnknown_841793C:: @ 841793C +gText_No:: @ 841793C .string "NO$" gUnknown_841793F:: @ 0x841793F .string "せつめい$" -gUnknown_8417944:: @ 0x8417944 +gText_SingleBattle:: @ 0x8417944 .string "SINGLE BATTLE$" -gUnknown_8417952:: @ 0x8417952 +gText_DoubleBattle:: @ 0x8417952 .string "DOUBLE BATTLE$" -gUnknown_8417960:: @ 0x8417960 +gText_MultiBattle:: @ 0x8417960 .string "MULTI BATTLE$" -gUnknown_841796D:: @ 0x841796D +gText_MakeAChallenge:: @ 0x841796D .string "Make a challenge.$" -gUnknown_841797F:: @ 0x841797F +gText_Info_2:: @ 0x841797F .string "INFO$" -gUnknown_8417984:: @ 0x8417984 +gText_FreshWater200:: @ 0x8417984 .string "FRESH WATER{CLEAR_TO 0x57}{SMALL}¥200$" -gUnknown_841799A:: @ 0x841799A +gText_SodaPop300:: @ 0x841799A .string "SODA POP{CLEAR_TO 0x57}{SMALL}¥300$" -gUnknown_84179AD:: @ 0x84179AD +gText_Lemonade350:: @ 0x84179AD .string "LEMONADE{CLEAR_TO 0x57}{SMALL}¥350$" -gUnknown_84179C0:: @ 0x84179C0 +gText_50Coins1000:: @ 0x84179C0 .string "{SMALL} 50 COINS{CLEAR_TO 0x45}¥1,000$" -gUnknown_84179D6:: @ 0x84179D6 +gText_500Coins10000:: @ 0x84179D6 .string "{SMALL}500 COINS{CLEAR_TO 0x40}¥10,000$" -gUnknown_84179ED:: @ 0x84179ED +gText_Excellent:: @ 0x84179ED .string "Excellent$" -gUnknown_84179F7:: @ 0x84179F7 +gText_NotSoBad:: @ 0x84179F7 .string "Not so bad$" -gUnknown_8417A02:: @ 0x8417A02 +gText_RedShard:: @ 0x8417A02 .string "RED SHARD$" -gUnknown_8417A0C:: @ 0x8417A0C +gText_YellowShard:: @ 0x8417A0C .string "YELLOW SHARD$" -gUnknown_8417A19:: @ 0x8417A19 +gText_BlueShard:: @ 0x8417A19 .string "BLUE SHARD$" -gUnknown_8417A24:: @ 0x8417A24 +gText_GreenShard:: @ 0x8417A24 .string "GREEN SHARD$" gUnknown_8417A30:: @ 0x8417A30 .string "バトルタワ-$" -gUnknown_8417A37:: @ 0x8417A37 +gText_Right:: @ 0x8417A37 .string "Right$" -gUnknown_8417A3D:: @ 0x8417A3D +gText_Left:: @ 0x8417A3D .string "Left$" -gUnknown_8417A42:: @ 0x8417A42 +gText_Tm134000Coins:: @ 0x8417A42 .string "TM13{CLEAR_TO 0x48}{SMALL}4,000 COINS$" -gUnknown_8417A58:: @ 0x8417A58 +gText_Tm233500Coins:: @ 0x8417A58 .string "TM23{CLEAR_TO 0x48}{SMALL}3,500 COINS$" -gUnknown_8417A6E:: @ 0x8417A6E +gText_Tm244000Coins:: @ 0x8417A6E .string "TM24{CLEAR_TO 0x48}{SMALL}4,000 COINS$" -gUnknown_8417A84:: @ 0x8417A84 +gText_Tm304500Coins:: @ 0x8417A84 .string "TM30{CLEAR_TO 0x48}{SMALL}4,500 COINS$" -gUnknown_8417A9A:: @ 0x8417A9A +gText_Tm354000Coins:: @ 0x8417A9A .string "TM35{CLEAR_TO 0x48}{SMALL}4,000 COINS$" -gUnknown_8417AB0:: @ 0x8417AB0 +gText_1F:: @ 0x8417AB0 .string "1F$" -gUnknown_8417AB3:: @ 0x8417AB3 +gText_2F:: @ 0x8417AB3 .string "2F$" -gUnknown_8417AB6:: @ 0x8417AB6 +gText_3F:: @ 0x8417AB6 .string "3F$" -gUnknown_8417AB9:: @ 0x8417AB9 +gText_4F:: @ 0x8417AB9 .string "4F$" -gUnknown_8417ABC:: @ 0x8417ABC +gText_5F:: @ 0x8417ABC .string "5F$" -gUnknown_8417ABF:: @ 0x8417ABF +gText_Cool:: @ 0x8417ABF .string "COOL$" -gUnknown_8417AC4:: @ 0x8417AC4 +gText_Beauty:: @ 0x8417AC4 .string "BEAUTY$" -gUnknown_8417ACB:: @ 0x8417ACB +gText_Cute:: @ 0x8417ACB .string "CUTE$" -gUnknown_8417AD0:: @ 0x8417AD0 +gText_Smart:: @ 0x8417AD0 .string "SMART$" -gUnknown_8417AD6:: @ 0x8417AD6 +gText_Tough:: @ 0x8417AD6 .string "TOUGH$" -gUnknown_8417ADC:: @ 0x8417ADC +gText_Normal:: @ 0x8417ADC .string "NORMAL$" -gUnknown_8417AE3:: @ 0x8417AE3 +gText_Black:: @ 0x8417AE3 .string "BLACK$" -gUnknown_8417AE9:: @ 0x8417AE9 +gText_Pink:: @ 0x8417AE9 .string "PINK$" -gUnknown_8417AEE:: @ 0x8417AEE +gText_Sepia:: @ 0x8417AEE .string "SEPIA$" -gUnknown_8417AF4:: @ 0x8417AF4 +gText_Cool_2:: @ 0x8417AF4 .string "COOL$" -gUnknown_8417AF9:: @ 0x8417AF9 +gText_Beauty_2:: @ 0x8417AF9 .string "BEAUTY$" -gUnknown_8417B00:: @ 0x8417B00 +gText_Cute_2:: @ 0x8417B00 .string "CUTE$" -gUnknown_8417B05:: @ 0x8417B05 +gText_Smart_2:: @ 0x8417B05 .string "SMART$" -gUnknown_8417B0B:: @ 0x8417B0B +gText_Tough_2:: @ 0x8417B0B .string "TOUGH$" -gUnknown_8417B11:: @ 0x8417B11 +gText_Items:: @ 0x8417B11 .string "ITEMS$" -gUnknown_8417B17:: @ 0x8417B17 +gText_KeyItems:: @ 0x8417B17 .string "KEY ITEMS$" -gUnknown_8417B21:: @ 0x8417B21 +gText_PokeBalls:: @ 0x8417B21 .string "POKé BALLS$" -gUnknown_8417B2C:: @ 0x8417B2C +gText_TmsgUnknown_8417B2CHms:: @ 0x8417B2C .string "TMs & HMs$" -gUnknown_8417B36:: @ 0x8417B36 +gText_Berries:: @ 0x8417B36 .string "BERRIES$" -gUnknown_8417B3E:: @ 0x8417B3E +gText_Boulderbadge:: @ 0x8417B3E .string "BOULDERBADGE$" -gUnknown_8417B4B:: @ 0x8417B4B +gText_Cascadebadge:: @ 0x8417B4B .string "CASCADEBADGE$" -gUnknown_8417B58:: @ 0x8417B58 +gText_Thunderbadge:: @ 0x8417B58 .string "THUNDERBADGE$" -gUnknown_8417B65:: @ 0x8417B65 +gText_Rainbowbadge:: @ 0x8417B65 .string "RAINBOWBADGE$" -gUnknown_8417B72:: @ 0x8417B72 +gText_Soulbadge:: @ 0x8417B72 .string "SOULBADGE$" -gUnknown_8417B7C:: @ 0x8417B7C +gText_Marshbadge:: @ 0x8417B7C .string "MARSHBADGE$" -gUnknown_8417B87:: @ 0x8417B87 +gText_Volcanobadge:: @ 0x8417B87 .string "VOLCANOBADGE$" -gUnknown_8417B94:: @ 0x8417B94 +gText_Earthbadge:: @ 0x8417B94 .string "EARTHBADGE$" -gUnknown_8417B9F:: @ 8417B9F +gText_SomeoneSPc:: @ 8417B9F .string "SOMEONE'S PC$" -gUnknown_8417BAC:: @ 8417BAC +gText_BillSPc:: @ 8417BAC .string "BILL'S PC$" -gUnknown_8417BB6:: @ 8417BB6 +gText_SPc:: @ 8417BB6 .string "{PLAYER}'s PC$" -gUnknown_8417BBE:: @ 8417BBE +gText_HallOfFame_2:: @ 8417BBE .string "HALL OF FAME$" -gUnknown_8417BCB:: @ 8417BCB +gText_LogOff:: @ 8417BCB .string "LOG OFF$" -gUnknown_8417BD3:: @ 8417BD3 +gText_ProfOakSPc:: @ 8417BD3 .string "PROF. OAK's PC$" -gUnknown_8417BE2:: @ 0x8417BE2 +gText_Eevee:: @ 0x8417BE2 .string "EEVEE$" -gUnknown_8417BE8:: @ 0x8417BE8 +gText_Flareon:: @ 0x8417BE8 .string "FLAREON$" -gUnknown_8417BF0:: @ 0x8417BF0 +gText_Jolteon:: @ 0x8417BF0 .string "JOLTEON$" -gUnknown_8417BF8:: @ 0x8417BF8 +gText_Vaporeon:: @ 0x8417BF8 .string "VAPOREON$" -gUnknown_8417C01:: @ 0x8417C01 +gText_QuitLooking:: @ 0x8417C01 .string "Quit looking.$" -gUnknown_8417C0F:: @ 0x8417C0F +gText_FreshWater:: @ 0x8417C0F .string "FRESH WATER$" -gUnknown_8417C1B:: @ 0x8417C1B +gText_SodaPop:: @ 0x8417C1B .string "SODA POP$" -gUnknown_8417C24:: @ 0x8417C24 +gText_Lemonade:: @ 0x8417C24 .string "LEMONADE$" -gUnknown_8417C2D:: @ 8417C2D +gText_Coins_2:: @ 8417C2D .string "COINS$" -gUnknown_8417C33:: @ 0x8417C33 +gText_Bicycle1000000:: @ 0x8417C33 .string "BICYCLE{CLEAR_TO 0x49}{SMALL}¥1,000,000$" -gUnknown_8417C4B:: @ 0x8417C4B +gText_NoThanks:: @ 0x8417C4B .string "NO THANKS$" -gUnknown_8417C55:: @ 0x8417C55 +gText_Abra180Coins:: @ 0x8417C55 .string "ABRA{CLEAR_TO 0x55}{SMALL} 180 COINS$" -gUnknown_8417C6A:: @ 0x8417C6A +gText_Clefairy500Coins:: @ 0x8417C6A .string "CLEFAIRY{CLEAR_TO 0x55}{SMALL} 500 COINS$" -gUnknown_8417C83:: @ 0x8417C83 +gText_Dratini2800Coins:: @ 0x8417C83 .string "DRATINI{CLEAR_TO 0x4B}{SMALL} 2,800 COINS$" -gUnknown_8417C9D:: @ 0x8417C9D +gText_Scyther5500Coins:: @ 0x8417C9D .string "SCYTHER{CLEAR_TO 0x4B}{SMALL} 5,500 COINS$" -gUnknown_8417CB7:: @ 0x8417CB7 +gText_Porygon9999Coins:: @ 0x8417CB7 .string "PORYGON{CLEAR_TO 0x4B}{SMALL} 9,999 COINS$" gUnknown_8417CD1:: @ 0x8417CD1 @@ -1661,136 +1661,136 @@ gUnknown_8417D18:: @ 0x8417D18 gUnknown_8417D32:: @ 0x8417D32 .string "PORYGON{CLEAR_TO 0x4B}{SMALL} 6,500 COINS$" -gUnknown_8417D4C:: @ 0x8417D4C +gText_NoThanks_2:: @ 0x8417D4C .string "NO THANKS$" -gUnknown_8417D56:: @ 0x8417D56 +gText_HelixFossil:: @ 0x8417D56 .string "HELIX FOSSIL$" -gUnknown_8417D63:: @ 0x8417D63 +gText_DomeFossil:: @ 0x8417D63 .string "DOME FOSSIL$" -gUnknown_8417D6F:: @ 0x8417D6F +gText_OldAmber:: @ 0x8417D6F .string "OLD AMBER$" -gUnknown_8417D79:: @ 0x8417D79 +gText_TradeCenter:: @ 0x8417D79 .string "TRADE CENTER$" -gUnknown_8417D86:: @ 0x8417D86 +gText_Colosseum:: @ 0x8417D86 .string "COLOSSEUM$" -gUnknown_8417D90:: @ 0x8417D90 +gText_GameLinkCable:: @ 0x8417D90 .string "Game Link cable$" -gUnknown_8417DA0:: @ 0x8417DA0 +gText_Wireless:: @ 0x8417DA0 .string "Wireless$" -gUnknown_8417DA9:: @ 0x8417DA9 +gText_ItemsPocket:: @ 0x8417DA9 .string "ITEMS POCKET$" -gUnknown_8417DB6:: @ 0x8417DB6 +gText_KeyItemsPocket:: @ 0x8417DB6 .string "KEY ITEMS POCKET$" -gUnknown_8417DC7:: @ 0x8417DC7 +gText_PokeBallsPocket:: @ 0x8417DC7 .string "POKé BALLS POCKET$" -gUnknown_8417DD9:: @ 0x8417DD9 +gText_TmCase:: @ 0x8417DD9 .string "TM CASE$" -gUnknown_8417DE1:: @ 0x8417DE1 +gText_BerryPouch_2:: @ 0x8417DE1 .string "BERRY POUCH$" -gUnknown_8417DED:: @ 8417DED +gText_Other:: @ 8417DED .string "OTHER$" -gUnknown_8417DF3:: @ 0x8417DF3 +gText_OneIsland:: @ 0x8417DF3 .string "ONE ISLAND$" -gUnknown_8417DFE:: @ 0x8417DFE +gText_TwoIsland:: @ 0x8417DFE .string "TWO ISLAND$" -gUnknown_8417E09:: @ 0x8417E09 +gText_ThreeIsland:: @ 0x8417E09 .string "THREE ISLAND$" -gUnknown_8417E16:: @ 0x8417E16 +gText_FourIsland:: @ 0x8417E16 .string "FOUR ISLAND$" -gUnknown_8417E22:: @ 0x8417E22 +gText_FiveIsland:: @ 0x8417E22 .string "FIVE ISLAND$" -gUnknown_8417E2E:: @ 0x8417E2E +gText_SixIsland:: @ 0x8417E2E .string "SIX ISLAND$" -gUnknown_8417E39:: @ 0x8417E39 +gText_SevenIsland:: @ 0x8417E39 .string "SEVEN ISLAND$" -gUnknown_8417E46:: @ 0x8417E46 +gText_Vermilion:: @ 0x8417E46 .string "VERMILION$" -gUnknown_8417E50:: @ 0x8417E50 +gText_Colosseum_2:: @ 0x8417E50 .string "COLOSSEUM$" -gUnknown_8417E5A:: @ 0x8417E5A +gText_BerryCrush:: @ 0x8417E5A .string "BERRY CRUSH$" -gUnknown_8417E66:: @ 0x8417E66 +gText_Dummy_8417E66:: @ 0x8417E66 .string "$" -gUnknown_8417E67:: @ 0x8417E67 +gText_Dummy_8417E67:: @ 0x8417E67 .string "$" gUnknown_8417E68:: @ 0x8417E68 .string "せつめいを きく$" -gUnknown_8417E71:: @ 0x8417E71 +gText_Dummy_8417E71:: @ 0x8417E71 .string "$" -gUnknown_8417E72:: @ 0x8417E72 +gText_PokemonJump:: @ 0x8417E72 .string "POKéMON JUMP$" -gUnknown_8417E7F:: @ 0x8417E7F +gText_DodrioBerryPicking:: @ 0x8417E7F .string "DODRIO BERRY-PICKING$" -gUnknown_8417E94:: @ 0x8417E94 +gText_2Tinymushrooms:: @ 0x8417E94 .string "2 TINYMUSHROOMS$" -gUnknown_8417EA4:: @ 0x8417EA4 +gText_1BigMushroom:: @ 0x8417EA4 .string "1 BIG MUSHROOM$" -gUnknown_8417EB3:: @ 0x8417EB3 +gText_SeviiIslands:: @ 0x8417EB3 .string "SEVII ISLANDS$" -gUnknown_8417EC1:: @ 0x8417EC1 +gText_NavelRock:: @ 0x8417EC1 .string "NAVEL ROCK$" -gUnknown_8417ECC:: @ 0x8417ECC +gText_BirthIsland:: @ 0x8417ECC .string "BIRTH ISLAND$" -gUnknown_8417ED9:: @ 0x8417ED9 +gText_MiracleSeed1000Coins:: @ 0x8417ED9 .string "MIRACLE SEED{CLEAR_TO 0x50}{SMALL}1,000 COINS$" -gUnknown_8417EF7:: @ 0x8417EF7 +gText_Charcoal1000Coins:: @ 0x8417EF7 .string "CHARCOAL{CLEAR_TO 0x50}{SMALL}1,000 COINS$" -gUnknown_8417F11:: @ 0x8417F11 +gText_MysticWater1000Coins:: @ 0x8417F11 .string "MYSTIC WATER{CLEAR_TO 0x50}{SMALL}1,000 COINS$" -gUnknown_8417F2F:: @ 0x8417F2F +gText_YellowFlute1600Coins:: @ 0x8417F2F .string "YELLOW FLUTE{CLEAR_TO 0x50}{SMALL}1,600 COINS$" -gUnknown_8417F4D:: @ 0x8417F4D +gText_SmokeBall800Coins:: @ 0x8417F4D .string "SMOKE BALL{CLEAR_TO 0x5A}{SMALL}800 COINS$" -gUnknown_8417F67:: @ 0x8417F67 +gText_Dummy_8417F67:: @ 0x8417F67 .string "$" -gUnknown_8417F68:: @ 0x8417F68 +gText_Dummy_8417F68:: @ 0x8417F68 .string "$" -gUnknown_8417F69:: @ 0x8417F69 +gText_BecomeLeader:: @ 0x8417F69 .string "BECOME LEADER$" -gUnknown_8417F77:: @ 0x8417F77 +gText_JoinGroup:: @ 0x8417F77 .string "JOIN GROUP$" gOtherText_Single:: @ 0x8417F82 @@ -1889,31 +1889,31 @@ gUnknown_8418055:: @ 0x8418055 gUnknown_8418059:: @ 0x8418059 .string "11F$" -gUnknown_841805D:: @ 0x841805D +gText_B1F:: @ 0x841805D .string "B1F$" -gUnknown_8418061:: @ 0x8418061 +gText_B2F:: @ 0x8418061 .string "B2F$" gUnknown_8418065:: @ 0x8418065 .string "B3F$" -gUnknown_8418069:: @ 0x8418069 +gText_B4F:: @ 0x8418069 .string "B4F$" -gUnknown_841806D:: @ 0x841806D +gText_Rooftop:: @ 0x841806D .string "ROOFTOP$" gUnknown_8418075:: @ 8418075 .string "Now on:$" -gUnknown_841807D:: @ 0x841807D +gText_LinkedGamePlay:: @ 0x841807D .string "LINKED GAME PLAY$" -gUnknown_841808E:: @ 0x841808E +gText_DirectCorner:: @ 0x841808E .string "DIRECT CORNER$" -gUnknown_841809C:: @ 0x841809C +gText_UnionRoom:: @ 0x841809C .string "UNION ROOM$" gUnknown_84180A7:: @ 0x84180A7 diff --git a/include/strings.h b/include/strings.h index d4507b41f..32b485ce4 100644 --- a/include/strings.h +++ b/include/strings.h @@ -474,10 +474,10 @@ extern const u8 gUnknown_8417FC3[]; extern const u8 gUnknown_8417FD0[]; extern const u8 gUnknown_8417FCC[]; extern const u8 gUnknown_8418075[]; -extern const u8 gUnknown_8418069[]; +extern const u8 gText_B4F[]; extern const u8 gUnknown_8418065[]; -extern const u8 gUnknown_8418061[]; -extern const u8 gUnknown_841805D[]; +extern const u8 gText_B2F[]; +extern const u8 gText_B1F[]; extern const u8 gUnknown_841803A[]; extern const u8 gUnknown_841803D[]; extern const u8 gUnknown_8418040[]; @@ -489,7 +489,7 @@ extern const u8 gUnknown_841804F[]; extern const u8 gUnknown_8418052[]; extern const u8 gUnknown_8418055[]; extern const u8 gUnknown_8418059[]; -extern const u8 gUnknown_841806D[]; +extern const u8 gText_Rooftop[]; extern const u8 gUnknown_8417FD9[]; extern const u8 gUnknown_8417FE6[]; extern const u8 gUnknown_8417FF3[]; @@ -498,9 +498,9 @@ extern const u8 gUnknown_841800D[]; extern const u8 gUnknown_8418017[]; extern const u8 gUnknown_8418022[]; extern const u8 gUnknown_841802F[]; -extern const u8 gUnknown_841807D[]; -extern const u8 gUnknown_841808E[]; -extern const u8 gUnknown_841809C[]; +extern const u8 gText_LinkedGamePlay[]; +extern const u8 gText_DirectCorner[]; +extern const u8 gText_UnionRoom[]; extern const u8 gOtherText_Quit[]; extern const u8 gUnknown_84180A7[]; extern const u8 gUnknown_84180BC[]; @@ -515,142 +515,137 @@ extern const u8 gUnknown_8418152[]; extern const u8 gUnknown_8418163[]; // script_menu -extern const u8 gUnknown_8417B9F[]; -extern const u8 gUnknown_8417BAC[]; -extern const u8 gUnknown_8417BB6[]; -extern const u8 gUnknown_8417BBE[]; -extern const u8 gUnknown_8417BCB[]; -extern const u8 gUnknown_8417BD3[]; -extern const u8 gUnknown_8417DED[]; +extern const u8 gText_SomeoneSPc[]; +extern const u8 gText_BillSPc[]; +extern const u8 gText_SPc[]; +extern const u8 gText_HallOfFame_2[]; +extern const u8 gText_LogOff[]; +extern const u8 gText_ProfOakSPc[]; +extern const u8 gText_Other[]; extern const u8 gUnknown_81A508A[]; extern const u8 gOtherText_Double[]; extern const u8 gOtherText_Knockout[]; extern const u8 gOtherText_Mixed[]; extern const u8 gOtherText_Single[]; -extern const u8 gUnknown_84178E6[]; -extern const u8 gUnknown_84178EB[]; -extern const u8 gUnknown_84178F0[]; -extern const u8 gUnknown_84178FD[]; -extern const u8 gUnknown_8417907[]; -extern const u8 gUnknown_841790C[]; -extern const u8 gUnknown_8417910[]; -extern const u8 gUnknown_8417914[]; -extern const u8 gUnknown_8417918[]; -extern const u8 gUnknown_841791C[]; -extern const u8 gUnknown_8417938[]; -extern const u8 gUnknown_841793C[]; -extern const u8 gUnknown_8417944[]; -extern const u8 gUnknown_8417952[]; -extern const u8 gUnknown_8417960[]; -extern const u8 gUnknown_841796D[]; -extern const u8 gUnknown_841797F[]; -extern const u8 gUnknown_8417984[]; -extern const u8 gUnknown_841799A[]; -extern const u8 gUnknown_84179AD[]; -extern const u8 gUnknown_84179C0[]; -extern const u8 gUnknown_84179D6[]; -extern const u8 gUnknown_84179ED[]; -extern const u8 gUnknown_84179F7[]; -extern const u8 gUnknown_8417A02[]; -extern const u8 gUnknown_8417A0C[]; -extern const u8 gUnknown_8417A19[]; -extern const u8 gUnknown_8417A24[]; -extern const u8 gUnknown_8417A37[]; -extern const u8 gUnknown_8417A3D[]; -extern const u8 gUnknown_8417A42[]; -extern const u8 gUnknown_8417A58[]; -extern const u8 gUnknown_8417A6E[]; -extern const u8 gUnknown_8417A84[]; -extern const u8 gUnknown_8417A9A[]; -extern const u8 gUnknown_8417AB0[]; -extern const u8 gUnknown_8417AB3[]; -extern const u8 gUnknown_8417AB6[]; -extern const u8 gUnknown_8417AB9[]; -extern const u8 gUnknown_8417ABC[]; -extern const u8 gUnknown_8417ADC[]; -extern const u8 gUnknown_8417AE3[]; -extern const u8 gUnknown_8417AE9[]; -extern const u8 gUnknown_8417AEE[]; -extern const u8 gUnknown_8417BE2[]; -extern const u8 gUnknown_8417BE8[]; -extern const u8 gUnknown_8417BF0[]; -extern const u8 gUnknown_8417BF8[]; -extern const u8 gUnknown_8417C01[]; -extern const u8 gUnknown_8417C0F[]; -extern const u8 gUnknown_8417C1B[]; -extern const u8 gUnknown_8417C24[]; -extern const u8 gUnknown_8417C33[]; -extern const u8 gUnknown_8417C4B[]; -extern const u8 gUnknown_8417C55[]; -extern const u8 gUnknown_8417C6A[]; -extern const u8 gUnknown_8417C83[]; -extern const u8 gUnknown_8417C9D[]; -extern const u8 gUnknown_8417CB7[]; -extern const u8 gUnknown_8417D4C[]; -extern const u8 gUnknown_8417D56[]; -extern const u8 gUnknown_8417D63[]; -extern const u8 gUnknown_8417D6F[]; -extern const u8 gUnknown_8417D79[]; -extern const u8 gUnknown_8417D86[]; -extern const u8 gUnknown_8417D90[]; -extern const u8 gUnknown_8417DA0[]; -extern const u8 gUnknown_8417DF3[]; -extern const u8 gUnknown_8417DFE[]; -extern const u8 gUnknown_8417E09[]; -extern const u8 gUnknown_8417E46[]; -extern const u8 gUnknown_8417E50[]; -extern const u8 gUnknown_8417E5A[]; -extern const u8 gUnknown_8417E66[]; -extern const u8 gUnknown_8417E67[]; -extern const u8 gUnknown_8417E71[]; -extern const u8 gUnknown_8417E72[]; -extern const u8 gUnknown_8417E7F[]; -extern const u8 gUnknown_8417E94[]; -extern const u8 gUnknown_8417EA4[]; -extern const u8 gUnknown_8417EB3[]; -extern const u8 gUnknown_8417EC1[]; -extern const u8 gUnknown_8417ECC[]; -extern const u8 gUnknown_8417ED9[]; -extern const u8 gUnknown_8417EF7[]; -extern const u8 gUnknown_8417F11[]; -extern const u8 gUnknown_8417F2F[]; -extern const u8 gUnknown_8417F4D[]; -extern const u8 gUnknown_8417F67[]; -extern const u8 gUnknown_8417F68[]; -extern const u8 gUnknown_8417F69[]; -extern const u8 gUnknown_8417F77[]; -extern const u8 gUnknown_8417ABF[]; -extern const u8 gUnknown_8417AC4[]; -extern const u8 gUnknown_8417ACB[]; -extern const u8 gUnknown_8417AD0[]; -extern const u8 gUnknown_8417AD6[]; -extern const u8 gUnknown_8417AF4[]; -extern const u8 gUnknown_8417AF9[]; -extern const u8 gUnknown_8417B00[]; -extern const u8 gUnknown_8417B05[]; -extern const u8 gUnknown_8417B0B[]; -extern const u8 gUnknown_8417B11[]; -extern const u8 gUnknown_8417B17[]; -extern const u8 gUnknown_8417B21[]; -extern const u8 gUnknown_8417B2C[]; -extern const u8 gUnknown_8417B36[]; -extern const u8 gUnknown_8417B3E[]; -extern const u8 gUnknown_8417B4B[]; -extern const u8 gUnknown_8417B58[]; -extern const u8 gUnknown_8417B65[]; -extern const u8 gUnknown_8417B72[]; -extern const u8 gUnknown_8417B7C[]; -extern const u8 gUnknown_8417B87[]; -extern const u8 gUnknown_8417B94[]; -extern const u8 gUnknown_8417C2D[]; -extern const u8 gUnknown_8417DA9[]; -extern const u8 gUnknown_8417DB6[]; -extern const u8 gUnknown_8417DC7[]; -extern const u8 gUnknown_8417DD9[]; -extern const u8 gUnknown_8417DE1[]; -extern const u8 gUnknown_8417E16[]; -extern const u8 gUnknown_8417E22[]; -extern const u8 gUnknown_8417E2E[]; -extern const u8 gUnknown_8417E39[]; +extern const u8 gText_Info[]; +extern const u8 gText_Eggs[]; +extern const u8 gText_HallOfFame[]; +extern const u8 gText_Victories[]; +extern const u8 gText_Quit[]; +extern const u8 gText_Psn[]; +extern const u8 gText_Par[]; +extern const u8 gText_Slp[]; +extern const u8 gText_Brn[]; +extern const u8 gText_Frz[]; +extern const u8 gText_Yes[]; +extern const u8 gText_No[]; +extern const u8 gText_SingleBattle[]; +extern const u8 gText_DoubleBattle[]; +extern const u8 gText_MultiBattle[]; +extern const u8 gText_MakeAChallenge[]; +extern const u8 gText_Info_2[]; +extern const u8 gText_FreshWater200[]; +extern const u8 gText_SodaPop300[]; +extern const u8 gText_Lemonade350[]; +extern const u8 gText_50Coins1000[]; +extern const u8 gText_500Coins10000[]; +extern const u8 gText_Excellent[]; +extern const u8 gText_NotSoBad[]; +extern const u8 gText_RedShard[]; +extern const u8 gText_YellowShard[]; +extern const u8 gText_BlueShard[]; +extern const u8 gText_GreenShard[]; +extern const u8 gText_Right[]; +extern const u8 gText_Left[]; +extern const u8 gText_Tm134000Coins[]; +extern const u8 gText_Tm233500Coins[]; +extern const u8 gText_Tm244000Coins[]; +extern const u8 gText_Tm304500Coins[]; +extern const u8 gText_Tm354000Coins[]; +extern const u8 gText_1F[]; +extern const u8 gText_2F[]; +extern const u8 gText_3F[]; +extern const u8 gText_4F[]; +extern const u8 gText_5F[]; +extern const u8 gText_Normal[]; +extern const u8 gText_Black[]; +extern const u8 gText_Pink[]; +extern const u8 gText_Sepia[]; +extern const u8 gText_Eevee[]; +extern const u8 gText_Flareon[]; +extern const u8 gText_Jolteon[]; +extern const u8 gText_Vaporeon[]; +extern const u8 gText_QuitLooking[]; +extern const u8 gText_FreshWater[]; +extern const u8 gText_SodaPop[]; +extern const u8 gText_Lemonade[]; +extern const u8 gText_Bicycle1000000[]; +extern const u8 gText_NoThanks[]; +extern const u8 gText_Abra180Coins[]; +extern const u8 gText_Clefairy500Coins[]; +extern const u8 gText_Dratini2800Coins[]; +extern const u8 gText_Scyther5500Coins[]; +extern const u8 gText_Porygon9999Coins[]; +extern const u8 gText_NoThanks_2[]; +extern const u8 gText_HelixFossil[]; +extern const u8 gText_DomeFossil[]; +extern const u8 gText_OldAmber[]; +extern const u8 gText_TradeCenter[]; +extern const u8 gText_Colosseum[]; +extern const u8 gText_GameLinkCable[]; +extern const u8 gText_Wireless[]; +extern const u8 gText_OneIsland[]; +extern const u8 gText_TwoIsland[]; +extern const u8 gText_ThreeIsland[]; +extern const u8 gText_Vermilion[]; +extern const u8 gText_Colosseum_2[]; +extern const u8 gText_BerryCrush[]; +extern const u8 gText_Dummy_8417E66[]; +extern const u8 gText_Dummy_8417E67[]; +extern const u8 gText_Dummy_8417E71[]; +extern const u8 gText_PokemonJump[]; +extern const u8 gText_DodrioBerryPicking[]; +extern const u8 gText_2Tinymushrooms[]; +extern const u8 gText_1BigMushroom[]; +extern const u8 gText_SeviiIslands[]; +extern const u8 gText_NavelRock[]; +extern const u8 gText_BirthIsland[]; +extern const u8 gText_MiracleSeed1000Coins[]; +extern const u8 gText_Charcoal1000Coins[]; +extern const u8 gText_MysticWater1000Coins[]; +extern const u8 gText_YellowFlute1600Coins[]; +extern const u8 gText_SmokeBall800Coins[]; +extern const u8 gText_Dummy_8417F67[]; +extern const u8 gText_Dummy_8417F68[]; +extern const u8 gText_BecomeLeader[]; +extern const u8 gText_JoinGroup[]; +extern const u8 gText_Cool_2[]; +extern const u8 gText_Beauty_2[]; +extern const u8 gText_Cute_2[]; +extern const u8 gText_Smart_2[]; +extern const u8 gText_Tough_2[]; +extern const u8 gText_Items[]; +extern const u8 gText_KeyItems[]; +extern const u8 gText_PokeBalls[]; +extern const u8 gText_TmsgUnknown_8417B2CHms[]; +extern const u8 gText_Berries[]; +extern const u8 gText_Boulderbadge[]; +extern const u8 gText_Cascadebadge[]; +extern const u8 gText_Thunderbadge[]; +extern const u8 gText_Rainbowbadge[]; +extern const u8 gText_Soulbadge[]; +extern const u8 gText_Marshbadge[]; +extern const u8 gText_Volcanobadge[]; +extern const u8 gText_Earthbadge[]; +extern const u8 gText_Coins_2[]; +extern const u8 gText_ItemsPocket[]; +extern const u8 gText_KeyItemsPocket[]; +extern const u8 gText_PokeBallsPocket[]; +extern const u8 gText_TmCase[]; +extern const u8 gText_BerryPouch_2[]; +extern const u8 gText_FourIsland[]; +extern const u8 gText_FiveIsland[]; +extern const u8 gText_SixIsland[]; +extern const u8 gText_SevenIsland[]; #endif //GUARD_STRINGS_H diff --git a/src/coins.c b/src/coins.c index e989bac88..2eaa31b2c 100644 --- a/src/coins.c +++ b/src/coins.c @@ -60,7 +60,7 @@ void PrintCoinsString_Parameterized(u8 windowId, u32 coinAmount, u8 x, u8 y, u8 void sub_80D0674(u8 windowId, u16 tileStart, u8 palette, u32 coinAmount) { DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, tileStart, palette); - AddTextPrinterParameterized(windowId, 2, gUnknown_8417C2D, 0, 0, 0xFF, 0); + AddTextPrinterParameterized(windowId, 2, gText_Coins_2, 0, 0, 0xFF, 0); PrintCoinsString_Parameterized(windowId, coinAmount, 0x10, 0xC, 0); } @@ -86,7 +86,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y) PutWindowTilemap(sCoinsWindowId); TextWindow_SetStdFrame0_WithPal(sCoinsWindowId, 0x21D, 0xD0); DrawStdFrameWithCustomTileAndPalette(sCoinsWindowId, FALSE, 0x21D, 0xD); - AddTextPrinterParameterized(sCoinsWindowId, 2, gUnknown_8417C2D, 0, 0, 0xFF, 0); + AddTextPrinterParameterized(sCoinsWindowId, 2, gText_Coins_2, 0, 0, 0xFF, 0); PrintCoinsString(coinAmount); } diff --git a/src/field_specials.c b/src/field_specials.c index 3c482e5bc..354226d09 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -729,10 +729,10 @@ static const struct WindowTemplate sElevatorCurrentFloorWindowTemplate = { }; static const u8 *const sFloorNamePointers[] = { - gUnknown_8418069, + gText_B4F, gUnknown_8418065, - gUnknown_8418061, - gUnknown_841805D, + gText_B2F, + gText_B1F, gUnknown_841803A, gUnknown_841803D, gUnknown_8418040, @@ -744,7 +744,7 @@ static const u8 *const sFloorNamePointers[] = { gUnknown_8418052, gUnknown_8418055, gUnknown_8418059, - gUnknown_841806D + gText_Rooftop }; static const u8 sUnused_83F5B84[] = { @@ -1250,9 +1250,9 @@ static const u8 *const sListMenuLabels[][12] = { gUnknown_841803A, gOtherText_Exit, }, { - gUnknown_841805D, - gUnknown_8418061, - gUnknown_8418069, + gText_B1F, + gText_B2F, + gText_B4F, gOtherText_Exit, }, { gUnknown_8418046, @@ -1262,9 +1262,9 @@ static const u8 *const sListMenuLabels[][12] = { gUnknown_841803A, gOtherText_Exit, }, { - gUnknown_841807D, - gUnknown_841808E, - gUnknown_841809C, + gText_LinkedGamePlay, + gText_DirectCorner, + gText_UnionRoom, gOtherText_Quit, }, { gUnknown_84180A7, @@ -1280,8 +1280,8 @@ static const u8 *const sListMenuLabels[][12] = { gUnknown_8418163, gOtherText_Exit, }, { - gUnknown_841806D, - gUnknown_841805D, + gText_Rooftop, + gText_B1F, gOtherText_Exit, } }; diff --git a/src/script_menu.c b/src/script_menu.c index 5df40c935..eee943793 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -41,439 +41,439 @@ static u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height); static const struct MenuAction sScriptMultiChoiceMenu_0[] = { - { gUnknown_8417938 }, - { gUnknown_841793C } + { gText_Yes }, + { gText_No } }; static const struct MenuAction sScriptMultiChoiceMenu_2[] = { - { gUnknown_8417ADC }, - { gUnknown_8417AE3 }, - { gUnknown_8417AE9 }, - { gUnknown_8417AEE } + { gText_Normal }, + { gText_Black }, + { gText_Pink }, + { gText_Sepia } }; static const struct MenuAction sScriptMultiChoiceMenu_3[] = { - { gUnknown_84178F0 }, - { gUnknown_8417907 } + { gText_HallOfFame }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_4[] = { - { gUnknown_84178EB }, - { gUnknown_8417907 } + { gText_Eggs }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_5[] = { - { gUnknown_84178FD }, - { gUnknown_8417907 } + { gText_Victories }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_6[] = { - { gUnknown_84178F0 }, - { gUnknown_84178EB }, - { gUnknown_8417907 } + { gText_HallOfFame }, + { gText_Eggs }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_7[] = { - { gUnknown_84178F0 }, - { gUnknown_84178FD }, - { gUnknown_8417907 } + { gText_HallOfFame }, + { gText_Victories }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_8[] = { - { gUnknown_84178EB }, - { gUnknown_84178FD }, - { gUnknown_8417907 } + { gText_Eggs }, + { gText_Victories }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_9[] = { - { gUnknown_84178F0 }, - { gUnknown_84178EB }, - { gUnknown_84178FD }, - { gUnknown_8417907 } + { gText_HallOfFame }, + { gText_Eggs }, + { gText_Victories }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_15[] = { - { gUnknown_8417914 }, - { gUnknown_841790C }, - { gUnknown_8417910 }, - { gUnknown_8417918 }, - { gUnknown_841791C }, + { gText_Slp }, + { gText_Psn }, + { gText_Par }, + { gText_Brn }, + { gText_Frz }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_16[] = { - { gUnknown_8417938 }, - { gUnknown_841793C }, - { gUnknown_84178E6 } + { gText_Yes }, + { gText_No }, + { gText_Info } }; static const struct MenuAction sScriptMultiChoiceMenu_17[] = { - { gUnknown_8417944 }, - { gUnknown_8417952 }, - { gUnknown_8417960 }, - { gUnknown_84178E6 }, + { gText_SingleBattle }, + { gText_DoubleBattle }, + { gText_MultiBattle }, + { gText_Info }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_18[] = { - { gUnknown_8417938 }, - { gUnknown_841793C }, - { gUnknown_84178E6 } + { gText_Yes }, + { gText_No }, + { gText_Info } }; static const struct MenuAction sScriptMultiChoiceMenu_19[] = { - { gUnknown_841796D }, - { gUnknown_841797F }, + { gText_MakeAChallenge }, + { gText_Info_2 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_20[] = { - { gUnknown_841806D }, - { gUnknown_841805D }, + { gText_Rooftop }, + { gText_B1F }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_21[] = { - { gUnknown_8417D56 }, + { gText_HelixFossil }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_22[] = { - { gUnknown_8417D63 }, + { gText_DomeFossil }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_23[] = { - { gUnknown_8417D6F }, + { gText_OldAmber }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_24[] = { - { gUnknown_8417D56 }, - { gUnknown_8417D6F }, + { gText_HelixFossil }, + { gText_OldAmber }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_25[] = { - { gUnknown_8417D63 }, - { gUnknown_8417D6F }, + { gText_DomeFossil }, + { gText_OldAmber }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_26[] = { - { gUnknown_8417984 }, - { gUnknown_841799A }, - { gUnknown_84179AD }, + { gText_FreshWater200 }, + { gText_SodaPop300 }, + { gText_Lemonade350 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_30[] = { - { gUnknown_8417A42 }, - { gUnknown_8417A58 }, - { gUnknown_8417A6E }, - { gUnknown_8417A84 }, - { gUnknown_8417A9A }, - { gUnknown_8417D4C } + { gText_Tm134000Coins }, + { gText_Tm233500Coins }, + { gText_Tm244000Coins }, + { gText_Tm304500Coins }, + { gText_Tm354000Coins }, + { gText_NoThanks_2 } }; static const struct MenuAction sScriptMultiChoiceMenu_41[] = { - { gUnknown_8417F4D }, - { gUnknown_8417ED9 }, - { gUnknown_8417EF7 }, - { gUnknown_8417F11 }, - { gUnknown_8417F2F }, - { gUnknown_8417D4C } + { gText_SmokeBall800Coins }, + { gText_MiracleSeed1000Coins }, + { gText_Charcoal1000Coins }, + { gText_MysticWater1000Coins }, + { gText_YellowFlute1600Coins }, + { gText_NoThanks_2 } }; static const struct MenuAction sScriptMultiChoiceMenu_27[] = { - { gUnknown_84179C0 }, - { gUnknown_84179D6 }, + { gText_50Coins1000 }, + { gText_500Coins10000 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_28[] = { - { gUnknown_84179ED }, - { gUnknown_84179F7 } + { gText_Excellent }, + { gText_NotSoBad } }; static const struct MenuAction sScriptMultiChoiceMenu_29[] = { - { gUnknown_8417A37 }, - { gUnknown_8417A3D } + { gText_Right }, + { gText_Left } }; static const struct MenuAction sScriptMultiChoiceMenu_31[] = { - { gUnknown_8417ABC }, - { gUnknown_8417AB9 }, - { gUnknown_8417AB6 }, - { gUnknown_8417AB3 }, - { gUnknown_8417AB0 }, + { gText_5F }, + { gText_4F }, + { gText_3F }, + { gText_2F }, + { gText_1F }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_32[] = { - { gUnknown_8417C0F }, + { gText_FreshWater }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_33[] = { - { gUnknown_8417C1B }, + { gText_SodaPop }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_34[] = { - { gUnknown_8417C0F }, - { gUnknown_8417C1B }, + { gText_FreshWater }, + { gText_SodaPop }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_35[] = { - { gUnknown_8417C24 }, + { gText_Lemonade }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_36[] = { - { gUnknown_8417C0F }, - { gUnknown_8417C24 }, + { gText_FreshWater }, + { gText_Lemonade }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_37[] = { - { gUnknown_8417C1B }, - { gUnknown_8417C24 }, + { gText_SodaPop }, + { gText_Lemonade }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_38[] = { - { gUnknown_8417C0F }, - { gUnknown_8417C1B }, - { gUnknown_8417C24 }, + { gText_FreshWater }, + { gText_SodaPop }, + { gText_Lemonade }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_0[] = { - { gUnknown_8417A24 }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_1[] = { - { gUnknown_8417A02 }, - { gUnknown_8417A24 }, + { gText_RedShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_2[] = { - { gUnknown_8417A0C }, - { gUnknown_8417A24 }, + { gText_YellowShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_3[] = { - { gUnknown_8417A02 }, - { gUnknown_8417A0C }, - { gUnknown_8417A24 }, + { gText_RedShard }, + { gText_YellowShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_4[] = { - { gUnknown_8417A19 }, - { gUnknown_8417A24 }, + { gText_BlueShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_5[] = { - { gUnknown_8417A02 }, - { gUnknown_8417A19 }, - { gUnknown_8417A24 }, + { gText_RedShard }, + { gText_BlueShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_6[] = { - { gUnknown_8417A0C }, - { gUnknown_8417A19 }, - { gUnknown_8417A24 }, + { gText_YellowShard }, + { gText_BlueShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_7[] = { - { gUnknown_8417A02 }, - { gUnknown_8417A0C }, - { gUnknown_8417A19 }, - { gUnknown_8417A24 }, + { gText_RedShard }, + { gText_YellowShard }, + { gText_BlueShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_1[] = { - { gUnknown_8417BE2 }, - { gUnknown_8417BE8 }, - { gUnknown_8417BF0 }, - { gUnknown_8417BF8 }, - { gUnknown_8417C01 } + { gText_Eevee }, + { gText_Flareon }, + { gText_Jolteon }, + { gText_Vaporeon }, + { gText_QuitLooking } }; static const struct MenuAction sScriptMultiChoiceMenu_13[] = { - { gUnknown_8417C33 }, - { gUnknown_8417C4B } + { gText_Bicycle1000000 }, + { gText_NoThanks } }; static const struct MenuAction sScriptMultiChoiceMenu_14[] = { - { gUnknown_8417C55 }, - { gUnknown_8417C6A }, - { gUnknown_8417C83 }, - { gUnknown_8417C9D }, - { gUnknown_8417CB7 }, - { gUnknown_8417D4C } + { gText_Abra180Coins }, + { gText_Clefairy500Coins }, + { gText_Dratini2800Coins }, + { gText_Scyther5500Coins }, + { gText_Porygon9999Coins }, + { gText_NoThanks_2 } }; static const struct MenuAction sScriptMultiChoiceMenu_39[] = { - { gUnknown_8417D79 }, - { gUnknown_8417D86 }, + { gText_TradeCenter }, + { gText_Colosseum }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_40[] = { - { gUnknown_8417D90 }, - { gUnknown_8417DA0 }, + { gText_GameLinkCable }, + { gText_Wireless }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_42[] = { - { gUnknown_841805D }, - { gUnknown_8418061 }, - { gUnknown_8418069 }, + { gText_B1F }, + { gText_B2F }, + { gText_B4F }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_43[] = { - { gUnknown_841807D }, - { gUnknown_841808E }, - { gUnknown_841809C }, + { gText_LinkedGamePlay }, + { gText_DirectCorner }, + { gText_UnionRoom }, { gOtherText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_44[] = { - { gUnknown_8417DFE }, - { gUnknown_8417E09 }, + { gText_TwoIsland }, + { gText_ThreeIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_45[] = { - { gUnknown_8417DF3 }, - { gUnknown_8417E09 }, + { gText_OneIsland }, + { gText_ThreeIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_46[] = { - { gUnknown_8417DF3 }, - { gUnknown_8417DFE }, + { gText_OneIsland }, + { gText_TwoIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_47[] = { - { gUnknown_8417D79 }, - { gUnknown_8417E50 }, - { gUnknown_8417E5A }, + { gText_TradeCenter }, + { gText_Colosseum_2 }, + { gText_BerryCrush }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_48[] = { - { gUnknown_8417E66 }, - { gUnknown_8417E67 }, + { gText_Dummy_8417E66 }, + { gText_Dummy_8417E67 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_50[] = { - { gUnknown_8417D79 }, - { gUnknown_8417E50 }, + { gText_TradeCenter }, + { gText_Colosseum_2 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_49[] = { - { gUnknown_8417E72 }, - { gUnknown_8417E7F }, + { gText_PokemonJump }, + { gText_DodrioBerryPicking }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_51[] = { - { gUnknown_8417E94 }, - { gUnknown_8417EA4 } + { gText_2Tinymushrooms }, + { gText_1BigMushroom } }; static const struct MenuAction sScriptMultiChoiceMenu_52[] = { - { gUnknown_8417D79 }, - { gUnknown_8417E50 }, - { gUnknown_8417E71 }, - { gUnknown_8417E5A }, + { gText_TradeCenter }, + { gText_Colosseum_2 }, + { gText_Dummy_8417E71 }, + { gText_BerryCrush }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_53[] = { - { gUnknown_8417D79 }, - { gUnknown_8417E50 }, - { gUnknown_8417E71 }, + { gText_TradeCenter }, + { gText_Colosseum_2 }, + { gText_Dummy_8417E71 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_54[] = { - { gUnknown_8417EB3 }, - { gUnknown_8417EC1 }, + { gText_SeviiIslands }, + { gText_NavelRock }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_55[] = { - { gUnknown_8417EB3 }, - { gUnknown_8417ECC }, + { gText_SeviiIslands }, + { gText_BirthIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_56[] = { - { gUnknown_8417EB3 }, - { gUnknown_8417EC1 }, - { gUnknown_8417ECC }, + { gText_SeviiIslands }, + { gText_NavelRock }, + { gText_BirthIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_57[] = { - { gUnknown_8417DF3 }, - { gUnknown_8417DFE }, - { gUnknown_8417E09 }, + { gText_OneIsland }, + { gText_TwoIsland }, + { gText_ThreeIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_58[] = { - { gUnknown_8417E46 }, - { gUnknown_8417DFE }, - { gUnknown_8417E09 }, + { gText_Vermilion }, + { gText_TwoIsland }, + { gText_ThreeIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_59[] = { - { gUnknown_8417E46 }, - { gUnknown_8417DF3 }, - { gUnknown_8417E09 }, + { gText_Vermilion }, + { gText_OneIsland }, + { gText_ThreeIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_60[] = { - { gUnknown_8417E46 }, - { gUnknown_8417DF3 }, - { gUnknown_8417DFE }, + { gText_Vermilion }, + { gText_OneIsland }, + { gText_TwoIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_61[] = { - { gUnknown_8417E46 }, + { gText_Vermilion }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_62[] = { - { gUnknown_8417F68 }, - { gUnknown_8417F67 }, + { gText_Dummy_8417F68 }, + { gText_Dummy_8417F67 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_63[] = { - { gUnknown_8417F77 }, - { gUnknown_8417F69 }, + { gText_JoinGroup }, + { gText_BecomeLeader }, { gOtherText_Exit } }; @@ -558,35 +558,35 @@ const struct MultichoiceListStruct gScriptMultiChoiceMenus[] = { }; const u8 *const gStdStringPtrs[] = { - gUnknown_8417ABF, - gUnknown_8417AC4, - gUnknown_8417ACB, - gUnknown_8417AD0, - gUnknown_8417AD6, - gUnknown_8417AF4, - gUnknown_8417AF9, - gUnknown_8417B00, - gUnknown_8417B05, - gUnknown_8417B0B, - gUnknown_8417B11, - gUnknown_8417B17, - gUnknown_8417B21, - gUnknown_8417B2C, - gUnknown_8417B36, - gUnknown_8417B3E, - gUnknown_8417B4B, - gUnknown_8417B58, - gUnknown_8417B65, - gUnknown_8417B72, - gUnknown_8417B7C, - gUnknown_8417B87, - gUnknown_8417B94, - gUnknown_8417C2D, - gUnknown_8417DA9, - gUnknown_8417DB6, - gUnknown_8417DC7, - gUnknown_8417DD9, - gUnknown_8417DE1 + gText_Cool, + gText_Beauty, + gText_Cute, + gText_Smart, + gText_Tough, + gText_Cool_2, + gText_Beauty_2, + gText_Cute_2, + gText_Smart_2, + gText_Tough_2, + gText_Items, + gText_KeyItems, + gText_PokeBalls, + gText_TmsgUnknown_8417B2CHms, + gText_Berries, + gText_Boulderbadge, + gText_Cascadebadge, + gText_Thunderbadge, + gText_Rainbowbadge, + gText_Soulbadge, + gText_Marshbadge, + gText_Volcanobadge, + gText_Earthbadge, + gText_Coins_2, + gText_ItemsPocket, + gText_KeyItemsPocket, + gText_PokeBallsPocket, + gText_TmCase, + gText_BerryPouch_2 }; static const u8 *const sDescriptionPtrs_CableClub_TradeBattleCancel[] = { @@ -648,14 +648,14 @@ static const struct SpriteSheet sMuseumAerodactylSprSheets[] = { static const u8 *const sSeaGallopDestStrings[] = { - gUnknown_8417E46, - gUnknown_8417DF3, - gUnknown_8417DFE, - gUnknown_8417E09, - gUnknown_8417E16, - gUnknown_8417E22, - gUnknown_8417E2E, - gUnknown_8417E39 + gText_Vermilion, + gText_OneIsland, + gText_TwoIsland, + gText_ThreeIsland, + gText_FourIsland, + gText_FiveIsland, + gText_SixIsland, + gText_SevenIsland }; static u16 GetStringTilesWide(const u8 *str) @@ -951,7 +951,7 @@ static void CreatePCMenuWindow(void) u8 windowWidth; u8 nitems; u8 windowId; - switch (GetStringTilesWide(gUnknown_8417BB6)) + switch (GetStringTilesWide(gText_SPc)) { default: if (FlagGet(FLAG_SYS_POKEDEX_GET)) @@ -969,9 +969,9 @@ static void CreatePCMenuWindow(void) nitems = 5; windowId = CreateWindowFromRect(0, 0, windowWidth, 10); SetStdWindowBorderStyle(windowId, FALSE); - AddTextPrinterParameterized(windowId, 2, gUnknown_8417BD3, cursorWidth, 34, 0xFF, NULL); - AddTextPrinterParameterized(windowId, 2, gUnknown_8417BBE, cursorWidth, 50, 0xFF, NULL); - AddTextPrinterParameterized(windowId, 2, gUnknown_8417BCB, cursorWidth, 66, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_ProfOakSPc, cursorWidth, 34, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_HallOfFame_2, cursorWidth, 50, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_LogOff, cursorWidth, 66, 0xFF, NULL); } else { @@ -982,14 +982,14 @@ static void CreatePCMenuWindow(void) windowId = CreateWindowFromRect(0, 0, windowWidth, nitems * 2); SetStdWindowBorderStyle(windowId, FALSE); if (FlagGet(FLAG_SYS_POKEDEX_GET)) - AddTextPrinterParameterized(windowId, 2, gUnknown_8417BD3, cursorWidth, 34, 0xFF, NULL); - AddTextPrinterParameterized(windowId, 2, gUnknown_8417BCB, cursorWidth, 2 + 16 * (nitems - 1), 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_ProfOakSPc, cursorWidth, 34, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_LogOff, cursorWidth, 2 + 16 * (nitems - 1), 0xFF, NULL); } if (FlagGet(FLAG_SYS_NOT_SOMEONES_PC)) - AddTextPrinterParameterized(windowId, 2, gUnknown_8417BAC, cursorWidth, 2 , 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_BillSPc, cursorWidth, 2 , 0xFF, NULL); else - AddTextPrinterParameterized(windowId, 2, gUnknown_8417B9F, cursorWidth, 2 , 0xFF, NULL); - StringExpandPlaceholders(gStringVar4, gUnknown_8417BB6); + AddTextPrinterParameterized(windowId, 2, gText_SomeoneSPc, cursorWidth, 2 , 0xFF, NULL); + StringExpandPlaceholders(gStringVar4, gText_SPc); Menu_PrintFormatIntlPlayerName(windowId, gStringVar4, cursorWidth, 18); Menu_InitCursor(windowId, 2, 0, 2, 16, nitems, 0); sub_809CC18(FALSE, nitems, windowId, 0xFF); @@ -1231,7 +1231,7 @@ void Special_DrawSeaGallopDestinationMenu(void) if (r4 == SEAGALLOP_CINNABAR_ISLAND) r4 = SEAGALLOP_VERMILION_CITY; } - AddTextPrinterParameterized(windowId, 2, gUnknown_8417DED, cursorWidth, i * 16 + 2, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_Other, cursorWidth, i * 16 + 2, 0xFF, NULL); i++; AddTextPrinterParameterized(windowId, 2, gOtherText_Exit, cursorWidth, i * 16 + 2, 0xFF, NULL); Menu_InitCursor(windowId, 2, 0, 2, 16, nitems, 0); |