diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-11-02 21:10:42 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-11-02 21:10:42 -0400 |
| commit | 8013fa861c7711a338dca9f0b693b847968b7072 (patch) | |
| tree | 32f15292ad5f39d2cd2a03fadc96cb29dd283b8a | |
| parent | 16ee97ad82f0fa629ae9f07bbc37dfbfa1049af8 (diff) | |
Sync charmap with Emerald
| -rw-r--r-- | charmap.txt | 129 | ||||
| -rw-r--r-- | data/battle_interface.s | 2 | ||||
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/strings.s | 226 | ||||
| -rw-r--r-- | data/text/help_system.inc | 434 | ||||
| -rw-r--r-- | data/text/quest_log.inc | 132 | ||||
| -rw-r--r-- | include/strings.h | 6 |
7 files changed, 489 insertions, 442 deletions
diff --git a/charmap.txt b/charmap.txt index 294749a77..2f6369c27 100644 --- a/charmap.txt +++ b/charmap.txt @@ -321,50 +321,10 @@ TALL_PLUS = FC 0C FB '·' = AF '‥' = B0 -@ TODO: Identify and declare F7 control codes -UNKNOWN_F7 = F7 +DYNAMIC = F7 KEYGFX = F8 EXTRA = F9 -KEYGFX_A_BUTTON = F8 00 -KEYGFX_B_BUTTON = F8 01 -KEYGFX_L_BUTTON = F8 02 -KEYGFX_R_BUTTON = F8 03 -KEYGFX_START_BUTTON = F8 04 -KEYGFX_SELECT_BUTTON = F8 05 -KEYGFX_DPAD_UP = F8 06 -KEYGFX_DPAD_DOWN = F8 07 -KEYGFX_DPAD_LEFT = F8 08 -KEYGFX_DPAD_RIGHT = F8 09 -KEYGFX_DPAD_UP_DOWN = F8 0A -KEYGFX_DPAD_LEFT_RIGHT = F8 0B -KEYGFX_DPAD_ANY = F8 0C - -EXTRA_UPARROW = F9 00 -EXTRA_DOWNARROW = F9 01 -EXTRA_LEFTARROW = F9 02 -EXTRA_RIGHTARROW = F9 03 -EXTRA_PLUS = F9 04 -EXTRA_LV = F9 05 -EXTRA_PP = F9 06 -EXTRA_ID = F9 07 -EXTRA_NO = F9 08 -EXTRA_UNDERSCORE = F9 09 -EXTRA_CIRCLE_1 = F9 0A -EXTRA_CIRCLE_2 = F9 0B -EXTRA_CIRCLE_3 = F9 0C -EXTRA_CIRCLE_4 = F9 0D -EXTRA_CIRCLE_5 = F9 0E -EXTRA_CIRCLE_6 = F9 0F -EXTRA_CIRCLE_7 = F9 10 -EXTRA_CIRCLE_8 = F9 11 -EXTRA_CIRCLE_9 = F9 12 -EXTRA_LEFT_PAREN = F9 13 -EXTRA_RIGHT_PAREN = F9 14 -EXTRA_TARGET = F9 15 -EXTRA_TRIANGLE = F9 16 -EXTRA_X = F9 17 - STRING = FD @ string placeholders @@ -798,6 +758,93 @@ MUS_T_TOWER = 58 01 MUS_SLOWMASARA = 59 01 MUS_TVNOIZE = 5A 01 +A_BUTTON = F8 00 +B_BUTTON = F8 01 +L_BUTTON = F8 02 +R_BUTTON = F8 03 +START_BUTTON = F8 04 +SELECT_BUTTON = F8 05 +DPAD_UP = F8 06 +DPAD_DOWN = F8 07 +DPAD_LEFT = F8 08 +DPAD_RIGHT = F8 09 +DPAD_UPDOWN = F8 0A +DPAD_LEFTRIGHT = F8 0B +DPAD_ANY = F8 0C + +UP_ARROW_2 = F9 00 +DOWN_ARROW_2 = F9 01 +LEFT_ARROW_2 = F9 02 +RIGHT_ARROW_2 = F9 03 +PLUS = F9 04 +LV_2 = F9 05 +PP = F9 06 +ID = F9 07 +NO = F9 08 +UNDERSCORE = F9 09 +CIRCLE_1 = F9 0A +CIRCLE_2 = F9 0B +CIRCLE_3 = F9 0C +CIRCLE_4 = F9 0D +CIRCLE_5 = F9 0E +CIRCLE_6 = F9 0F +CIRCLE_7 = F9 10 +CIRCLE_8 = F9 11 +CIRCLE_9 = F9 12 +LEFT_PAREN = F9 13 +RIGHT_PAREN = F9 14 +CIRCLE_DOT = F9 15 +TRIANGLE = F9 16 +BIG_MULT_X = F9 17 + +EMOJI_UNDERSCORE = F9 D0 +EMOJI_PIPE = F9 D1 +EMOJI_HIGHBAR = F9 D2 +EMOJI_TILDE = F9 D3 +EMOJI_LEFT_PAREN = F9 D4 +EMOJI_RIGHT_PAREN = F9 D5 +EMOJI_UNION = F9 D6 @ ⊂ +EMOJI_GREATER_THAN = F9 D7 +EMOJI_LEFT_EYE = F9 D8 +EMOJI_RIGHT_EYE = F9 D9 +EMOJI_AT = F9 DA +EMOJI_SEMICOLON = F9 DB +EMOJI_PLUS = F9 DC +EMOJI_MINUS = F9 DD +EMOJI_EQUALS = F9 DE +EMOJI_SPIRAL = F9 DF +EMOJI_TONGUE = F9 E0 +EMOJI_TRIANGLE_OUTLINE = F9 E1 +EMOJI_ACUTE = F9 E2 +EMOJI_GRAVE = F9 E3 +EMOJI_CIRCLE = F9 E4 +EMOJI_TRIANGLE = F9 E5 +EMOJI_SQUARE = F9 E6 +EMOJI_HEART = F9 E7 +EMOJI_MOON = F9 E8 +EMOJI_NOTE = F9 E9 +EMOJI_BALL = F9 EA +EMOJI_BOLT = F9 EB +EMOJI_LEAF = F9 EC +EMOJI_FIRE = F9 ED +EMOJI_WATER = F9 EE +EMOJI_LEFT_FIST = F9 EF +EMOJI_RIGHT_FIST = F9 F0 +EMOJI_BIGWHEEL = F9 F1 +EMOJI_SMALLWHEEL = F9 F2 +EMOJI_SPHERE = F9 F3 +EMOJI_IRRITATED = F9 F4 +EMOJI_MISCHIEVOUS = F9 F5 +EMOJI_HAPPY = F9 F6 +EMOJI_ANGRY = F9 F7 +EMOJI_SURPRISED = F9 F8 +EMOJI_BIGSMILE = F9 F9 +EMOJI_EVIL = F9 FA +EMOJI_TIRED = F9 FB +EMOJI_NEUTRAL = F9 FC +EMOJI_SHOCKED = F9 FD +EMOJI_BIGANGER = F9 FE + '\l' = FA @ scroll up window text '\p' = FB @ new paragraph '\n' = FE @ new line diff --git a/data/battle_interface.s b/data/battle_interface.s index f7072c3e7..f8cf4a4b9 100644 --- a/data/battle_interface.s +++ b/data/battle_interface.s @@ -129,7 +129,7 @@ gUnknown_82604EC:: @ 82604EC spr_template 55061, 55059, gUnknown_82604B4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_StatusSummaryBallsOnBattleStart gUnknown_826051C:: @ 826051C - .string "{EXTRA_LV}$", 16 + .string "{LV_2}$", 16 gUnknown_826052C:: @ 826052C .string "{COLOR 01}{HIGHLIGHT 02}", 20 diff --git a/data/event_scripts.s b/data/event_scripts.s index 78a039926..af9eff3e6 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -10086,7 +10086,7 @@ gUnknown_81BCE73:: @ 81BCE73 .string "Command DODRIO's three heads to\n" .string "catch falling BERRIES.\p" .string "Press right, up, or left on the\n" - .string "{EXTRA_PLUS} Control Pad to move the heads.\p" + .string "{PLUS} Control Pad to move the heads.\p" .string "To play this game, you must have\n" .string "a DODRIO.$" diff --git a/data/strings.s b/data/strings.s index 5599847de..4914f9062 100644 --- a/data/strings.s +++ b/data/strings.s @@ -157,27 +157,27 @@ gText_Controls:: @ 8415D2C .align 2 gUnknown_8415D38:: @ 8415D2C - .string "{KEYGFX_DPAD_UP_DOWN}えらぶ {KEYGFX_A_BUTTON}けってい$" + .string "{DPAD_UPDOWN}えらぶ {A_BUTTON}けってい$" .align 2 gText_ABUTTONNext:: @ 8415D48 - .string "{KEYGFX_A_BUTTON}NEXT$" + .string "{A_BUTTON}NEXT$" .align 2 gText_ABUTTONNext_BBUTTONBack:: @ 8415D50 - .string "{KEYGFX_A_BUTTON}NEXT {KEYGFX_B_BUTTON}BACK$" + .string "{A_BUTTON}NEXT {B_BUTTON}BACK$" .align 2 gText_UPDOWNPick_ABUTTONNext_BBUTTONBack:: @ 8415D60 - .string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}NEXT {KEYGFX_B_BUTTON}CANCEL$" + .string "{DPAD_UPDOWN}PICK {A_BUTTON}NEXT {B_BUTTON}CANCEL$" .align 2 gText_UPDOWNPick_ABUTTONBBUTTONCancel:: @ 8415D78 - .string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}{KEYGFX_B_BUTTON}CANCEL$" + .string "{DPAD_UPDOWN}PICK {A_BUTTON}{B_BUTTON}CANCEL$" .align 2 gText_ABUTTONExit:: @ 8415D8C - .string "{KEYGFX_A_BUTTON}EXIT$" + .string "{A_BUTTON}EXIT$" gText_Boy:: @ 8415D93 .string "BOY$" @@ -189,7 +189,7 @@ gUnknown_8415D9C:: @ 8415D9C .string "POKéDEX TABLE OF CONTENTS$" gUnknown_8415DB8:: @ 8415DB8 - .string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}OK$" + .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK$" gUnknown_8415DC4:: @ 8415DC4 .string "Seen:$" @@ -276,13 +276,13 @@ gUnknown_8415F4A:: @ 8415F4A .string "SEARCH$" gText_PickOKExit:: @ 8415F51 - .string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}OK {KEYGFX_B_BUTTON}CANCEL$" + .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}CANCEL$" gUnknown_8415F66:: @ 8415F66 .string "-----$" gUnknown_8415F6C:: @ 8415F6C - .string "{KEYGFX_DPAD_LEFT_RIGHT}PICK{EXTRA_PLUS}FLIP PAGE {KEYGFX_A_BUTTON}CHECK {KEYGFX_B_BUTTON}CANCEL$" + .string "{DPAD_LEFTRIGHT}PICK{PLUS}FLIP PAGE {A_BUTTON}CHECK {B_BUTTON}CANCEL$" gUnknown_8415F8F:: @ 8415F8F .string " POKéMON$" @@ -303,16 +303,16 @@ gUnknown_8415FA5:: @ 0x8415FA5 .string "ポケモンデ-タ$" gUnknown_8415FAD:: @ 8415FAD - .string "{KEYGFX_START_BUTTON}CRY$" + .string "{START_BUTTON}CRY$" gUnknown_8415FB3:: @ 8415FB3 - .string "{KEYGFX_A_BUTTON}NEXT DATA {KEYGFX_B_BUTTON}CANCEL$" + .string "{A_BUTTON}NEXT DATA {B_BUTTON}CANCEL$" gUnknown_8415FC8:: @ 8415FC8 - .string "{KEYGFX_A_BUTTON}NEXT$" + .string "{A_BUTTON}NEXT$" gUnknown_8415FCF:: @ 8415FCF - .string "{KEYGFX_A_BUTTON}CANCEL {KEYGFX_B_BUTTON}PREVIOUS DATA$" + .string "{A_BUTTON}CANCEL {B_BUTTON}PREVIOUS DATA$" gUnknown_8415FE8:: @ 8415FE8 .string "AREA$" @@ -324,7 +324,7 @@ gUnknown_8415FF2:: @ 8415FF2 .string "AREA UNKNOWN$" gUnknown_8415FFF:: @ 8415FFF - .string "{EXTRA_NO}$" + .string "{NO}$" gUnknown_8416002:: @ 8416002 .string "PAGE$" @@ -485,22 +485,22 @@ gUnknown_8416221:: @ 8416221 .string "♀$" gText_Lv:: @ 8416223 - .string "{EXTRA_LV}$" + .string "{LV_2}$" gOtherText_UnkF9_08_Clear_01:: @ 8416226 - .string "{EXTRA_NO}{CLEAR 0x01}$" + .string "{NO}{CLEAR 0x01}$" gUnknown_841622C:: - .string "{EXTRA_PLUS}$" + .string "{PLUS}$" gUnknown_841622F:: .string "{ESCAPE 0x03}$" gUnknown_8416233:: - .string "{EXTRA_ID}{EXTRA_NO}$" + .string "{ID}{NO}$" gUnknown_8416238:: @ 8416238 - .string "{EXTRA_PP}$" + .string "{PP}$" gFameCheckerText_ListMenuCursor:: @ 841623B .string "▶$" @@ -1992,7 +1992,7 @@ gUnknown_8418248:: @ 0x8418248 .string "Pick the wallpaper.$" gUnknown_841825C:: @ 0x841825C - .string "{UNKNOWN_F7 0x00} is selected.$" + .string "{DYNAMIC 0x00} is selected.$" gUnknown_841826C:: @ 0x841826C .string "Jump to which BOX?$" @@ -2001,7 +2001,7 @@ gUnknown_841827F:: @ 0x841827F .string "Deposit in which BOX?$" gUnknown_8418295:: @ 0x8418295 - .string "{UNKNOWN_F7 0x00} was deposited.$" + .string "{DYNAMIC 0x00} was deposited.$" gUnknown_84182A7:: @ 0x84182A7 .string "The BOX is full.$" @@ -2010,10 +2010,10 @@ gUnknown_84182B8:: @ 0x84182B8 .string "Release this POKéMON?$" gUnknown_84182CE:: @ 0x84182CE - .string "{UNKNOWN_F7 0x00} was released.$" + .string "{DYNAMIC 0x00} was released.$" gUnknown_84182DF:: @ 0x84182DF - .string "Bye-bye, {UNKNOWN_F7 0x00}!$" + .string "Bye-bye, {DYNAMIC 0x00}!$" gUnknown_84182EC:: @ 0x84182EC .string "Mark your POKéMON.$" @@ -2037,7 +2037,7 @@ gUnknown_8418379:: @ 0x8418379 .string "Continue BOX operations?$" gUnknown_8418392:: @ 0x8418392 - .string "{UNKNOWN_F7 0x00} came back!$" + .string "{DYNAMIC 0x00} came back!$" gUnknown_84183A0:: @ 0x84183A0 .string "Was it worried about you?$" @@ -2061,10 +2061,10 @@ gUnknown_8418419:: @ 0x8418419 .string "Put this item in the BAG?$" gUnknown_8418433:: @ 0x8418433 - .string "{UNKNOWN_F7 0x00} is now held.$" + .string "{DYNAMIC 0x00} is now held.$" gUnknown_8418443:: @ 0x8418443 - .string "Changed to {UNKNOWN_F7 0x00}.$" + .string "Changed to {DYNAMIC 0x00}.$" gUnknown_8418452:: @ 0x8418452 .string "MAIL can't be stored!$" @@ -2517,7 +2517,7 @@ gUnknown_8418E69:: @ 0x8418E69 .string "RIVAL's NAME?$" gUnknown_8418E77:: @ 8418E77 - .string "{KEYGFX_DPAD_ANY}MOVE {KEYGFX_A_BUTTON}OK {KEYGFX_B_BUTTON}BACK$" + .string "{DPAD_ANY}MOVE {A_BUTTON}OK {B_BUTTON}BACK$" gUnknown_8418E8A:: @ 8418E8A .string "$" @@ -2526,25 +2526,25 @@ gUnknown_8418E8B:: @ 8418E8B .string " $" gUnknown_8418E8D:: @ 8418E8D - .string "{KEYGFX_A_BUTTON}GUIDE$" + .string "{A_BUTTON}GUIDE$" gUnknown_8418E95:: @ 8418E95 - .string "{KEYGFX_A_BUTTON}CANCEL$" + .string "{A_BUTTON}CANCEL$" gUnknown_8418E9E:: @ 8418E9E - .string "{KEYGFX_A_BUTTON}CANCEL$" + .string "{A_BUTTON}CANCEL$" gUnknown_8418EA7:: @ 8418EA7 - .string "{KEYGFX_A_BUTTON}SWITCH$" + .string "{A_BUTTON}SWITCH$" gUnknown_8418EB0:: @ 8418EB0 - .string "{KEYGFX_A_BUTTON}OK$" + .string "{A_BUTTON}OK$" gUnknown_8418EB5:: @ 8418EB5 - .string "{KEYGFX_DPAD_ANY}MOVE$" + .string "{DPAD_ANY}MOVE$" gUnknown_8418EBC:: @ 8418EBC - .string "{KEYGFX_DPAD_UP_DOWN}PICK$" + .string "{DPAD_UPDOWN}PICK$" gUnknown_8418EC3:: @ 8418EC3 .string "No data$" @@ -2683,79 +2683,79 @@ gUnknown_841971A:: @ 841971A .string "on its door.$" gUnknown_8419782:: @ 8419782 - .string "{UNKNOWN_F7 0x00} nature.\n" + .string "{DYNAMIC 0x00} nature.\n" .string "Met in a trade.$" gUnknown_841979D:: @ 841979D - .string "{UNKNOWN_F7 0x00} nature.\n" + .string "{DYNAMIC 0x00} nature.\n" .string "Met in a trade.$" gUnknown_84197B8:: @ 84197B8 - .string "{UNKNOWN_F7 0x00} nature.\n" + .string "{DYNAMIC 0x00} nature.\n" .string "Met in a fateful encounter when\n" - .string "at {EXTRA_LV} {UNKNOWN_F7 0x01}.$" + .string "at {LV_2} {DYNAMIC 0x01}.$" gUnknown_84197ED:: @ 84197ED - .string "{UNKNOWN_F7 0x00} nature.\n" + .string "{DYNAMIC 0x00} nature.\n" .string "Met in a fateful encounter when\n" - .string "at {EXTRA_LV} {UNKNOWN_F7 0x01}.$" + .string "at {LV_2} {DYNAMIC 0x01}.$" gUnknown_8419822:: @ 8419822 - .string "{UNKNOWN_F7 0x00} nature.\n" - .string "Met in {UNKNOWN_F7 0x02} at {EXTRA_LV} {UNKNOWN_F7 0x01}.$" + .string "{DYNAMIC 0x00} nature.\n" + .string "Met in {DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}.$" gUnknown_8419841:: @ 8419841 - .string "{UNKNOWN_F7 0x00} nature.\n" - .string "Met in {UNKNOWN_F7 0x02} at {EXTRA_LV} {UNKNOWN_F7 0x01}.$" + .string "{DYNAMIC 0x00} nature.\n" + .string "Met in {DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}.$" gUnknown_8419860:: @ 8419860 - .string "{UNKNOWN_F7 0x00} nature.\n" - .string "Apparently met in {UNKNOWN_F7 0x02}\n" - .string "at {EXTRA_LV} {UNKNOWN_F7 0x01}.$" + .string "{DYNAMIC 0x00} nature.\n" + .string "Apparently met in {DYNAMIC 0x02}\n" + .string "at {LV_2} {DYNAMIC 0x01}.$" gUnknown_841988A:: @ 841988A - .string "{UNKNOWN_F7 0x00} nature.\n" - .string "Apparently met in {UNKNOWN_F7 0x02}\n" - .string "at {EXTRA_LV} {UNKNOWN_F7 0x01}.$" + .string "{DYNAMIC 0x00} nature.\n" + .string "Apparently met in {DYNAMIC 0x02}\n" + .string "at {LV_2} {DYNAMIC 0x01}.$" gUnknown_84198B4:: @ 84198B4 - .string "{UNKNOWN_F7 0x00} nature.\n" - .string "Hatched: {UNKNOWN_F7 0x02}\n" - .string "at {EXTRA_LV} {UNKNOWN_F7 0x01}.$" + .string "{DYNAMIC 0x00} nature.\n" + .string "Hatched: {DYNAMIC 0x02}\n" + .string "at {LV_2} {DYNAMIC 0x01}.$" gUnknown_84198D5:: @ 84198D5 - .string "{UNKNOWN_F7 0x00} nature.\n" - .string "Hatched: {UNKNOWN_F7 0x02}\n" - .string "at {EXTRA_LV} {UNKNOWN_F7 0x01}.$" + .string "{DYNAMIC 0x00} nature.\n" + .string "Hatched: {DYNAMIC 0x02}\n" + .string "at {LV_2} {DYNAMIC 0x01}.$" @ TODO: Replace this gibberish with the proper Hiragana gUnknown_84198F6:: @ 84198F6 - .string "{UNKNOWN_F7 0x00}ßÓÁÉË {EXTRA_LV}{UNKNOWN_F7 0x01}çÑÊ\n" - .string "{UNKNOWN_F7 0x02}で ÉÇっŒ ùÂだ$" + .string "{DYNAMIC 0x00}ßÓÁÉË {LV_2}{DYNAMIC 0x01}çÑÊ\n" + .string "{DYNAMIC 0x02}で ÉÇっŒ ùÂだ$" gUnknown_8419913:: @ 8419913 - .string "{UNKNOWN_F7 0x00}ÓÁÉË {EXTRA_LV}{UNKNOWN_F7 0x01}çÑÊ\n" - .string "{UNKNOWN_F7 0x02}で ÉÇっŒ ùÂだ$" + .string "{DYNAMIC 0x00}ÓÁÉË {LV_2}{DYNAMIC 0x01}çÑÊ\n" + .string "{DYNAMIC 0x02}で ÉÇっŒ ùÂだ$" gUnknown_841992F:: @ 841992F - .string "{UNKNOWN_F7 0x00} nature. Met in a fateful\n" - .string "encounter (hatched: {UNKNOWN_F7 0x02}\n" - .string "at {EXTRA_LV} {UNKNOWN_F7 0x01}).$" + .string "{DYNAMIC 0x00} nature. Met in a fateful\n" + .string "encounter (hatched: {DYNAMIC 0x02}\n" + .string "at {LV_2} {DYNAMIC 0x01}).$" gUnknown_841996D:: @ 841996D - .string "{UNKNOWN_F7 0x00} nature. Met in a fateful\n" - .string "encounter (hatched: {UNKNOWN_F7 0x02}\n" - .string "at {EXTRA_LV} {UNKNOWN_F7 0x01}).$" + .string "{DYNAMIC 0x00} nature. Met in a fateful\n" + .string "encounter (hatched: {DYNAMIC 0x02}\n" + .string "at {LV_2} {DYNAMIC 0x01}).$" gUnknown_84199AB:: @ 84199AB - .string "{UNKNOWN_F7 0x00} nature. Apparently met in\n" + .string "{DYNAMIC 0x00} nature. Apparently met in\n" .string "a fateful encounter (hatched:\n" - .string "{UNKNOWN_F7 0x02} at {EXTRA_LV} {UNKNOWN_F7 0x01}).$" + .string "{DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}).$" gUnknown_84199F4:: @ 84199F4 - .string "{UNKNOWN_F7 0x00} nature. Apparently met in\n" + .string "{DYNAMIC 0x00} nature. Apparently met in\n" .string "a fateful encounter シhatched:\n" - .string "{UNKNOWN_F7 0x02} at {EXTRA_LV} {UNKNOWN_F7 0x01}ス.$" + .string "{DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}ス.$" gUnknown_8419A3D:: @ 0x8419A3D .string "An odd POKéMON EGG found by the\n" @@ -2822,25 +2822,25 @@ gUnknown_8419C59:: @ 8419C59 .string "NEXT LV.$" gUnknown_8419C62:: @ 8419C62 - .string "{KEYGFX_DPAD_RIGHT}PAGE {KEYGFX_A_BUTTON}CANCEL$" + .string "{DPAD_RIGHT}PAGE {A_BUTTON}CANCEL$" gUnknown_8419C72:: @ 8419C72 - .string "{KEYGFX_A_BUTTON}CANCEL$" + .string "{A_BUTTON}CANCEL$" gUnknown_8419C7B:: @ 8419C7B - .string "{KEYGFX_DPAD_LEFT_RIGHT}PAGE$" + .string "{DPAD_LEFTRIGHT}PAGE$" gUnknown_8419C82:: @ 8419C82 - .string "{KEYGFX_DPAD_LEFT}PAGE {KEYGFX_A_BUTTON}DETAIL$" + .string "{DPAD_LEFT}PAGE {A_BUTTON}DETAIL$" gUnknown_8419C92:: @ 8419C92 - .string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}SWITCH$" + .string "{DPAD_UPDOWN}PICK {A_BUTTON}SWITCH$" gUnknown_8419CA2:: @ 8419CA2 - .string "{KEYGFX_DPAD_UP_DOWN}PICK$" + .string "{DPAD_UPDOWN}PICK$" gUnknown_8419CA9:: @ 8419CA9 - .string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}DELETE$" + .string "{DPAD_UPDOWN}PICK {A_BUTTON}DELETE$" gUnknown_8419CB9:: @ 8419CB9 .string "HM moves can't be\n" @@ -2971,7 +2971,7 @@ gUnknown_8419E52:: @ 8419E52 .string "TYPE$" gUnknown_8419E57:: @ 8419E57 - .string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_DPAD_LEFT_RIGHT}SWITCH {KEYGFX_A_BUTTON}{KEYGFX_B_BUTTON}CANCEL$" + .string "{DPAD_UPDOWN}PICK {DPAD_LEFTRIGHT}SWITCH {A_BUTTON}{B_BUTTON}CANCEL$" gUnknown_8419E72:: @ 0x8419E72 .string "RTCを リセットします\n" @@ -3075,7 +3075,7 @@ gUnknown_841B2D4:: @ 0x841B2D4 .string "SP. DEF$" gUnknown_841B2DC:: @ 841B2DC - .string "{SMALL}{EXTRA_PLUS}{SIZE 0x02}$" + .string "{SMALL}{PLUS}{SIZE 0x02}$" gUnknown_841B2E5:: @ 841B2E5 .string "{SMALL}-{SIZE 0x02}$" @@ -3091,8 +3091,8 @@ gUnknown_841B2FF:: @ 0x841B2FF .string "$" gUnknown_841B306:: @ 841B306 - .string "{UNKNOWN_F7 0x00} forgot\n" - .string "{UNKNOWN_F7 0x01}.\p" + .string "{DYNAMIC 0x00} forgot\n" + .string "{DYNAMIC 0x01}.\p" .string "$" gUnknown_841B315:: @ 841B315 @@ -3107,8 +3107,8 @@ gUnknown_841B329:: @ 841B329 .string "Huh?$" gUnknown_841B32E:: @ 841B32E - .string "{UNKNOWN_F7 0x00} learned\n" - .string "{UNKNOWN_F7 0x01}!$" + .string "{DYNAMIC 0x00} learned\n" + .string "{DYNAMIC 0x01}!$" gUnknown_841B33D:: @ 0x841B33D .string "UPPER$" @@ -3141,22 +3141,22 @@ gUnknown_841B39E:: @ 0x841B39E .string "Input text.$" gUnknown_841B3AA:: @ 841B3AA - .string "{UNKNOWN_F7 0x00} joined the chat!$" + .string "{DYNAMIC 0x00} joined the chat!$" gUnknown_841B3BE:: @ 841B3BE - .string "{UNKNOWN_F7 0x00} left the chat.$" + .string "{DYNAMIC 0x00} left the chat.$" gUnknown_841B3D0:: @ 0x841B3D0 - .string "{UNKNOWN_F7 0x00}の{UNKNOWN_F7 0x01}ひきめ:$" + .string "{DYNAMIC 0x00}の{DYNAMIC 0x01}ひきめ:$" gUnknown_841B3DA:: @ 0x841B3DA - .string "{UNKNOWN_F7 0x00}の{UNKNOWN_F7 0x01}ひきめは いません$" + .string "{DYNAMIC 0x00}の{DYNAMIC 0x01}ひきめは いません$" gUnknown_841B3E9:: @ 0x841B3E9 .string "Exiting the chat‥$" gUnknown_841B3FB:: @ 0x841B3FB - .string "The LEADER, {UNKNOWN_F7 0x00}, has\n" + .string "The LEADER, {DYNAMIC 0x00}, has\n" .string "left, ending the chat.$" gUnknown_841B426:: @ 0x841B426 @@ -3172,7 +3172,7 @@ gUnknown_841B4A4:: @ 0x841B4A4 .string "DON'T TURN OFF THE POWER.$" gUnknown_841B4C6:: @ 0x841B4C6 - .string "{UNKNOWN_F7 0x00} saved the game.$" + .string "{DYNAMIC 0x00} saved the game.$" gUnknown_841B4D9:: @ 0x841B4D9 .string "If the LEADER leaves, the chat\n" @@ -3221,13 +3221,13 @@ gUnknown_841B5B6:: @ 841B5B6 .string "$" gUnknown_841B60E:: @ 841B60E - .string "PLAYER: {UNKNOWN_F7 0x00}$" + .string "PLAYER: {DYNAMIC 0x00}$" gUnknown_841B619:: @ 841B619 .string "This document is issued in\n" .string "recognition of your magnificent\n" .string "achievement - the completion of\n" - .string "the {UNKNOWN_F7 0x01} POKéDEX.$" + .string "the {DYNAMIC 0x01} POKéDEX.$" gUnknown_841B684:: @ 841B684 .string "GAME FREAK$" @@ -3284,7 +3284,7 @@ gString_QuitPlaying:: @ 841B76B .string "Quit playing?$" gString_SlotMachineControls:: @ 841B779 - .string "{KEYGFX_DPAD_LEFT_RIGHT}COMBOS {KEYGFX_DPAD_DOWN}WAGER {KEYGFX_A_BUTTON}STOP {KEYGFX_B_BUTTON}EXIT$" + .string "{DPAD_LEFTRIGHT}COMBOS {DPAD_DOWN}WAGER {A_BUTTON}STOP {B_BUTTON}EXIT$" gUnknown_841B798:: @ 0x841B798 .string "おしえテレビ$" @@ -3323,7 +3323,7 @@ gUnknown_841CB63:: @ 841CB63 gUnknown_841CBA9:: @ 841CBA9 .string "Awesome score! You've\n" - .string "won {UNKNOWN_F7 01} {UNKNOWN_F7 00}!$" + .string "won {DYNAMIC 01} {DYNAMIC 00}!$" gUnknown_841CBCA:: @ 841CBCA .string "There's no room left now.$" @@ -3381,7 +3381,7 @@ gUnknown_841CD58:: @ 841CD58 gUnknown_841CD7A:: @ 841CD7A .string "The first-place winner gets\n" - .string "this {UNKNOWN_F7 00}!$" + .string "this {DYNAMIC 00}!$" gUnknown_841CD9F:: @ 841CD9F .string "You can't hold any more...$" @@ -3436,10 +3436,10 @@ gUnknown_841CE24:: @ 841CE24 .align 2 gUnknown_841D020:: @ 841D020 - .string "1. {COLOR LIGHT_GRAY}{SHADOW BLACK}{UNKNOWN_F7 0x00}$" + .string "1. {COLOR LIGHT_GRAY}{SHADOW BLACK}{DYNAMIC 0x00}$" gUnknown_841D02C:: @ 841D02C - .string "1. {UNKNOWN_F7 0x00}$" + .string "1. {DYNAMIC 0x00}$" gUnknown_841D032:: @ 0x841D032 .string " times$" @@ -4219,7 +4219,7 @@ gUnknown_841DE54:: @ 841DE54 .string "$" gUnknown_841DE55:: @ 841DE55 - .string "カ-ドeリ-ダ-{EXTRA_PLUS}の ‘つうしん'を\n" + .string "カ-ドeリ-ダ-{PLUS}の ‘つうしん'を\n" .string "えらんで Aボタンを おしてください$" gUnknown_841DE7C:: @ 841DE7C @@ -4229,7 +4229,7 @@ gUnknown_841DE7D:: @ 841DE7D .string "$" gUnknown_841DE7E:: @ 841DE7E - .string "カ-ドeリ-ダ-{EXTRA_PLUS}と\n" + .string "カ-ドeリ-ダ-{PLUS}と\n" .string "つうしん できません$" gUnknown_841DE95:: @ 841DE95 @@ -4290,16 +4290,16 @@ gUnknown_841DFA0:: @ 841DFA0 .string "GOLD$" gUnknown_841DFA5:: @ 841DFA5 - .string "{KEYGFX_A_BUTTON}NEXT$" + .string "{A_BUTTON}NEXT$" gUnknown_841DFAC:: @ 841DFAC - .string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}OK {KEYGFX_B_BUTTON}END$" + .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}END$" gUnknown_841DFBE:: @ 841DFBE - .string "{KEYGFX_A_BUTTON}{KEYGFX_B_BUTTON}CANCEL$" + .string "{A_BUTTON}{B_BUTTON}CANCEL$" gUnknown_841DFC9:: @ 841DFC9 - .string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}OK {KEYGFX_B_BUTTON}CANCEL$" + .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}CANCEL$" gEasyChatGroupName_Pokemon:: @ 841E08A @ easy chat categories .string "POKéMON$" @@ -4493,29 +4493,29 @@ gUnknown_841E29E:: @ 841E29E .string "People communicating:$" gUnknown_841E2B4:: @ 841E2B4 - .string "{UNKNOWN_F7 0x00} players$" + .string "{DYNAMIC 0x00} players$" gUnknown_841E2BF:: @ 841E2BF - .string "{UNKNOWN_F7 0x01} player$" + .string "{DYNAMIC 0x01} player$" gUnknown_841E2C9:: @ 841E2C9 - .string "{UNKNOWN_F7 0x02} players$" + .string "{DYNAMIC 0x02} players$" gUnknown_841E2D4:: @ 841E2D4 - .string "{UNKNOWN_F7 0x03} players$" + .string "{DYNAMIC 0x03} players$" gUnknown_841E2DF:: @ 841E2DF - .string "{KEYGFX_DPAD_ANY}えらぶ:{KEYGFX_A_BUTTON}けってい$" + .string "{DPAD_ANY}えらぶ:{A_BUTTON}けってい$" gUnknown_841E2EC:: @ 841E2EC - .string "{KEYGFX_B_BUTTON}CANCEL$" + .string "{B_BUTTON}CANCEL$" gUnknown_841E2F5:: @ 841E2F5 .string "{COLOR BLUE}{SHADOW YELLOW} たいせんの くみあわせ\n" .string "{COLOR RED}{SHADOW GREEN}じぶんの ばしょをきめて ください$" gUnknown_841E322:: @ 841E322 - .string "{EXTRA_ID}$" + .string "{ID}$" gUnknown_841E325:: @ 841E325 .string "Communication standby…$" @@ -4588,13 +4588,13 @@ gUnknown_841E58D:: @ 841E58D .string "Refused the battle.{PAUSE 0x3C}$" gFameCheckerText_MainScreenUI:: @ 841E5A4 - .string "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$" + .string "{START_BUTTON}PICK {DPAD_UPDOWN}SELECT {A_BUTTON}OK$" gFameCheckerText_PickScreenUI:: @ 841E5B9 - .string "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$" + .string "{START_BUTTON}PICK {DPAD_UPDOWN}SELECT {B_BUTTON}CANCEL$" gFameCheckerText_FlavorTextUI:: @ 841E5D2 - .string "{KEYGFX_DPAD_ANY}PICK {KEYGFX_A_BUTTON}READ {KEYGFX_B_BUTTON}CANCEL$" + .string "{DPAD_ANY}PICK {A_BUTTON}READ {B_BUTTON}CANCEL$" gFameCheckerOakName:: @ 841E5E9 .string "OAK$" @@ -4793,7 +4793,7 @@ gText_MysteryGift2:: @ 841EDBD .string "MYSTERY GIFT$" gText_PickOKCancel:: @ 841EDCA - .string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}OK {KEYGFX_B_BUTTON}EXIT$" + .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}EXIT$" gText_WonderCards:: .string "WONDER CARDS$" diff --git a/data/text/help_system.inc b/data/text/help_system.inc index a85af88a8..7a74de349 100644 --- a/data/text/help_system.inc +++ b/data/text/help_system.inc @@ -208,7 +208,7 @@ gUnknown_81B36EB:: @ 81B36EB .string "On the stairs or the exits of a\n" .string "building is a red mat. Move your\l" .string "character to stand on top of the\l" - .string "red mat. Press the {EXTRA_PLUS} Control Pad \l" + .string "red mat. Press the {PLUS} Control Pad \l" .string "toward the stairs or the exit to\l" .string "advance.$" @@ -238,7 +238,7 @@ gUnknown_81B3972:: @ 81B3972 .string "them and pressing the A Button.\l" .string "Also, try checking things like odd trees\l" .string "and strange rocks with the A Button.\l" - .string "Press the {EXTRA_PLUS} Control Pad and try going\l" + .string "Press the {PLUS} Control Pad and try going\l" .string "to places that look impassable, too.$" gUnknown_81B3A51:: @ 81B3A51 @@ -676,48 +676,48 @@ gUnknown_81B5A37:: @ 81B5A37 .string " Using “HALL OF FAME”$" gUnknown_81B5A4D:: @ 81B5A4D - .string "{EXTRA_CIRCLE_1} Select “POKéDEX” on the MENU.\n" - .string "{EXTRA_CIRCLE_2} Choose POKéMON using commands such\n" + .string "{CIRCLE_1} Select “POKéDEX” on the MENU.\n" + .string "{CIRCLE_2} Choose POKéMON using commands such\n" .string " as “POKéMON LIST,”\n" .string " “HABITATS OF POKéMON,” and\n" .string " “SEARCH.”\n" - .string "{EXTRA_CIRCLE_3} Select a POKéMON to obtain detailed\n" + .string "{CIRCLE_3} Select a POKéMON to obtain detailed\n" .string " information.$" gUnknown_81B5B0C:: @ 81B5B0C - .string "{EXTRA_CIRCLE_1} Select “POKéMON” on the MENU.\n" - .string "{EXTRA_CIRCLE_2} Choose a POKéMON in your party.\n" - .string "{EXTRA_CIRCLE_3} Select “SUMMARY,” “SWITCH,”\n" + .string "{CIRCLE_1} Select “POKéMON” on the MENU.\n" + .string "{CIRCLE_2} Choose a POKéMON in your party.\n" + .string "{CIRCLE_3} Select “SUMMARY,” “SWITCH,”\n" .string " or “ITEM.”$" gUnknown_81B5B7D:: @ 81B5B7D - .string "{EXTRA_CIRCLE_1} Select “SUMMARY.”\n" - .string "{EXTRA_CIRCLE_2} Press left or right on the {EXTRA_PLUS} Control\n" + .string "{CIRCLE_1} Select “SUMMARY.”\n" + .string "{CIRCLE_2} Press left or right on the {PLUS} Control\n" .string " Pad to check the information:\n" .string " “POKéMON INFO”\n" .string " “POKéMON SKILLS”\n" .string " “KNOWN MOVES”$" gUnknown_81B5C13:: @ 81B5C13 - .string "{EXTRA_CIRCLE_1} Choose the POKéMON you want to\n" + .string "{CIRCLE_1} Choose the POKéMON you want to\n" .string " switch around.\n" - .string "{EXTRA_CIRCLE_2} Select “SWITCH.”\n" - .string "{EXTRA_CIRCLE_3} Select the POKéMON to switch with\n" + .string "{CIRCLE_2} Select “SWITCH.”\n" + .string "{CIRCLE_3} Select the POKéMON to switch with\n" .string " the first one.\n" .string "The POKéMON at the left of the screen\n" .string "will be the first one out in a battle.$" gUnknown_81B5CDF:: @ 81B5CDF - .string "{EXTRA_CIRCLE_1} Select “ITEM.”\n" - .string "{EXTRA_CIRCLE_2} Select whether you want to “GIVE”\n" + .string "{CIRCLE_1} Select “ITEM.”\n" + .string "{CIRCLE_2} Select whether you want to “GIVE”\n" .string " an item to the POKéMON to hold,\n" .string " or “TAKE” an item it is holding.\n" .string "A POKéMON can hold no more than one\n" .string "item!$" gUnknown_81B5D87:: @ 81B5D87 - .string "{EXTRA_CIRCLE_1} Select “BAG” on the MENU.\n" - .string "{EXTRA_CIRCLE_2} Press left or right on the {EXTRA_PLUS} Control\n" + .string "{CIRCLE_1} Select “BAG” on the MENU.\n" + .string "{CIRCLE_2} Press left or right on the {PLUS} Control\n" .string " Pad to check the data headings:\n" .string " “ITEMS”\n" .string " “KEY ITEMS”\n" @@ -725,125 +725,125 @@ gUnknown_81B5D87:: @ 81B5D87 .string " Press up or down to select an item.$" gUnknown_81B5E41:: @ 81B5E41 - .string "{EXTRA_CIRCLE_1} Select the “ITEMS” POCKET.\n" - .string "{EXTRA_CIRCLE_2} Press up or down on the {EXTRA_PLUS} Control\n" + .string "{CIRCLE_1} Select the “ITEMS” POCKET.\n" + .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad to select an item.\n" - .string "{EXTRA_CIRCLE_3} Select “USE” to use the selected\n" + .string "{CIRCLE_3} Select “USE” to use the selected\n" .string " item.\n" .string "Some items may not be used depending\n" .string "on the place and/or situation.$" gUnknown_81B5F10:: @ 81B5F10 - .string "{EXTRA_CIRCLE_1} Select the “KEY ITEMS” POCKET.\n" - .string "{EXTRA_CIRCLE_2} Press up or down on the {EXTRA_PLUS} Control\n" + .string "{CIRCLE_1} Select the “KEY ITEMS” POCKET.\n" + .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad to select a key item.\n" - .string "{EXTRA_CIRCLE_3} Select “USE” to use the selected\n" + .string "{CIRCLE_3} Select “USE” to use the selected\n" .string " key item.$" gUnknown_81B5FA6:: @ 81B5FA6 - .string "{EXTRA_CIRCLE_1} While battling a wild POKéMON,\n" + .string "{CIRCLE_1} While battling a wild POKéMON,\n" .string " select the BAG's “POKé BALLS”\n" .string " POCKET.\n" - .string "{EXTRA_CIRCLE_2} Press up or down on the {EXTRA_PLUS} Control\n" + .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad to select a POKé BALL.\n" - .string "{EXTRA_CIRCLE_3} Select “USE” to throw the selected\n" + .string "{CIRCLE_3} Select “USE” to throw the selected\n" .string " POKé BALL.$" gUnknown_81B606C:: @ 81B606C - .string "{EXTRA_CIRCLE_1} Select “{PLAYER}” on the MENU.\n" - .string "{EXTRA_CIRCLE_2} Your TRAINER CARD is displayed face\n" + .string "{CIRCLE_1} Select “{PLAYER}” on the MENU.\n" + .string "{CIRCLE_2} Your TRAINER CARD is displayed face\n" .string " up with basic information. Press the\n" .string " A Button to turn the CARD over.\n" - .string "{EXTRA_CIRCLE_3} A variety of data can be found on\n" + .string "{CIRCLE_3} A variety of data can be found on\n" .string " the reverse side of the CARD.$" gUnknown_81B6140:: @ 81B6140 - .string "{EXTRA_CIRCLE_1} Select “SAVE” on the MENU.\n" - .string "{EXTRA_CIRCLE_2} Select “YES” and your progress is\n" + .string "{CIRCLE_1} Select “SAVE” on the MENU.\n" + .string "{CIRCLE_2} Select “YES” and your progress is\n" .string " recorded in the save file.\n" .string "Once the game is saved, you may turn\n" .string "off the game. Your game can be resumed\n" .string "from where you saved.$" gUnknown_81B6203:: @ 81B6203 - .string "{EXTRA_CIRCLE_1} Select “OPTION” on the MENU.\n" - .string "{EXTRA_CIRCLE_2} Press up or down on the {EXTRA_PLUS} Control\n" + .string "{CIRCLE_1} Select “OPTION” on the MENU.\n" + .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad to select an optional item, then\n" .string " press left or right to alter the\n" .string " settings.\n" - .string "{EXTRA_CIRCLE_3} Select “CANCEL” or press the\n" + .string "{CIRCLE_3} Select “CANCEL” or press the\n" .string " B Button after making changes.$" gUnknown_81B62E4:: @ 81B62E4 - .string "{EXTRA_CIRCLE_1} Open the MENU.\n" - .string "{EXTRA_CIRCLE_2} Press up or down on the {EXTRA_PLUS} Control\n" + .string "{CIRCLE_1} Open the MENU.\n" + .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad and select “BAG.”\n" - .string "{EXTRA_CIRCLE_3} Select “POTION” in the “ITEMS”\n" + .string "{CIRCLE_3} Select “POTION” in the “ITEMS”\n" .string " POCKET.\n" - .string "{EXTRA_CIRCLE_4} Select “USE.”\n" - .string "{EXTRA_CIRCLE_5} Select the POKéMON to be healed.$" + .string "{CIRCLE_4} Select “USE.”\n" + .string "{CIRCLE_5} Select the POKéMON to be healed.$" gUnknown_81B6397:: @ 81B6397 - .string "{EXTRA_CIRCLE_1} Open the MENU.\n" - .string "{EXTRA_CIRCLE_2} Press up or down on the {EXTRA_PLUS} Control\n" + .string "{CIRCLE_1} Open the MENU.\n" + .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad and select “BAG.”\n" - .string "{EXTRA_CIRCLE_3} Press left or right to open the\n" + .string "{CIRCLE_3} Press left or right to open the\n" .string " “KEY ITEMS” POCKET, then press\n" .string " up or down to select “TOWN MAP.” \n" - .string "{EXTRA_CIRCLE_4} Select “USE” to open the TOWN MAP.$" + .string "{CIRCLE_4} Select “USE” to open the TOWN MAP.$" gUnknown_81B6478:: @ 81B6478 - .string "{EXTRA_CIRCLE_1} Open the MENU.\n" - .string "{EXTRA_CIRCLE_2} Open the “KEY ITEMS” POCKET in the\n" + .string "{CIRCLE_1} Open the MENU.\n" + .string "{CIRCLE_2} Open the “KEY ITEMS” POCKET in the\n" .string " “BAG.”\n" - .string "{EXTRA_CIRCLE_3} “OPEN” the TM CASE.\n" - .string "{EXTRA_CIRCLE_4} Select and “USE” a TM.\n" - .string "{EXTRA_CIRCLE_5} Select a POKéMON that can learn the\n" + .string "{CIRCLE_3} “OPEN” the TM CASE.\n" + .string "{CIRCLE_4} Select and “USE” a TM.\n" + .string "{CIRCLE_5} Select a POKéMON that can learn the\n" .string " move in the TM.$" gUnknown_81B6525:: @ 81B6525 - .string "{EXTRA_CIRCLE_1} Open the MENU.\n" - .string "{EXTRA_CIRCLE_2} Open the “KEY ITEMS” POCKET in the\n" + .string "{CIRCLE_1} Open the MENU.\n" + .string "{CIRCLE_2} Open the “KEY ITEMS” POCKET in the\n" .string " “BAG.”\n" - .string "{EXTRA_CIRCLE_3} “OPEN” the TM CASE.\n" - .string "{EXTRA_CIRCLE_4} Select and “USE” an HM.\n" - .string "{EXTRA_CIRCLE_5} Select a POKéMON that can learn it.\n" + .string "{CIRCLE_3} “OPEN” the TM CASE.\n" + .string "{CIRCLE_4} Select and “USE” an HM.\n" + .string "{CIRCLE_5} Select a POKéMON that can learn it.\n" .string "HMs are hard to remove, so be careful!$" gUnknown_81B65E7:: @ 81B65E7 - .string "{EXTRA_CIRCLE_1} Open the MENU.\n" - .string "{EXTRA_CIRCLE_2} Select “POKéMON.”\n" - .string "{EXTRA_CIRCLE_3} Select a POKéMON that knows an\n" + .string "{CIRCLE_1} Open the MENU.\n" + .string "{CIRCLE_2} Select “POKéMON.”\n" + .string "{CIRCLE_3} Select a POKéMON that knows an\n" .string " HM move. The usable HM move(s)\n" .string " will be shown in blue. Select and\n" .string " use the desired move to destroy an\n" .string " obstacle, fly, surf, etc.$" gUnknown_81B66BA:: @ 81B66BA - .string "{EXTRA_CIRCLE_1} Open the MENU. Open the\n" + .string "{CIRCLE_1} Open the MENU. Open the\n" .string " “KEY ITEMS” POCKET in the “BAG”\n" .string " and select the “BICYCLE.”\n" - .string "{EXTRA_CIRCLE_2} The BICYCLE can be ridden by\n" + .string "{CIRCLE_2} The BICYCLE can be ridden by\n" .string " selecting “USE.” You may also\n" .string " “REGISTER” it for instant use by\n" .string " pressing SELECT.$" gUnknown_81B678E:: @ 81B678E - .string "{EXTRA_CIRCLE_1} Move the cursor to the letter you\n" - .string " want with the {EXTRA_PLUS} Control Pad, then\n" + .string "{CIRCLE_1} Move the cursor to the letter you\n" + .string " want with the {PLUS} Control Pad, then\n" .string " press the A Button to enter it.\n" - .string "{EXTRA_CIRCLE_2} Press the B Button to back up.\n" - .string "{EXTRA_CIRCLE_3} Press SELECT to switch between\n" + .string "{CIRCLE_2} Press the B Button to back up.\n" + .string "{CIRCLE_3} Press SELECT to switch between\n" .string " uppercase and lowercase letters.\n" - .string "{EXTRA_CIRCLE_4} Press the A Button on “OK.”$" + .string "{CIRCLE_4} Press the A Button on “OK.”$" gUnknown_81B6883:: @ 81B6883 - .string "{EXTRA_CIRCLE_1} Go to any POKéMON CENTER, go up\n" + .string "{CIRCLE_1} Go to any POKéMON CENTER, go up\n" .string " to the PC, then press the A Button.$" gUnknown_81B68CD:: @ 81B68CD - .string "{EXTRA_CIRCLE_1} Select “{STR_VAR_1}'S PC” on the PC.\n" - .string "{EXTRA_CIRCLE_2} Select from one of the top three\n" + .string "{CIRCLE_1} Select “{STR_VAR_1}'S PC” on the PC.\n" + .string "{CIRCLE_2} Select from one of the top three\n" .string " MENU items to access the POKéMON\n" .string " Storage System.\n" .string "If you catch a POKéMON when you have\n" @@ -851,100 +851,100 @@ gUnknown_81B68CD:: @ 81B68CD .string "automatically to a BOX in the System!$" gUnknown_81B69B9:: @ 81B69B9 - .string "{EXTRA_CIRCLE_1} Select a POKéMON in the open BOX\n" - .string " with the {EXTRA_PLUS} Control Pad.\n" - .string "{EXTRA_CIRCLE_2} Select “WITHDRAW” to remove the\n" + .string "{CIRCLE_1} Select a POKéMON in the open BOX\n" + .string " with the {PLUS} Control Pad.\n" + .string "{CIRCLE_2} Select “WITHDRAW” to remove the\n" .string " POKéMON from the BOX and add it to\n" .string " your party.\n" .string "You may not withdraw a POKéMON if you\n" .string "already have six POKéMON with you!$" gUnknown_81B6A9A:: @ 81B6A9A - .string "{EXTRA_CIRCLE_1} Select a POKéMON in your party with\n" - .string " the {EXTRA_PLUS} Control Pad.\n" - .string "{EXTRA_CIRCLE_2} Select “DEPOSIT.”\n" - .string "{EXTRA_CIRCLE_3} Select the BOX, then press the\n" + .string "{CIRCLE_1} Select a POKéMON in your party with\n" + .string " the {PLUS} Control Pad.\n" + .string "{CIRCLE_2} Select “DEPOSIT.”\n" + .string "{CIRCLE_3} Select the BOX, then press the\n" .string " A Button to store the POKéMON.\n" .string "If you have only one POKéMON with you,\n" .string "it may not be stored!$" gUnknown_81B6B6E:: @ 81B6B6E - .string "{EXTRA_CIRCLE_1} Select a POKéMON in the open BOX.\n" - .string "{EXTRA_CIRCLE_2} Pick up the POKéMON by selecting\n" + .string "{CIRCLE_1} Select a POKéMON in the open BOX.\n" + .string "{CIRCLE_2} Pick up the POKéMON by selecting\n" .string " “MOVE” and move it anywhere with\n" - .string " the {EXTRA_PLUS} Control Pad.\n" - .string "{EXTRA_CIRCLE_3} Move the POKéMON to the BOX name\n" + .string " the {PLUS} Control Pad.\n" + .string "{CIRCLE_3} Move the POKéMON to the BOX name\n" .string " and press left or right to move it\n" .string " to another BOX.$" gUnknown_81B6C4F:: @ 81B6C4F - .string "{EXTRA_CIRCLE_1} Faintly shown POKéMON can be made\n" + .string "{CIRCLE_1} Faintly shown POKéMON can be made\n" .string " to hold an item by selecting it and\n" .string " pressing the A Button.\n" - .string "{EXTRA_CIRCLE_2} Clearly shown POKéMON can be made\n" + .string "{CIRCLE_2} Clearly shown POKéMON can be made\n" .string " to give the item they are holding to\n" .string " another POKéMON, or return the item\n" .string " to the BAG with the A Button.$" gUnknown_81B6D4A:: @ 81B6D4A - .string "{EXTRA_CIRCLE_1} Select “{PLAYER}'s PC” on the PC.\n" - .string "{EXTRA_CIRCLE_2} Select either “ITEM STORAGE” or\n" + .string "{CIRCLE_1} Select “{PLAYER}'s PC” on the PC.\n" + .string "{CIRCLE_2} Select either “ITEM STORAGE” or\n" .string " “MAILBOX.”\n" .string "You may store things in your own PC\n" .string "if your BAG is full. You may also\n" .string "withdraw items stored in your PC.$" gUnknown_81B6E02:: @ 81B6E02 - .string "{EXTRA_CIRCLE_1} Select “WITHDRAW ITEM.”\n" - .string "{EXTRA_CIRCLE_2} Select the item to be withdrawn.\n" - .string "{EXTRA_CIRCLE_3} The item can be withdrawn and\n" + .string "{CIRCLE_1} Select “WITHDRAW ITEM.”\n" + .string "{CIRCLE_2} Select the item to be withdrawn.\n" + .string "{CIRCLE_3} The item can be withdrawn and\n" .string " placed in the BAG's ITEMS POCKET.\n" .string " It may also be directly given to a\n" .string " POKéMON to hold.$" gUnknown_81B6EC1:: @ 81B6EC1 - .string "{EXTRA_CIRCLE_1} Select “DEPOSIT ITEM.”\n" - .string "{EXTRA_CIRCLE_2} Select the item in the BAG to be\n" - .string " deposited using the {EXTRA_PLUS} Control Pad.\n" - .string "{EXTRA_CIRCLE_3} If there is more than one \n" + .string "{CIRCLE_1} Select “DEPOSIT ITEM.”\n" + .string "{CIRCLE_2} Select the item in the BAG to be\n" + .string " deposited using the {PLUS} Control Pad.\n" + .string "{CIRCLE_3} If there is more than one \n" .string " item to be deposited, enter the\n" - .string " quantity with the {EXTRA_PLUS} Control Pad,\n" + .string " quantity with the {PLUS} Control Pad,\n" .string " then press the A Button.$" gUnknown_81B6FA8:: @ 81B6FA8 .string "When MAIL is taken from a POKéMON,\n" .string "it is moved to the MAILBOX. If it has\n" .string "no MAIL, the MAILBOX can't be used.\n" - .string "{EXTRA_CIRCLE_1} Select “{PLAYER}'S PC” on the PC.\n" - .string "{EXTRA_CIRCLE_2} Select “MAILBOX” to read MAIL or\n" + .string "{CIRCLE_1} Select “{PLAYER}'S PC” on the PC.\n" + .string "{CIRCLE_2} Select “MAILBOX” to read MAIL or\n" .string " make a POKéMON hold MAIL.$" gUnknown_81B7075:: @ 81B7075 - .string "{EXTRA_CIRCLE_1} Select “PROF. OAK'S PC” on the PC.\n" - .string "{EXTRA_CIRCLE_2} PROF. OAK will evaluate your\n" + .string "{CIRCLE_1} Select “PROF. OAK'S PC” on the PC.\n" + .string "{CIRCLE_2} PROF. OAK will evaluate your\n" .string " POKéDEX.\n" .string "His evaluations should give you hints\n" .string "for catching more POKéMON!$" gUnknown_81B7108:: @ 81B7108 - .string "{EXTRA_CIRCLE_1} Press START.\n" - .string "{EXTRA_CIRCLE_2} The MENU will open on the right.\n" - .string "{EXTRA_CIRCLE_3} Depending on the situation, the MENU\n" + .string "{CIRCLE_1} Press START.\n" + .string "{CIRCLE_2} The MENU will open on the right.\n" + .string "{CIRCLE_3} Depending on the situation, the MENU\n" .string " may feature different headings.\n" .string "The MENU will not open in certain\n" .string "situations such as when talking, doing\n" .string "something, battling, etc.$" gUnknown_81B71EA:: @ 81B71EA - .string "{EXTRA_CIRCLE_1} Select “FIGHT.”\n" - .string "{EXTRA_CIRCLE_2} Select one of the moves shown,\n" + .string "{CIRCLE_1} Select “FIGHT.”\n" + .string "{CIRCLE_2} Select one of the moves shown,\n" .string "and that move will be used!$" gUnknown_81B723B:: @ 81B723B - .string "{EXTRA_CIRCLE_1} Select “POKéMON.”\n" - .string "{EXTRA_CIRCLE_2} Select the POKéMON in your party\n" + .string "{CIRCLE_1} Select “POKéMON.”\n" + .string "{CIRCLE_2} Select the POKéMON in your party\n" .string " that you want to use.\n" - .string "{EXTRA_CIRCLE_3} If you have two or more POKéMON\n" + .string "{CIRCLE_3} If you have two or more POKéMON\n" .string " with you, they may be switched by\n" .string " selecting “SHIFT.” Check POKéMON\n" .string " data by selecting “SUMMARY.”$" @@ -952,22 +952,22 @@ gUnknown_81B723B:: @ 81B723B gUnknown_81B7319:: @ 81B7319 .string "This command switches the POKéMON in\n" .string "battle with another one in your party.\n" - .string "{EXTRA_CIRCLE_1} Select the POKéMON to be sent out.\n" - .string "{EXTRA_CIRCLE_2} Select “SHIFT.”\n" - .string "{EXTRA_CIRCLE_3} The selected POKéMON will switch\n" + .string "{CIRCLE_1} Select the POKéMON to be sent out.\n" + .string "{CIRCLE_2} Select “SHIFT.”\n" + .string "{CIRCLE_3} The selected POKéMON will switch\n" .string " places with the POKéMON in battle!$" gUnknown_81B73E8:: @ 81B73E8 - .string "{EXTRA_CIRCLE_1} Select “SUMMARY.”\n" - .string "{EXTRA_CIRCLE_2} Press left or right on the {EXTRA_PLUS} Control\n" + .string "{CIRCLE_1} Select “SUMMARY.”\n" + .string "{CIRCLE_2} Press left or right on the {PLUS} Control\n" .string " Pad to check the information:\n" .string " “POKéMON INFO”\n" .string " “POKéMON SKILLS”\n" .string " “KNOWN MOVES”$" gUnknown_81B747E:: @ 81B747E - .string "{EXTRA_CIRCLE_1} Select “BAG.”\n" - .string "{EXTRA_CIRCLE_2} Press left or right on the {EXTRA_PLUS} Control\n" + .string "{CIRCLE_1} Select “BAG.”\n" + .string "{CIRCLE_2} Press left or right on the {PLUS} Control\n" .string " Pad to check the data headings:\n" .string " “ITEMS”\n" .string " “KEY ITEMS”\n" @@ -975,71 +975,71 @@ gUnknown_81B747E:: @ 81B747E .string " Press up or down to select an item.$" gUnknown_81B752C:: @ 81B752C - .string "{EXTRA_CIRCLE_1} POKéMON that you have caught are\n" + .string "{CIRCLE_1} POKéMON that you have caught are\n" .string " identified by a POKé BALL mark on\n" .string " the POKéDEX list.\n" - .string "{EXTRA_CIRCLE_2} A caught POKéMON will provide a\n" + .string "{CIRCLE_2} A caught POKéMON will provide a\n" .string " large amount of data.\n" - .string "{EXTRA_CIRCLE_3} Select “AREA” to display the TOWN\n" + .string "{CIRCLE_3} Select “AREA” to display the TOWN\n" .string " MAP with the POKéMON's habitat(s).$" gUnknown_81B7611:: @ 81B7611 - .string "{EXTRA_CIRCLE_1} Go up to the PC at home, then press\n" + .string "{CIRCLE_1} Go up to the PC at home, then press\n" .string " the A Button.\n" - .string "{EXTRA_CIRCLE_2} The PC will turn on.\n" - .string "{EXTRA_CIRCLE_3} Select either “ITEM STORAGE” or\n" + .string "{CIRCLE_2} The PC will turn on.\n" + .string "{CIRCLE_3} Select either “ITEM STORAGE” or\n" .string " “MAILBOX.”$" gUnknown_81B7692:: @ 81B7692 - .string "{EXTRA_CIRCLE_1} Select “WITHDRAW ITEM” to withdraw\n" + .string "{CIRCLE_1} Select “WITHDRAW ITEM” to withdraw\n" .string " an item stored on your PC.\n" - .string "{EXTRA_CIRCLE_2} Select “DEPOSIT ITEM” to put \n" + .string "{CIRCLE_2} Select “DEPOSIT ITEM” to put \n" .string " an item from your BAG into your PC.$" gUnknown_81B771E:: @ 81B771E - .string "{EXTRA_CIRCLE_1} Select “WITHDRAW ITEM.”\n" - .string "{EXTRA_CIRCLE_2} Select the item to be withdrawn.\n" - .string "{EXTRA_CIRCLE_3} The item can be withdrawn and\n" + .string "{CIRCLE_1} Select “WITHDRAW ITEM.”\n" + .string "{CIRCLE_2} Select the item to be withdrawn.\n" + .string "{CIRCLE_3} The item can be withdrawn and\n" .string " placed in the BAG's ITEMS POCKET.\n" .string " It may also be directly given to a\n" .string " POKéMON to hold.$" gUnknown_81B77DD:: @ 81B77DD - .string "{EXTRA_CIRCLE_1} Select “DEPOSIT ITEM.”\n" - .string "{EXTRA_CIRCLE_2} Select the item in the BAG to be\n" - .string " deposited using the {EXTRA_PLUS} Control Pad.\n" - .string "{EXTRA_CIRCLE_3} If there is nothing in the BAG, this\n" + .string "{CIRCLE_1} Select “DEPOSIT ITEM.”\n" + .string "{CIRCLE_2} Select the item in the BAG to be\n" + .string " deposited using the {PLUS} Control Pad.\n" + .string "{CIRCLE_3} If there is nothing in the BAG, this\n" .string " command can't be used!$" gUnknown_81B7884:: @ 81B7884 .string "When MAIL is taken from a POKéMON,\n" .string "it is moved to the MAILBOX. If it has\n" .string "no MAIL, the MAILBOX can't be used.\n" - .string "{EXTRA_CIRCLE_1} Select MAIL by name to read it or\n" + .string "{CIRCLE_1} Select MAIL by name to read it or\n" .string " make a POKéMON hold it.$" gUnknown_81B7931:: @ 81B7931 .string "You may not “RUN” from a TRAINER\n" .string "battle!\n" - .string "{EXTRA_CIRCLE_1} You may “RUN” from a wild POKéMON.\n" - .string "{EXTRA_CIRCLE_2} Your chance of escape is improved\n" + .string "{CIRCLE_1} You may “RUN” from a wild POKéMON.\n" + .string "{CIRCLE_2} Your chance of escape is improved\n" .string " if your POKéMON in battle is fast.$" gUnknown_81B79CB:: @ 81B79CB .string "You may “REGISTER” a key item for\n" .string "instant use by pressing SELECT!\n" - .string "{EXTRA_CIRCLE_1} Open the “KEY ITEMS” POCKET.\n" - .string "{EXTRA_CIRCLE_2} Select the key item, then select\n" + .string "{CIRCLE_1} Open the “KEY ITEMS” POCKET.\n" + .string "{CIRCLE_2} Select the key item, then select\n" .string " “REGISTER.”$" gUnknown_81B7A60:: @ 81B7A60 - .string "{EXTRA_CIRCLE_1} Select to throw the special POKé\n" + .string "{CIRCLE_1} Select to throw the special POKé\n" .string " BALL used only in the SAFARI ZONE.\n" .string "When wild POKéMON appear, throw lots\n" .string "of SAFARI BALLS to catch them!$" gUnknown_81B7AEE:: @ 81B7AEE - .string "{EXTRA_CIRCLE_1} Select to throw the special food\n" + .string "{CIRCLE_1} Select to throw the special food\n" .string " used only in the SAFARI ZONE.\n" .string "It is POKéMON food rolled up into\n" .string "a ball for easy eating. When BAIT is\n" @@ -1047,22 +1047,22 @@ gUnknown_81B7AEE:: @ 81B7AEE .string "attracted by it, and may not flee!$" gUnknown_81B7BBE:: @ 81B7BBE - .string "{EXTRA_CIRCLE_1} Select to throw a rock lying on\n" + .string "{CIRCLE_1} Select to throw a rock lying on\n" .string " the ground in the SAFARI ZONE.\n" .string "Throwing a rock at a POKéMON may \n" .string "make it run away, but it becomes easier\n" .string "to catch!$" gUnknown_81B7C57:: @ 81B7C57 - .string "{EXTRA_CIRCLE_1} Select “HALL OF FAME” on the PC.\n" - .string "{EXTRA_CIRCLE_2} The POKéMON that have entered the\n" + .string "{CIRCLE_1} Select “HALL OF FAME” on the PC.\n" + .string "{CIRCLE_2} The POKéMON that have entered the\n" .string " HALL OF FAME can be examined.$" gUnknown_81B7CC1:: @ 81B7CC1 .string "HP$" gUnknown_81B7CC4:: @ 81B7CC4 - .string "EXP. {EXTRA_LEFT_PAREN}EXP. Points{EXTRA_RIGHT_PAREN}$" + .string "EXP. {LEFT_PAREN}EXP. Points{RIGHT_PAREN}$" gUnknown_81B7CD9:: @ 81B7CD9 .string "MOVES$" @@ -1083,7 +1083,7 @@ gUnknown_81B7CFE:: @ 81B7CFE .string "SPEED$" gUnknown_81B7D04:: @ 81B7D04 - .string "Lv. {EXTRA_LEFT_PAREN}Level{EXTRA_RIGHT_PAREN}$" + .string "Lv. {LEFT_PAREN}Level{RIGHT_PAREN}$" gUnknown_81B7D12:: @ 81B7D12 .string "TYPE$" @@ -1685,195 +1685,195 @@ gUnknown_81BA416:: @ 81BA416 .string "Depending on the matchup of the\n" .string "move type and the target POKéMON's\l" .string "type, the move's effectiveness varies:\l" - .string "{EXTRA_TARGET}: Super effective!\l" - .string "{EXTRA_TRIANGLE}: Not very effective\l" - .string "{EXTRA_X}: Not effective at all\l" + .string "{CIRCLE_DOT}: Super effective!\l" + .string "{TRIANGLE}: Not very effective\l" + .string "{BIG_MULT_X}: Not effective at all\l" .string "(No changes for other matchups.)$" gUnknown_81BA4E6:: @ 81BA4E6 .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: PSYCHIC, GHOST\p" - .string " {EXTRA_TRIANGLE}: FIGHTING, DARK, STEEL$" + .string " {CIRCLE_DOT}: PSYCHIC, GHOST\p" + .string " {TRIANGLE}: FIGHTING, DARK, STEEL$" gUnknown_81BA539:: @ 81BA539 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: FIGHTING, BUG\p" - .string " {EXTRA_TRIANGLE}: GHOST, DARK\p" - .string " {EXTRA_X}: PSYCHIC$" + .string " {CIRCLE_DOT}: FIGHTING, BUG\p" + .string " {TRIANGLE}: GHOST, DARK\p" + .string " {BIG_MULT_X}: PSYCHIC$" gUnknown_81BA595:: @ 81BA595 .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: FIRE, ICE, FLYING, BUG\p" - .string " {EXTRA_TRIANGLE}: FIGHTING, GROUND, STEEL$" + .string " {CIRCLE_DOT}: FIRE, ICE, FLYING, BUG\p" + .string " {TRIANGLE}: FIGHTING, GROUND, STEEL$" gUnknown_81BA5F2:: @ 81BA5F2 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: WATER, GRASS, FIGHTING,\n" + .string " {CIRCLE_DOT}: WATER, GRASS, FIGHTING,\n" .string " GROUND, STEEL\p" - .string " {EXTRA_TRIANGLE}: NORMAL, FIRE, POISON, FLYING$" + .string " {TRIANGLE}: NORMAL, FIRE, POISON, FLYING$" gUnknown_81BA66F:: @ 81BA66F .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: FIGHTING, POISON\p" - .string " {EXTRA_TRIANGLE}: PSYCHIC, STEEL\p" - .string " {EXTRA_X}: DARK$" + .string " {CIRCLE_DOT}: FIGHTING, POISON\p" + .string " {TRIANGLE}: PSYCHIC, STEEL\p" + .string " {BIG_MULT_X}: DARK$" gUnknown_81BA6C9:: @ 81BA6C9 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: BUG, GHOST, DARK\p" - .string " {EXTRA_TRIANGLE}: FIGHTING, PSYCHIC$" + .string " {CIRCLE_DOT}: BUG, GHOST, DARK\p" + .string " {TRIANGLE}: FIGHTING, PSYCHIC$" gUnknown_81BA71F:: @ 81BA71F .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: NORMAL, ICE, ROCK, DARK, STEEL\p" - .string " {EXTRA_TRIANGLE}: POISON, FLYING, PSYCHIC, BUG\p" - .string " {EXTRA_X}: GHOST$" + .string " {CIRCLE_DOT}: NORMAL, ICE, ROCK, DARK, STEEL\p" + .string " {TRIANGLE}: POISON, FLYING, PSYCHIC, BUG\p" + .string " {BIG_MULT_X}: GHOST$" gUnknown_81BA796:: @ 81BA796 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: FLYING, PSYCHIC\p" - .string " {EXTRA_TRIANGLE}: BUG, ROCK, DARK$" + .string " {CIRCLE_DOT}: FLYING, PSYCHIC\p" + .string " {TRIANGLE}: BUG, ROCK, DARK$" gUnknown_81BA7E9:: @ 81BA7E9 .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: WATER, GROUND, ROCK\p" - .string " {EXTRA_TRIANGLE}: FIRE, GRASS, POISON, FLYING,\n" + .string " {CIRCLE_DOT}: WATER, GROUND, ROCK\p" + .string " {TRIANGLE}: FIRE, GRASS, POISON, FLYING,\n" .string " BUG, DRAGON, STEEL$" gUnknown_81BA862:: @ 81BA862 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: FIRE, ICE, POISON, FLYING, BUG\p" - .string " {EXTRA_TRIANGLE}: WATER, ELECTRIC, GRASS, GROUND$" + .string " {CIRCLE_DOT}: FIRE, ICE, POISON, FLYING, BUG\p" + .string " {TRIANGLE}: WATER, ELECTRIC, GRASS, GROUND$" gUnknown_81BA8D3:: @ 81BA8D3 .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: PSYCHIC, GHOST\p" - .string " {EXTRA_TRIANGLE}: DARK, STEEL\p" - .string " {EXTRA_X}: NORMAL$" + .string " {CIRCLE_DOT}: PSYCHIC, GHOST\p" + .string " {TRIANGLE}: DARK, STEEL\p" + .string " {BIG_MULT_X}: NORMAL$" gUnknown_81BA92A:: @ 81BA92A .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: GHOST, DARK\p" - .string " {EXTRA_TRIANGLE}: POISON, BUG\p" - .string " {EXTRA_X}: NORMAL, FIGHTING$" + .string " {CIRCLE_DOT}: GHOST, DARK\p" + .string " {TRIANGLE}: POISON, BUG\p" + .string " {BIG_MULT_X}: NORMAL, FIGHTING$" gUnknown_81BA98D:: @ 81BA98D .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: GRASS, GROUND, FLYING, DRAGON\p" - .string " {EXTRA_TRIANGLE}: FIRE, WATER, ICE, STEEL$" + .string " {CIRCLE_DOT}: GRASS, GROUND, FLYING, DRAGON\p" + .string " {TRIANGLE}: FIRE, WATER, ICE, STEEL$" gUnknown_81BA9F1:: @ 81BA9F1 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: FIRE, FIGHTING, ROCK, STEEL\p" - .string " {EXTRA_TRIANGLE}: ICE$" + .string " {CIRCLE_DOT}: FIRE, FIGHTING, ROCK, STEEL\p" + .string " {TRIANGLE}: ICE$" gUnknown_81BAA44:: @ 81BAA44 .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: FIRE, ELECTRIC, POISON, ROCK,\n" + .string " {CIRCLE_DOT}: FIRE, ELECTRIC, POISON, ROCK,\n" .string " STEEL\p" - .string " {EXTRA_TRIANGLE}: GRASS, BUG\n" - .string " {EXTRA_X}: FLYING$" + .string " {TRIANGLE}: GRASS, BUG\n" + .string " {BIG_MULT_X}: FLYING$" gUnknown_81BAAB6:: @ 81BAAB6 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: WATER, GRASS, ICE\p" - .string " {EXTRA_TRIANGLE}: POISON, ROCK\p" - .string " {EXTRA_X}: ELECTRIC$" + .string " {CIRCLE_DOT}: WATER, GRASS, ICE\p" + .string " {TRIANGLE}: POISON, ROCK\p" + .string " {BIG_MULT_X}: ELECTRIC$" gUnknown_81BAB18:: @ 81BAB18 .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: WATER, FLYING\p" - .string " {EXTRA_TRIANGLE}: ELECTRIC, GRASS, DRAGON\p" - .string " {EXTRA_X}: GROUND$" + .string " {CIRCLE_DOT}: WATER, FLYING\p" + .string " {TRIANGLE}: ELECTRIC, GRASS, DRAGON\p" + .string " {BIG_MULT_X}: GROUND$" gUnknown_81BAB7A:: @ 81BAB7A .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: GROUND\p" - .string " {EXTRA_TRIANGLE}: ELECTRIC, FLYING, STEEL$" + .string " {CIRCLE_DOT}: GROUND\p" + .string " {TRIANGLE}: ELECTRIC, FLYING, STEEL$" gUnknown_81BABCC:: @ 81BABCC .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: GRASS\p" - .string " {EXTRA_TRIANGLE}: POISON, GROUND, ROCK, GHOST\p" - .string " {EXTRA_X}: STEEL$" + .string " {CIRCLE_DOT}: GRASS\p" + .string " {TRIANGLE}: POISON, GROUND, ROCK, GHOST\p" + .string " {BIG_MULT_X}: STEEL$" gUnknown_81BAC29:: @ 81BAC29 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: GROUND, PSYCHIC\p" - .string " {EXTRA_TRIANGLE}: GRASS, FIGHTING, POISON, BUG$" + .string " {CIRCLE_DOT}: GROUND, PSYCHIC\p" + .string " {TRIANGLE}: GRASS, FIGHTING, POISON, BUG$" gUnknown_81BAC89:: @ 81BAC89 .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: DRAGON\p" - .string " {EXTRA_TRIANGLE}: STEEL$" + .string " {CIRCLE_DOT}: DRAGON\p" + .string " {TRIANGLE}: STEEL$" gUnknown_81BACC4:: @ 81BACC4 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: ICE, DRAGON\p" - .string " {EXTRA_TRIANGLE}: FIRE, WATER, ELECTRIC, GRASS$" + .string " {CIRCLE_DOT}: ICE, DRAGON\p" + .string " {TRIANGLE}: FIRE, WATER, ELECTRIC, GRASS$" gUnknown_81BAD20:: @ 81BAD20 .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TRIANGLE}: ROCK, STEEL\p" - .string " {EXTRA_X}: GHOST$" + .string " {TRIANGLE}: ROCK, STEEL\p" + .string " {BIG_MULT_X}: GHOST$" gUnknown_81BAD60:: @ 81BAD60 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: FIGHTING\p" - .string " {EXTRA_X}: GHOST$" + .string " {CIRCLE_DOT}: FIGHTING\p" + .string " {BIG_MULT_X}: GHOST$" gUnknown_81BADA2:: @ 81BADA2 .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: ICE, ROCK\p" - .string " {EXTRA_TRIANGLE}: FIRE, WATER, ELECTRIC, STEEL$" + .string " {CIRCLE_DOT}: ICE, ROCK\p" + .string " {TRIANGLE}: FIRE, WATER, ELECTRIC, STEEL$" gUnknown_81BADF7:: @ 81BADF7 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: FIRE, FIGHTING, GROUND\n" - .string " {EXTRA_TRIANGLE}: NORMAL, GRASS, ICE, FLYING,\l" + .string " {CIRCLE_DOT}: FIRE, FIGHTING, GROUND\n" + .string " {TRIANGLE}: NORMAL, GRASS, ICE, FLYING,\l" .string " PSYCHIC, BUG, ROCK, GHOST,\l" .string " DRAGON, DARK, STEEL\l" - .string " {EXTRA_X}: POISON$" + .string " {BIG_MULT_X}: POISON$" gUnknown_81BAEA8:: @ 81BAEA8 .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: GRASS, FIGHTING, BUG\p" - .string " {EXTRA_TRIANGLE}: ELECTRIC, ROCK, STEEL$" + .string " {CIRCLE_DOT}: GRASS, FIGHTING, BUG\p" + .string " {TRIANGLE}: ELECTRIC, ROCK, STEEL$" gUnknown_81BAF01:: @ 81BAF01 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: ELECTRIC, ICE, ROCK\p" - .string " {EXTRA_TRIANGLE}: GRASS, FIGHTING, BUG\p" - .string " {EXTRA_X}: GROUND$" + .string " {CIRCLE_DOT}: ELECTRIC, ICE, ROCK\p" + .string " {TRIANGLE}: GRASS, FIGHTING, BUG\p" + .string " {BIG_MULT_X}: GROUND$" gUnknown_81BAF6B:: @ 81BAF6B .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: GRASS, ICE, BUG, STEEL\p" - .string " {EXTRA_TRIANGLE}: FIRE, WATER, ROCK, DRAGON$" + .string " {CIRCLE_DOT}: GRASS, ICE, BUG, STEEL\p" + .string " {TRIANGLE}: FIRE, WATER, ROCK, DRAGON$" gUnknown_81BAFCA:: @ 81BAFCA .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: WATER, GROUND, ROCK\p" - .string " {EXTRA_TRIANGLE}: FIRE, GRASS, ICE, BUG, STEEL$" + .string " {CIRCLE_DOT}: WATER, GROUND, ROCK\p" + .string " {TRIANGLE}: FIRE, GRASS, ICE, BUG, STEEL$" gUnknown_81BB02E:: @ 81BB02E .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: FIRE, GROUND, ROCK\p" - .string " {EXTRA_TRIANGLE}: WATER, GRASS, DRAGON$" + .string " {CIRCLE_DOT}: FIRE, GROUND, ROCK\p" + .string " {TRIANGLE}: WATER, GRASS, DRAGON$" gUnknown_81BB084:: @ 81BB084 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: ELECTRIC, GRASS\p" - .string " {EXTRA_TRIANGLE}: FIRE, WATER, ICE, STEEL$" + .string " {CIRCLE_DOT}: ELECTRIC, GRASS\p" + .string " {TRIANGLE}: FIRE, WATER, ICE, STEEL$" gUnknown_81BB0DF:: @ 81BB0DF .string "Effect on the opposing POKéMON:\p" - .string " {EXTRA_TARGET}: GRASS, PSYCHIC, DARK\p" - .string " {EXTRA_TRIANGLE}: FIRE, FIGHTING, POISON,\n" + .string " {CIRCLE_DOT}: GRASS, PSYCHIC, DARK\p" + .string " {TRIANGLE}: FIRE, FIGHTING, POISON,\n" .string " FLYING, GHOST, STEEL$" gUnknown_81BB156:: @ 81BB156 .string "Effect of foe's move on own POKéMON:\p" - .string " {EXTRA_TARGET}: FIRE, FLYING, ROCK\p" - .string " {EXTRA_TRIANGLE}: GRASS, FIGHTING, GROUND$" + .string " {CIRCLE_DOT}: FIRE, FLYING, ROCK\p" + .string " {TRIANGLE}: GRASS, FIGHTING, GROUND$" diff --git a/data/text/quest_log.inc b/data/text/quest_log.inc index 7a605b239..a9a22429b 100644 --- a/data/text/quest_log.inc +++ b/data/text/quest_log.inc @@ -40,17 +40,17 @@ gUnknown_841A2B0:: @ 841A2B0 .string "at a POKéMON CENTER.$" gUnknown_841A2E1:: @ 841A2E1 - .string "{UNKNOWN_F7 0x00} had a marvelous battle\n" - .string "with the CHAMPION, {UNKNOWN_F7 0x01}.$" + .string "{DYNAMIC 0x00} had a marvelous battle\n" + .string "with the CHAMPION, {DYNAMIC 0x01}.$" gUnknown_841A312:: @ 841A312 - .string "In the end, {UNKNOWN_F7 0x00} sent out {UNKNOWN_F7 0x01}\n" - .string "while {UNKNOWN_F7 0x02} countered with\n" - .string "{UNKNOWN_F7 0x03}.$" + .string "In the end, {DYNAMIC 0x00} sent out {DYNAMIC 0x01}\n" + .string "while {DYNAMIC 0x02} countered with\n" + .string "{DYNAMIC 0x03}.$" gUnknown_841A349:: @ 841A349 .string "And, as a result of battling with every\n" - .string "bit of power, {UNKNOWN_F7 0x00} won\n" + .string "bit of power, {DYNAMIC 0x00} won\n" .string "the match.$" gUnknown_841A391:: @ 841A391 @@ -67,19 +67,19 @@ gUnknown_841A3FF:: @ 841A3FF .string "{STR_VAR_1}'s {STR_VAR_2}.$" gUnknown_841A422:: @ 841A422 - .string "Took on {UNKNOWN_F7 0x00} in a SINGLE BATTLE.\n" + .string "Took on {DYNAMIC 0x00} in a SINGLE BATTLE.\n" .string "It was a hotly contested match that\n" - .string "resulted in a {UNKNOWN_F7 0x01}.$" + .string "resulted in a {DYNAMIC 0x01}.$" gUnknown_841A477:: @ 841A477 - .string "Took on {UNKNOWN_F7 0x00} in a DOUBLE BATTLE.\n" + .string "Took on {DYNAMIC 0x00} in a DOUBLE BATTLE.\n" .string "It was an extended match that resulted\n" - .string "in a {UNKNOWN_F7 0x01}.$" + .string "in a {DYNAMIC 0x01}.$" gUnknown_841A4C6:: @ 841A4C6 - .string "{UNKNOWN_F7 0x00} and {UNKNOWN_F7 0x01} took on\n" - .string "{UNKNOWN_F7 0x02} and {UNKNOWN_F7 0x03} in a\n" - .string "MULTI BATTLE and got a {UNKNOWN_F7 0x04}.$" + .string "{DYNAMIC 0x00} and {DYNAMIC 0x01} took on\n" + .string "{DYNAMIC 0x02} and {DYNAMIC 0x03} in a\n" + .string "MULTI BATTLE and got a {DYNAMIC 0x04}.$" gUnknown_841A502:: .string "win$" @@ -98,36 +98,36 @@ gUnknown_841A53A:: gUnknown_841A566:: @ 841A566 .string "After consideration, switched\n" - .string "{UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00} with\n" - .string "{UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x02}.$" + .string "{DYNAMIC 0x01} in {DYNAMIC 0x00} with\n" + .string "{DYNAMIC 0x03} in {DYNAMIC 0x02}.$" gUnknown_841A59C:: @ 841A59C .string "After deep thought, switched\n" - .string "{UNKNOWN_F7 0x01} in BOX “{UNKNOWN_F7 0x00}” to\n" - .string "the BOX “{UNKNOWN_F7 0x02}.”$" + .string "{DYNAMIC 0x01} in BOX “{DYNAMIC 0x00}” to\n" + .string "the BOX “{DYNAMIC 0x02}.”$" gUnknown_841A5D9:: @ 841A5D9 - .string "Switched around {UNKNOWN_F7 0x01} and\n" - .string "{UNKNOWN_F7 0x02} in {UNKNOWN_F7 0x00}.$" + .string "Switched around {DYNAMIC 0x01} and\n" + .string "{DYNAMIC 0x02} in {DYNAMIC 0x00}.$" gUnknown_841A5FA:: @ 841A5FA - .string "Moved {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}.$" + .string "Moved {DYNAMIC 0x01} in {DYNAMIC 0x00}.$" gUnknown_841A60A:: @ 841A60A - .string "Switched {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}\n" - .string "with {UNKNOWN_F7 0x02} in the party.$" + .string "Switched {DYNAMIC 0x01} in {DYNAMIC 0x00}\n" + .string "with {DYNAMIC 0x02} in the party.$" gUnknown_841A632:: @ 841A632 - .string "Added {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}\n" + .string "Added {DYNAMIC 0x01} in {DYNAMIC 0x00}\n" .string "to the party.$" gUnknown_841A64F:: @ 841A64F - .string "Moved {UNKNOWN_F7 0x00} from the party\n" - .string "to {UNKNOWN_F7 0x01}.$" + .string "Moved {DYNAMIC 0x00} from the party\n" + .string "to {DYNAMIC 0x01}.$" gUnknown_841A66E:: @ 841A66E .string "Moved a group of POKéMON in\n" - .string "{UNKNOWN_F7 0x00} to {UNKNOWN_F7 0x01}.$" + .string "{DYNAMIC 0x00} to {DYNAMIC 0x01}.$" gUnknown_841A694:: @ 841A694 .string "a different spot$" @@ -165,29 +165,29 @@ gUnknown_841A7B0:: @ 841A7B0 gUnknown_841A7DD:: @ 841A7DD .string "Went to the POKéMON MART in\n" - .string "{UNKNOWN_F7 0x00} and bought one \n" - .string "{UNKNOWN_F7 0x01}.$" + .string "{DYNAMIC 0x00} and bought one \n" + .string "{DYNAMIC 0x01}.$" gUnknown_841A810:: @ 841A810 .string "Went to the POKéMON MART in\n" - .string "{UNKNOWN_F7 0x00} and spent ¥{UNKNOWN_F7 0x02} for\n" - .string "items including {UNKNOWN_F7 0x01}(s).$" + .string "{DYNAMIC 0x00} and spent ¥{DYNAMIC 0x02} for\n" + .string "items including {DYNAMIC 0x01}(s).$" gUnknown_841A858:: @ 841A858 - .string "{UNKNOWN_F7 0x00} went to the POKéMON MART in\n" - .string "{UNKNOWN_F7 0x01} and sold {UNKNOWN_F7 0x03} of\n" - .string "the item {UNKNOWN_F7 0x02}.$" + .string "{DYNAMIC 0x00} went to the POKéMON MART in\n" + .string "{DYNAMIC 0x01} and sold {DYNAMIC 0x03} of\n" + .string "the item {DYNAMIC 0x02}.$" gUnknown_841A896:: @ 841A896 - .string "Sold items including {UNKNOWN_F7 0x01} at\n" - .string "the POKéMON MART in {UNKNOWN_F7 0x00},\n" - .string "worth ¥{UNKNOWN_F7 0x02}.$" + .string "Sold items including {DYNAMIC 0x01} at\n" + .string "the POKéMON MART in {DYNAMIC 0x00},\n" + .string "worth ¥{DYNAMIC 0x02}.$" gUnknown_841A8D4:: @ 841A8D4 .string "just one$" gUnknown_841A8DD:: @ 841A8DD - .string "{UNKNOWN_F7 0x04}$" + .string "{DYNAMIC 0x04}$" gUnknown_841A8E0:: @ 841A8E0 .string "{STR_VAR_1} shared its HP using the move\n" @@ -207,41 +207,41 @@ gUnknown_841A965:: @ 841A965 .string "the move {STR_VAR_3}.$" gUnknown_841A9A9:: @ 841A9A9 - .string "{UNKNOWN_F7 0x05} managed to defeat the POKéMON\n" - .string "{UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}.$" + .string "{DYNAMIC 0x05} managed to defeat the POKéMON\n" + .string "{DYNAMIC 0x01} in {DYNAMIC 0x00}.$" gUnknown_841A9D4:: @ 841A9D4 - .string "Defeated {UNKNOWN_F7 0x02} wild POKéMON including\n" - .string "{UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}.$" + .string "Defeated {DYNAMIC 0x02} wild POKéMON including\n" + .string "{DYNAMIC 0x01} in {DYNAMIC 0x00}.$" gUnknown_841AA01:: @ 841AA01 - .string "{UNKNOWN_F7 0x05} managed to catch the POKéMON\n" - .string "{UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x00}.$" + .string "{DYNAMIC 0x05} managed to catch the POKéMON\n" + .string "{DYNAMIC 0x03} in {DYNAMIC 0x00}.$" gUnknown_841AA2B:: @ 841AA2B .string "Threw POKé BALLS in a frenzy, catching\n" - .string "{UNKNOWN_F7 0x04} POKéMON including {UNKNOWN_F7 0x03} here\n" - .string "in {UNKNOWN_F7 0x00}.$" + .string "{DYNAMIC 0x04} POKéMON including {DYNAMIC 0x03} here\n" + .string "in {DYNAMIC 0x00}.$" gUnknown_841AA76:: @ 841AA76 - .string "{UNKNOWN_F7 0x05} defeated the POKéMON\n" - .string "{UNKNOWN_F7 0x01} and caught one {UNKNOWN_F7 0x03}\n" - .string "in {UNKNOWN_F7 0x00}.$" + .string "{DYNAMIC 0x05} defeated the POKéMON\n" + .string "{DYNAMIC 0x01} and caught one {DYNAMIC 0x03}\n" + .string "in {DYNAMIC 0x00}.$" gUnknown_841AAAA:: @ 841AAAA - .string "Defeated the POKéMON {UNKNOWN_F7 0x01}\n" - .string "and caught {UNKNOWN_F7 0x04} POKéMON including\n" - .string "{UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x00}.$" + .string "Defeated the POKéMON {DYNAMIC 0x01}\n" + .string "and caught {DYNAMIC 0x04} POKéMON including\n" + .string "{DYNAMIC 0x03} in {DYNAMIC 0x00}.$" gUnknown_841AAEC:: @ 841AAEC - .string "{UNKNOWN_F7 0x05} defeated {UNKNOWN_F7 0x02} POKéMON including\n" - .string "{UNKNOWN_F7 0x01} and caught one {UNKNOWN_F7 0x03}\n" - .string "in {UNKNOWN_F7 0x00}.$" + .string "{DYNAMIC 0x05} defeated {DYNAMIC 0x02} POKéMON including\n" + .string "{DYNAMIC 0x01} and caught one {DYNAMIC 0x03}\n" + .string "in {DYNAMIC 0x00}.$" gUnknown_841AB29:: @ 841AB29 - .string "Defeated {UNKNOWN_F7 0x02} POKéMON including\n" - .string "{UNKNOWN_F7 0x01} and caught {UNKNOWN_F7 0x04} POKéMON\n" - .string "including {UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x00}.$" + .string "Defeated {DYNAMIC 0x02} POKéMON including\n" + .string "{DYNAMIC 0x01} and caught {DYNAMIC 0x04} POKéMON\n" + .string "including {DYNAMIC 0x03} in {DYNAMIC 0x00}.$" gUnknown_841AB74:: @ 841AB74 .string "Made {STR_VAR_1} hold the item\n" @@ -331,19 +331,19 @@ gUnknown_841AEDC:: @ 841AEDC .string "after wandering about.$" gUnknown_841AF0C:: @ 841AF0C - .string "Took on {UNKNOWN_F7 0x00} GYM LEADER\n" - .string "{UNKNOWN_F7 0x01}'s {UNKNOWN_F7 0x02} with {UNKNOWN_F7 0x03}\n" - .string "and won {UNKNOWN_F7 0x04}!$" + .string "Took on {DYNAMIC 0x00} GYM LEADER\n" + .string "{DYNAMIC 0x01}'s {DYNAMIC 0x02} with {DYNAMIC 0x03}\n" + .string "and won {DYNAMIC 0x04}!$" gUnknown_841AF3E:: @ 841AF3E - .string "Took on ELITE FOUR {UNKNOWN_F7 0x00}'s\n" - .string "{UNKNOWN_F7 0x01} with {UNKNOWN_F7 0x02} and\n" - .string "won {UNKNOWN_F7 0x03}!$" + .string "Took on ELITE FOUR {DYNAMIC 0x00}'s\n" + .string "{DYNAMIC 0x01} with {DYNAMIC 0x02} and\n" + .string "won {DYNAMIC 0x03}!$" gUnknown_841AF6D:: @ 841AF6D - .string "In {UNKNOWN_F7 0x00}, took on\n" - .string "{UNKNOWN_F7 0x01}'s {UNKNOWN_F7 0x02} with {UNKNOWN_F7 0x03}\n" - .string "and won {UNKNOWN_F7 0x04}!$" + .string "In {DYNAMIC 0x00}, took on\n" + .string "{DYNAMIC 0x01}'s {DYNAMIC 0x02} with {DYNAMIC 0x03}\n" + .string "and won {DYNAMIC 0x04}!$" gUnknown_841AF98:: @ 841AF98 .string "coolly$" diff --git a/include/strings.h b/include/strings.h index 45f228e19..32f4dcf43 100644 --- a/include/strings.h +++ b/include/strings.h @@ -117,9 +117,9 @@ extern const u8 gFameCheckerText_Cancel[]; extern const u8 gFameCheckerText_ListMenuCursor[]; extern const u8 gFameCheckerText_FameCheckerWillBeClosed[]; extern const u8 gFameCheckerText_ClearTextbox[]; -extern const u8 gFameCheckerText_MainScreenUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$" -extern const u8 gFameCheckerText_PickScreenUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$" -extern const u8 gFameCheckerText_FlavorTextUI[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_A_BUTTON}READ {KEYGFX_B_BUTTON}CANCEL$" +extern const u8 gFameCheckerText_MainScreenUI[]; // "{DPAD_ANY}PICK {DPAD_UPDOWN}SELECT {A_BUTTON}OK$" +extern const u8 gFameCheckerText_PickScreenUI[]; // "{DPAD_ANY}PICK {DPAD_UPDOWN}SELECT {B_BUTTON}CANCEL$" +extern const u8 gFameCheckerText_FlavorTextUI[]; // "{START_BUTTON}PICK {A_BUTTON}READ {B_BUTTON}CANCEL$" extern const u8 gFameCheckerOakName[]; // "OAK$" extern const u8 gFameCheckerDaisyName[]; // "DAISY$" extern const u8 gFameCheckerBillName[]; // "BILL$" |