diff --git a/charmap.txt b/charmap.txt index 356f64c8..b0918f42 100644 --- a/charmap.txt +++ b/charmap.txt @@ -283,34 +283,35 @@ L_BUTTON = 87 74 UNK_95 = 7E 39 35 @ ~95 - Seems to be a special (?) symbol @ Placeholders for message arguments to swap out for names within strings. -ARG_VALUE_0 = 24 64 30 @ $d0 -ARG_VALUE_1 = 24 64 31 @ $d1 -ARG_VALUE_2 = 24 64 32 @ $d2 -ARG_VALUE_3 = 24 64 33 @ $d3 -ARG_VALUE_4 = 24 64 34 @ $d4 -ARG_FRIEND_AREA = 24 68 @ $h -ARG_MOVE_ITEM_0 = 24 69 30 @ $i0 -ARG_MOVE_ITEM_1 = 24 69 31 @ $i1 -ARG_POKEMON_0 = 24 6D 30 @ $m0 -ARG_POKEMON_1 = 24 6D 31 @ $m1 -ARG_POKEMON_2 = 24 6D 32 @ $m2 -ARG_POKEMON_3 = 24 6D 33 @ $m3 -ARG_POKEMON_4 = 24 6D 34 @ $m4 -ARG_POKEMON_5 = 24 6D 35 @ $m5 -ARG_POKEMON_6 = 24 6D 36 @ $m6 -ARG_POKEMON_7 = 24 6D 37 @ $m7 -ARG_POKEMON_8 = 24 6D 38 @ $m8 -ARG_NICKNAME_0 = 24 6E 30 @ $n0 -ARG_NICKNAME_1 = 24 6E 31 @ $n1 -ARG_NICKNAME_2 = 24 6E 32 @ $n2 -ARG_NICKNAME_3 = 24 6E 33 @ $n3 -ARG_NICKNAME_4 = 24 6E 34 @ $n4 -ARG_NICKNAME_5 = 24 6E 35 @ $n5 -ARG_NICKNAME_6 = 24 6E 36 @ $n6 -ARG_NICKNAME_7 = 24 6E 37 @ $n7 -ARG_NICKNAME_8 = 24 6E 38 @ $n8 -ARG_NICKNAME_9 = 24 6E 39 @ $n9 -ARG_TEAM_NAME = 24 74 @ $t + +VALUE_0 = 24 64 30 @ $d0 +VALUE_1 = 24 64 31 @ $d1 +VALUE_2 = 24 64 32 @ $d2 +VALUE_3 = 24 64 33 @ $d3 +VALUE_4 = 24 64 34 @ $d4 +FRIEND_AREA = 24 68 @ $h +MOVE_ITEM_0 = 24 69 30 @ $i0 +MOVE_ITEM_1 = 24 69 31 @ $i1 +POKEMON_0 = 24 6D 30 @ $m0 +POKEMON_1 = 24 6D 31 @ $m1 +POKEMON_2 = 24 6D 32 @ $m2 +POKEMON_3 = 24 6D 33 @ $m3 +POKEMON_4 = 24 6D 34 @ $m4 +POKEMON_5 = 24 6D 35 @ $m5 +POKEMON_6 = 24 6D 36 @ $m6 +POKEMON_7 = 24 6D 37 @ $m7 +POKEMON_8 = 24 6D 38 @ $m8 +NAME_0 = 24 6E 30 @ $n0 +NAME_1 = 24 6E 31 @ $n1 +NAME_2 = 24 6E 32 @ $n2 +NAME_3 = 24 6E 33 @ $n3 +NAME_4 = 24 6E 34 @ $n4 +NAME_5 = 24 6E 35 @ $n5 +NAME_6 = 24 6E 36 @ $n6 +NAME_7 = 24 6E 37 @ $n7 +NAME_8 = 24 6E 38 @ $n8 +NAME_9 = 24 6E 39 @ $n9 +TEAM_NAME = 24 74 @ $t @ TEXT MACROS @ @@ -327,40 +328,43 @@ NEW_LINE = 23 6E @ #n @ COLOR FORMATTING MACROS @ -@ TO USE: {COLOR_(1 or 2) ______} text here {END_COLOR_(# from first one)} -@ EX: {COLOR_2 YELLOW}Steel{END_COLOR_TEXT_2} gets you a colored yellow "Steel" -COLOR_1 = 23 43 @ #C -COLOR_2 = 23 63 @ #c -END_COLOR_TEXT_1 = 23 52 @ #R -END_COLOR_TEXT_2 = 23 72 @ #r +@ TO USE: {COLOR (or color lowercase) ______} text here {RESET (likewise)} +@ EX: {COLOR YELLOW}Steel{RESET} gets you a colored yellow "Steel" +COLOR = 23 43 @ #C +color = 23 63 @ #c +RESET = 23 52 @ #R +reset = 23 72 @ #r @ COLORS -WHITE = 30 @ 0 -BLUE = 31 @ 1 +@ note: unused refers to currently decomped data, possible they exist in incbin +DEFAULT = 30 @ 0 +BLUE = 31 @ 1 - unused RED = 32 @ 2 -UNK_COLOR_2 = 02 -BLACK = 33 @ 3 +RED_RAW = 02 +RED_W = 57 @ W +BLACK = 33 @ 3 - unused GREEN = 34 @ 4 -UNK_COLOR_4 = 04 +GREEN_RAW = 04 +GREEN_H = 48 @ H (Seems to be for Friend Areas) +GREEN_I = 49 @ I CYAN = 35 @ 5 -CYAN_2 = 05 +CYAN_RAW = 05 +CYAN_G = 47 @ G +CYAN_M = 4D @ M YELLOW = 36 @ 6 -YELLOW_2 = 06 -WHITE_2 = 37 @ 7 -DARKER_GRAY = 38 @ 8 -DARK_GRAY = 39 @ 9 -WHITE_3 = 41 @ A -WHITE_4 = 42 @ B -YELLOW_3 = 43 @ C -YELLOW_4 = 44 @ D -GENDER_COLOR = 45 @ E -WHITE_5 = 46 @ F -LIGHT_BLUE = 47 @ G (TODO CHECK THIS) -UNK_COLOR_5 = 48 @ H (Seems to be for Friend Areas) -GREEN_2 = 49 @ I -CYAN_3 = 4D @ M -YELLOW_5 = 4E @ N -RED_2 = 57 @ W +YELLOW_RAW = 06 +YELLOW_C = 43 @ C +YELLOW_D = 44 @ D +YELLOW_N = 4E @ N +WHITE = 37 @ 7 +WHITE_A = 41 @ A - unused +WHITE_B = 42 @ B - unused +WHITE_F = 46 @ F - unused +DARKER_GRAY = 38 @ 8 - unused +DARK_GRAY = 39 @ 9 - unused +GENDER_COLOR = 45 @ E - color 15 +COLOR15_S = 53 @ S - color 15 - unused +COLOR15_T = 54 @ T - color 15 - unused @ FOR UNK_MACRO_3D diff --git a/data/data.s b/data/data.s index 7514dcad..c3228d80 100644 --- a/data/data.s +++ b/data/data.s @@ -453,22 +453,22 @@ gUnknown_80B71A0: @ 80B71A0 .global CWEND_text CWEND_text: - .string "{COLOR_1 RED_2}END{END_COLOR_TEXT_1}\0" + .string "{COLOR RED_W}END{RESET}\0" .align 2,0 .global CNLAST_text CNLAST_text: - .string "{COLOR_1 YELLOW_5}LAST{END_COLOR_TEXT_1}\0" + .string "{COLOR YELLOW_N}LAST{RESET}\0" .align 2,0 .global CECONTINUE_text CECONTINUE_text: - .string "{COLOR_1 GENDER_COLOR}CONTINUE{END_COLOR_TEXT_1}\0" + .string "{COLOR GENDER_COLOR}CONTINUE{RESET}\0" .align 2,0 .global CISTART_text CISTART_text: - .string "{COLOR_1 GREEN_2}START{END_COLOR_TEXT_1}\0" + .string "{COLOR GREEN_I}START{RESET}\0" .align 2,0 .global gGroundEnterLookupTable diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s index eefa6628..9dd2e9c3 100644 --- a/data/data_80B9BB8.s +++ b/data/data_80B9BB8.s @@ -6099,7 +6099,7 @@ gUnknown_80D406C: @ 80D406C .global gUnknown_80D4074 gUnknown_80D4074: @ 80D4074 - .string "{CENTER_ALIGN}{ARG_POKEMON_0}\0" + .string "{CENTER_ALIGN}{POKEMON_0}\0" .align 2,0 .global gUnknown_80D407C @@ -6179,12 +6179,12 @@ gUnknown_80D4104: @ 80D4104 .global gUnknown_80D4120 gUnknown_80D4120: @ 80D4120 - .string "{ARG_MOVE_ITEM_0}\0" + .string "{MOVE_ITEM_0}\0" .align 2,0 .global gUnknown_80D4124 gUnknown_80D4124: @ 80D4124 - .string "{ARG_MOVE_ITEM_0}($v02" + .string "{MOVE_ITEM_0}($v02" .byte 0x81, 0x5E .asciz "$v12)" .align 2,0 diff --git a/data/data_80DAF70.s b/data/data_80DAF70.s index 4e506b85..99d7a2fd 100644 --- a/data/data_80DAF70.s +++ b/data/data_80DAF70.s @@ -276,23 +276,23 @@ gUnknown_80DB580: @ 80DB580 .global gUnknown_80DB598 gUnknown_80DB598: @ 80DB598 - .string "{COLOR_1 GREEN}OVR{END_COLOR_TEXT_1}\0" + .string "{COLOR GREEN}OVR{RESET}\0" .align 2,0 .global gUnknown_80DB5A4 gUnknown_80DB5A4: @ 80DB5A4 - .string "{COLOR_1 YELLOW}INS{END_COLOR_TEXT_1}\0" + .string "{COLOR YELLOW}INS{RESET}\0" .align 2,0 .global gUnknown_80DB5B0 gUnknown_80DB5B0: @ 80DB5B0 - .string "{COLOR_1}%c" + .string "{COLOR}%c" .byte 0x81, 0x59 .align 2,0 .global gUnknown_80DB5B8 gUnknown_80DB5B8: @ 80DB5B8 - .string "{COLOR_1}%c%s\0" + .string "{COLOR}%c%s\0" .align 2,0 .global gUnknown_80DB5C0 @@ -322,12 +322,12 @@ gUnknown_80DB638: @ 80DB638 .global gUnknown_80DB654 gUnknown_80DB654: @ 80DB654 - .string "{COLOR_1 RED}%s{END_COLOR_TEXT_1}\0" + .string "{COLOR RED}%s{RESET}\0" .align 2,0 .global gUnknown_80DB65C gUnknown_80DB65C: @ 80DB65C - .string "{COLOR_1 CYAN}%s{END_COLOR_TEXT_1}\0" + .string "{COLOR CYAN}%s{RESET}\0" .align 2,0 .global gUnknown_80DB664 diff --git a/data/data_80F59C8.s b/data/data_80F59C8.s index 9e9ff234..13c14364 100644 --- a/data/data_80F59C8.s +++ b/data/data_80F59C8.s @@ -1235,14 +1235,14 @@ gUnknown_80F7AF8: @ 80F7AF8 .global gUnknown_80F7AFC gUnknown_80F7AFC: @ 80F7AFC -.string "{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}\0" +.string "{COLOR YELLOW}%s{RESET}\0" .align 2,0 .global gUnknown_80F7B04 gUnknown_80F7B04: @ 80F7B04 -.string "{COLOR_1 YELLOW}" +.string "{COLOR YELLOW}" .byte 0x87, 0x45 -.string "{END_COLOR_TEXT_1}\0" +.string "{RESET}\0" .align 2,0 .string "pksdir0\0" .align 2,0 @@ -1284,8 +1284,8 @@ gActions: @ 80F7B14 .global gEquipPutOnDescription gEquipPutOnDescription: @ 80F7B94 -.string "{ARG_POKEMON_0} put on\n" -.string "the {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} put on\n" +.string "the {MOVE_ITEM_0}.\0" .global gPeelText gPeelText: @ 80F7BA8 @@ -1294,8 +1294,8 @@ gPeelText: @ 80F7BA8 .global gPeelDescription gPeelDescription: @ 80F7BB0 -.string "{ARG_POKEMON_0} peeled\n" -.string "the {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} peeled\n" +.string "the {MOVE_ITEM_0}.\0" .align 2,0 .global gIngestText @@ -1305,8 +1305,8 @@ gIngestText: @ 80F7BC4 .global gIngestDescription gIngestDescription: @ 80F7BCC -.string "{ARG_POKEMON_0} swallowed\n" -.string "the {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} swallowed\n" +.string "the {MOVE_ITEM_0}.\0" .align 2,0 .global gEatText @@ -1316,8 +1316,8 @@ gEatText: @ 80F7BE4 .global gEatDescription gEatDescription: @ 80F7BE8 -.string "{ARG_POKEMON_0} ate\n" -.string "the {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} ate\n" +.string "the {MOVE_ITEM_0}.\0" .align 2,0 .global gEquipText @@ -1327,8 +1327,8 @@ gEquipText: @ 80F7BFC .global gEquipDescription gEquipDescription: @ 80F7C04 -.string "{ARG_POKEMON_0} equipped\n" -.string "the {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} equipped\n" +.string "the {MOVE_ITEM_0}.\0" .align 2,0 .global gThrowText @@ -1338,8 +1338,8 @@ gThrowText: @ 80F7C1C .global gThrowDescription gThrowDescription: @ 80F7C24 -.string "{ARG_POKEMON_0} threw\n" -.string "the {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} threw\n" +.string "the {MOVE_ITEM_0}.\0" .align 2,0 .global gUseText @@ -1352,8 +1352,8 @@ gUseDescription: @ 80F7C3C .global gUnknown_80F7C3C gUnknown_80F7C3C: @ 80F7C3C -.string "{ARG_POKEMON_0} used\n" -.string "the {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} used\n" +.string "the {MOVE_ITEM_0}.\0" .align 2,0 .global gUnknown_80F7C50 @@ -1683,7 +1683,7 @@ gUnknown_80F7F70: @ 80F7F70 gRescueSpotDescription: @ 80F7F7C .string "You reached the rescue spot where your\n" .string "friend's team went down!\n" -.string "Send an {COLOR_2 RED}A-OK Mail{END_COLOR_TEXT_2} from the Pelipper Post\n" +.string "Send an {color RED}A-OK Mail{reset} from the Pelipper Post\n" .string "Office to let your friend know you've\n" .string "rescued the defeated team.\0" .align 2,0 @@ -1756,7 +1756,7 @@ gTrapDescriptions: @ 80F8130 .global SpikeTrapDescription SpikeTrapDescription: @ 80F8180 .string "Stepping on this trap inflicts damage.\n" -.string "It can be made using the move {COLOR_2 YELLOW}Spikes{END_COLOR_TEXT_2}.\0" +.string "It can be made using the move {color YELLOW}Spikes{reset}.\0" .align 2, 0 .global PokemonTrapDescription @@ -1769,7 +1769,7 @@ PokemonTrapDescription: @ 80F81D4 WonderTileDescription: @ 80F8224 .string "An odd floor tile seen in many dungeons.\n" .string "Stepping on it resets the Pokémon's\n" -.string "{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}, and so on, if\n" +.string "{color YELLOW}Attack{reset}, {color YELLOW}Defense{reset}, and so on, if\n" .string "they are boosted or reduced.\0" .align 2, 0 @@ -1783,13 +1783,13 @@ ChestnutTrapDescription: @ 80F82C0 .global PPZeroTrapDescription PPZeroTrapDescription: @ 80F8318 .string "Stepping on this trap completely drains\n" -.string "the {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} of a random move.\0" +.string "the {color YELLOW}PP{reset} of a random move.\0" .align 2, 0 .global ExplosionTrapDescription ExplosionTrapDescription: @ 80F8360 .string "Stepping on this trap triggers a\n" -.string "{COLOR_2 CYAN}huge explosion{END_COLOR_TEXT_2}.\n" +.string "{color CYAN}huge explosion{reset}.\n" .string "Its damage extends to other Pokémon,\n" .string "items, and walls. It has a bigger\n" .string "range than a Selfdestruct Trap.\0" @@ -1797,7 +1797,7 @@ ExplosionTrapDescription: @ 80F8360 .global SelfdestructTrapDescription SelfdestructTrapDescription: @ 80F8404 -.string "Stepping on this trap makes it {COLOR_2 CYAN}explode{END_COLOR_TEXT_2}.\n" +.string "Stepping on this trap makes it {color CYAN}explode{reset}.\n" .string "Its damage extends to other Pokémon,\n" .string "items, and walls around the trap.\0" .align 2, 0 @@ -1805,7 +1805,7 @@ SelfdestructTrapDescription: @ 80F8404 .global PoisonTrapDescription PoisonTrapDescription: @ 80F847C .string "Stepping on this trap looses poison\n" -.string "spikes that leave the Pokémon {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}.\0" +.string "spikes that leave the Pokémon {color CYAN}poisoned{reset}.\0" .align 2, 0 .global SealTrapDescription @@ -1818,21 +1818,21 @@ SealTrapDescription: @ 80F84D0 .global SlowTrapDescription SlowTrapDescription: @ 80F8538 .string "Stepping on this trap lowers the\n" -.string "Pokémon's {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by one level.\0" +.string "Pokémon's {color YELLOW}Movement Speed{reset} by one level.\0" .align 2, 0 .global SleepTrapDescription SleepTrapDescription: @ 80F8588 .string "Stepping on this trap releases a sleeping\n" .string "gas that puts the Pokémon to\n" -.string "{COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}.\0" +.string "{color CYAN}sleep{reset}.\0" .align 2, 0 .global ConfuseTrapDescription ConfuseTrapDescription: @ 80F85DC .string "Stepping on this trap spins the Pokémon\n" .string "around dizzyingly, making it \n" -.string "{COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" +.string "{color CYAN}confused{reset}.\0" .align 2, 0 .global GustTrapDescription @@ -1878,9 +1878,9 @@ StickyTrapDescription: @ 80F8834 .global MudTrapDescription MudTrapDescription: @ 80F887C .string "Stepping on this trap makes it blow\n" -.string "mud that lowers the Pokémon's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2},\n" -.string "{COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}, or\n" -.string "{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\0" +.string "mud that lowers the Pokémon's {color YELLOW}Attack{reset},\n" +.string "{color YELLOW}Defense{reset}, {color YELLOW}Special Attack{reset}, or\n" +.string "{color YELLOW}Special Defense{reset} by one level.\0" .align 2, 0 @ This trap is unused in the game. @@ -1892,7 +1892,7 @@ TripTrapDescription: @ 80F891C .global gUnknown_80F895C gUnknown_80F895C: @ 80F895C -.string "{COLOR_2 YELLOW}Decoy{END_COLOR_TEXT_2}\0" +.string "{color YELLOW}Decoy{reset}\0" .align 2, 0 .global gUnknown_80F8968 @@ -1911,7 +1911,7 @@ gUnknown_80F8974: @ 80F8974 .global gUnknown_80F8978 gUnknown_80F8978: @ 80F8978 -.string "{COLOR_2 YELLOW}Pokémon{END_COLOR_TEXT_2}\0" +.string "{color YELLOW}Pokémon{reset}\0" .align 2, 0 .global gUnknown_80F8988 @@ -1930,7 +1930,7 @@ gUnknown_80F8994: @ 80F8994 .global PartnerFainted_80F8998 PartnerFainted_80F8998: @ 80F8998 -.string "Your partner {ARG_POKEMON_0} fainted!\0" +.string "Your partner {POKEMON_0} fainted!\0" .align 2,0 .global gUnknown_80F89B4 @@ -1939,7 +1939,7 @@ gUnknown_80F89B4: @ 80F89B4 .global ClientFainted_80F89B8 ClientFainted_80F89B8: @ 80F89B8 -.string "Your client {ARG_POKEMON_0} fainted!\0" +.string "Your client {POKEMON_0} fainted!\0" .align 2,0 .global gUnknown_80F89D4 @@ -1964,7 +1964,7 @@ gUnknown_80F89F4: @ 80F89F4 .global BlownAway_80F89F8 BlownAway_80F89F8: @ 80F89F8 -.string "{ARG_POKEMON_0} was blown away!\0" +.string "{POKEMON_0} was blown away!\0" .align 2,0 .global gUnknown_80F8A0C @@ -2044,7 +2044,7 @@ gUnknown_80F8B24: @ 80F8B24 .global gUnknown_80F8B28 gUnknown_80F8B28: @ 80F8B28 -.string "The move {ARG_MOVE_ITEM_0} was set.\0" +.string "The move {MOVE_ITEM_0} was set.\0" .align 2,0 .global gUnknown_80F8B40 @@ -2053,7 +2053,7 @@ gUnknown_80F8B40: @ 80F8B40 .global gUnknown_80F8B44 gUnknown_80F8B44: @ 80F8B44 -.string "The move {ARG_MOVE_ITEM_0} was deselected.\0" +.string "The move {MOVE_ITEM_0} was deselected.\0" .align 2,0 .global gUnknown_80F8B64 @@ -2063,7 +2063,7 @@ gUnknown_80F8B64: @ 80F8B64 .global gUnknown_80F8B6C gUnknown_80F8B6C: @ 80F8B6C -.string "The move {ARG_MOVE_ITEM_0} was delinked.\0" +.string "The move {MOVE_ITEM_0} was delinked.\0" .align 2,0 .global gUnknown_80F8B88 @@ -2091,14 +2091,14 @@ gUnknown_80F8BE0: @ 80F8BE0 .global gUnknown_80F8BE4 gUnknown_80F8BE4: @ 80F8BE4 -.string "The {ARG_MOVE_ITEM_1} is all sticky!\n" +.string "The {MOVE_ITEM_1} is all sticky!\n" .string "It doesn't work!\0" .align 2, 0 .4byte gUnknown_80F8BE4 .global gUnknown_80F8C14 gUnknown_80F8C14: @ 80F8C14 -.string "The {ARG_MOVE_ITEM_1} is all sticky!\n" +.string "The {MOVE_ITEM_1} is all sticky!\n" .string "It can't be moved.\0" .align 2, 0 @@ -2116,7 +2116,7 @@ gItemStickyCannotMove3: @ 80F8C48 .global gUnknown_80F8C4C gUnknown_80F8C4C: @ 80F8C4C -.string "The {ARG_MOVE_ITEM_0} is all sticky!\n" +.string "The {MOVE_ITEM_0} is all sticky!\n" .string "It can't be equipped.\0" .align 2,0 @@ -2126,8 +2126,8 @@ gItemStickyCannotEquip: @ 80F8C7C .global gUnknown_80F8C80 gUnknown_80F8C80: @ 80F8C80 -.string "{ARG_POKEMON_1} took the {ARG_MOVE_ITEM_0}\n" -.string "and returned the {ARG_MOVE_ITEM_1}.\0" +.string "{POKEMON_1} took the {MOVE_ITEM_0}\n" +.string "and returned the {MOVE_ITEM_1}.\0" .align 2,0 .global gMonTookAndReturnedItem @@ -2137,7 +2137,7 @@ gMonTookAndReturnedItem: @ 80F8CA8 .global gUnknown_80F8CAC gUnknown_80F8CAC: @ 80F8CAC -.string "The {ARG_MOVE_ITEM_0} was set.\n" +.string "The {MOVE_ITEM_0} was set.\n" .string "Hold {L_BUTTON} then press {R_BUTTON} to throw one.\0" .align 2, 0 @@ -2151,7 +2151,7 @@ gUnknown_80F8CE8: @ 80F8CE8 .global gUnknown_80F8CEC gUnknown_80F8CEC: @ 80F8CEC -.string "Equipped the item {ARG_MOVE_ITEM_0}.\0" +.string "Equipped the item {MOVE_ITEM_0}.\0" .align 2,0 .global gUnknown_80F8D04 @@ -2160,7 +2160,7 @@ gUnknown_80F8D04: @ 80F8D04 .global gUnknown_80F8D08 gUnknown_80F8D08: @ 80F8D08 -.string "The {ARG_MOVE_ITEM_0} was deselected.\0" +.string "The {MOVE_ITEM_0} was deselected.\0" .global gUnknown_80F8D20 gUnknown_80F8D20: @ 80F8D20 @@ -2168,8 +2168,8 @@ gUnknown_80F8D20: @ 80F8D20 .global gUnknown_80F8D24 gUnknown_80F8D24: @ 80F8D24 -.string "The item {ARG_MOVE_ITEM_0} was given\n" -.string "to {ARG_POKEMON_1}.\0" +.string "The item {MOVE_ITEM_0} was given\n" +.string "to {POKEMON_1}.\0" .align 2,0 .global gUnknown_80F8D44 @@ -2188,8 +2188,8 @@ gUnknown_80F8D60: @ 80F8D60 .global gUnknown_80F8D64 gUnknown_80F8D64: @ 80F8D64 -.string "{ARG_POKEMON_0} returned\n" -.string "the {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} returned\n" +.string "the {MOVE_ITEM_0}.\0" .align 2, 0 .global gUnknown_80F8D7C @@ -2199,8 +2199,8 @@ gUnknown_80F8D7C: @ 80F8D7C .global gUnknown_80F8D80 gUnknown_80F8D80: @ 80F8D80 -.string "The {ARG_MOVE_ITEM_0} was exchanged for\n" -.string "the {ARG_MOVE_ITEM_1} in the Toolbox.\0" +.string "The {MOVE_ITEM_0} was exchanged for\n" +.string "the {MOVE_ITEM_1} in the Toolbox.\0" .align 2, 0 .global gUnknown_80F8DB4 @@ -2210,7 +2210,7 @@ gUnknown_80F8DB4: @ 80F8DB4 .global gUnknown_80F8DB8 gUnknown_80F8DB8: @ 80F8DB8 -.string "{ARG_POKEMON_1} used the {ARG_MOVE_ITEM_0}\n" +.string "{POKEMON_1} used the {MOVE_ITEM_0}\n" .string "it was holding!\0" .align 2, 0 .4byte gUnknown_80F8DB8 @@ -2232,7 +2232,7 @@ gUnknown_80F8E04: @ 80F8E04 .global gUnknown_80F8E08 gUnknown_80F8E08: @ 80F8E08 -.string "{ARG_POKEMON_0} put the {ARG_MOVE_ITEM_0}\n" +.string "{POKEMON_0} put the {MOVE_ITEM_0}\n" .string "on the ground.\0" .align 2, 0 @@ -2268,8 +2268,8 @@ gNothingCanBePutDownHere: @ 80F8E78 .global gUnknown_80F8E7C gUnknown_80F8E7C: @ 80F8E7C -.string "Exchanged the {ARG_MOVE_ITEM_1} on the\n" -.string "ground with the {ARG_MOVE_ITEM_0}.\0" +.string "Exchanged the {MOVE_ITEM_1} on the\n" +.string "ground with the {MOVE_ITEM_0}.\0" .align 2, 0 .global gSwappedGroundItem @@ -2279,7 +2279,7 @@ gSwappedGroundItem: @ 80F8EAC .global gUnknown_80F8EB0 gUnknown_80F8EB0: @ 80F8EB0 -.string "{ARG_POKEMON_0} threw the {ARG_MOVE_ITEM_0}!\0" +.string "{POKEMON_0} threw the {MOVE_ITEM_0}!\0" .align 2, 0 .global gMonThrewItem1 @@ -2314,7 +2314,7 @@ gCannotFarewell: @ 80F8F08 .global gUnknown_80F8F0C gUnknown_80F8F0C: @ 80F8F0C -.string "{ARG_POKEMON_0} is cringing!\0" +.string "{POKEMON_0} is cringing!\0" .align 2, 0 .global gMonCringing @@ -2324,7 +2324,7 @@ gMonCringing: @ 80F8F20 .global gUnknown_80F8F24 gUnknown_80F8F24: @ 80F8F24 -.string "{ARG_POKEMON_0} is paralyzed!\0" +.string "{POKEMON_0} is paralyzed!\0" .align 2, 0 .global gMonParalyzed @@ -2334,8 +2334,8 @@ gMonParalyzed: @ 80F8F38 .global gUnknown_80F8F3C gUnknown_80F8F3C: @ 80F8F3C -.string "{ARG_POKEMON_0} stepped on\n" -.string "the {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} stepped on\n" +.string "the {MOVE_ITEM_0}.\0" .align 2, 0 .global gMonSteppedOnItem @@ -2345,8 +2345,8 @@ gMonSteppedOnItem: @ 80F8F54 .global gUnknown_80F8F58 gUnknown_80F8F58: @ 80F8F58 -.string "{ARG_POKEMON_0} is terrified.\n" -.string "It didn't pick up the {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} is terrified.\n" +.string "It didn't pick up the {MOVE_ITEM_0}.\0" .align 2, 0 .global gMonTerrifiedCouldntPickUpItem @@ -2356,8 +2356,8 @@ gMonTerrifiedCouldntPickUpItem: @ 80F8F88 .global gUnknown_80F8F8C gUnknown_80F8F8C: @ 80F8F8C -.string "{ARG_POKEMON_0} couldn't pick up\n" -.string "the {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} couldn't pick up\n" +.string "the {MOVE_ITEM_0}.\0" .align 2, 0 .global gMonCouldntPickUpItem @@ -2367,7 +2367,7 @@ gMonCouldntPickUpItem: @ 80F8FAC .global gUnknown_80F8FB0 gUnknown_80F8FB0: @ 80F8FB0 -.string "Picked up the {ARG_MOVE_ITEM_0}.\0" +.string "Picked up the {MOVE_ITEM_0}.\0" .align 2, 0 .global gPickedUpItem2 @@ -2377,7 +2377,7 @@ gPickedUpItem2: @ 80F8FC4 .global gUnknown_80F8FC8 gUnknown_80F8FC8: @ 80F8FC8 -.string "Picked up the {ARG_MOVE_ITEM_0} and\n" +.string "Picked up the {MOVE_ITEM_0} and\n" .string "put it in the Toolbox.\0" .align 2, 0 @@ -2393,8 +2393,8 @@ gPickedUpItem: @ 80F8FFC .global gUnknown_80F9000 gUnknown_80F9000: @ 80F9000 -.string "{ARG_POKEMON_0} picked up\n" -.string "the {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} picked up\n" +.string "the {MOVE_ITEM_0}.\0" .align 2, 0 .global gMonPickedUpItem2 @@ -2404,8 +2404,8 @@ gMonPickedUpItem2: @ 80F9018 .global gUnknown_80F901C gUnknown_80F901C: @ 80F901C -.string "{ARG_POKEMON_0} picked up the\n" -.string "{ARG_MOVE_ITEM_0} and put it in the Toolbox.\0" +.string "{POKEMON_0} picked up the\n" +.string "{MOVE_ITEM_0} and put it in the Toolbox.\0" .align 2, 0 .global gMonPickedUpItemToolbox @@ -2420,7 +2420,7 @@ gMonPickedUpItem: @ 80F9054 .global gUnknown_80F9058 gUnknown_80F9058: @ 80F9058 -.string "Say farewell to {ARG_POKEMON_0}?\n" +.string "Say farewell to {POKEMON_0}?\n" .string "It will be gone from the team forever.\0" .align 2, 0 @@ -2431,8 +2431,8 @@ gSayFarewellQ: @ 80F9094 .global gUnknown_80F9098 gUnknown_80F9098: @ 80F9098 -.string "Send {ARG_POKEMON_0} back?\n" -.string "{ARG_POKEMON_0}'s hold item will be lost.\0" +.string "Send {POKEMON_0} back?\n" +.string "{POKEMON_0}'s hold item will be lost.\0" .align 2, 0 .global gSendMonBackWithItemQ @@ -2442,7 +2442,7 @@ gSendMonBackWithItemQ: @ 80F90C8 .global gUnknown_80F90CC gUnknown_80F90CC: @ 80F90CC -.string "Send {ARG_POKEMON_0} back?\0" +.string "Send {POKEMON_0} back?\0" .align 2, 0 .global gSendMonBackQ @@ -2452,7 +2452,7 @@ gSendMonBackQ: @ 80F90DC .global gUnknown_80F90E0 gUnknown_80F90E0: @ 80F90E0 -.string "Say farewell to {ARG_POKEMON_0} and dismiss\n" +.string "Say farewell to {POKEMON_0} and dismiss\n" .string "it from the team?\0" .align 2, 0 @@ -2463,7 +2463,7 @@ gUnknown_80F9114: @ 80F9114 .global gUnknown_80F9118 gUnknown_80F9118: @ 80F9118 -.string "{ARG_POKEMON_0} seemed disappointed and left.\0" +.string "{POKEMON_0} seemed disappointed and left.\0" .align 2, 0 .global gUnknown_80F913C @@ -2473,7 +2473,7 @@ gUnknown_80F913C: @ 80F913C .global gUnknown_80F9140 gUnknown_80F9140: @ 80F9140 -.string "{ARG_POKEMON_0} went back.\0" +.string "{POKEMON_0} went back.\0" .align 2, 0 .global gMonWentBack @@ -2493,7 +2493,7 @@ gUnknown_80F9158: @ 80F9158 .global gUnknown_80F915C gUnknown_80F915C: @ 80F915C -.string "$-Belly:{UNK_MACRO_3E M3E_147}{ARG_VALUE_0}/{ARG_VALUE_1}\0" +.string "$-Belly:{UNK_MACRO_3E M3E_147}{VALUE_0}/{VALUE_1}\0" .align 2, 0 .global gUnknown_80F9174 @@ -2503,7 +2503,7 @@ gUnknown_80F9174: @ 80F9174 .global gUnknown_80F9178 gUnknown_80F9178: @ 80F9178 -.string "Money:{UNK_MACRO_3E M3E_147}{ARG_VALUE_0} {POKE}\0" +.string "Money:{UNK_MACRO_3E M3E_147}{VALUE_0} {POKE}\0" .align 2, 0 .global gUnknown_80F9190 @@ -2513,7 +2513,7 @@ gUnknown_80F9190: @ 80F9190 .global gUnknown_80F9194 gUnknown_80F9194: @ 80F9194 -.string "Weather:{UNK_MACRO_3E M3E_159}{ARG_POKEMON_0}\0" +.string "Weather:{UNK_MACRO_3E M3E_159}{POKEMON_0}\0" .align 2, 0 .global gUnknown_80F91A8 @@ -2523,7 +2523,7 @@ gUnknown_80F91A8: @ 80F91A8 .global gUnknown_80F91AC gUnknown_80F91AC: @ 80F91AC -.string "Play:{UNK_MACRO_3E M3E_147}{ARG_VALUE_0}:$V12:$V22\0" +.string "Play:{UNK_MACRO_3E M3E_147}{VALUE_0}:$V12:$V22\0" .align 2, 0 .global gUnknown_80F91C8 @@ -2533,7 +2533,7 @@ gUnknown_80F91C8: @ 80F91C8 .global gUnknown_80F91CC gUnknown_80F91CC: @ 80F91CC -.string "{ARG_POKEMON_0}{UNK_MACRO_3E M3E_66}$v03/$v13\0" +.string "{POKEMON_0}{UNK_MACRO_3E M3E_66}$v03/$v13\0" .align 2, 0 .global gUnknown_80F91E0 @@ -2677,7 +2677,7 @@ gUnknown_80F9344: @ 80F9344 .global gUnknown_80F9350 gUnknown_80F9350: @ 80F9350 -.string "{ARG_POKEMON_1} is unaffected!\0" +.string "{POKEMON_1} is unaffected!\0" .align 2, 0 .global gUnknown_80F9364 @@ -2687,7 +2687,7 @@ gUnknown_80F9364: @ 80F9364 .global gUnknown_80F9368 gUnknown_80F9368: @ 80F9368 -.string "The move missed {ARG_POKEMON_1}!\0" +.string "The move missed {POKEMON_1}!\0" .align 2, 0 .global gUnknown_80F9380 @@ -2702,7 +2702,7 @@ gUnknown_80F9384: @ 80F9384 .global gUnknown_80F9388 gUnknown_80F9388: @ 80F9388 -.string "It had no effect on {ARG_POKEMON_1}!\0" +.string "It had no effect on {POKEMON_1}!\0" .align 2, 0 .global gUnknown_80F93A4 @@ -2712,7 +2712,7 @@ gUnknown_80F93A4: @ 80F93A4 .global gUnknown_80F93A8 gUnknown_80F93A8: @ 80F93A8 -.string "The move {ARG_MOVE_ITEM_0} can't be used!\0" +.string "The move {MOVE_ITEM_0} can't be used!\0" .align 2, 0 .global gUnknown_80F93C8 @@ -2722,7 +2722,7 @@ gUnknown_80F93C8: @ 80F93C8 .global gUnknown_80F93CC gUnknown_80F93CC: @ 80F93CC -.string "The {ARG_MOVE_ITEM_0} fell on the ground.\0" +.string "The {MOVE_ITEM_0} fell on the ground.\0" .align 2, 0 .global gItemFellOnGround @@ -2732,7 +2732,7 @@ gItemFellOnGround: @ 80F93E8 .global gUnknown_80F93EC gUnknown_80F93EC: @ 80F93EC -.string "The {ARG_MOVE_ITEM_0} fell in the water.\0" +.string "The {MOVE_ITEM_0} fell in the water.\0" .align 2, 0 .global gItemFellInWater @@ -2742,7 +2742,7 @@ gItemFellInWater: @ 80F9408 .global gUnknown_80F940C gUnknown_80F940C: @ 80F940C -.string "The {ARG_MOVE_ITEM_0} became buried.\0" +.string "The {MOVE_ITEM_0} became buried.\0" .align 2, 0 .global gItemBuried @@ -2752,7 +2752,7 @@ gItemBuried: @ 80F9424 .global gUnknown_80F9428 gUnknown_80F9428: @ 80F9428 -.string "The {ARG_MOVE_ITEM_0} was lost!\0" +.string "The {MOVE_ITEM_0} was lost!\0" .align 2, 0 .global gItemLost @@ -2782,7 +2782,7 @@ gSeveralItemsLost: @ 80F947C .global gUnknown_80F9480 gUnknown_80F9480: @ 80F9480 -.string "The {ARG_MOVE_ITEM_0} fell out of sight!\0" +.string "The {MOVE_ITEM_0} fell out of sight!\0" .align 2, 0 .global gItemFellOutOfSight @@ -2792,8 +2792,8 @@ gItemFellOutOfSight: @ 80F949C .global gUnknown_80F94A0 gUnknown_80F94A0: @ 80F94A0 -.string "The {ARG_MOVE_ITEM_0} went flying\n" -.string "towards {ARG_POKEMON_0}!\0" +.string "The {MOVE_ITEM_0} went flying\n" +.string "towards {POKEMON_0}!\0" .align 2, 0 .global gUnknown_80F94C4 @@ -2803,7 +2803,7 @@ gUnknown_80F94C4: @ 80F94C4 .global gUnknown_80F94C8 gUnknown_80F94C8: @ 80F94C8 -.string "It missed {ARG_POKEMON_0}!\0" +.string "It missed {POKEMON_0}!\0" .align 2, 0 .global gUnknown_80F94D8 @@ -2813,7 +2813,7 @@ gUnknown_80F94D8: @ 80F94D8 .global gUnknown_80F94DC gUnknown_80F94DC: @ 80F94DC -.string "{ARG_POKEMON_0} dodged the {ARG_MOVE_ITEM_0}!\0" +.string "{POKEMON_0} dodged the {MOVE_ITEM_0}!\0" .align 2, 0 .global gUnknown_80F94F0 @@ -2823,8 +2823,8 @@ gUnknown_80F94F0: @ 80F94F0 .global gUnknown_80F94F4 gUnknown_80F94F4: @ 80F94F4 -.string "The {ARG_MOVE_ITEM_0} bounced off\n" -.string "{ARG_POKEMON_0}!\0" +.string "The {MOVE_ITEM_0} bounced off\n" +.string "{POKEMON_0}!\0" .align 2, 0 .global gUnknown_80F9510 @@ -2834,7 +2834,7 @@ gUnknown_80F9510: @ 80F9510 .global gUnknown_80F9514 gUnknown_80F9514: @ 80F9514 -.string "The {ARG_MOVE_ITEM_0} flew out of sight!\0" +.string "The {MOVE_ITEM_0} flew out of sight!\0" .align 2, 0 .global gUnknown_80F9530 @@ -2844,7 +2844,7 @@ gUnknown_80F9530: @ 80F9530 .global gFrozenMessage gFrozenMessage: @ 80F9534 -.string "{ARG_POKEMON_0} is frozen solid!\0" +.string "{POKEMON_0} is frozen solid!\0" .align 2, 0 .global gPtrFrozenMessage @@ -2853,7 +2853,7 @@ gPtrFrozenMessage: @ 80F954C .global gWrappedAroundMessage gWrappedAroundMessage: @ 80F9550 -.string "{ARG_POKEMON_0} has its foe wrapped!\0" +.string "{POKEMON_0} has its foe wrapped!\0" .align 2, 0 .global gPtrWrappedAroundMessage @@ -2862,7 +2862,7 @@ gPtrWrappedAroundMessage: @ 80F956C .global gWrappedByMessage gWrappedByMessage: @ 80F9570 -.string "{ARG_POKEMON_0} is wrapped by its foe!\0" +.string "{POKEMON_0} is wrapped by its foe!\0" .align 2, 0 .global gPtrWrappedByMessage @@ -2871,7 +2871,7 @@ gPtrWrappedByMessage: @ 80F958C .global gPausedMessage gPausedMessage: @ 80F9590 -.string "{ARG_POKEMON_0} can't move!\0" +.string "{POKEMON_0} can't move!\0" .align 2, 0 .global gPtrPausedMessage @@ -2883,7 +2883,7 @@ gInfatuatedMessage: @ 80F95A8 .global gUnknown_80F95A8 gUnknown_80F95A8: @ 80F95A8 -.string "{ARG_POKEMON_0} is infatuated!\0" +.string "{POKEMON_0} is infatuated!\0" .align 2, 0 .global gPtrInfatuatedMessage @@ -2892,7 +2892,7 @@ gPtrInfatuatedMessage: @ 80F95BC .global gBideMessage gBideMessage: @ 80F95C0 -.string "{ARG_POKEMON_0} is storing energy!\0" +.string "{POKEMON_0} is storing energy!\0" .align 2, 0 .global gPtrBideMessage @@ -2905,7 +2905,7 @@ gUnknown_80F95DC: @ 80F95DC .global gUnknown_80F95DC gUnknown_80F95DC: @ 80F95DC -.string "{ARG_POKEMON_0} is asleep!\0" +.string "{POKEMON_0} is asleep!\0" .align 2, 0 .global gUnknown_80F95EC @@ -2915,7 +2915,7 @@ gUnknown_80F95EC: @ 80F95EC .global gUnknown_80F95F0 gUnknown_80F95F0: @ 80F95F0 -.string "{ARG_POKEMON_1} is frozen!\0" +.string "{POKEMON_1} is frozen!\0" .align 2, 0 .global gUnknown_80F9600 @@ -2965,7 +2965,7 @@ gUnknown_80F9670: @ 80F9670 .global gUnknown_80F9674 gUnknown_80F9674: @ 80F9674 -.string "{ARG_POKEMON_1} took no damage!\0" +.string "{POKEMON_1} took no damage!\0" .align 2, 0 .global gUnknown_80F9688 @@ -2975,7 +2975,7 @@ gUnknown_80F9688: @ 80F9688 .global gUnknown_80F968C gUnknown_80F968C: @ 80F968C -.string "{ARG_POKEMON_1} took calamitous damage!\0" +.string "{POKEMON_1} took calamitous damage!\0" .align 2, 0 .global gUnknown_80F96A8 @@ -2985,7 +2985,7 @@ gUnknown_80F96A8: @ 80F96A8 .global gUnknown_80F96AC gUnknown_80F96AC: @ 80F96AC -.string "{ARG_POKEMON_0} exploded!\0" +.string "{POKEMON_0} exploded!\0" .align 2, 0 .global gUnknown_80F96BC @@ -3006,7 +3006,7 @@ gUnknown_80F96EC: @ 80F96EC .global gUnknown_80F96F0 gUnknown_80F96F0: @ 80F96F0 -.string "{ARG_POKEMON_0} fell into the pitfall!\0" +.string "{POKEMON_0} fell into the pitfall!\0" .align 2, 0 .global gUnknown_80F970C @@ -3026,7 +3026,7 @@ gUnknown_80F9728: @ 80F9728 .global gUnknown_80F972C gUnknown_80F972C: @ 80F972C -.string "{ARG_POKEMON_0} is famished.\0" +.string "{POKEMON_0} is famished.\0" .align 2, 0 .global gUnknown_80F9740 @@ -3036,7 +3036,7 @@ gUnknown_80F9740: @ 80F9740 .global gUnknown_80F9744 gUnknown_80F9744: @ 80F9744 -.string "{ARG_POKEMON_0} is already famished.\0" +.string "{POKEMON_0} is already famished.\0" .align 2, 0 .global gUnknown_80F9760 @@ -3072,103 +3072,103 @@ gUnknown_80F9764: @ 80F9764 .global gUnknown_80F97B8 gUnknown_80F97B8: @ 80F97B8 -.string "The recoil hit {ARG_POKEMON_1} for\n" -.string "{ARG_VALUE_0} damage!\0" +.string "The recoil hit {POKEMON_1} for\n" +.string "{VALUE_0} damage!\0" .align 2, 0 .global gUnknown_80F97DC gUnknown_80F97DC: @ 80F97DC .string "The move failed!\n" -.string "{ARG_POKEMON_1} took {ARG_VALUE_0} damage!\0" +.string "{POKEMON_1} took {VALUE_0} damage!\0" .align 2, 0 .global gUnknown_80F9804 gUnknown_80F9804: @ 80F9804 -.string "The bad weather inflicted {ARG_VALUE_0} damage\n" -.string "on {ARG_POKEMON_1}!\0" +.string "The bad weather inflicted {VALUE_0} damage\n" +.string "on {POKEMON_1}!\0" .align 2, 0 .global gUnknown_80F9834 gUnknown_80F9834: @ 80F9834 -.string "The Chestnut Trap hit {ARG_POKEMON_1}\n" -.string "for {ARG_VALUE_0} damage!\0" +.string "The Chestnut Trap hit {POKEMON_1}\n" +.string "for {VALUE_0} damage!\0" .align 2, 0 .global gUnknown_80F9860 gUnknown_80F9860: @ 80F9860 -.string "{ARG_POKEMON_1} was showered with sludge\n" -.string "for {ARG_VALUE_0} damage!\0" +.string "{POKEMON_1} was showered with sludge\n" +.string "for {VALUE_0} damage!\0" .align 2, 0 .global gUnknown_80F9890 gUnknown_80F9890: @ 80F9890 -.string "{ARG_POKEMON_1} took {ARG_VALUE_0} damage\n" +.string "{POKEMON_1} took {VALUE_0} damage\n" .string "from Destiny Bond!\0" .align 2, 0 .global gUnknown_80F98B8 gUnknown_80F98B8: @ 80F98B8 -.string "{ARG_POKEMON_1} took {ARG_VALUE_0} damage\n" +.string "{POKEMON_1} took {VALUE_0} damage\n" .string "from Perish Song!\0" .align 2, 0 .global gUnknown_80F98E0 gUnknown_80F98E0: @ 80F98E0 -.string "{ARG_POKEMON_1} stepped on spikes for\n" -.string "{ARG_VALUE_0} damage!\0" +.string "{POKEMON_1} stepped on spikes for\n" +.string "{VALUE_0} damage!\0" .align 2, 0 .global gUnknown_80F9908 gUnknown_80F9908: @ 80F9908 -.string "{ARG_POKEMON_1} took {ARG_VALUE_0} damage\n" +.string "{POKEMON_1} took {VALUE_0} damage\n" .string "from Leech Seed!\0" .align 2, 0 .global gUnknown_80F9930 gUnknown_80F9930: @ 80F9930 -.string "{ARG_POKEMON_1} awoke from its nightmare\n" -.string "and took {ARG_VALUE_0} damage!\0" +.string "{POKEMON_1} awoke from its nightmare\n" +.string "and took {VALUE_0} damage!\0" .align 2, 0 .global gUnknown_80F9964 gUnknown_80F9964: @ 80F9964 -.string "{ARG_POKEMON_1} was cursed for\n" -.string "{ARG_VALUE_0} damage!\0" +.string "{POKEMON_1} was cursed for\n" +.string "{VALUE_0} damage!\0" .align 2, 0 .global gUnknown_80F9984 gUnknown_80F9984: @ 80F9984 -.string "{ARG_POKEMON_1} took {ARG_VALUE_0} damage\n" +.string "{POKEMON_1} took {VALUE_0} damage\n" .string "from the counterattack!\0" .align 2, 0 .global gUnknown_80F99B0 gUnknown_80F99B0: @ 80F99B0 -.string "{ARG_POKEMON_1} was wrapped for\n" -.string "{ARG_VALUE_0} damage!\0" +.string "{POKEMON_1} was wrapped for\n" +.string "{VALUE_0} damage!\0" .align 2, 0 .global gUnknown_80F99D0 gUnknown_80F99D0: @ 80F99D0 -.string "{ARG_POKEMON_1} took {ARG_VALUE_0} damage\n" +.string "{POKEMON_1} took {VALUE_0} damage\n" .string "from poison!\0" .align 2, 0 .global gUnknown_80F99F4 gUnknown_80F99F4: @ 80F99F4 -.string "{ARG_POKEMON_1} was squeezed for\n" -.string "{ARG_VALUE_0} damage!\0" +.string "{POKEMON_1} was squeezed for\n" +.string "{VALUE_0} damage!\0" .align 2, 0 .global gUnknown_80F9A18 gUnknown_80F9A18: @ 80F9A18 -.string "{ARG_POKEMON_1}'s burn inflicted\n" -.string "{ARG_VALUE_0} damage!\0" +.string "{POKEMON_1}'s burn inflicted\n" +.string "{VALUE_0} damage!\0" .align 2, 0 .global gUnknown_80F9A3C gUnknown_80F9A3C: @ 80F9A3C -.string "{ARG_POKEMON_1} took {ARG_VALUE_0} damage!\0" +.string "{POKEMON_1} took {VALUE_0} damage!\0" .align 2, 0 .global gWeatherNames @@ -3225,7 +3225,7 @@ gUnknown_80F9AAC: @ 80F9AAC .global gUnknown_80F9AB4 gUnknown_80F9AB4: @ 80F9AB4 -.string "{ARG_POKEMON_0}'s HP went up {ARG_VALUE_0}!\0" +.string "{POKEMON_0}'s HP went up {VALUE_0}!\0" .align 2, 0 .global gUnknown_80F9ACC @@ -3235,7 +3235,7 @@ gUnknown_80F9ACC: @ 80F9ACC .global gUnknown_80F9AD0 gUnknown_80F9AD0: @ 80F9AD0 -.string "{ARG_POKEMON_0}'s Attack went up {ARG_VALUE_1}!\0" +.string "{POKEMON_0}'s Attack went up {VALUE_1}!\0" .align 2, 0 .global gUnknown_80F9AEC @@ -3245,7 +3245,7 @@ gUnknown_80F9AEC: @ 80F9AEC .global gUnknown_80F9AF0 gUnknown_80F9AF0: @ 80F9AF0 -.string "{ARG_POKEMON_0}'s Defense went up {ARG_VALUE_2}!\0" +.string "{POKEMON_0}'s Defense went up {VALUE_2}!\0" .align 2, 0 .global gUnknown_80F9B10 @@ -3255,7 +3255,7 @@ gUnknown_80F9B10: @ 80F9B10 .global gUnknown_80F9B14 gUnknown_80F9B14: @ 80F9B14 -.string "{ARG_POKEMON_0}'s Sp. Atk. went up {ARG_VALUE_3}!\0" +.string "{POKEMON_0}'s Sp. Atk. went up {VALUE_3}!\0" .align 2, 0 .global gUnknown_80F9B34 @@ -3265,7 +3265,7 @@ gUnknown_80F9B34: @ 80F9B34 .global gUnknown_80F9B38 gUnknown_80F9B38: @ 80F9B38 -.string "{ARG_POKEMON_0}'s Sp. Def. went up $d4!\0" +.string "{POKEMON_0}'s Sp. Def. went up $d4!\0" .align 2, 0 .global gUnknown_80F9B58 @@ -3275,7 +3275,7 @@ gUnknown_80F9B58: @ 80F9B58 .global gUnknown_80F9B5C gUnknown_80F9B5C: @ 80F9B5C -.string "{ARG_POKEMON_0} didn't level up.\0" +.string "{POKEMON_0} didn't level up.\0" .align 2, 0 .global gUnknown_80F9B74 @@ -3285,7 +3285,7 @@ gUnknown_80F9B74: @ 80F9B74 .global gUnknown_80F9B78 gUnknown_80F9B78: @ 80F9B78 -.string "{ARG_POKEMON_0} didn't level down.\0" +.string "{POKEMON_0} didn't level down.\0" .align 2, 0 .global gUnknown_80F9B94 @@ -3295,7 +3295,7 @@ gUnknown_80F9B94: @ 80F9B94 .global gUnknown_80F9B98 gUnknown_80F9B98: @ 80F9B98 -.string "{ARG_POKEMON_0} became the leader!\0" +.string "{POKEMON_0} became the leader!\0" .align 2, 0 .global gUnknown_80F9BB0 @@ -3381,12 +3381,12 @@ gUnknown_80F9CC0: @ 80F9CC0 .global gUnknown_80F9CC8 gUnknown_80F9CC8: @ 80F9CC8 -.string "{ARG_POKEMON_1} fainted!\0" +.string "{POKEMON_1} fainted!\0" .align 2, 0 .global gUnknown_80F9CD8 gUnknown_80F9CD8: @ 80F9CD8 -.string "{ARG_POKEMON_1} was defeated!\0" +.string "{POKEMON_1} was defeated!\0" .align 2, 0 .global gUnknown_80F9CEC @@ -3397,12 +3397,12 @@ gUnknown_80F9CEC: @ 80F9CEC .global gUnknown_80F9CF4 gUnknown_80F9CF4: @ 80F9CF4 -.string "Oh, no! {ARG_POKEMON_1} fainted!\0" +.string "Oh, no! {POKEMON_1} fainted!\0" .align 2, 0 .global gUnknown_80F9D0C gUnknown_80F9D0C: @ 80F9D0C -.string "Oh, no! {ARG_POKEMON_1} was defeated!\0" +.string "Oh, no! {POKEMON_1} was defeated!\0" .align 2, 0 .global gUnknown_80F9D28 @@ -3413,13 +3413,13 @@ gUnknown_80F9D28: @ 80F9D28 .global gUnknown_80F9D30 gUnknown_80F9D30: @ 80F9D30 -.string "{ARG_POKEMON_1} fainted!\n" +.string "{POKEMON_1} fainted!\n" .string "It left the rescue team!\0" .align 2, 0 .global gUnknown_80F9D58 gUnknown_80F9D58: @ 80F9D58 -.string "{ARG_POKEMON_1} was defeated!\n" +.string "{POKEMON_1} was defeated!\n" .string "It left the rescue team!\0" .align 2, 0 @@ -3437,7 +3437,7 @@ gUnknown_80F9D8C: @ 80F9D8C .global gUnknown_80F9D94 gUnknown_80F9D94: @ 80F9D94 -.string "{ARG_POKEMON_1} went back for now!\0" +.string "{POKEMON_1} went back for now!\0" .align 2, 0 .global gUnknown_80F9DAC @@ -3448,12 +3448,12 @@ gUnknown_80F9DAC: @ 80F9DAC .global gUnknown_80F9DB4 gUnknown_80F9DB4: @ 80F9DB4 -.string "Your client {ARG_POKEMON_1} fainted!\0" +.string "Your client {POKEMON_1} fainted!\0" .align 2, 0 .global gUnknown_80F9DD0 gUnknown_80F9DD0: @ 80F9DD0 -.string "Your client {ARG_POKEMON_1} was defeated!\0" +.string "Your client {POKEMON_1} was defeated!\0" .align 2, 0 .global gUnknown_80F9DF0 @@ -3464,13 +3464,13 @@ gUnknown_80F9DF0: @ 80F9DF0 .global gUnknown_80F9DF8 gUnknown_80F9DF8: @ 80F9DF8 -.string "{ARG_POKEMON_1} fainted while awaiting\n" +.string "{POKEMON_1} fainted while awaiting\n" .string "rescue!\0" .align 2, 0 .global gUnknown_80F9E1C gUnknown_80F9E1C: @ 80F9E1C -.string "{ARG_POKEMON_1} was defeated while awaiting\n" +.string "{POKEMON_1} was defeated while awaiting\n" .string "rescue!\0" .align 2, 0 @@ -3481,7 +3481,7 @@ gUnknown_80F9E44: @ 80F9E44 .global gUnknown_80F9E48 gUnknown_80F9E48: @ 80F9E48 -.string "{ARG_POKEMON_0} gained {ARG_VALUE_0} Exp. Points!\0" +.string "{POKEMON_0} gained {VALUE_0} Exp. Points!\0" .align 2, 0 .global gUnknown_80F9E64 @@ -3491,7 +3491,7 @@ gUnknown_80F9E64: @ 80F9E64 .global gUnknown_80F9E68 gUnknown_80F9E68: @ 80F9E68 -.string "{ARG_POKEMON_0} grew to Level {ARG_VALUE_0}!\0" +.string "{POKEMON_0} grew to Level {VALUE_0}!\0" .align 2, 0 .global gUnknown_80F9E80 @@ -3501,13 +3501,13 @@ gUnknown_80F9E80: @ 80F9E80 .global gUnknown_80F9E84 gUnknown_80F9E84: @ 80F9E84 -.string "{ARG_POKEMON_0}'s level remained unchanged.\0" +.string "{POKEMON_0}'s level remained unchanged.\0" .align 2, 0 .4byte gUnknown_80F9E84 .global gUnknown_80F9EAC gUnknown_80F9EAC: @ 80F9EAC -.string "{ARG_POKEMON_0} dropped to Level {ARG_VALUE_0}!\0" +.string "{POKEMON_0} dropped to Level {VALUE_0}!\0" .align 2, 0 .global gUnknown_80F9EC8 @@ -3517,7 +3517,7 @@ gUnknown_80F9EC8: @ 80F9EC8 .global gUnknown_80F9ECC gUnknown_80F9ECC: @ 80F9ECC -.string "{ARG_POKEMON_0}'s level didn't go down.\0" +.string "{POKEMON_0}'s level didn't go down.\0" .align 2, 0 .global gUnknown_80F9EEC @@ -3527,7 +3527,7 @@ gUnknown_80F9EEC: @ 80F9EEC .global gUnknown_80F9EF0 gUnknown_80F9EF0: @ 80F9EF0 -.string "{ARG_POKEMON_0} learned {ARG_MOVE_ITEM_0}!\0" +.string "{POKEMON_0} learned {MOVE_ITEM_0}!\0" .align 2, 0 .global gUnknown_80F9F04 @@ -3537,7 +3537,7 @@ gUnknown_80F9F04: @ 80F9F04 .global gUnknown_80F9F08 gUnknown_80F9F08: @ 80F9F08 -.string "{ARG_POKEMON_0} didn't learn the new move.\0" +.string "{POKEMON_0} didn't learn the new move.\0" .align 2, 0 .global gUnknown_80F9F2C @@ -3559,8 +3559,8 @@ gUnknown_80F9FA4: @ 80F9FA4 .global gUnknown_80F9FA8 gUnknown_80F9FA8: @ 80F9FA8 -.string "Yes! {ARG_POKEMON_0} wants to join the team!\n" -.string "Accept {ARG_POKEMON_0} as a team member?\0" +.string "Yes! {POKEMON_0} wants to join the team!\n" +.string "Accept {POKEMON_0} as a team member?\0" .align 2, 0 .global gUnknown_80F9FE8 @@ -3571,7 +3571,7 @@ gUnknown_80F9FE8: @ 80F9FE8 .global gUnknown_80F9FF0 gUnknown_80F9FF0: @ 80F9FF0 -.string "{ARG_POKEMON_0} went away...\0" +.string "{POKEMON_0} went away...\0" .align 2, 0 .global gUnknown_80FA004 @@ -3623,7 +3623,7 @@ gUnknown_80FA0C8: @ 80FA0C8 .global gUnknown_80FA0CC gUnknown_80FA0CC: @ 80FA0CC -.string "{ARG_POKEMON_0} joined $t to\n" +.string "{POKEMON_0} joined $t to\n" .string "go on adventures!\0" .align 2, 0 @@ -3634,8 +3634,8 @@ gUnknown_80FA0F0: @ 80FA0F0 .global gUnknown_80FA0F4 gUnknown_80FA0F4: @ 80FA0F4 -.string "{ARG_POKEMON_0} gained access to\n" -.string "the Friend Area {ARG_FRIEND_AREA}.\0" +.string "{POKEMON_0} gained access to\n" +.string "the Friend Area {FRIEND_AREA}.\0" .align 2, 0 .global gUnknown_80FA120 @@ -3654,38 +3654,38 @@ gUnknown_80FA124: @ 80FA124 .global gUnknown_80FA138 gUnknown_80FA138: @ 80FA138 -.string "{ARG_POKEMON_0}'s at quadruple speed!\0" +.string "{POKEMON_0}'s at quadruple speed!\0" .align 2, 0 .global gUnknown_80FA154 gUnknown_80FA154: @ 80FA154 -.string "{ARG_POKEMON_0}'s at triple speed!\0" +.string "{POKEMON_0}'s at triple speed!\0" .align 2, 0 .global gUnknown_80FA170 gUnknown_80FA170: @ 80FA170 -.string "{ARG_POKEMON_0}'s at double speed!\0" +.string "{POKEMON_0}'s at double speed!\0" .align 2, 0 .global gUnknown_80FA18C gUnknown_80FA18C: @ 80FA18C -.string "{ARG_POKEMON_0} returned to normal speed!\0" +.string "{POKEMON_0} returned to normal speed!\0" .align 2, 0 .global gUnknown_80FA1AC gUnknown_80FA1AC: @ 80FA1AC -.string "{ARG_POKEMON_0} was slowed!\0" +.string "{POKEMON_0} was slowed!\0" .align 2, 0 .global gUnknown_80FA1BC gUnknown_80FA1BC: @ 80FA1BC .string "The Rescue Team Badge\n" -.string "shone on {ARG_POKEMON_1}!\n" -.string "{ARG_POKEMON_1} gained a magical power!\n" -.string "{ARG_POKEMON_1}: Thank you!\n" +.string "shone on {POKEMON_1}!\n" +.string "{POKEMON_1} gained a magical power!\n" +.string "{POKEMON_1}: Thank you!\n" .string "Please come see me at the Pelipper\n" .string "Post Office later.\n" -.string "{ARG_POKEMON_1} escaped from the dungeon!\0" +.string "{POKEMON_1} escaped from the dungeon!\0" .align 2, 0 .global gUnknown_80FA260 @@ -3695,11 +3695,11 @@ gUnknown_80FA260: @ 80FA260 .global gUnknown_80FA264 gUnknown_80FA264: @ 80FA264 -.string "{ARG_POKEMON_1} happily accepted the item!\n" +.string "{POKEMON_1} happily accepted the item!\n" .string "\n\n" -.string "{ARG_POKEMON_1}: Thank you!\n" +.string "{POKEMON_1}: Thank you!\n" .string "\n\n" -.string "{ARG_POKEMON_1} left the dungeon!\n" +.string "{POKEMON_1} left the dungeon!\n" .string "\n\0" .align 2, 0 @@ -3710,9 +3710,9 @@ gUnknown_80FA2B0: @ 80FA2B0 .global gUnknown_80FA2B4 gUnknown_80FA2B4: @ 80FA2B4 -.string "Yes! {ARG_POKEMON_1} was found!\n" +.string "Yes! {POKEMON_1} was found!\n" .string "Use the Rescue Team Badge to save\n" -.string "{ARG_POKEMON_1}?\0" +.string "{POKEMON_1}?\0" .align 2, 0 .global gUnknown_80FA2F0 @@ -3722,9 +3722,9 @@ gUnknown_80FA2F0: @ 80FA2F0 .global gUnknown_80FA2F4 gUnknown_80FA2F4: @ 80FA2F4 -.string "Yes! {ARG_POKEMON_1} was found!\n" +.string "Yes! {POKEMON_1} was found!\n" .string "Deliver the requested item to\n" -.string "{ARG_POKEMON_1}?\0" +.string "{POKEMON_1}?\0" .align 2, 0 .global gUnknown_80FA32C @@ -3781,7 +3781,7 @@ gUnknown_80FA408: @ 80FA408 .global gUnknown_80FA40C gUnknown_80FA40C: @ 80FA40C -.string "The {ARG_MOVE_ITEM_0} isn't in the Toolbox.\n" +.string "The {MOVE_ITEM_0} isn't in the Toolbox.\n" .string "It couldn't be delivered.\0" .align 2, 0 @@ -3792,7 +3792,7 @@ gUnknown_80FA448: @ 80FA448 .global gUnknown_80FA44C gUnknown_80FA44C: @ 80FA44C -.string "{ARG_POKEMON_1} can't talk now.\0" +.string "{POKEMON_1} can't talk now.\0" .align 2, 0 .global gUnknown_80FA464 @@ -3802,12 +3802,12 @@ gUnknown_80FA464: @ 80FA464 .global gUnknown_80FA468 gUnknown_80FA468: @ 80FA468 -.string "Yes! {ARG_POKEMON_2} was successfully\n" +.string "Yes! {POKEMON_2} was successfully\n" .string "escorted!\n" -.string "{ARG_POKEMON_2} is delighted!\n" -.string "{ARG_POKEMON_2}: Thank you!\n" +.string "{POKEMON_2} is delighted!\n" +.string "{POKEMON_2}: Thank you!\n" .string "\n\n" -.string "{ARG_POKEMON_2}'s twosome left the dungeon!\n" +.string "{POKEMON_2}'s twosome left the dungeon!\n" .string "\n\0" .align 2, 0 @@ -3823,7 +3823,7 @@ gUnknown_80FA4D8: @ 80FA4D8 .global gUnknown_80FA4DC gUnknown_80FA4DC: @ 80FA4DC -.string "{ARG_POKEMON_2} doesn't seem to be around.\0" +.string "{POKEMON_2} doesn't seem to be around.\0" .align 2, 0 .global gUnknown_80FA500 @@ -3848,7 +3848,7 @@ gUnknown_80FA530: @ 80FA530 .global gUnknown_80FA534 gUnknown_80FA534: @ 80FA534 -.string "{ARG_POKEMON_2} can't talk now.\0" +.string "{POKEMON_2} can't talk now.\0" .align 2, 0 .global gUnknown_80FA54C @@ -3901,7 +3901,7 @@ gUnknown_80FA61C: @ 80FA61C .global gUnknown_80FA620 gUnknown_80FA620: @ 80FA620 -.string "{ARG_POKEMON_0}'s Reflect faded.\0" +.string "{POKEMON_0}'s Reflect faded.\0" .align 2, 0 .global gUnknown_80FA638 @@ -3911,7 +3911,7 @@ gUnknown_80FA638: @ 80FA638 .global gUnknown_80FA63C gUnknown_80FA63C: @ 80FA63C -.string "{ARG_POKEMON_0}'s Light Screen faded.\0" +.string "{POKEMON_0}'s Light Screen faded.\0" .align 2, 0 .global gUnknown_80FA658 @@ -3921,7 +3921,7 @@ gUnknown_80FA658: @ 80FA658 .global gUnknown_80FA65C gUnknown_80FA65C: @ 80FA65C -.string "{ARG_POKEMON_0}'s Counter effect faded.\0" +.string "{POKEMON_0}'s Counter effect faded.\0" .align 2, 0 .global gUnknown_80FA67C @@ -3931,7 +3931,7 @@ gUnknown_80FA67C: @ 80FA67C .global gUnknown_80FA680 gUnknown_80FA680: @ 80FA680 -.string "{ARG_POKEMON_0}'s Safeguard faded.\0" +.string "{POKEMON_0}'s Safeguard faded.\0" .align 2, 0 .global gUnknown_80FA69C @@ -3941,7 +3941,7 @@ gUnknown_80FA69C: @ 80FA69C .global gUnknown_80FA6A0 gUnknown_80FA6A0: @ 80FA6A0 -.string "{ARG_POKEMON_0}'s Magic Coat faded.\0" +.string "{POKEMON_0}'s Magic Coat faded.\0" .align 2, 0 .global gUnknown_80FA6BC @@ -3951,7 +3951,7 @@ gUnknown_80FA6BC: @ 80FA6BC .global gUnknown_80FA6C0 gUnknown_80FA6C0: @ 80FA6C0 -.string "{ARG_POKEMON_0}'s Wish faded.\0" +.string "{POKEMON_0}'s Wish faded.\0" .align 2, 0 .global gUnknown_80FA6D4 @@ -3961,7 +3961,7 @@ gUnknown_80FA6D4: @ 80FA6D4 .global gUnknown_80FA6D8 gUnknown_80FA6D8: @ 80FA6D8 -.string "{ARG_POKEMON_0} woke up!\0" +.string "{POKEMON_0} woke up!\0" .align 2, 0 .global gUnknown_80FA6E8 @@ -3971,7 +3971,7 @@ gUnknown_80FA6E8: @ 80FA6E8 .global gUnknown_80FA6EC gUnknown_80FA6EC: @ 80FA6EC -.string "{ARG_POKEMON_0} is no longer sleepless!\0" +.string "{POKEMON_0} is no longer sleepless!\0" .align 2, 0 .global gUnknown_80FA708 @@ -3991,7 +3991,7 @@ gUnknown_80FA710: @ 80FA710 .global gUnknown_80FA714 gUnknown_80FA714: @ 80FA714 -.string "{ARG_POKEMON_0} got over its drowsiness!\0" +.string "{POKEMON_0} got over its drowsiness!\0" .align 2, 0 .global gUnknown_80FA734 @@ -4021,7 +4021,7 @@ gUnknown_80FA778: @ 80FA778 .global gUnknown_80FA77C gUnknown_80FA77C: @ 80FA77C -.string "{ARG_POKEMON_0}'s Leech Seed wore off.\0" +.string "{POKEMON_0}'s Leech Seed wore off.\0" .align 2, 0 .global gUnknown_80FA79C @@ -4031,7 +4031,7 @@ gUnknown_80FA79C: @ 80FA79C .global gUnknown_80FA7A0 gUnknown_80FA7A0: @ 80FA7A0 -.string "{ARG_POKEMON_0} is no longer cursed!\0" +.string "{POKEMON_0} is no longer cursed!\0" .align 2, 0 .global gUnknown_80FA7BC @@ -4041,7 +4041,7 @@ gUnknown_80FA7BC: @ 80FA7BC .global gUnknown_80FA7C0 gUnknown_80FA7C0: @ 80FA7C0 -.string "{ARG_POKEMON_0}'s Snatch wore off!\0" +.string "{POKEMON_0}'s Snatch wore off!\0" .align 2, 0 .global gUnknown_80FA7DC @@ -4051,7 +4051,7 @@ gUnknown_80FA7DC: @ 80FA7DC .global gUnknown_80FA7E0 gUnknown_80FA7E0: @ 80FA7E0 -.string "{ARG_POKEMON_0} recovered from confusion!\0" +.string "{POKEMON_0} recovered from confusion!\0" .align 2, 0 .global gUnknown_80FA800 @@ -4061,7 +4061,7 @@ gUnknown_80FA800: @ 80FA800 .global gUnknown_80FA804 gUnknown_80FA804: @ 80FA804 -.string "{ARG_POKEMON_0} regained mobility!\0" +.string "{POKEMON_0} regained mobility!\0" .align 2, 0 .global gUnknown_80FA81C @@ -4081,7 +4081,7 @@ gUnknown_80FA824: @ 80FA824 .global gUnknown_80FA828 gUnknown_80FA828: @ 80FA828 -.string "{ARG_POKEMON_0}'s Ingrain wore off!\0" +.string "{POKEMON_0}'s Ingrain wore off!\0" .align 2, 0 .global gUnknown_80FA844 @@ -4091,7 +4091,7 @@ gUnknown_80FA844: @ 80FA844 .global gUnknown_80FA848 gUnknown_80FA848: @ 80FA848 -.string "{ARG_POKEMON_0} recovered from paralysis!\0" +.string "{POKEMON_0} recovered from paralysis!\0" .align 2, 0 .global gUnknown_80FA868 @@ -4101,7 +4101,7 @@ gUnknown_80FA868: @ 80FA868 .global gUnknown_80FA86C gUnknown_80FA86C: @ 80FA86C -.string "{ARG_POKEMON_0} recovered from a burn!\0" +.string "{POKEMON_0} recovered from a burn!\0" .align 2, 0 .global gUnknown_80FA888 @@ -4111,7 +4111,7 @@ gUnknown_80FA888: @ 80FA888 .global gUnknown_80FA88C gUnknown_80FA88C: @ 80FA88C -.string "{ARG_POKEMON_0} recovered from poison!\0" +.string "{POKEMON_0} recovered from poison!\0" .align 2, 0 .global gUnknown_80FA8A8 @@ -4121,7 +4121,7 @@ gUnknown_80FA8A8: @ 80FA8A8 .global gUnknown_80FA8AC gUnknown_80FA8AC: @ 80FA8AC -.string "{ARG_POKEMON_0} thawed out!\0" +.string "{POKEMON_0} thawed out!\0" .align 2, 0 .global gUnknown_80FA8BC @@ -4131,7 +4131,7 @@ gUnknown_80FA8BC: @ 80FA8BC .global gUnknown_80FA8C0 gUnknown_80FA8C0: @ 80FA8C0 -.string "{ARG_POKEMON_0} lost its Sure Shot status!\0" +.string "{POKEMON_0} lost its Sure Shot status!\0" .align 2, 0 .global gUnknown_80FA8E0 @@ -4141,7 +4141,7 @@ gUnknown_80FA8E0: @ 80FA8E0 .global gUnknown_80FA8E4 gUnknown_80FA8E4: @ 80FA8E4 -.string "{ARG_POKEMON_0} recovered from its\n" +.string "{POKEMON_0} recovered from its\n" .string "Whiffer status!\0" .align 2, 0 @@ -4152,7 +4152,7 @@ gUnknown_80FA90C: @ 80FA90C .global gUnknown_80FA910 gUnknown_80FA910: @ 80FA910 -.string "{ARG_POKEMON_0}'s damage returned to normal!\0" +.string "{POKEMON_0}'s damage returned to normal!\0" .align 2, 0 .global gUnknown_80FA934 @@ -4162,7 +4162,7 @@ gUnknown_80FA934: @ 80FA934 .global gUnknown_80FA938 gUnknown_80FA938: @ 80FA938 -.string "{ARG_POKEMON_0} lost its Focus Energy status!\0" +.string "{POKEMON_0} lost its Focus Energy status!\0" .align 2, 0 .global gUnknown_80FA95C @@ -4172,7 +4172,7 @@ gUnknown_80FA95C: @ 80FA95C .global gUnknown_80FA960 gUnknown_80FA960: @ 80FA960 -.string "{ARG_POKEMON_0} is no longer cowering!\0" +.string "{POKEMON_0} is no longer cowering!\0" .align 2, 0 .global gUnknown_80FA97C @@ -4192,7 +4192,7 @@ gUnknown_80FA9A0: @ 80FA9A0 .global gUnknown_80FA9A4 gUnknown_80FA9A4: @ 80FA9A4 -.string "{ARG_POKEMON_0}'s Protect wore off!\0" +.string "{POKEMON_0}'s Protect wore off!\0" .align 2, 0 .global gUnknown_80FA9C0 @@ -4202,7 +4202,7 @@ gUnknown_80FA9C0: @ 80FA9C0 .global gUnknown_80FA9C4 gUnknown_80FA9C4: @ 80FA9C4 -.string "{ARG_POKEMON_0}'s Taunt wore off!\0" +.string "{POKEMON_0}'s Taunt wore off!\0" .align 2, 0 .global gUnknown_80FA9DC @@ -4212,7 +4212,7 @@ gUnknown_80FA9DC: @ 80FA9DC .global gUnknown_80FA9E0 gUnknown_80FA9E0: @ 80FA9E0 -.string "{ARG_POKEMON_0} became visible!\0" +.string "{POKEMON_0} became visible!\0" .align 2, 0 .global gUnknown_80FA9F4 @@ -4222,7 +4222,7 @@ gUnknown_80FA9F4: @ 80FA9F4 .global gUnknown_80FA9F8 gUnknown_80FA9F8: @ 80FA9F8 -.string "{ARG_POKEMON_0} regained sight!\0" +.string "{POKEMON_0} regained sight!\0" .align 2, 0 .global gUnknown_80FAA0C @@ -4232,7 +4232,7 @@ gUnknown_80FAA0C: @ 80FAA0C .global gUnknown_80FAA10 gUnknown_80FAA10: @ 80FAA10 -.string "{ARG_POKEMON_0} can see normally again!\0" +.string "{POKEMON_0} can see normally again!\0" .align 2, 0 .global gUnknown_80FAA2C @@ -4242,7 +4242,7 @@ gUnknown_80FAA2C: @ 80FAA2C .global gUnknown_80FAA30 gUnknown_80FAA30: @ 80FAA30 -.string "{ARG_POKEMON_0} returned to normal!\0" +.string "{POKEMON_0} returned to normal!\0" .align 2, 0 .global gUnknown_80FAA48 @@ -4252,7 +4252,7 @@ gUnknown_80FAA48: @ 80FAA48 .global gUnknown_80FAA4C gUnknown_80FAA4C: @ 80FAA4C -.string "{ARG_POKEMON_0}'s Mirror Coat faded!\0" +.string "{POKEMON_0}'s Mirror Coat faded!\0" .align 2, 0 .global gUnknown_80FAA68 @@ -4262,7 +4262,7 @@ gUnknown_80FAA68: @ 80FAA68 .global gUnknown_80FAA6C gUnknown_80FAA6C: @ 80FAA6C -.string "{ARG_POKEMON_0} gave up on Destiny Bond!\0" +.string "{POKEMON_0} gave up on Destiny Bond!\0" .align 2, 0 .global gUnknown_80FAA8C @@ -4272,7 +4272,7 @@ gUnknown_80FAA8C: @ 80FAA8C .global gUnknown_80FAA90 gUnknown_80FAA90: @ 80FAA90 -.string "{ARG_POKEMON_0} recovered from Encore!\0" +.string "{POKEMON_0} recovered from Encore!\0" .align 2, 0 .global gUnknown_80FAAAC @@ -4282,7 +4282,7 @@ gUnknown_80FAAAC: @ 80FAAAC .global gMonStoppedEnduringMessage gMonStoppedEnduringMessage: @ 80FAAB0 -.string "{ARG_POKEMON_0} stopped enduring!\0" +.string "{POKEMON_0} stopped enduring!\0" .align 2, 0 .global gPtrMonStoppedEnduringMessage @@ -4291,7 +4291,7 @@ gPtrMonStoppedEnduringMessage: @ 80FAAC8 .global gMonMirrorMoveFadedMessage gMonMirrorMoveFadedMessage: @ 80FAACC -.string "{ARG_POKEMON_0}'s Mirror Move faded!\0" +.string "{POKEMON_0}'s Mirror Move faded!\0" .align 2, 0 .global gPtrMonMirrorMoveFadedMessage @@ -4300,7 +4300,7 @@ gPtrMonMirrorMoveFadedMessage: @ 80FAAE8 .global gMonConversion2FailedMessage gMonConversion2FailedMessage: @ 80FAAEC -.string "{ARG_POKEMON_0}'s Conversion 2 faded!\0" +.string "{POKEMON_0}'s Conversion 2 faded!\0" .align 2, 0 .global gPtrMonConversion2FailedMessage @@ -4309,7 +4309,7 @@ gPtrMonConversion2FailedMessage: @ 80FAB08 .global gMonGaveUpVitalThrowMessage gMonGaveUpVitalThrowMessage: @ 80FAB0C -.string "{ARG_POKEMON_0} gave up on Vital Throw!\0" +.string "{POKEMON_0} gave up on Vital Throw!\0" .align 2, 0 .global gPtrMonGaveUpVitalThrowMessage @@ -4318,7 +4318,7 @@ gPtrMonGaveUpVitalThrowMessage: @ 80FAB28 .global gUnknown_80FAB2C gUnknown_80FAB2C: @ 80FAB2C -.string "{ARG_POKEMON_0}'s Mist faded!\0" +.string "{POKEMON_0}'s Mist faded!\0" .align 2, 0 .global gUnknown_80FAB40 @@ -4328,7 +4328,7 @@ gUnknown_80FAB40: @ 80FAB40 .global gUnknown_80FAB44 gUnknown_80FAB44: @ 80FAB44 -.string "{ARG_POKEMON_0}'s appearance returned to\n" +.string "{POKEMON_0}'s appearance returned to\n" .string "normal!\0" .align 2, 0 @@ -4339,7 +4339,7 @@ gUnknown_80FAB6C: @ 80FAB6C .global gUnknown_80FAB70 gUnknown_80FAB70: @ 80FAB70 -.string "{ARG_POKEMON_0} got over its infatuation!\0" +.string "{POKEMON_0} got over its infatuation!\0" .align 2, 0 .global gUnknown_80FAB90 @@ -4349,7 +4349,7 @@ gUnknown_80FAB90: @ 80FAB90 .global gUnknown_80FAB94 gUnknown_80FAB94: @ 80FAB94 -.string "{ARG_POKEMON_0} can't go through walls\n" +.string "{POKEMON_0} can't go through walls\n" .string "anymore!\0" .align 2, 0 @@ -4365,7 +4365,7 @@ gUnknown_80FABC0: @ 80FABC0 .global gUnknown_80FABC4 gUnknown_80FABC4: @ 80FABC4 -.string "{ARG_POKEMON_0}'s rage faded!\0" +.string "{POKEMON_0}'s rage faded!\0" .align 2, 0 .global gUnknown_80FABD8 @@ -4375,7 +4375,7 @@ gUnknown_80FABD8: @ 80FABD8 .global gMonNoLongerPetrifiedMessage gMonNoLongerPetrifiedMessage: @ 80FABDC -.string "{ARG_POKEMON_0} is no longer petrified!\0" +.string "{POKEMON_0} is no longer petrified!\0" .align 2, 0 .global gPtrMonNoLongerPetrifiedMessage @@ -4384,7 +4384,7 @@ gPtrMonNoLongerPetrifiedMessage: @ 80FABF8 .global gMonNoLongerCringingMessage gMonNoLongerCringingMessage: @ 80FABFC -.string "{ARG_POKEMON_0} is no longer cringing!\0" +.string "{POKEMON_0} is no longer cringing!\0" .align 2, 0 .global gPtrMonNoLongerCringingMessage @@ -4393,7 +4393,7 @@ gPtrMonNoLongerCringingMessage: @ 80FAC18 .global gUnknown_80FAC1C gUnknown_80FAC1C: @ 80FAC1C -.string "{ARG_POKEMON_0} is no longer paused!\0" +.string "{POKEMON_0} is no longer paused!\0" .align 2, 0 .global gUnknown_80FAC38 @@ -4403,7 +4403,7 @@ gUnknown_80FAC38: @ 80FAC38 .global gUnknown_80FAC3C gUnknown_80FAC3C: @ 80FAC3C -.string "{ARG_POKEMON_0} readies Razor Wind!\0" +.string "{POKEMON_0} readies Razor Wind!\0" .align 2, 0 .global gUnknown_80FAC54 @@ -4413,7 +4413,7 @@ gUnknown_80FAC54: @ 80FAC54 .global gUnknown_80FAC58 gUnknown_80FAC58: @ 80FAC58 -.string "{ARG_POKEMON_0} began storing energy!\0" +.string "{POKEMON_0} began storing energy!\0" .align 2, 0 .global gUnknown_80FAC74 @@ -4423,7 +4423,7 @@ gUnknown_80FAC74: @ 80FAC74 .global gUnknown_80FAC78 gUnknown_80FAC78: @ 80FAC78 -.string "{ARG_POKEMON_0} is enraged!\0" +.string "{POKEMON_0} is enraged!\0" .align 2, 0 .global gUnknown_80FAC88 @@ -4433,7 +4433,7 @@ gUnknown_80FAC88: @ 80FAC88 .global gUnknown_80FAC8C gUnknown_80FAC8C: @ 80FAC8C -.string "{ARG_POKEMON_0} is focusing energy!\0" +.string "{POKEMON_0} is focusing energy!\0" .align 2, 0 .global gUnknown_80FACA4 @@ -4443,7 +4443,7 @@ gUnknown_80FACA4: @ 80FACA4 .global gUnknown_80FACA8 gUnknown_80FACA8: @ 80FACA8 -.string "{ARG_POKEMON_0} is readying Sky Attack!\0" +.string "{POKEMON_0} is readying Sky Attack!\0" .align 2, 0 .global gUnknown_80FACC4 @@ -4453,7 +4453,7 @@ gUnknown_80FACC4: @ 80FACC4 .global gUnknown_80FACC8 gUnknown_80FACC8: @ 80FACC8 -.string "{ARG_POKEMON_0} is readying Solarbeam!\0" +.string "{POKEMON_0} is readying Solarbeam!\0" .align 2, 0 .global gUnknown_80FACE4 @@ -4463,7 +4463,7 @@ gUnknown_80FACE4: @ 80FACE4 .global gUnknown_80FACE8 gUnknown_80FACE8: @ 80FACE8 -.string "{ARG_POKEMON_0} flew up high!\0" +.string "{POKEMON_0} flew up high!\0" .align 2, 0 .global gUnknown_80FACFC @@ -4473,7 +4473,7 @@ gUnknown_80FACFC: @ 80FACFC .global gUnknown_80FAD00 gUnknown_80FAD00: @ 80FAD00 -.string "{ARG_POKEMON_0} bounced up!\0" +.string "{POKEMON_0} bounced up!\0" .align 2, 0 .global gUnknown_80FAD10 @@ -4483,7 +4483,7 @@ gUnknown_80FAD10: @ 80FAD10 .global gUnknown_80FAD14 gUnknown_80FAD14: @ 80FAD14 -.string "{ARG_POKEMON_0} dove underwater!\0" +.string "{POKEMON_0} dove underwater!\0" .align 2, 0 .global gUnknown_80FAD2C @@ -4493,7 +4493,7 @@ gUnknown_80FAD2C: @ 80FAD2C .global gUnknown_80FAD30 gUnknown_80FAD30: @ 80FAD30 -.string "{ARG_POKEMON_0} burrowed underground!\0" +.string "{POKEMON_0} burrowed underground!\0" .align 2, 0 .global gUnknown_80FAD4C @@ -4503,7 +4503,7 @@ gUnknown_80FAD4C: @ 80FAD4C .global gUnknown_80FAD50 gUnknown_80FAD50: @ 80FAD50 -.string "{ARG_POKEMON_0} began charging power!\0" +.string "{POKEMON_0} began charging power!\0" .align 2, 0 .global gUnknown_80FAD6C @@ -4533,7 +4533,7 @@ gUnknown_80FADB0: @ 80FADB0 .global gUnknown_80FADB4 gUnknown_80FADB4: @ 80FADB4 -.string "{ARG_POKEMON_1} used Flash Fire to absorb\n" +.string "{POKEMON_1} used Flash Fire to absorb\n" .string "fire!\0" .align 2, 0 @@ -4554,7 +4554,7 @@ gUnknown_80FAE00: @ 80FAE00 .global gUnknown_80FAE04 gUnknown_80FAE04: @ 80FAE04 -.string "{ARG_POKEMON_0} began using Wish!\0" +.string "{POKEMON_0} began using Wish!\0" .align 2, 0 .global gUnknown_80FAE1C @@ -4564,7 +4564,7 @@ gUnknown_80FAE1C: @ 80FAE1C .global gUnknown_80FAE20 gUnknown_80FAE20: @ 80FAE20 -.string "{ARG_POKEMON_0} is already using Wish.\0" +.string "{POKEMON_0} is already using Wish.\0" .align 2, 0 .global gUnknown_80FAE3C @@ -4574,7 +4574,7 @@ gUnknown_80FAE3C: @ 80FAE3C .global gUnknown_80FAE40 gUnknown_80FAE40: @ 80FAE40 -.string "{ARG_POKEMON_0} took a leech seed!\0" +.string "{POKEMON_0} took a leech seed!\0" .align 2, 0 .global gUnknown_80FAE58 @@ -4584,7 +4584,7 @@ gUnknown_80FAE58: @ 80FAE58 .global gUnknown_80FAE5C gUnknown_80FAE5C: @ 80FAE5C -.string "{ARG_POKEMON_0} already has a leech seed!\0" +.string "{POKEMON_0} already has a leech seed!\0" .align 2, 0 .global gUnknown_80FAE7C @@ -4644,7 +4644,7 @@ gUnknown_80FAF3C: @ 80FAF3C .global gUnknown_80FAF40 gUnknown_80FAF40: @ 80FAF40 -.string "{ARG_POKEMON_0} put up its magic coat!\0" +.string "{POKEMON_0} put up its magic coat!\0" .align 2, 0 .global gUnknown_80FAF5C @@ -4654,7 +4654,7 @@ gUnknown_80FAF5C: @ 80FAF5C .global gUnknown_80FAF60 gUnknown_80FAF60: @ 80FAF60 -.string "{ARG_POKEMON_0} is already cloaked in its\n" +.string "{POKEMON_0} is already cloaked in its\n" .string "magic coat!\0" .align 2, 0 @@ -4665,7 +4665,7 @@ gUnknown_80FAF8C: @ 80FAF8C .global gUnknown_80FAF90 gUnknown_80FAF90: @ 80FAF90 -.string "{ARG_POKEMON_0} can locate foes now!\0" +.string "{POKEMON_0} can locate foes now!\0" .align 2, 0 .global gUnknown_80FAFAC @@ -4685,7 +4685,7 @@ gUnknown_80FAFD0: @ 80FAFD0 .global gUnknown_80FAFD4 gUnknown_80FAFD4: @ 80FAFD4 -.string "{ARG_POKEMON_0} readies its Skull Bash!\0" +.string "{POKEMON_0} readies its Skull Bash!\0" .align 2, 0 .global gUnknown_80FAFF0 @@ -4695,7 +4695,7 @@ gUnknown_80FAFF0: @ 80FAFF0 .global gUnknown_80FAFF4 gUnknown_80FAFF4: @ 80FAFF4 -.string "{ARG_POKEMON_0} was cursed!\0" +.string "{POKEMON_0} was cursed!\0" .align 2, 0 .global gUnknown_80FB004 @@ -4705,7 +4705,7 @@ gUnknown_80FB004: @ 80FB004 .global gUnknown_80FB008 gUnknown_80FB008: @ 80FB008 -.string "{ARG_POKEMON_0} readied Snatch!\0" +.string "{POKEMON_0} readied Snatch!\0" .align 2, 0 .global gUnknown_80FB01C @@ -4715,7 +4715,7 @@ gUnknown_80FB01C: @ 80FB01C .global gUnknown_80FB020 gUnknown_80FB020: @ 80FB020 -.string "{ARG_POKEMON_0} gained the protection\n" +.string "{POKEMON_0} gained the protection\n" .string "of Safeguard!\0" .align 2, 0 @@ -4726,7 +4726,7 @@ gUnknown_80FB048: @ 80FB048 .global gUnknown_80FB04C gUnknown_80FB04C: @ 80FB04C -.string "{ARG_POKEMON_0} is already protected\n" +.string "{POKEMON_0} is already protected\n" .string "by Safeguard.\0" .align 2, 0 @@ -4737,7 +4737,7 @@ gUnknown_80FB074: @ 80FB074 .global gUnknown_80FB078 gUnknown_80FB078: @ 80FB078 -.string "{ARG_POKEMON_0} gained the protection\n" +.string "{POKEMON_0} gained the protection\n" .string "of Mist!\0" .align 2, 0 @@ -4748,7 +4748,7 @@ gUnknown_80FB09C: @ 80FB09C .global gUnknown_80FB0A0 gUnknown_80FB0A0: @ 80FB0A0 -.string "{ARG_POKEMON_0} is already protected\n" +.string "{POKEMON_0} is already protected\n" .string "by Mist.\0" .align 2, 0 @@ -4759,7 +4759,7 @@ gUnknown_80FB0C4: @ 80FB0C4 .global gUnknown_80FB0C8 gUnknown_80FB0C8: @ 80FB0C8 -.string "{ARG_POKEMON_0} is set to counter!\0" +.string "{POKEMON_0} is set to counter!\0" .align 2, 0 .global gUnknown_80FB0E0 @@ -4769,7 +4769,7 @@ gUnknown_80FB0E0: @ 80FB0E0 .global gUnknown_80FB0E4 gUnknown_80FB0E4: @ 80FB0E4 -.string "{ARG_POKEMON_0} has been waiting to\n" +.string "{POKEMON_0} has been waiting to\n" .string "counterattack!\0" .align 2, 0 @@ -4780,7 +4780,7 @@ gUnknown_80FB10C: @ 80FB10C .global gUnknown_80FB110 gUnknown_80FB110: @ 80FB110 -.string "{ARG_POKEMON_0} put up its light screen!\0" +.string "{POKEMON_0} put up its light screen!\0" .align 2, 0 .global gUnknown_80FB130 @@ -4790,7 +4790,7 @@ gUnknown_80FB130: @ 80FB130 .global gUnknown_80FB134 gUnknown_80FB134: @ 80FB134 -.string "{ARG_POKEMON_0} is already protected\n" +.string "{POKEMON_0} is already protected\n" .string "by Light Screen.\0" .align 2, 0 @@ -4801,7 +4801,7 @@ gUnknown_80FB160: @ 80FB160 .global gUnknown_80FB164 gUnknown_80FB164: @ 80FB164 -.string "{ARG_POKEMON_0} put up its reflect!\0" +.string "{POKEMON_0} put up its reflect!\0" .align 2, 0 .global gUnknown_80FB17C @@ -4811,7 +4811,7 @@ gUnknown_80FB17C: @ 80FB17C .global gUnknown_80FB180 gUnknown_80FB180: @ 80FB180 -.string "{ARG_POKEMON_0} is already protected by\n" +.string "{POKEMON_0} is already protected by\n" .string "Reflect.\0" .align 2, 0 @@ -4822,7 +4822,7 @@ gUnknown_80FB1A8: @ 80FB1A8 .global gUnknown_80FB1AC gUnknown_80FB1AC: @ 80FB1AC -.string "{ARG_POKEMON_0} recovered {ARG_VALUE_0} HP!\0" +.string "{POKEMON_0} recovered {VALUE_0} HP!\0" .align 2, 0 .global gUnknown_80FB1C4 @@ -4832,7 +4832,7 @@ gUnknown_80FB1C4: @ 80FB1C4 .global gUnknown_80FB1C8 gUnknown_80FB1C8: @ 80FB1C8 -.string "{ARG_POKEMON_0} was fully healed!\0" +.string "{POKEMON_0} was fully healed!\0" .align 2, 0 .global gUnknown_80FB1E0 @@ -4842,7 +4842,7 @@ gUnknown_80FB1E0: @ 80FB1E0 .global gUnknown_80FB1E4 gUnknown_80FB1E4: @ 80FB1E4 -.string "{ARG_POKEMON_0}'s HP remained unchanged.\0" +.string "{POKEMON_0}'s HP remained unchanged.\0" .align 2, 0 .global gUnknown_80FB204 @@ -4852,7 +4852,7 @@ gUnknown_80FB204: @ 80FB204 .global gUnknown_80FB208 gUnknown_80FB208: @ 80FB208 -.string "{ARG_POKEMON_0} has full HP.\0" +.string "{POKEMON_0} has full HP.\0" .align 2, 0 .global gUnknown_80FB21C @@ -4862,7 +4862,7 @@ gUnknown_80FB21C: @ 80FB21C .global gUnknown_80FB220 gUnknown_80FB220: @ 80FB220 -.string "{ARG_POKEMON_0}'s max. HP rose by {ARG_VALUE_1}.\0" +.string "{POKEMON_0}'s max. HP rose by {VALUE_1}.\0" .align 2, 0 .global gUnknown_80FB240 @@ -4872,7 +4872,7 @@ gUnknown_80FB240: @ 80FB240 .global gUnknown_80FB244 gUnknown_80FB244: @ 80FB244 -.string "{ARG_POKEMON_0} became confused!\0" +.string "{POKEMON_0} became confused!\0" .align 2, 0 .global gUnknown_80FB25C @@ -4882,7 +4882,7 @@ gUnknown_80FB25C: @ 80FB25C .global gUnknown_80FB260 gUnknown_80FB260: @ 80FB260 -.string "{ARG_POKEMON_0} is already confused!\0" +.string "{POKEMON_0} is already confused!\0" .align 2, 0 .global gUnknown_80FB27C @@ -4892,7 +4892,7 @@ gUnknown_80FB27C: @ 80FB27C .global gUnknown_80FB280 gUnknown_80FB280: @ 80FB280 -.string "{ARG_POKEMON_0} became paralyzed!\n" +.string "{POKEMON_0} became paralyzed!\n" .string "It can't attack!\0" .align 2, 0 @@ -4903,7 +4903,7 @@ gUnknown_80FB2AC: @ 80FB2AC .global gUnknown_80FB2B0 gUnknown_80FB2B0: @ 80FB2B0 -.string "{ARG_POKEMON_0} is already paralyzed!\0" +.string "{POKEMON_0} is already paralyzed!\0" .align 2, 0 .global gUnknown_80FB2CC @@ -4913,7 +4913,7 @@ gUnknown_80FB2CC: @ 80FB2CC .global gUnknown_80FB2D0 gUnknown_80FB2D0: @ 80FB2D0 -.string "{ARG_POKEMON_0} cringed!\0" +.string "{POKEMON_0} cringed!\0" .align 2, 0 .global gUnknown_80FB2E0 @@ -4923,7 +4923,7 @@ gUnknown_80FB2E0: @ 80FB2E0 .global gUnknown_80FB2E4 gUnknown_80FB2E4: @ 80FB2E4 -.string "{ARG_POKEMON_0} is already cringing!\0" +.string "{POKEMON_0} is already cringing!\0" .align 2, 0 .global gUnknown_80FB300 @@ -4933,7 +4933,7 @@ gUnknown_80FB300: @ 80FB300 .global gUnknown_80FB304 gUnknown_80FB304: @ 80FB304 -.string "{ARG_POKEMON_0} fell asleep!\0" +.string "{POKEMON_0} fell asleep!\0" .align 2, 0 .global gUnknown_80FB318 @@ -4948,7 +4948,7 @@ gUnknown_80FB31C: @ 80FB31C .global gUnknown_80FB320 gUnknown_80FB320: @ 80FB320 -.string "{ARG_POKEMON_0} is already asleep!\0" +.string "{POKEMON_0} is already asleep!\0" .align 2, 0 .global gUnknown_80FB338 @@ -4958,7 +4958,7 @@ gUnknown_80FB338: @ 80FB338 .global gUnknown_80FB33C gUnknown_80FB33C: @ 80FB33C -.string "{ARG_POKEMON_0} is locked in a nightmare!\0" +.string "{POKEMON_0} is locked in a nightmare!\0" .align 2, 0 .global gUnknown_80FB35C @@ -4973,7 +4973,7 @@ gUnknown_80FB360: @ 80FB360 .global gUnknown_80FB364 gUnknown_80FB364: @ 80FB364 -.string "{ARG_POKEMON_0} didn't become drowsy!\0" +.string "{POKEMON_0} didn't become drowsy!\0" .align 2, 0 .global gUnknown_80FB380 @@ -4993,7 +4993,7 @@ gUnknown_80FB388: @ 80FB388 .global gUnknown_80FB38C gUnknown_80FB38C: @ 80FB38C -.string "{ARG_POKEMON_0} had a nightmare!\0" +.string "{POKEMON_0} had a nightmare!\0" .align 2, 0 .global gUnknown_80FB3A4 @@ -5003,7 +5003,7 @@ gUnknown_80FB3A4: @ 80FB3A4 .global gUnknown_80FB3A8 gUnknown_80FB3A8: @ 80FB3A8 -.string "{ARG_POKEMON_0} is already having\n" +.string "{POKEMON_0} is already having\n" .string "a nightmare!\0" .align 2, 0 @@ -5019,7 +5019,7 @@ gUnknown_80FB3D0: @ 80FB3D0 .global gUnknown_80FB3D4 gUnknown_80FB3D4: @ 80FB3D4 -.string "{ARG_POKEMON_0} yawned!\0" +.string "{POKEMON_0} yawned!\0" .align 2, 0 .global gUnknown_80FB3E0 @@ -5029,7 +5029,7 @@ gUnknown_80FB3E0: @ 80FB3E0 .global gUnknown_80FB3E4 gUnknown_80FB3E4: @ 80FB3E4 -.string "{ARG_POKEMON_0} didn't yawn!\0" +.string "{POKEMON_0} didn't yawn!\0" .align 2, 0 .global gUnknown_80FB3F8 @@ -5039,7 +5039,7 @@ gUnknown_80FB3F8: @ 80FB3F8 .global gUnknown_80FB3FC gUnknown_80FB3FC: @ 80FB3FC -.string "{ARG_POKEMON_0} is already yawning!\0" +.string "{POKEMON_0} is already yawning!\0" .align 2, 0 .global gUnknown_80FB414 @@ -5059,7 +5059,7 @@ gUnknown_80FB41C: @ 80FB41C .global gUnknown_80FB420 gUnknown_80FB420: @ 80FB420 -.string "{ARG_POKEMON_0} is already sleepless!\0" +.string "{POKEMON_0} is already sleepless!\0" .align 2, 0 .global gUnknown_80FB43C @@ -5069,7 +5069,7 @@ gUnknown_80FB43C: @ 80FB43C .global gUnknown_80FB440 gUnknown_80FB440: @ 80FB440 -.string "{ARG_POKEMON_0} became sleepless!\0" +.string "{POKEMON_0} became sleepless!\0" .align 2, 0 .global gUnknown_80FB458 @@ -5079,7 +5079,7 @@ gUnknown_80FB458: @ 80FB458 .global gUnknown_80FB45C gUnknown_80FB45C: @ 80FB45C -.string "{ARG_POKEMON_0} can't move on the next turn!\0" +.string "{POKEMON_0} can't move on the next turn!\0" .align 2, 0 .global gUnknown_80FB480 @@ -5089,7 +5089,7 @@ gUnknown_80FB480: @ 80FB480 .global gUnknown_80FB484 gUnknown_80FB484: @ 80FB484 -.string "{ARG_POKEMON_0} already can't move on\n" +.string "{POKEMON_0} already can't move on\n" .string "the next turn!\0" .align 2, 0 @@ -5100,7 +5100,7 @@ gUnknown_80FB4B0: @ 80FB4B0 .global gUnknown_80FB4B4 gUnknown_80FB4B4: @ 80FB4B4 -.string "{ARG_POKEMON_0} can't move for a while!\0" +.string "{POKEMON_0} can't move for a while!\0" .align 2, 0 .global gUnknown_80FB4D4 @@ -5110,7 +5110,7 @@ gUnknown_80FB4D4: @ 80FB4D4 .global gUnknown_80FB4D8 gUnknown_80FB4D8: @ 80FB4D8 -.string "{ARG_POKEMON_0} is already paused!\0" +.string "{POKEMON_0} is already paused!\0" .align 2, 0 .global gUnknown_80FB4F0 @@ -5120,7 +5120,7 @@ gUnknown_80FB4F0: @ 80FB4F0 .global gUnknown_80FB4F4 gUnknown_80FB4F4: @ 80FB4F4 -.string "{ARG_POKEMON_0} became infatuated!\0" +.string "{POKEMON_0} became infatuated!\0" .align 2, 0 .global gUnknown_80FB50C @@ -5130,7 +5130,7 @@ gUnknown_80FB50C: @ 80FB50C .global gUnknown_80FB510 gUnknown_80FB510: @ 80FB510 -.string "{ARG_POKEMON_0} is already infatuated!\0" +.string "{POKEMON_0} is already infatuated!\0" .align 2, 0 .global gUnknown_80FB52C @@ -5140,7 +5140,7 @@ gUnknown_80FB52C: @ 80FB52C .global gUnknown_80FB530 gUnknown_80FB530: @ 80FB530 -.string "{ARG_POKEMON_0} sustained a burn!\0" +.string "{POKEMON_0} sustained a burn!\0" .align 2, 0 .global gUnknown_80FB548 @@ -5150,7 +5150,7 @@ gUnknown_80FB548: @ 80FB548 .global gUnknown_80FB54C gUnknown_80FB54C: @ 80FB54C -.string "{ARG_POKEMON_0} already has a burn!\0" +.string "{POKEMON_0} already has a burn!\0" .align 2, 0 .global gUnknown_80FB564 @@ -5170,7 +5170,7 @@ gUnknown_80FB580: @ 80FB580 .global gUnknown_80FB584 gUnknown_80FB584: @ 80FB584 -.string "{ARG_POKEMON_0} was poisoned!\0" +.string "{POKEMON_0} was poisoned!\0" .align 2, 0 .global gUnknown_80FB598 @@ -5180,7 +5180,7 @@ gUnknown_80FB598: @ 80FB598 .global gUnknown_80FB59C gUnknown_80FB59C: @ 80FB59C -.string "{ARG_POKEMON_0} was badly poisoned!\0" +.string "{POKEMON_0} was badly poisoned!\0" .align 2, 0 .global gUnknown_80FB5B4 @@ -5190,7 +5190,7 @@ gUnknown_80FB5B4: @ 80FB5B4 .global gUnknown_80FB5B8 gUnknown_80FB5B8: @ 80FB5B8 -.string "{ARG_POKEMON_0} is already poisoned!\0" +.string "{POKEMON_0} is already poisoned!\0" .align 2, 0 .global gUnknown_80FB5D4 @@ -5200,7 +5200,7 @@ gUnknown_80FB5D4: @ 80FB5D4 .global gUnknown_80FB5D8 gUnknown_80FB5D8: @ 80FB5D8 -.string "{ARG_POKEMON_0} is already badly poisoned!\0" +.string "{POKEMON_0} is already badly poisoned!\0" .align 2, 0 .global gUnknown_80FB5F8 @@ -5210,7 +5210,7 @@ gUnknown_80FB5F8: @ 80FB5F8 .global gUnknown_80FB5FC gUnknown_80FB5FC: @ 80FB5FC -.string "{ARG_POKEMON_0} became frozen!\0" +.string "{POKEMON_0} became frozen!\0" .align 2, 0 .global gUnknown_80FB610 @@ -5220,7 +5220,7 @@ gUnknown_80FB610: @ 80FB610 .global gUnknown_80FB614 gUnknown_80FB614: @ 80FB614 -.string "{ARG_POKEMON_0} was squeezed!\0" +.string "{POKEMON_0} was squeezed!\0" .align 2, 0 .global gUnknown_80FB628 @@ -5230,7 +5230,7 @@ gUnknown_80FB628: @ 80FB628 .global gUnknown_80FB62C gUnknown_80FB62C: @ 80FB62C -.string "{ARG_POKEMON_0} is already being squeezed!\0" +.string "{POKEMON_0} is already being squeezed!\0" .align 2, 0 .global gUnknown_80FB64C @@ -5240,7 +5240,7 @@ gUnknown_80FB64C: @ 80FB64C .global gUnknown_80FB650 gUnknown_80FB650: @ 80FB650 -.string "{ARG_POKEMON_0} became immobilized!\0" +.string "{POKEMON_0} became immobilized!\0" .align 2, 0 .global gUnknown_80FB668 @@ -5250,7 +5250,7 @@ gUnknown_80FB668: @ 80FB668 .global gUnknown_80FB66C gUnknown_80FB66C: @ 80FB66C -.string "{ARG_POKEMON_0} is already immobilized!\0" +.string "{POKEMON_0} is already immobilized!\0" .align 2, 0 .global gUnknown_80FB688 @@ -5260,7 +5260,7 @@ gUnknown_80FB688: @ 80FB688 .global gUnknown_80FB68C gUnknown_80FB68C: @ 80FB68C -.string "{ARG_POKEMON_0} put down its roots!\0" +.string "{POKEMON_0} put down its roots!\0" .align 2, 0 .global gUnknown_80FB6A4 @@ -5270,7 +5270,7 @@ gUnknown_80FB6A4: @ 80FB6A4 .global gUnknown_80FB6A8 gUnknown_80FB6A8: @ 80FB6A8 -.string "{ARG_POKEMON_0} is already rooted!\0" +.string "{POKEMON_0} is already rooted!\0" .align 2, 0 .global gUnknown_80FB6C0 @@ -5280,7 +5280,7 @@ gUnknown_80FB6C0: @ 80FB6C0 .global gUnknown_80FB6C4 gUnknown_80FB6C4: @ 80FB6C4 -.string "{ARG_POKEMON_0} became wrapped!\0" +.string "{POKEMON_0} became wrapped!\0" .align 2, 0 .global gUnknown_80FB6D8 @@ -5290,7 +5290,7 @@ gUnknown_80FB6D8: @ 80FB6D8 .global gUnknown_80FB6DC gUnknown_80FB6DC: @ 80FB6DC -.string "{ARG_POKEMON_0} has a foe wrapped already!\0" +.string "{POKEMON_0} has a foe wrapped already!\0" .align 2, 0 .global gUnknown_80FB6FC @@ -5300,7 +5300,7 @@ gUnknown_80FB6FC: @ 80FB6FC .global gUnknown_80FB700 gUnknown_80FB700: @ 80FB700 -.string "{ARG_POKEMON_0} is already wrapped!\0" +.string "{POKEMON_0} is already wrapped!\0" .align 2, 0 .global gUnknown_80FB718 @@ -5310,7 +5310,7 @@ gUnknown_80FB718: @ 80FB718 .global gUnknown_80FB71C gUnknown_80FB71C: @ 80FB71C -.string "{ARG_POKEMON_0} attained Sure Shot status!\0" +.string "{POKEMON_0} attained Sure Shot status!\0" .align 2, 0 .global gUnknown_80FB73C @@ -5320,7 +5320,7 @@ gUnknown_80FB73C: @ 80FB73C .global gUnknown_80FB740 gUnknown_80FB740: @ 80FB740 -.string "{ARG_POKEMON_0} already has Sure Shot\n" +.string "{POKEMON_0} already has Sure Shot\n" .string "status!\0" .align 2, 0 @@ -5331,7 +5331,7 @@ gUnknown_80FB764: @ 80FB764 .global gUnknown_80FB768 gUnknown_80FB768: @ 80FB768 -.string "{ARG_POKEMON_0} became a whiffer!\0" +.string "{POKEMON_0} became a whiffer!\0" .align 2, 0 .global gUnknown_80FB780 @@ -5341,7 +5341,7 @@ gUnknown_80FB780: @ 80FB780 .global gUnknown_80FB784 gUnknown_80FB784: @ 80FB784 -.string "{ARG_POKEMON_0} is already a whiffer!\0" +.string "{POKEMON_0} is already a whiffer!\0" .align 2, 0 .global gUnknown_80FB7A0 @@ -5351,7 +5351,7 @@ gUnknown_80FB7A0: @ 80FB7A0 .global gUnknown_80FB7A4 gUnknown_80FB7A4: @ 80FB7A4 -.string "{ARG_POKEMON_0} became petrified!\0" +.string "{POKEMON_0} became petrified!\0" .align 2, 0 .global gUnknown_80FB7BC @@ -5361,7 +5361,7 @@ gUnknown_80FB7BC: @ 80FB7BC .global gUnknown_80FB7C0 gUnknown_80FB7C0: @ 80FB7C0 -.string "{ARG_POKEMON_0} is already petrified!\0" +.string "{POKEMON_0} is already petrified!\0" .align 2, 0 .global gUnknown_80FB7DC @@ -5371,7 +5371,7 @@ gUnknown_80FB7DC: @ 80FB7DC .global gUnknown_80FB7E0 gUnknown_80FB7E0: @ 80FB7E0 -.string "{ARG_POKEMON_0} was blinded!\0" +.string "{POKEMON_0} was blinded!\0" .align 2, 0 .global gUnknown_80FB7F4 @@ -5381,7 +5381,7 @@ gUnknown_80FB7F4: @ 80FB7F4 .global gUnknown_80FB7F8 gUnknown_80FB7F8: @ 80FB7F8 -.string "{ARG_POKEMON_0} is already blinded!\0" +.string "{POKEMON_0} is already blinded!\0" .align 2, 0 .global gUnknown_80FB810 @@ -5391,7 +5391,7 @@ gUnknown_80FB810: @ 80FB810 .global gUnknown_80FB814 gUnknown_80FB814: @ 80FB814 -.string "{ARG_POKEMON_0}'s vision turned weird!\0" +.string "{POKEMON_0}'s vision turned weird!\0" .align 2, 0 .global gUnknown_80FB834 @@ -5401,7 +5401,7 @@ gUnknown_80FB834: @ 80FB834 .global gUnknown_80FB838 gUnknown_80FB838: @ 80FB838 -.string "{ARG_POKEMON_0}'s vision is already weird!\0" +.string "{POKEMON_0}'s vision is already weird!\0" .align 2, 0 .global gUnknown_80FB85C @@ -5411,7 +5411,7 @@ gUnknown_80FB85C: @ 80FB85C .global gUnknown_80FB860 gUnknown_80FB860: @ 80FB860 -.string "{ARG_POKEMON_0}'s vision was restored!\0" +.string "{POKEMON_0}'s vision was restored!\0" .align 2, 0 .global gUnknown_80FB880 @@ -5421,7 +5421,7 @@ gUnknown_80FB880: @ 80FB880 .global gUnknown_80FB884 gUnknown_80FB884: @ 80FB884 -.string "{ARG_POKEMON_0}'s vision is fine!\0" +.string "{POKEMON_0}'s vision is fine!\0" .align 2, 0 .global gUnknown_80FB89C @@ -5431,7 +5431,7 @@ gUnknown_80FB89C: @ 80FB89C .global gUnknown_80FB8A0 gUnknown_80FB8A0: @ 80FB8A0 -.string "{ARG_POKEMON_0}'s damage was fixed!\0" +.string "{POKEMON_0}'s damage was fixed!\0" .align 2, 0 .global gUnknown_80FB8BC @@ -5441,7 +5441,7 @@ gUnknown_80FB8BC: @ 80FB8BC .global gUnknown_80FB8C0 gUnknown_80FB8C0: @ 80FB8C0 -.string "{ARG_POKEMON_0}'s damage is already fixed!\0" +.string "{POKEMON_0}'s damage is already fixed!\0" .align 2, 0 .global gUnknown_80FB8E4 @@ -5451,7 +5451,7 @@ gUnknown_80FB8E4: @ 80FB8E4 .global gUnknown_80FB8E8 gUnknown_80FB8E8: @ 80FB8E8 -.string "{ARG_POKEMON_0} is getting pumped!\0" +.string "{POKEMON_0} is getting pumped!\0" .align 2, 0 .global gUnknown_80FB900 @@ -5461,7 +5461,7 @@ gUnknown_80FB900: @ 80FB900 .global gUnknown_80FB904 gUnknown_80FB904: @ 80FB904 -.string "{ARG_POKEMON_0} is already getting pumped!\0" +.string "{POKEMON_0} is already getting pumped!\0" .align 2, 0 .global gUnknown_80FB924 @@ -5471,7 +5471,7 @@ gUnknown_80FB924: @ 80FB924 .global gUnknown_80FB928 gUnknown_80FB928: @ 80FB928 -.string "{ARG_POKEMON_0} cowered in fear!\0" +.string "{POKEMON_0} cowered in fear!\0" .align 2, 0 .global gUnknown_80FB940 @@ -5481,7 +5481,7 @@ gUnknown_80FB940: @ 80FB940 .global gUnknown_80FB944 gUnknown_80FB944: @ 80FB944 -.string "{ARG_POKEMON_0} is already cowering!\0" +.string "{POKEMON_0} is already cowering!\0" .align 2, 0 .global gUnknown_80FB960 @@ -5491,7 +5491,7 @@ gUnknown_80FB960: @ 80FB960 .global gUnknown_80FB964 gUnknown_80FB964: @ 80FB964 -.string "{ARG_POKEMON_0} became a decoy!\0" +.string "{POKEMON_0} became a decoy!\0" .align 2, 0 .global gUnknown_80FB978 @@ -5501,7 +5501,7 @@ gUnknown_80FB978: @ 80FB978 .global gUnknown_80FB97C gUnknown_80FB97C: @ 80FB97C -.string "{ARG_POKEMON_0} is already a decoy!\0" +.string "{POKEMON_0} is already a decoy!\0" .align 2, 0 .global gUnknown_80FB994 @@ -5511,7 +5511,7 @@ gUnknown_80FB994: @ 80FB994 .global gUnknown_80FB998 gUnknown_80FB998: @ 80FB998 -.string "{ARG_POKEMON_0} protected itself!\0" +.string "{POKEMON_0} protected itself!\0" .align 2, 0 .global gUnknown_80FB9B0 @@ -5521,7 +5521,7 @@ gUnknown_80FB9B0: @ 80FB9B0 .global gUnknown_80FB9B4 gUnknown_80FB9B4: @ 80FB9B4 -.string "{ARG_POKEMON_0} is already protecting itself!\0" +.string "{POKEMON_0} is already protecting itself!\0" .align 2, 0 .global gUnknown_80FB9D8 @@ -5531,7 +5531,7 @@ gUnknown_80FB9D8: @ 80FB9D8 .global gUnknown_80FB9DC gUnknown_80FB9DC: @ 80FB9DC -.string "{ARG_POKEMON_0} was taunted!\0" +.string "{POKEMON_0} was taunted!\0" .align 2, 0 .global gUnknown_80FB9F0 @@ -5541,7 +5541,7 @@ gUnknown_80FB9F0: @ 80FB9F0 .global gUnknown_80FB9F4 gUnknown_80FB9F4: @ 80FB9F4 -.string "{ARG_POKEMON_0} has been taunted already!\0" +.string "{POKEMON_0} has been taunted already!\0" .align 2, 0 .global gUnknown_80FBA14 @@ -5551,7 +5551,7 @@ gUnknown_80FBA14: @ 80FBA14 .global gUnknown_80FBA18 gUnknown_80FBA18: @ 80FBA18 -.string "{ARG_POKEMON_0} stored power {ARG_VALUE_0} time(s)!\0" +.string "{POKEMON_0} stored power {VALUE_0} time(s)!\0" .align 2, 0 .global gUnknown_80FBA38 @@ -5561,7 +5561,7 @@ gUnknown_80FBA38: @ 80FBA38 .global gUnknown_80FBA3C gUnknown_80FBA3C: @ 80FBA3C -.string "{ARG_POKEMON_0} can't store any more power!\0" +.string "{POKEMON_0} can't store any more power!\0" .align 2, 0 .global gUnknown_80FBA60 @@ -5571,7 +5571,7 @@ gUnknown_80FBA60: @ 80FBA60 .global gUnknown_80FBA64 gUnknown_80FBA64: @ 80FBA64 -.string "{ARG_POKEMON_0} disappeared from view!\0" +.string "{POKEMON_0} disappeared from view!\0" .align 2, 0 .global gUnknown_80FBA80 @@ -5581,7 +5581,7 @@ gUnknown_80FBA80: @ 80FBA80 .global gUnknown_80FBA84 gUnknown_80FBA84: @ 80FBA84 -.string "{ARG_POKEMON_0} is invisible already!\0" +.string "{POKEMON_0} is invisible already!\0" .align 2, 0 .global gUnknown_80FBAA0 @@ -5591,7 +5591,7 @@ gUnknown_80FBAA0: @ 80FBAA0 .global gUnknown_80FBAA4 gUnknown_80FBAA4: @ 80FBAA4 -.string "{ARG_POKEMON_0} put up its mirror coat!\0" +.string "{POKEMON_0} put up its mirror coat!\0" .align 2, 0 .global gUnknown_80FBAC0 @@ -5601,7 +5601,7 @@ gUnknown_80FBAC0: @ 80FBAC0 .global gUnknown_80FBAC4 gUnknown_80FBAC4: @ 80FBAC4 -.string "{ARG_POKEMON_0} already has a mirror coat!\0" +.string "{POKEMON_0} already has a mirror coat!\0" .align 2, 0 .global gUnknown_80FBAE4 @@ -5611,7 +5611,7 @@ gUnknown_80FBAE4: @ 80FBAE4 .global gUnknown_80FBAE8 gUnknown_80FBAE8: @ 80FBAE8 -.string "{ARG_POKEMON_0} heard the perish song!\0" +.string "{POKEMON_0} heard the perish song!\0" .align 2, 0 .global gUnknown_80FBB04 @@ -5621,7 +5621,7 @@ gUnknown_80FBB04: @ 80FBB04 .global gUnknown_80FBB08 gUnknown_80FBB08: @ 80FBB08 -.string "{ARG_POKEMON_0} already heard that song!\0" +.string "{POKEMON_0} already heard that song!\0" .align 2, 0 .global gUnknown_80FBB28 @@ -5631,7 +5631,7 @@ gUnknown_80FBB28: @ 80FBB28 .global gUnknown_80FBB2C gUnknown_80FBB2C: @ 80FBB2C -.string "{ARG_POKEMON_0} readied its Destiny Bond!\0" +.string "{POKEMON_0} readied its Destiny Bond!\0" .align 2, 0 .global gUnknown_80FBB4C @@ -5641,7 +5641,7 @@ gUnknown_80FBB4C: @ 80FBB4C .global gUnknown_80FBB50 gUnknown_80FBB50: @ 80FBB50 -.string "{ARG_POKEMON_0} already has Destiny Bond\n" +.string "{POKEMON_0} already has Destiny Bond\n" .string "readied!\0" .align 2, 0 @@ -5652,7 +5652,7 @@ gUnknown_80FBB78: @ 80FBB78 .global gUnknown_80FBB7C gUnknown_80FBB7C: @ 80FBB7C -.string "{ARG_POKEMON_0} earned an encore!\0" +.string "{POKEMON_0} earned an encore!\0" .align 2, 0 .global gUnknown_80FBB94 @@ -5662,7 +5662,7 @@ gUnknown_80FBB94: @ 80FBB94 .global gUnknown_80FBB98 gUnknown_80FBB98: @ 80FBB98 -.string "{ARG_POKEMON_0} is already doing encores!\0" +.string "{POKEMON_0} is already doing encores!\0" .align 2, 0 .global gUnknown_80FBBB8 @@ -5672,7 +5672,7 @@ gUnknown_80FBBB8: @ 80FBBB8 .global gUnknown_80FBBBC gUnknown_80FBBBC: @ 80FBBBC -.string "{ARG_POKEMON_0} won't do encores!\0" +.string "{POKEMON_0} won't do encores!\0" .align 2, 0 .global gUnknown_80FBBD4 @@ -5682,7 +5682,7 @@ gUnknown_80FBBD4: @ 80FBBD4 .global gUnknown_80FBBD8 gUnknown_80FBBD8: @ 80FBBD8 -.string "{ARG_POKEMON_0} is set to endure!\0" +.string "{POKEMON_0} is set to endure!\0" .align 2, 0 .global gUnknown_80FBBF0 @@ -5692,7 +5692,7 @@ gUnknown_80FBBF0: @ 80FBBF0 .global gUnknown_80FBBF4 gUnknown_80FBBF4: @ 80FBBF4 -.string "{ARG_POKEMON_0} is already set to endure!\0" +.string "{POKEMON_0} is already set to endure!\0" .align 2, 0 .global gUnknown_80FBC14 @@ -5702,7 +5702,7 @@ gUnknown_80FBC14: @ 80FBC14 .global gUnknown_80FBC18 gUnknown_80FBC18: @ 80FBC18 -.string "{ARG_POKEMON_0} readied its Mirror Move!\0" +.string "{POKEMON_0} readied its Mirror Move!\0" .align 2, 0 .global gUnknown_80FBC38 @@ -5712,7 +5712,7 @@ gUnknown_80FBC38: @ 80FBC38 .global gUnknown_80FBC3C gUnknown_80FBC3C: @ 80FBC3C -.string "{ARG_POKEMON_0} already used Mirror Move!\0" +.string "{POKEMON_0} already used Mirror Move!\0" .align 2, 0 .global gUnknown_80FBC5C @@ -5722,7 +5722,7 @@ gUnknown_80FBC5C: @ 80FBC5C .global gUnknown_80FBC60 gUnknown_80FBC60: @ 80FBC60 -.string "{ARG_POKEMON_0} has Conversion 2 up!\0" +.string "{POKEMON_0} has Conversion 2 up!\0" .align 2, 0 .global gUnknown_80FBC7C @@ -5732,7 +5732,7 @@ gUnknown_80FBC7C: @ 80FBC7C .global gUnknown_80FBC80 gUnknown_80FBC80: @ 80FBC80 -.string "{ARG_POKEMON_0} already has Conversion 2 up!\0" +.string "{POKEMON_0} already has Conversion 2 up!\0" .align 2, 0 .global gUnknown_80FBCA4 @@ -5742,7 +5742,7 @@ gUnknown_80FBCA4: @ 80FBCA4 .global gUnknown_80FBCA8 gUnknown_80FBCA8: @ 80FBCA8 -.string "{ARG_POKEMON_0} readied its Vital Throw!\0" +.string "{POKEMON_0} readied its Vital Throw!\0" .align 2, 0 .global gUnknown_80FBCC8 @@ -5752,7 +5752,7 @@ gUnknown_80FBCC8: @ 80FBCC8 .global gUnknown_80FBCCC gUnknown_80FBCCC: @ 80FBCCC -.string "{ARG_POKEMON_0} is already set for\n" +.string "{POKEMON_0} is already set for\n" .string "Vital Throw!\0" .align 2, 0 @@ -5763,7 +5763,7 @@ gUnknown_80FBCF0: @ 80FBCF0 .global gUnknown_80FBCF4 gUnknown_80FBCF4: @ 80FBCF4 -.string "{ARG_POKEMON_0}'s stats returned to normal.\0" +.string "{POKEMON_0}'s stats returned to normal.\0" .align 2, 0 .global gUnknown_80FBD18 @@ -5773,7 +5773,7 @@ gUnknown_80FBD18: @ 80FBD18 .global gUnknown_80FBD1C gUnknown_80FBD1C: @ 80FBD1C -.string "{ARG_POKEMON_0}'s stats appear unchanged.\0" +.string "{POKEMON_0}'s stats appear unchanged.\0" .align 2, 0 .global gUnknown_80FBD3C @@ -5793,7 +5793,7 @@ gUnknown_80FBD58: @ 80FBD58 .global gUnknown_80FBD5C gUnknown_80FBD5C: @ 80FBD5C -.string "{ARG_POKEMON_0}'s Belly went down.\0" +.string "{POKEMON_0}'s Belly went down.\0" .align 2, 0 .global gUnknown_80FBD78 @@ -5803,7 +5803,7 @@ gUnknown_80FBD78: @ 80FBD78 .global gUnknown_80FBD7C gUnknown_80FBD7C: @ 80FBD7C -.string "{ARG_POKEMON_0}'s max. Belly size shrank!\0" +.string "{POKEMON_0}'s max. Belly size shrank!\0" .align 2, 0 .global gUnknown_80FBD9C @@ -5813,7 +5813,7 @@ gUnknown_80FBD9C: @ 80FBD9C .global gUnknown_80FBDA0 gUnknown_80FBDA0: @ 80FBDA0 -.string "{ARG_POKEMON_0}'s max. Belly size increased!\0" +.string "{POKEMON_0}'s max. Belly size increased!\0" .align 2, 0 .global gUnknown_80FBDC4 @@ -5823,7 +5823,7 @@ gUnknown_80FBDC4: @ 80FBDC4 .global gUnknown_80FBDC8 gUnknown_80FBDC8: @ 80FBDC8 -.string "{ARG_POKEMON_0}'s Belly won't get any bigger!\0" +.string "{POKEMON_0}'s Belly won't get any bigger!\0" .align 2, 0 .global gUnknown_80FBDF0 @@ -5833,7 +5833,7 @@ gUnknown_80FBDF0: @ 80FBDF0 .global gUnknown_80FBDF4 gUnknown_80FBDF4: @ 80FBDF4 -.string "{ARG_POKEMON_0}'s Belly didn't change!\0" +.string "{POKEMON_0}'s Belly didn't change!\0" .align 2, 0 .global gUnknown_80FBE14 @@ -5843,7 +5843,7 @@ gUnknown_80FBE14: @ 80FBE14 .global gUnknown_80FBE18 gUnknown_80FBE18: @ 80FBE18 -.string "{ARG_POKEMON_0}'s Belly size didn't change!\0" +.string "{POKEMON_0}'s Belly size didn't change!\0" .align 2, 0 .global gUnknown_80FBE3C @@ -5858,7 +5858,7 @@ gUnknown_80FBE40: @ 80FBE40 .global gUnknown_80FBE44 gUnknown_80FBE44: @ 80FBE44 -.string "{ARG_POKEMON_0}'s Belly filled up full!\0" +.string "{POKEMON_0}'s Belly filled up full!\0" .align 2, 0 .global gUnknown_80FBE64 @@ -5868,7 +5868,7 @@ gUnknown_80FBE64: @ 80FBE64 .global gUnknown_80FBE68 gUnknown_80FBE68: @ 80FBE68 -.string "{ARG_POKEMON_0}'s Belly was filled!\0" +.string "{POKEMON_0}'s Belly was filled!\0" .align 2, 0 .global gUnknown_80FBE84 @@ -5878,7 +5878,7 @@ gUnknown_80FBE84: @ 80FBE84 .global gUnknown_80FBE88 gUnknown_80FBE88: @ 80FBE88 -.string "{ARG_POKEMON_0}'s Belly dropped!\0" +.string "{POKEMON_0}'s Belly dropped!\0" .align 2, 0 .global gUnknown_80FBEA0 @@ -5888,8 +5888,8 @@ gUnknown_80FBEA0: @ 80FBEA0 .global gUnknown_80FBEA4 gUnknown_80FBEA4: @ 80FBEA4 -.string "{ARG_POKEMON_0} transformed into\n" -.string "{ARG_POKEMON_1}!\0" +.string "{POKEMON_0} transformed into\n" +.string "{POKEMON_1}!\0" .align 2, 0 .global gUnknown_80FBEC0 @@ -5899,7 +5899,7 @@ gUnknown_80FBEC0: @ 80FBEC0 .global gUnknown_80FBEC4 gUnknown_80FBEC4: @ 80FBEC4 -.string "{ARG_POKEMON_0}'s transformation failed!\0" +.string "{POKEMON_0}'s transformation failed!\0" .align 2, 0 .global gUnknown_80FBEE4 @@ -5909,7 +5909,7 @@ gUnknown_80FBEE4: @ 80FBEE4 .global gUnknown_80FBEE8 gUnknown_80FBEE8: @ 80FBEE8 -.string "{ARG_POKEMON_0} is already transformed.\0" +.string "{POKEMON_0} is already transformed.\0" .align 2, 0 .global gUnknown_80FBF04 @@ -5919,7 +5919,7 @@ gUnknown_80FBF04: @ 80FBF04 .global gUnknown_80FBF08 gUnknown_80FBF08: @ 80FBF08 -.string "{ARG_POKEMON_0} can go through walls now!\0" +.string "{POKEMON_0} can go through walls now!\0" .align 2, 0 .global gUnknown_80FBF28 @@ -5929,7 +5929,7 @@ gUnknown_80FBF28: @ 80FBF28 .global gUnknown_80FBF2C gUnknown_80FBF2C: @ 80FBF2C -.string "{ARG_POKEMON_0} can already go through walls!\0" +.string "{POKEMON_0} can already go through walls!\0" .align 2, 0 .global gUnknown_80FBF50 @@ -5939,7 +5939,7 @@ gUnknown_80FBF50: @ 80FBF50 .global gUnknown_80FBF54 gUnknown_80FBF54: @ 80FBF54 -.string "{ARG_POKEMON_0} became muzzled!\0" +.string "{POKEMON_0} became muzzled!\0" .align 2, 0 .global gUnknown_80FBF68 @@ -5949,7 +5949,7 @@ gUnknown_80FBF68: @ 80FBF68 .global gUnknown_80FBF6C gUnknown_80FBF6C: @ 80FBF6C -.string "{ARG_POKEMON_0} is already muzzled!\0" +.string "{POKEMON_0} is already muzzled!\0" .align 2, 0 .global gUnknown_80FBF84 @@ -5959,7 +5959,7 @@ gUnknown_80FBF84: @ 80FBF84 .global gUnknown_80FBF88 gUnknown_80FBF88: @ 80FBF88 -.string "{ARG_POKEMON_0} was exposed!\0" +.string "{POKEMON_0} was exposed!\0" .align 2, 0 .global gUnknown_80FBF9C @@ -5969,7 +5969,7 @@ gUnknown_80FBF9C: @ 80FBF9C .global gUnknown_80FBFA0 gUnknown_80FBFA0: @ 80FBFA0 -.string "{ARG_POKEMON_0} is already exposed!\0" +.string "{POKEMON_0} is already exposed!\0" .align 2, 0 .global gUnknown_80FBFB8 @@ -5979,7 +5979,7 @@ gUnknown_80FBFB8: @ 80FBFB8 .global gUnknown_80FBFBC gUnknown_80FBFBC: @ 80FBFBC -.string "{ARG_POKEMON_0} isn't a Ghost type!\0" +.string "{POKEMON_0} isn't a Ghost type!\0" .align 2, 0 .global gUnknown_80FBFD8 @@ -5989,7 +5989,7 @@ gUnknown_80FBFD8: @ 80FBFD8 .global gUnknown_80FBFDC gUnknown_80FBFDC: @ 80FBFDC -.string "{ARG_POKEMON_0}'s Evasion returned to normal!\0" +.string "{POKEMON_0}'s Evasion returned to normal!\0" .align 2, 0 .global gUnknown_80FC000 @@ -6019,7 +6019,7 @@ gUnknown_80FC054: @ 80FC054 .global gUnknown_80FC058 gUnknown_80FC058: @ 80FC058 -.string "{ARG_POKEMON_0} is already in a rage!\0" +.string "{POKEMON_0} is already in a rage!\0" .align 2, 0 .global gUnknown_80FC074 @@ -6109,7 +6109,7 @@ gUnknown_80FC0E4: @ 80FC0E4 .global gUnknown_80FC0E8 gUnknown_80FC0E8: @ 80FC0E8 -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0} rose!\0" +.string "{POKEMON_0}'s {MOVE_ITEM_0} rose!\0" .align 2, 0 .global gUnknown_80FC0FC @@ -6119,7 +6119,7 @@ gUnknown_80FC0FC: @ 80FC0FC .global gUnknown_80FC100 gUnknown_80FC100: @ 80FC100 -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0} fell!\0" +.string "{POKEMON_0}'s {MOVE_ITEM_0} fell!\0" .align 2, 0 .global gUnknown_80FC114 @@ -6139,8 +6139,8 @@ gUnknown_80FC11C: @ 80FC11C .global gUnknown_80FC120 gUnknown_80FC120: @ 80FC120 -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0} rose\n" -.string "{ARG_MOVE_ITEM_1}!\0" +.string "{POKEMON_0}'s {MOVE_ITEM_0} rose\n" +.string "{MOVE_ITEM_1}!\0" .align 2, 0 .global gUnknown_80FC138 @@ -6155,8 +6155,8 @@ gUnknown_80FC13C: @ 80FC13C .global gUnknown_80FC140 gUnknown_80FC140: @ 80FC140 -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0} fell\n" -.string "{ARG_MOVE_ITEM_1}!\0" +.string "{POKEMON_0}'s {MOVE_ITEM_0} fell\n" +.string "{MOVE_ITEM_1}!\0" .align 2, 0 .global gUnknown_80FC158 @@ -6171,7 +6171,7 @@ gUnknown_80FC15C: @ 80FC15C .global gUnknown_80FC160 gUnknown_80FC160: @ 80FC160 -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0} remained\n" +.string "{POKEMON_0}'s {MOVE_ITEM_0} remained\n" .string "unchanged!\0" .align 2, 0 @@ -6187,7 +6187,7 @@ gUnknown_80FC184: @ 80FC184 .global gUnknown_80FC188 gUnknown_80FC188: @ 80FC188 -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0} fell\n" +.string "{POKEMON_0}'s {MOVE_ITEM_0} fell\n" .string "slightly!\0" .align 2, 0 @@ -6198,7 +6198,7 @@ gUnknown_80FC1A4: @ 80FC1A4 .global gUnknown_80FC1A8 gUnknown_80FC1A8: @ 80FC1A8 -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0} rose\n" +.string "{POKEMON_0}'s {MOVE_ITEM_0} rose\n" .string "slightly!\0" .align 2, 0 @@ -6209,7 +6209,7 @@ gUnknown_80FC1C4: @ 80FC1C4 .global gUnknown_80FC1C8 gUnknown_80FC1C8: @ 80FC1C8 -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0} won't\n" +.string "{POKEMON_0}'s {MOVE_ITEM_0} won't\n" .string "go down any more!\0" .align 2, 0 @@ -6220,7 +6220,7 @@ gUnknown_80FC1F0: @ 80FC1F0 .global gUnknown_80FC1F4 gUnknown_80FC1F4: @ 80FC1F4 -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0} won't\n" +.string "{POKEMON_0}'s {MOVE_ITEM_0} won't\n" .string "go up any more!\0" .align 2, 0 @@ -6236,7 +6236,7 @@ gUnknown_80FC21C: @ 80FC21C .global gUnknown_80FC220 gUnknown_80FC220: @ 80FC220 -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0} won't\n" +.string "{POKEMON_0}'s {MOVE_ITEM_0} won't\n" .string "go down any more.\0" .align 2, 0 @@ -6247,7 +6247,7 @@ gUnknown_80FC248: @ 80FC248 .global gUnknown_80FC24C gUnknown_80FC24C: @ 80FC24C -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0} won't\n" +.string "{POKEMON_0}'s {MOVE_ITEM_0} won't\n" .string "go up any more.\0" .align 2, 0 @@ -6263,7 +6263,7 @@ gUnknown_80FC274: @ 80FC274 .global gUnknown_80FC278 gUnknown_80FC278: @ 80FC278 -.string "{ARG_POKEMON_0}'s speed didn't change!\0" +.string "{POKEMON_0}'s speed didn't change!\0" .align 2, 0 .global gUnknown_80FC298 @@ -6273,7 +6273,7 @@ gUnknown_80FC298: @ 80FC298 .global gUnknown_80FC29C gUnknown_80FC29C: @ 80FC29C -.string "{ARG_POKEMON_0} can't go any faster!\0" +.string "{POKEMON_0} can't go any faster!\0" .align 2, 0 .global gUnknown_80FC2B8 @@ -6283,7 +6283,7 @@ gUnknown_80FC2B8: @ 80FC2B8 .global gUnknown_80FC2BC gUnknown_80FC2BC: @ 80FC2BC -.string "{ARG_POKEMON_0} can't go any slower!\0" +.string "{POKEMON_0} can't go any slower!\0" .align 2, 0 .global gUnknown_80FC2D8 @@ -6293,7 +6293,7 @@ gUnknown_80FC2D8: @ 80FC2D8 .global gUnknown_80FC2DC gUnknown_80FC2DC: @ 80FC2DC -.string "{ARG_POKEMON_0} is protected by Safeguard!\0" +.string "{POKEMON_0} is protected by Safeguard!\0" .align 2, 0 .global gUnknown_80FC2FC @@ -6303,7 +6303,7 @@ gUnknown_80FC2FC: @ 80FC2FC .global gUnknown_80FC300 gUnknown_80FC300: @ 80FC300 -.string "{ARG_POKEMON_0} is protected by Mist!\0" +.string "{POKEMON_0} is protected by Mist!\0" .align 2, 0 .global gUnknown_80FC31C @@ -6313,7 +6313,7 @@ gUnknown_80FC31C: @ 80FC31C .global gUnknown_80FC320 gUnknown_80FC320: @ 80FC320 -.string "{ARG_POKEMON_0}'s Attack was boosted.\0" +.string "{POKEMON_0}'s Attack was boosted.\0" .align 2, 0 .global gUnknown_80FC33C @@ -6323,7 +6323,7 @@ gUnknown_80FC33C: @ 80FC33C .global gUnknown_80FC340 gUnknown_80FC340: @ 80FC340 -.string "{ARG_POKEMON_0}'s Attack didn't go up.\0" +.string "{POKEMON_0}'s Attack didn't go up.\0" .align 2, 0 .global gUnknown_80FC360 @@ -6333,7 +6333,7 @@ gUnknown_80FC360: @ 80FC360 .global gUnknown_80FC364 gUnknown_80FC364: @ 80FC364 -.string "{ARG_POKEMON_0}'s Special Attack was boosted.\0" +.string "{POKEMON_0}'s Special Attack was boosted.\0" .align 2, 0 .global gUnknown_80FC388 @@ -6343,7 +6343,7 @@ gUnknown_80FC388: @ 80FC388 .global gUnknown_80FC38C gUnknown_80FC38C: @ 80FC38C -.string "{ARG_POKEMON_0}'s Special Attack didn't go up.\0" +.string "{POKEMON_0}'s Special Attack didn't go up.\0" .align 2, 0 .global gUnknown_80FC3B4 @@ -6353,7 +6353,7 @@ gUnknown_80FC3B4: @ 80FC3B4 .global gUnknown_80FC3B8 gUnknown_80FC3B8: @ 80FC3B8 -.string "{ARG_POKEMON_0}'s Defense was boosted.\0" +.string "{POKEMON_0}'s Defense was boosted.\0" .align 2, 0 .global gUnknown_80FC3D8 @@ -6363,7 +6363,7 @@ gUnknown_80FC3D8: @ 80FC3D8 .global gUnknown_80FC3DC gUnknown_80FC3DC: @ 80FC3DC -.string "{ARG_POKEMON_0}'s Defense didn't go up.\0" +.string "{POKEMON_0}'s Defense didn't go up.\0" .align 2, 0 .global gUnknown_80FC3FC @@ -6373,7 +6373,7 @@ gUnknown_80FC3FC: @ 80FC3FC .global gUnknown_80FC400 gUnknown_80FC400: @ 80FC400 -.string "{ARG_POKEMON_0}'s Special Defense was\n" +.string "{POKEMON_0}'s Special Defense was\n" .string "boosted.\0" .align 2, 0 @@ -6384,7 +6384,7 @@ gUnknown_80FC428: @ 80FC428 .global gUnknown_80FC42C gUnknown_80FC42C: @ 80FC42C -.string "{ARG_POKEMON_0}'s Special Defense didn't\n" +.string "{POKEMON_0}'s Special Defense didn't\n" .string "go up.\0" .align 2, 0 @@ -6395,26 +6395,26 @@ gUnknown_80FC454: @ 80FC454 .global gUnknown_80FC458 gUnknown_80FC458: @ 80FC458 -.string "{ARG_POKEMON_0}'s Attack was weakened.\0" +.string "{POKEMON_0}'s Attack was weakened.\0" .align 2, 0 .4byte gUnknown_80FC458 .global gUnknown_80FC47C gUnknown_80FC47C: @ 80FC47C -.string "{ARG_POKEMON_0}'s Attack didn't go down.\0" +.string "{POKEMON_0}'s Attack didn't go down.\0" .align 2, 0 .4byte gUnknown_80FC47C .global gUnknown_80FC4A4 gUnknown_80FC4A4: @ 80FC4A4 -.string "{ARG_POKEMON_0}'s Special Attack was\n" +.string "{POKEMON_0}'s Special Attack was\n" .string "weakened.\0" .align 2, 0 .4byte gUnknown_80FC4A4 .global gUnknown_80FC4D0 gUnknown_80FC4D0: @ 80FC4D0 -.string "{ARG_POKEMON_0}'s Special Attack didn't go\n" +.string "{POKEMON_0}'s Special Attack didn't go\n" .string "down.\0" .align 2, 0 .4byte gUnknown_80FC4D0 @@ -6441,7 +6441,7 @@ gUnknown_80FC558: @ 80FC558 .global gUnknown_80FC55C gUnknown_80FC55C: @ 80FC55C -.string "{ARG_POKEMON_1} protected itself!\0" +.string "{POKEMON_1} protected itself!\0" .align 2, 0 .global gUnknown_80FC574 @@ -6451,7 +6451,7 @@ gUnknown_80FC574: @ 80FC574 .global gUnknown_80FC578 gUnknown_80FC578: @ 80FC578 -.string "{ARG_POKEMON_0} warped!\0" +.string "{POKEMON_0} warped!\0" .align 2, 0 .global gUnknown_80FC584 @@ -6471,7 +6471,7 @@ gUnknown_80FC5A8: @ 80FC5A8 .global gUnknown_80FC5AC gUnknown_80FC5AC: @ 80FC5AC -.string "{ARG_POKEMON_0} was too hungry to use it!\0" +.string "{POKEMON_0} was too hungry to use it!\0" .align 2, 0 .global gUnknown_80FC5CC @@ -6481,7 +6481,7 @@ gUnknown_80FC5CC: @ 80FC5CC .global gUnknown_80FC5D0 gUnknown_80FC5D0: @ 80FC5D0 -.string "Weather: {ARG_POKEMON_0}\0" +.string "Weather: {POKEMON_0}\0" .align 2, 0 .global gUnknown_80FC5E0 @@ -6506,7 +6506,7 @@ gUnknown_80FC5FC: @ 80FC5FC .global gUnknown_80FC600 gUnknown_80FC600: @ 80FC600 -.string "Got {ARG_POKEMON_1}'s item!\0" +.string "Got {POKEMON_1}'s item!\0" .align 2, 0 .global gUnknown_80FC614 @@ -6516,7 +6516,7 @@ gUnknown_80FC614: @ 80FC614 .global gUnknown_80FC618 gUnknown_80FC618: @ 80FC618 -.string "{ARG_POKEMON_0} has an item already.\n" +.string "{POKEMON_0} has an item already.\n" .string "It couldn't get another item.\0" .align 2, 0 @@ -6527,7 +6527,7 @@ gUnknown_80FC654: @ 80FC654 .global gUnknown_80FC658 gUnknown_80FC658: @ 80FC658 -.string "{ARG_POKEMON_1} doesn't have anything!\0" +.string "{POKEMON_1} doesn't have anything!\0" .align 2, 0 .global gUnknown_80FC678 @@ -6582,7 +6582,7 @@ gUnknown_80FC6FC: @ 80FC6FC .global gUnknown_80FC700 gUnknown_80FC700: @ 80FC700 -.string "{ARG_POKEMON_0} is muzzled!\0" +.string "{POKEMON_0} is muzzled!\0" .align 2, 0 .global gUnknown_80FC710 @@ -6602,7 +6602,7 @@ gUnknown_80FC718: @ 80FC718 .global gUnknown_80FC71C gUnknown_80FC71C: @ 80FC71C -.string "{ARG_POKEMON_0} loosed {ARG_MOVE_ITEM_0}!\0" +.string "{POKEMON_0} loosed {MOVE_ITEM_0}!\0" .align 2, 0 .global gUnknown_80FC72C @@ -6642,8 +6642,8 @@ gUnknown_80FC770: @ 80FC770 .global gUnknown_80FC774 gUnknown_80FC774: @ 80FC774 -.string "{ARG_POKEMON_0} traded items with\n" -.string "{ARG_POKEMON_1}!\0" +.string "{POKEMON_0} traded items with\n" +.string "{POKEMON_1}!\0" .align 2, 0 .global gUnknown_80FC790 @@ -6663,7 +6663,7 @@ gUnknown_80FC7AC: @ 80FC7AC .global gUnknown_80FC7B0 gUnknown_80FC7B0: @ 80FC7B0 -.string "{ARG_POKEMON_0}'s move missed!\0" +.string "{POKEMON_0}'s move missed!\0" .align 2, 0 .global gUnknown_80FC7C8 @@ -6673,7 +6673,7 @@ gUnknown_80FC7C8: @ 80FC7C8 .global gUnknown_80FC7CC gUnknown_80FC7CC: @ 80FC7CC -.string "{ARG_POKEMON_0} and {ARG_POKEMON_1} shared\n" +.string "{POKEMON_0} and {POKEMON_1} shared\n" .string "their HP!\0" .align 2, 0 @@ -6684,7 +6684,7 @@ gUnknown_80FC7EC: @ 80FC7EC .global gUnknown_80FC7F0 gUnknown_80FC7F0: @ 80FC7F0 -.string "{ARG_POKEMON_0} copied the target's\n" +.string "{POKEMON_0} copied the target's\n" .string "special ability!\0" .align 2, 0 @@ -6695,7 +6695,7 @@ gUnknown_80FC81C: @ 80FC81C .global gUnknown_80FC820 gUnknown_80FC820: @ 80FC820 -.string "{ARG_POKEMON_0} couldn't copy the target's\n" +.string "{POKEMON_0} couldn't copy the target's\n" .string "Wonder Guard!\0" .align 2, 0 @@ -6706,7 +6706,7 @@ gUnknown_80FC854: @ 80FC854 .global gUnknown_80FC858 gUnknown_80FC858: @ 80FC858 -.string "{ARG_POKEMON_0} swapped special abilities\n" +.string "{POKEMON_0} swapped special abilities\n" .string "with the target!\0" .align 2, 0 @@ -6717,7 +6717,7 @@ gUnknown_80FC888: @ 80FC888 .global gUnknown_80FC88C gUnknown_80FC88C: @ 80FC88C -.string "{ARG_POKEMON_0} couldn't swap the target's\n" +.string "{POKEMON_0} couldn't swap the target's\n" .string "Wonder Guard!\0" .align 2, 0 @@ -6795,7 +6795,7 @@ gUnknown_80FC9E8: @ 80FC9E8 .global gUnknown_80FC9EC gUnknown_80FC9EC: @ 80FC9EC -.string "{ARG_POKEMON_0} couldn't be knocked flying!\0" +.string "{POKEMON_0} couldn't be knocked flying!\0" .align 2, 0 .global gUnknown_80FCA10 @@ -6815,7 +6815,7 @@ gUnknown_80FCA3C: @ 80FCA3C .global gUnknown_80FCA40 gUnknown_80FCA40: @ 80FCA40 -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0} didn't\n" +.string "{POKEMON_0}'s {MOVE_ITEM_0} didn't\n" .string "go down!\0" .align 2, 0 @@ -6831,7 +6831,7 @@ gUnknown_80FCA64: @ 80FCA64 .global gUnknown_80FCA68 gUnknown_80FCA68: @ 80FCA68 -.string "{ARG_POKEMON_1} is sturdy!\n" +.string "{POKEMON_1} is sturdy!\n" .string "It withstood the move!\0" .align 2, 0 @@ -6842,7 +6842,7 @@ gUnknown_80FCA90: @ 80FCA90 .global gUnknown_80FCA94 gUnknown_80FCA94: @ 80FCA94 -.string "{ARG_POKEMON_0} is anchored!\n" +.string "{POKEMON_0} is anchored!\n" .string "It won't switch places!\0" .align 2, 0 @@ -6853,7 +6853,7 @@ gUnknown_80FCAC0: @ 80FCAC0 .global gUnknown_80FCAC4 gUnknown_80FCAC4: @ 80FCAC4 -.string "{ARG_POKEMON_0} is anchored!\n" +.string "{POKEMON_0} is anchored!\n" .string "It won't warp!\0" .align 2, 0 @@ -6874,7 +6874,7 @@ gUnknown_80FCB14: @ 80FCB14 .global gUnknown_80FCB18 gUnknown_80FCB18: @ 80FCB18 -.string "{ARG_POKEMON_0} is anchored!\n" +.string "{POKEMON_0} is anchored!\n" .string "It can't be thrown!\0" .align 2, 0 @@ -6885,7 +6885,7 @@ gUnknown_80FCB40: @ 80FCB40 .global gUnknown_80FCB44 gUnknown_80FCB44: @ 80FCB44 -.string "{ARG_POKEMON_0} couldn't be thrown for\n" +.string "{POKEMON_0} couldn't be thrown for\n" .string "some reason!\0" .align 2, 0 @@ -6896,7 +6896,7 @@ gUnknown_80FCB70: @ 80FCB70 .global gUnknown_80FCB74 gUnknown_80FCB74: @ 80FCB74 -.string "{ARG_POKEMON_0} is anchored!\n" +.string "{POKEMON_0} is anchored!\n" .string "It can't leap!\0" .align 2, 0 @@ -6907,7 +6907,7 @@ gUnknown_80FCB98: @ 80FCB98 .global gUnknown_80FCB9C gUnknown_80FCB9C: @ 80FCB9C -.string "{ARG_POKEMON_0} is anchored!\n" +.string "{POKEMON_0} is anchored!\n" .string "It can't be knocked flying!\0" .align 2, 0 @@ -6918,7 +6918,7 @@ gUnknown_80FCBCC: @ 80FCBCC .global gUnknown_80FCBD0 gUnknown_80FCBD0: @ 80FCBD0 -.string "{ARG_POKEMON_0} is limber!\n" +.string "{POKEMON_0} is limber!\n" .string "It can't be paralyzed!\0" .align 2, 0 @@ -6929,7 +6929,7 @@ gUnknown_80FCBF8: @ 80FCBF8 .global gUnknown_80FCBFC gUnknown_80FCBFC: @ 80FCBFC -.string "But {ARG_POKEMON_0} didn't cringe!\0" +.string "But {POKEMON_0} didn't cringe!\0" .align 2, 0 .global gUnknown_80FCC18 @@ -6939,7 +6939,7 @@ gUnknown_80FCC18: @ 80FCC18 .global gUnknown_80FCC1C gUnknown_80FCC1C: @ 80FCC1C -.string "{ARG_POKEMON_0} is oblivious!\n" +.string "{POKEMON_0} is oblivious!\n" .string "It doesn't get infatuated!\0" .align 2, 0 @@ -6950,7 +6950,7 @@ gUnknown_80FCC4C: @ 80FCC4C .global gUnknown_80FCC50 gUnknown_80FCC50: @ 80FCC50 -.string "{ARG_POKEMON_0} traced the target's\n" +.string "{POKEMON_0} traced the target's\n" .string "special ability!\0" .align 2, 0 @@ -6961,8 +6961,8 @@ gUnknown_80FCC7C: @ 80FCC7C .global gUnknown_80FCC80 gUnknown_80FCC80: @ 80FCC80 -.string "{ARG_POKEMON_0}'s Color Change made it\n" -.string "the {ARG_MOVE_ITEM_0} type!\0" +.string "{POKEMON_0}'s Color Change made it\n" +.string "the {MOVE_ITEM_0} type!\0" .align 2, 0 .global gUnknown_80FCCAC @@ -7008,7 +7008,7 @@ gUnknown_80FCD28: @ 80FCD28 .global gUnknown_80FCD2C gUnknown_80FCD2C: @ 80FCD2C -.string "{ARG_POKEMON_0}'s Insomnia prevents\n" +.string "{POKEMON_0}'s Insomnia prevents\n" .string "drowsiness!\0" .align 2, 0 @@ -7024,7 +7024,7 @@ gUnknown_80FCD58: @ 80FCD58 .global gUnknown_80FCD5C gUnknown_80FCD5C: @ 80FCD5C -.string "{ARG_POKEMON_0}'s Vital Spirit prevents\n" +.string "{POKEMON_0}'s Vital Spirit prevents\n" .string "drowsiness!\0" .align 2, 0 @@ -7035,7 +7035,7 @@ gUnknown_80FCD88: @ 80FCD88 .global gUnknown_80FCD8C gUnknown_80FCD8C: @ 80FCD8C -.string "{ARG_POKEMON_0}'s Own Tempo prevents\n" +.string "{POKEMON_0}'s Own Tempo prevents\n" .string "confusion!\0" .align 2, 0 @@ -7046,7 +7046,7 @@ gUnknown_80FCDB4: @ 80FCDB4 .global gUnknown_80FCDB8 gUnknown_80FCDB8: @ 80FCDB8 -.string "{ARG_POKEMON_0}'s Magma Armor prevents\n" +.string "{POKEMON_0}'s Magma Armor prevents\n" .string "freezing!\0" .align 2, 0 @@ -7057,7 +7057,7 @@ gUnknown_80FCDE0: @ 80FCDE0 .global gUnknown_80FCDE4 gUnknown_80FCDE4: @ 80FCDE4 -.string "{ARG_POKEMON_0} is an unfreezable type!\0" +.string "{POKEMON_0} is an unfreezable type!\0" .align 2, 0 .global gUnknown_80FCE00 @@ -7067,7 +7067,7 @@ gUnknown_80FCE00: @ 80FCE00 .global gUnknown_80FCE04 gUnknown_80FCE04: @ 80FCE04 -.string "The magma's heat prevents {ARG_POKEMON_0}\n" +.string "The magma's heat prevents {POKEMON_0}\n" .string "from freezing!\0" .align 2, 0 @@ -7078,7 +7078,7 @@ gUnknown_80FCE34: @ 80FCE34 .global gUnknown_80FCE38 gUnknown_80FCE38: @ 80FCE38 -.string "{ARG_POKEMON_0}'s Water Veil prevents burns!\0" +.string "{POKEMON_0}'s Water Veil prevents burns!\0" .align 2, 0 .global gUnknown_80FCE5C @@ -7088,7 +7088,7 @@ gUnknown_80FCE5C: @ 80FCE5C .global gUnknown_80FCE60 gUnknown_80FCE60: @ 80FCE60 -.string "{ARG_POKEMON_0}'s type doesn't get burns!\0" +.string "{POKEMON_0}'s type doesn't get burns!\0" .align 2, 0 .global gUnknown_80FCE84 @@ -7098,7 +7098,7 @@ gUnknown_80FCE84: @ 80FCE84 .global gUnknown_80FCE88 gUnknown_80FCE88: @ 80FCE88 -.string "{ARG_POKEMON_0}'s Immunity prevents\n" +.string "{POKEMON_0}'s Immunity prevents\n" .string "poisoning!\0" .align 2, 0 @@ -7109,7 +7109,7 @@ gUnknown_80FCEB0: @ 80FCEB0 .global gUnknown_80FCEB4 gUnknown_80FCEB4: @ 80FCEB4 -.string "{ARG_POKEMON_0}'s type doesn't get poisoned!\0" +.string "{POKEMON_0}'s type doesn't get poisoned!\0" .align 2, 0 .global gUnknown_80FCEDC @@ -7119,7 +7119,7 @@ gUnknown_80FCEDC: @ 80FCEDC .global gUnknown_80FCEE0 gUnknown_80FCEE0: @ 80FCEE0 -.string "It had no effect on {ARG_POKEMON_0}!\0" +.string "It had no effect on {POKEMON_0}!\0" .align 2, 0 .global gUnknown_80FCEFC @@ -7129,7 +7129,7 @@ gUnknown_80FCEFC: @ 80FCEFC .global gUnknown_80FCF00 gUnknown_80FCF00: @ 80FCF00 -.string "Yes! {ARG_POKEMON_0} leveled up!\0" +.string "Yes! {POKEMON_0} leveled up!\0" .align 2, 0 .global gUnknown_80FCF18 @@ -7139,7 +7139,7 @@ gUnknown_80FCF18: @ 80FCF18 .global gUnknown_80FCF1C gUnknown_80FCF1C: @ 80FCF1C -.string "{ARG_POKEMON_0} uttered its sleep talk!\0" +.string "{POKEMON_0} uttered its sleep talk!\0" .align 2, 0 .global gUnknown_80FCF38 @@ -7149,7 +7149,7 @@ gUnknown_80FCF38: @ 80FCF38 .global gUnknown_80FCF3C gUnknown_80FCF3C: @ 80FCF3C -.string "{ARG_POKEMON_0} loosed a snore!\0" +.string "{POKEMON_0} loosed a snore!\0" .align 2, 0 .global gUnknown_80FCF50 @@ -7194,7 +7194,7 @@ gUnknown_80FCFA4: @ 80FCFA4 .global gUnknown_80FCFA8 gUnknown_80FCFA8: @ 80FCFA8 -.string "{ARG_MOVE_ITEM_0} was tormented!\0" +.string "{MOVE_ITEM_0} was tormented!\0" .align 2, 0 .global gUnknown_80FCFBC @@ -7313,7 +7313,7 @@ gUnknown_80FD14C: @ 80FD14C .global gUnknown_80FD150 gUnknown_80FD150: @ 80FD150 -.string "{ARG_POKEMON_1}'s item was swatted down!\0" +.string "{POKEMON_1}'s item was swatted down!\0" .align 2, 0 .global gUnknown_80FD170 @@ -7363,7 +7363,7 @@ gUnknown_80FD1EC: @ 80FD1EC .global gUnknown_80FD1F0 gUnknown_80FD1F0: @ 80FD1F0 -.string "{ARG_POKEMON_1} can throw a long way!\0" +.string "{POKEMON_1} can throw a long way!\0" .align 2, 0 .global gUnknown_80FD20C @@ -7373,7 +7373,7 @@ gUnknown_80FD20C: @ 80FD20C .global gUnknown_80FD210 gUnknown_80FD210: @ 80FD210 -.string "{ARG_POKEMON_1} can throw far already!\0" +.string "{POKEMON_1} can throw far already!\0" .align 2, 0 .global gUnknown_80FD22C @@ -7383,7 +7383,7 @@ gUnknown_80FD22C: @ 80FD22C .global gUnknown_80FD230 gUnknown_80FD230: @ 80FD230 -.string "{ARG_POKEMON_1}'s throws can pierce things!\0" +.string "{POKEMON_1}'s throws can pierce things!\0" .align 2, 0 .global gUnknown_80FD254 @@ -7393,7 +7393,7 @@ gUnknown_80FD254: @ 80FD254 .global gUnknown_80FD258 gUnknown_80FD258: @ 80FD258 -.string "{ARG_POKEMON_1}'s throws can pierce already!\0" +.string "{POKEMON_1}'s throws can pierce already!\0" .align 2, 0 .global gUnknown_80FD27C @@ -7403,7 +7403,7 @@ gUnknown_80FD27C: @ 80FD27C .global gUnknown_80FD280 gUnknown_80FD280: @ 80FD280 -.string "{ARG_POKEMON_1} bears a grudge!\0" +.string "{POKEMON_1} bears a grudge!\0" .align 2, 0 .global gUnknown_80FD294 @@ -7413,7 +7413,7 @@ gUnknown_80FD294: @ 80FD294 .global gUnknown_80FD298 gUnknown_80FD298: @ 80FD298 -.string "{ARG_POKEMON_1} already bears a grudge!\0" +.string "{POKEMON_1} already bears a grudge!\0" .align 2, 0 .global gUnknown_80FD2B4 @@ -7433,7 +7433,7 @@ gUnknown_80FD2CC: @ 80FD2CC .global gUnknown_80FD2D0 gUnknown_80FD2D0: @ 80FD2D0 -.string "Assist: {ARG_MOVE_ITEM_0}\0" +.string "Assist: {MOVE_ITEM_0}\0" .align 2, 0 .global gUnknown_80FD2DC @@ -7463,7 +7463,7 @@ gUnknown_80FD320: @ 80FD320 .global gUnknown_80FD324 gUnknown_80FD324: @ 80FD324 -.string "The last move used by {ARG_POKEMON_1} lost\n" +.string "The last move used by {POKEMON_1} lost\n" .string "all its PP!\0" .align 2, 0 @@ -7474,7 +7474,7 @@ gUnknown_80FD350: @ 80FD350 .global gUnknown_80FD354 gUnknown_80FD354: @ 80FD354 -.string "Nothing happened to {ARG_POKEMON_1}.\0" +.string "Nothing happened to {POKEMON_1}.\0" .align 2, 0 .global gUnknown_80FD370 @@ -7549,7 +7549,7 @@ gUnknown_80FD434: @ 80FD434 .global gUnknown_80FD438 gUnknown_80FD438: @ 80FD438 -.string "{ARG_POKEMON_0} can't transform!\0" +.string "{POKEMON_0} can't transform!\0" .align 2, 0 .global gUnknown_80FD450 @@ -7564,7 +7564,7 @@ gUnknown_80FD454: @ 80FD454 .global gUnknown_80FD458 gUnknown_80FD458: @ 80FD458 -.string "{ARG_POKEMON_1} was revived!\0" +.string "{POKEMON_1} was revived!\0" .align 2, 0 .global gUnknown_80FD46C @@ -7574,7 +7574,7 @@ gUnknown_80FD46C: @ 80FD46C .global gUnknown_80FD470 gUnknown_80FD470: @ 80FD470 -.string "{ARG_POKEMON_0} possessed {ARG_POKEMON_1}!\0" +.string "{POKEMON_0} possessed {POKEMON_1}!\0" .align 2, 0 .global gUnknown_80FD484 @@ -7594,7 +7594,7 @@ gUnknown_80FD4B0: @ 80FD4B0 .global gUnknown_80FD4B4 gUnknown_80FD4B4: @ 80FD4B4 -.string "{ARG_POKEMON_0} escaped!\0" +.string "{POKEMON_0} escaped!\0" .align 2, 0 .global gUnknown_80FD4C4 @@ -7604,7 +7604,7 @@ gUnknown_80FD4C4: @ 80FD4C4 .global gUnknown_80FD4C8 gUnknown_80FD4C8: @ 80FD4C8 -.string "{ARG_POKEMON_0} can't escape!\0" +.string "{POKEMON_0} can't escape!\0" .align 2, 0 .global gUnknown_80FD4DC @@ -7614,7 +7614,7 @@ gUnknown_80FD4DC: @ 80FD4DC .global gUnknown_80FD4E0 gUnknown_80FD4E0: @ 80FD4E0 -.string "{ARG_POKEMON_0} was protected by its Band!\0" +.string "{POKEMON_0} was protected by its Band!\0" .align 2, 0 .global gUnknown_80FD500 @@ -7624,7 +7624,7 @@ gUnknown_80FD500: @ 80FD500 .global gUnknown_80FD504 gUnknown_80FD504: @ 80FD504 -.string "{ARG_POKEMON_0} was protected by its Scarf!\0" +.string "{POKEMON_0} was protected by its Scarf!\0" .align 2, 0 .global gUnknown_80FD524 @@ -7634,7 +7634,7 @@ gUnknown_80FD524: @ 80FD524 .global gUnknown_80FD528 gUnknown_80FD528: @ 80FD528 -.string "{ARG_POKEMON_0} was protected by its Scope!\0" +.string "{POKEMON_0} was protected by its Scope!\0" .align 2, 0 .global gUnknown_80FD548 @@ -7650,7 +7650,7 @@ gUnknown_80FD550: @ 80FD550 .global gUnknown_80FD554 gUnknown_80FD554: @ 80FD554 -.string "{ARG_POKEMON_1} was protected by its Specs!\0" +.string "{POKEMON_1} was protected by its Specs!\0" .align 2, 0 .global gUnknown_80FD574 @@ -7921,12 +7921,12 @@ gUnknown_80FD98C: @ 80FD98C .global gUnknown_80FD9A0 gUnknown_80FD9A0: @ 80FD9A0 -.string "Stepped on a {ARG_POKEMON_0}!\0" +.string "Stepped on a {POKEMON_0}!\0" .align 2, 0 .global gUnknown_80FD9B4 gUnknown_80FD9B4: @ 80FD9B4 -.string "{ARG_POKEMON_0}!\0" +.string "{POKEMON_0}!\0" .align 2, 0 .global gUnknown_80FD9BC @@ -7947,17 +7947,17 @@ gUnknown_80FDA0C: @ 80FDA0C .global gUnknown_80FDA28 gUnknown_80FDA28: @ 80FDA28 -.string "Mud splashed up from the {ARG_POKEMON_0}!\0" +.string "Mud splashed up from the {POKEMON_0}!\0" .align 2, 0 .global gUnknown_80FDA48 gUnknown_80FDA48: @ 80FDA48 -.string "There was a {ARG_POKEMON_0} underfoot!\0" +.string "There was a {POKEMON_0} underfoot!\0" .align 2, 0 .global gUnknown_80FDA64 gUnknown_80FDA64: @ 80FDA64 -.string "The move {ARG_MOVE_ITEM_0} lost its PP!\0" +.string "The move {MOVE_ITEM_0} lost its PP!\0" .align 2, 0 .global gUnknown_80FDA80 @@ -7997,7 +7997,7 @@ gUnknown_80FDAE4: @ 80FDAE4 .global gUnknown_80FDAE8 gUnknown_80FDAE8: @ 80FDAE8 -.string "The move {ARG_MOVE_ITEM_0} was sealed!\0" +.string "The move {MOVE_ITEM_0} was sealed!\0" .align 2, 0 .global gUnknown_80FDB04 @@ -8048,7 +8048,7 @@ gUnknown_80FDBA0: @ 80FDBA0 .global gUnknown_80FDBA4 gUnknown_80FDBA4: @ 80FDBA4 -.string "{ARG_POKEMON_0} caught the {ARG_MOVE_ITEM_0}!\0" +.string "{POKEMON_0} caught the {MOVE_ITEM_0}!\0" .align 2, 0 .global gUnknown_80FDBB8 @@ -8058,7 +8058,7 @@ gUnknown_80FDBB8: @ 80FDBB8 .global gUnknown_80FDBBC gUnknown_80FDBBC: @ 80FDBBC -.string "{ARG_POKEMON_0} regained PP.\0" +.string "{POKEMON_0} regained PP.\0" .align 2, 0 .global gUnknown_80FDBD0 @@ -8068,7 +8068,7 @@ gUnknown_80FDBD0: @ 80FDBD0 .global gUnknown_80FDBD4 gUnknown_80FDBD4: @ 80FDBD4 -.string "{ARG_POKEMON_0} has full PP already!\0" +.string "{POKEMON_0} has full PP already!\0" .align 2, 0 .global gUnknown_80FDBF0 @@ -8078,7 +8078,7 @@ gUnknown_80FDBF0: @ 80FDBF0 .global gUnknown_80FDBF4 gUnknown_80FDBF4: @ 80FDBF4 -.string "The {ARG_MOVE_ITEM_0} became sticky and\n" +.string "The {MOVE_ITEM_0} became sticky and\n" .string "unusable!\0" .align 2, 0 @@ -8130,8 +8130,8 @@ gUnknown_80FDCA4: @ 80FDCA4 .global gUnknown_80FDCA8 gUnknown_80FDCA8: @ 80FDCA8 -.string "{ARG_POKEMON_0} converted to\n" -.string "the {ARG_MOVE_ITEM_0} type!\0" +.string "{POKEMON_0} converted to\n" +.string "the {MOVE_ITEM_0} type!\0" .align 2, 0 .global gUnknown_80FDCC8 @@ -8141,7 +8141,7 @@ gUnknown_80FDCC8: @ 80FDCC8 .global gUnknown_80FDCCC gUnknown_80FDCCC: @ 80FDCCC -.string "{ARG_POKEMON_0} mimicked its foe!\0" +.string "{POKEMON_0} mimicked its foe!\0" .align 2, 0 .global gUnknown_80FDCE4 @@ -8151,7 +8151,7 @@ gUnknown_80FDCE4: @ 80FDCE4 .global gUnknown_80FDCE8 gUnknown_80FDCE8: @ 80FDCE8 -.string "{ARG_POKEMON_0}'s Mimic failed!\0" +.string "{POKEMON_0}'s Mimic failed!\0" .align 2, 0 .global gUnknown_80FDD00 @@ -8227,7 +8227,7 @@ gUnknown_80FDDF0: @ 80FDDF0 .global gUnknown_80FDDF4 gUnknown_80FDDF4: @ 80FDDF4 -.string "There is nothing at {ARG_POKEMON_0}'s feet.\0" +.string "There is nothing at {POKEMON_0}'s feet.\0" .align 2, 0 .global gUnknown_80FDE18 @@ -8260,7 +8260,7 @@ gUnknown_80FDEB8: @ 80FDEB8 .global gUnknown_80FDEBC gUnknown_80FDEBC: @ 80FDEBC .string "Will the linked moves be forgotten,\n" -.string "including the selected {ARG_MOVE_ITEM_0}?\0" +.string "including the selected {MOVE_ITEM_0}?\0" .align 2, 0 .global gUnknown_80FDF00 @@ -8281,7 +8281,7 @@ gUnknown_80FDF40: @ 80FDF40 .global gUnknown_80FDF44 gUnknown_80FDF44: @ 80FDF44 -.string "The move {ARG_MOVE_ITEM_0} will be\n" +.string "The move {MOVE_ITEM_0} will be\n" .string "forgotten.\n" .string "Is that OK?\0" .align 2, 0 @@ -8316,7 +8316,7 @@ gUnknown_80FDFE8: @ 80FDFE8 .global gUnknown_80FDFEC gUnknown_80FDFEC: @ 80FDFEC -.string "{ARG_POKEMON_0} can't talk just now.\0" +.string "{POKEMON_0} can't talk just now.\0" .align 2, 0 .global gUnknown_80FE008 @@ -8347,7 +8347,7 @@ gUnknown_80FE060: @ 80FE060 .global gUnknown_80FE064 gUnknown_80FE064: @ 80FE064 .string "There is no room on your team to accept\n" -.string "the guest rescue team's {ARG_POKEMON_0}.\0" +.string "the guest rescue team's {POKEMON_0}.\0" .align 2, 0 .global gUnknown_80FE0AC @@ -8358,7 +8358,7 @@ gUnknown_80FE0AC: @ 80FE0AC .global gUnknown_80FE0B0 gUnknown_80FE0B0: @ 80FE0B0 .string "There is no room on your team to fit\n" -.string "the {ARG_POKEMON_0} that needs your help.\0" +.string "the {POKEMON_0} that needs your help.\0" .align 2, 0 .global gUnknown_80FE0F4 @@ -8373,7 +8373,7 @@ gUnknown_80FE0F8: @ 80FE0F8 .global gUnknown_80FE0FC gUnknown_80FE0FC: @ 80FE0FC -.string "The guest rescue team's {ARG_POKEMON_0}\n" +.string "The guest rescue team's {POKEMON_0}\n" .string "joined your rescue team!\0" .align 2, 0 @@ -8384,7 +8384,7 @@ gUnknown_80FE134: @ 80FE134 .global gUnknown_80FE138 gUnknown_80FE138: @ 80FE138 -.string "Your client, {ARG_POKEMON_0}, joined\n" +.string "Your client, {POKEMON_0}, joined\n" .string "your rescue team!\0" .align 2, 0 @@ -8395,7 +8395,7 @@ gUnknown_80FE168: @ 80FE168 .global gUnknown_80FE16C gUnknown_80FE16C: @ 80FE16C -.string "The Friend Area {ARG_MOVE_ITEM_0} is\n" +.string "The Friend Area {MOVE_ITEM_0} is\n" .string "full.\n" .string "A friend must be released.\0" .align 2, 0 @@ -8452,7 +8452,7 @@ gUnknown_80FE2D0: @ 80FE2D0 .global gUnknown_80FE2D4 gUnknown_80FE2D4: @ 80FE2D4 -.string "{ARG_POKEMON_0} evolved into {ARG_POKEMON_1}!\0" +.string "{POKEMON_0} evolved into {POKEMON_1}!\0" .align 2, 0 .global gUnknown_80FE2EC @@ -8472,7 +8472,7 @@ gPtrItsaMonsterHouseMessage: @ 80FE308 .global gUnknown_80FE30C gUnknown_80FE30C: @ 80FE30C -.string "It became the move {ARG_MOVE_ITEM_0}'s type!\0" +.string "It became the move {MOVE_ITEM_0}'s type!\0" .align 2, 0 .global gUnknown_80FE330 @@ -8493,7 +8493,7 @@ gUnknown_80FE36C: @ 80FE36C .global gUnknown_80FE370 gUnknown_80FE370: @ 80FE370 -.string "The move {ARG_MOVE_ITEM_0} was sketched!\0" +.string "The move {MOVE_ITEM_0} was sketched!\0" .align 2, 0 .global gUnknown_80FE38C @@ -8514,7 +8514,7 @@ gUnknown_80FE3BC: @ 80FE3BC .global gUnknown_80FE3C0 gUnknown_80FE3C0: @ 80FE3C0 -.string "{ARG_MOVE_ITEM_0} is all sticky!\n" +.string "{MOVE_ITEM_0} is all sticky!\n" .string "It doesn't work!\0" .align 2, 0 @@ -8525,8 +8525,8 @@ gItemStickyDoesntWorkText: @ 80FE3E8 .global gUnknown_80FE3EC gUnknown_80FE3EC: @ 80FE3EC -.string "{ARG_POKEMON_0} learned the move\n" -.string "{ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0} learned the move\n" +.string "{MOVE_ITEM_0}.\0" .align 2, 0 .4byte gUnknown_80FE3EC @@ -8562,7 +8562,7 @@ gUnknown_80FE458: @ 80FE458 .global gUnknown_80FE45C gUnknown_80FE45C: @ 80FE45C -.string "{ARG_POKEMON_0} had second thoughts!\0" +.string "{POKEMON_0} had second thoughts!\0" .align 2, 0 .global gUnknown_80FE478 @@ -8614,7 +8614,7 @@ gUnknown_80FE520: @ 80FE520 .global gUnknown_80FE524 gUnknown_80FE524: @ 80FE524 .string "The merchandise you have chosen\n" -.string "costs {ARG_VALUE_0} {POKE}.\n" +.string "costs {VALUE_0} {POKE}.\n" .string "Is that acceptable?\0" .align 2, 0 @@ -8626,7 +8626,7 @@ gUnknown_80FE568: @ 80FE568 .global gUnknown_80FE56C gUnknown_80FE56C: @ 80FE56C .string "For the merchandise you have left me,\n" -.string "I shall pay {ARG_VALUE_0} {POKE}.\n" +.string "I shall pay {VALUE_0} {POKE}.\n" .string "Is that acceptable?\0" .align 2, 0 @@ -8679,7 +8679,7 @@ gUnknown_80FE674: @ 80FE674 .global gUnknown_80FE678 gUnknown_80FE678: @ 80FE678 -.string "{ARG_POKEMON_0} was sent flying!\0" +.string "{POKEMON_0} was sent flying!\0" .align 2, 0 .global gUnknown_80FE690 @@ -8699,7 +8699,7 @@ gUnknown_80FE6B4: @ 80FE6B4 .global gUnknown_80FE6B8 gUnknown_80FE6B8: @ 80FE6B8 -.string "{ARG_POKEMON_0} can't throw items!\0" +.string "{POKEMON_0} can't throw items!\0" .align 2, 0 .global gUnknown_80FE6D4 @@ -8933,7 +8933,7 @@ gFieldItemMenuGroundTextPtr: @ 80FE92C .global ItemText_80FE930 ItemText_80FE930: @ 80FE930 -.string "{ARG_POKEMON_0}'s item\0" +.string "{POKEMON_0}'s item\0" .align 2,0 .global gUnknown_80FE940 @@ -8959,7 +8959,7 @@ gUnknown_80FE954: @ 80FE954 .global ItemText_80FE958 ItemText_80FE958: @ 80FE958 -.string "{ARG_MOVE_ITEM_0}\0" +.string "{MOVE_ITEM_0}\0" .align 2,0 .global gUnknown_80FE95C @@ -8976,7 +8976,7 @@ gUnknown_80FE964: @ 80FE964 .global PokeMove_80FE968 PokeMove_80FE968: @ 80FE968 -.string "{ARG_POKEMON_0}'s moves\0" +.string "{POKEMON_0}'s moves\0" .align 2,0 .global gUnknown_80FE978 @@ -9080,7 +9080,7 @@ gUnknown_80FEA28: @ 80FEA28 .global gUnknown_80FEA2C gUnknown_80FEA2C: @ 80FEA2C -.string "{COLOR_1 RED}Recruitment search{END_COLOR_TEXT_1}\0" +.string "{COLOR RED}Recruitment search{RESET}\0" .align 2, 0 .global gUnknown_80FEA44 @@ -9128,9 +9128,9 @@ gUnknown_80FEA8C: @ 80FEA8C .global gUnknown_80FEA90 gUnknown_80FEA90: @ 80FEA90 -.string "{ARG_POKEMON_0}'s IQ rose!\n" +.string "{POKEMON_0}'s IQ rose!\n" .string "It learned the IQ skill\n" -.string "“{ARG_MOVE_ITEM_0}”!\0" +.string "“{MOVE_ITEM_0}”!\0" .align 2, 0 .global gUnknown_80FEAC4 @@ -9150,7 +9150,7 @@ gUnknown_80FEAE8: @ 80FEAE8 .global gUnknown_80FEAEC gUnknown_80FEAEC: @ 80FEAEC -.string "{ARG_POKEMON_1} became the {ARG_MOVE_ITEM_0} type.\0" +.string "{POKEMON_1} became the {MOVE_ITEM_0} type.\0" .align 2, 0 .global gUnknown_80FEB08 @@ -9160,7 +9160,7 @@ gUnknown_80FEB08: @ 80FEB08 .global gUnknown_80FEB0C gUnknown_80FEB0C: @ 80FEB0C -.string "{ARG_POKEMON_1} took Perish Song's effect!\0" +.string "{POKEMON_1} took Perish Song's effect!\0" .align 2, 0 .global gUnknown_80FEB30 @@ -9240,7 +9240,7 @@ gUnknown_80FEC28: @ 80FEC28 .global gUnknown_80FEC2C gUnknown_80FEC2C: @ 80FEC2C -.string "Rescue chances left: {ARG_VALUE_0}\0" +.string "Rescue chances left: {VALUE_0}\0" .align 2, 0 .global gUnknown_80FEC48 @@ -9270,7 +9270,7 @@ gUnknown_80FECA0: @ 80FECA0 .global gUnknown_80FECA4 gUnknown_80FECA4: @ 80FECA4 -.string "{ARG_POKEMON_0} waggled its finger!\0" +.string "{POKEMON_0} waggled its finger!\0" .align 2, 0 .global gUnknown_80FECBC @@ -9280,7 +9280,7 @@ gUnknown_80FECBC: @ 80FECBC .global gUnknown_80FECC0 gUnknown_80FECC0: @ 80FECC0 -.string "{ARG_POKEMON_0} drew out nature's power!\0" +.string "{POKEMON_0} drew out nature's power!\0" .align 2, 0 .global gUnknown_80FECE0 @@ -9325,13 +9325,13 @@ gUnknown_80FED30: @ 80FED30 .global gUnknown_80FED34 gUnknown_80FED34: @ 80FED34 -.string "{ARG_POKEMON_0} disappeared in the blast!\0" +.string "{POKEMON_0} disappeared in the blast!\0" .align 2, 0 .4byte gUnknown_80FED34 .global gUnknown_80FED58 gUnknown_80FED58: @ 80FED58 -.string "{ARG_POKEMON_0} blinked.\0" +.string "{POKEMON_0} blinked.\0" .align 2, 0 .global gUnknown_80FED68 @@ -9512,7 +9512,7 @@ gUnknown_80FEF98: @ 80FEF98 .global gUnknown_80FEF9C gUnknown_80FEF9C: @ 80FEF9C .string "A horrid stench billowed out!\n" -.string "{ARG_POKEMON_0} became terrified!\0" +.string "{POKEMON_0} became terrified!\0" .align 2, 0 .global gUnknown_80FEFD0 @@ -9532,7 +9532,7 @@ gUnknown_80FEFF4: @ 80FEFF4 .global gUnknown_80FEFF8 gUnknown_80FEFF8: @ 80FEFF8 -.string "{ARG_POKEMON_0}'s Synchronize took effect!\0" +.string "{POKEMON_0}'s Synchronize took effect!\0" .align 2, 0 .global gUnknown_80FF01C @@ -9774,8 +9774,8 @@ gUnknown_80FF6F8: @ 80FF6F8 .global gUnknown_80FF6FC gUnknown_80FF6FC: @ 80FF6FC -.string "{ARG_MOVE_ITEM_0} was added to\n" -.string "{ARG_POKEMON_0}'s list of usable tactics.\0" +.string "{MOVE_ITEM_0} was added to\n" +.string "{POKEMON_0}'s list of usable tactics.\0" .align 2, 0 .global gUnknown_80FF730 @@ -9996,7 +9996,7 @@ gUnknown_8100208: @ 8100208 .global gMagnitudeMessage gMagnitudeMessage: @ 810020C -.string "It's Magnitude {ARG_VALUE_0}!\0" +.string "It's Magnitude {VALUE_0}!\0" .align 2, 0 .global gPtrMagnitudeMessage @@ -10014,7 +10014,7 @@ gPtrSleepingTargetOnlyMessage: @ 810024C .global gFeralFoundItemMessage gFeralFoundItemMessage: @ 8100250 -.string "{ARG_POKEMON_0} found an item somewhere.\0" +.string "{POKEMON_0} found an item somewhere.\0" .align 2, 0 .global gPtrFeralFoundItemMessage @@ -10032,7 +10032,7 @@ gPtrSelfHealPreventedHungerMessage: @ 8100298 .global gUnknown_810029C gUnknown_810029C: @ 810029C -.string "Rescue challenges left: {ARG_VALUE_0}\0" +.string "Rescue challenges left: {VALUE_0}\0" .align 2, 0 .global gUnknown_81002B8 @@ -10059,8 +10059,8 @@ gPtrLinkedMovesComeApartMessage: @ 81002FC .global gLinkMoveOneUseWarningMessage gLinkMoveOneUseWarningMessage: @ 8100300 -.string "{COLOR_2 YELLOW}The linked moves are almost out of PP!{END_COLOR_TEXT_2}\n" -.string "{COLOR_2 YELLOW}Use them again and they will come apart!{END_COLOR_TEXT_2}\0" +.string "{color YELLOW}The linked moves are almost out of PP!{reset}\n" +.string "{color YELLOW}Use them again and they will come apart!{reset}\0" .align 2, 0 .global gPtrLinkMoveOneUseWarningMessage @@ -10069,8 +10069,8 @@ gPtrLinkMoveOneUseWarningMessage: @ 810035C .global gLinkMoveTwoUsesWarningMessage gLinkMoveTwoUsesWarningMessage: @ 8100360 -.string "{COLOR_2 YELLOW}The linked moves are almost out of PP!{END_COLOR_TEXT_2}\n" -.string "{COLOR_2 YELLOW}Use them twice and they will come apart!{END_COLOR_TEXT_2}\0" +.string "{color YELLOW}The linked moves are almost out of PP!{reset}\n" +.string "{color YELLOW}Use them twice and they will come apart!{reset}\0" .align 2, 0 .global gPtrLinkMoveTwoUsesWarningMessage @@ -10155,7 +10155,7 @@ gUnknown_81004F0: @ 81004F0 .global gUnknown_81004F4 gUnknown_81004F4: @ 81004F4 -.string "{ARG_POKEMON_1}'s Soundproof suppressed\n" +.string "{POKEMON_1}'s Soundproof suppressed\n" .string "the sound move!\0" .align 2, 0 @@ -10220,7 +10220,7 @@ gPtrCantLeechSeedSelfMessage: @ 8100610 .global gCantLeechSeedMonMessage gCantLeechSeedMonMessage: @ 8100614 .string "A leech seed couldn't be planted on\n" -.string "{ARG_POKEMON_0}!\0" +.string "{POKEMON_0}!\0" .align 2, 0 .global gPtrCantLeechSeedMonMessage @@ -10301,8 +10301,8 @@ gSkarmoryPreFightDialogue_1: @ 8100768 .global gUnknown_8100774 gUnknown_8100774: @ 8100774 -.string " Look, {ARG_POKEMON_0}!\n" -.string "{ARG_POKEMON_2}'s over there!\0" +.string " Look, {POKEMON_0}!\n" +.string "{POKEMON_2}'s over there!\0" .align 2, 0 .global gSkarmoryPreFightDialogue_2 @@ -10359,17 +10359,17 @@ gSkarmoryPreFightDialogue_5: @ 8100880 .global gUnknown_8100898 gUnknown_8100898: @ 8100898 .string " We're here to rescue\n" -.string "{ARG_POKEMON_2}!{EXTRA_MSG}" -.string " {ARG_POKEMON_3}!\n" -.string "Don't do this! Release {ARG_POKEMON_2}!\0" +.string "{POKEMON_2}!{EXTRA_MSG}" +.string " {POKEMON_3}!\n" +.string "Don't do this! Release {POKEMON_2}!\0" .align 2, 0 .global gUnknown_81008DC gUnknown_81008DC: @ 81008DC .string " We came to rescue\n" -.string "{ARG_POKEMON_2}!{EXTRA_MSG}" -.string " Hey, {ARG_POKEMON_3}!\n" -.string "Quit doing this, and release {ARG_POKEMON_2}!\0" +.string "{POKEMON_2}!{EXTRA_MSG}" +.string " Hey, {POKEMON_3}!\n" +.string "Quit doing this, and release {POKEMON_2}!\0" .align 2, 0 .global gSkarmoryPreFightDialogue_6 @@ -10404,7 +10404,7 @@ gUnknown_8100A1C: @ 8100A1C .string "Well, it's true there have\n" .string "been many earthquakes lately, but...{EXTRA_MSG}" .string " It would take more than\n" -.string "{ARG_POKEMON_2}'s family going wild under\n" +.string "{POKEMON_2}'s family going wild under\n" .string "the ground to cause earthquakes.\0" .align 2, 0 @@ -10414,7 +10414,7 @@ gUnknown_8100AD4: @ 8100AD4 .string " Sure there've been quakes\n" .string "galore lately...{EXTRA_MSG}" .string " But it would take more than\n" -.string "{ARG_POKEMON_2}'s family running wild under\n" +.string "{POKEMON_2}'s family running wild under\n" .string "the ground to set off a quake.\0" .align 2, 0 @@ -10442,7 +10442,7 @@ gSkarmoryPreFightDialogue_9: @ 8100BC0 .global gUnknown_8100BD8 gUnknown_8100BD8: @ 8100BD8 .string " It's no good.\n" -.string "{ARG_POKEMON_3} is too agitated to listen to\n" +.string "{POKEMON_3} is too agitated to listen to\n" .string "reason.{EXTRA_MSG}" .string " We'll have to fight it out!\0" .align 2, 0 @@ -10450,7 +10450,7 @@ gUnknown_8100BD8: @ 8100BD8 .global gUnknown_8100C34 gUnknown_8100C34: @ 8100C34 .string " It's useless.\n" -.string "{ARG_POKEMON_3} is too steamed to talk\n" +.string "{POKEMON_3} is too steamed to talk\n" .string "reasonably.{EXTRA_MSG}" .string " We're going to have to\n" .string "fight!\0" @@ -10477,8 +10477,8 @@ gSkarmoryReFightDialogue_2: @ 8100CBC .global gUnknown_8100CC8 gUnknown_8100CC8: @ 8100CC8 -.string " Let {ARG_POKEMON_2} go!\n" -.string "{ARG_POKEMON_3}!\0" +.string " Let {POKEMON_2} go!\n" +.string "{POKEMON_3}!\0" .align 2, 0 .global gSkarmoryReFightDialogue_3 @@ -10520,7 +10520,7 @@ gTeamMeaniesPreFightDialogue_1: @ 8100DB0 gUnknown_8100DC8: @ 8100DC8 .string " Wow, we came quite a ways\n" .string "into this forest.{EXTRA_MSG}" -.string " I wonder if {ARG_POKEMON_2} is\n" +.string " I wonder if {POKEMON_2} is\n" .string "ahead...\0" .align 2, 0 @@ -10528,7 +10528,7 @@ gUnknown_8100DC8: @ 8100DC8 gUnknown_8100E18: @ 8100E18 .string " We've come pretty far\n" .string "into this forest.{EXTRA_MSG}" -.string " I wonder if {ARG_POKEMON_2} is\n" +.string " I wonder if {POKEMON_2} is\n" .string "ahead...\0" .align 2, 0 @@ -10553,7 +10553,7 @@ gTeamMeaniesPreFightDialogue_3: @ 8100E88 gUnknown_8100E94: @ 8100E94 .string " Keke!\n" .string "You know who's going to get to\n" -.string "{ARG_POKEMON_2} first? We are!{EXTRA_MSG}" +.string "{POKEMON_2} first? We are!{EXTRA_MSG}" .string " So, for you to go ahead...{WAIT_PRESS}\n" .string "Well, we can't let that happen.\0" .align 2, 0 @@ -10572,21 +10572,21 @@ gTeamMeaniesPreFightDialogue_4: @ 8100F14 .global gUnknown_8100F38 gUnknown_8100F38: @ 8100F38 .string " Wh-what?!{EXTRA_MSG}" -.string " Now, hold on, {ARG_POKEMON_3}!{WAIT_PRESS}\n" +.string " Now, hold on, {POKEMON_3}!{WAIT_PRESS}\n" .string "Why do you always interfere with us?\0" .align 2, 0 .global gUnknown_8100F84 gUnknown_8100F84: @ 8100F84 .string " Wh-what!{EXTRA_MSG}" -.string " Hey, {ARG_POKEMON_3}!{WAIT_PRESS}\n" +.string " Hey, {POKEMON_3}!{WAIT_PRESS}\n" .string "Why do you always mess with us?\0" .align 2, 0 .global gUnknown_8100FC0 gUnknown_8100FC0: @ 8100FC0 .string " Wh-what...?{EXTRA_MSG}" -.string " Hey, {ARG_POKEMON_3}!{WAIT_PRESS}\n" +.string " Hey, {POKEMON_3}!{WAIT_PRESS}\n" .string "Why do you always try to mess with us?\0" .align 2, 0 @@ -10610,9 +10610,9 @@ gTeamMeaniesPreFightDialogue_6: @ 8101050 .global gUnknown_810105C gUnknown_810105C: @ 810105C -.string " {ARG_POKEMON_4}'s mama will\n" +.string " {POKEMON_4}'s mama will\n" .string "give us a generous reward...{EXTRA_MSG}" -.string " And {ARG_POKEMON_4} will join\n" +.string " And {POKEMON_4} will join\n" .string "us too...{WAIT_PRESS}\n" .string "That brings us closer to our goal.\0" .align 2, 0 @@ -10629,7 +10629,7 @@ gUnknown_81010DC: @ 81010DC .string "And for that, your lot is in the way!{EXTRA_MSG}" .string " So sorry to say, but your\n" .string "party's over right here and now!{EXTRA_MSG}" -.string " Say good-bye, {ARG_POKEMON_1}!\0" +.string " Say good-bye, {POKEMON_1}!\0" .align 2, 0 .global gTeamMeaniesReFightDialogue_1 @@ -10643,17 +10643,17 @@ gTeamMeaniesReFightDialogue_1: @ 8101164 .global gUnknown_810117C gUnknown_810117C: @ 810117C -.string " This is where the {COLOR_1 CYAN}Meanies{END_COLOR_TEXT_1}\n" +.string " This is where the {COLOR CYAN}Meanies{RESET}\n" .string "showed up last time.{EXTRA_MSG}" -.string " I wonder if {ARG_POKEMON_3}'s\n" -.string "bunch already found {ARG_POKEMON_2}...\0" +.string " I wonder if {POKEMON_3}'s\n" +.string "bunch already found {POKEMON_2}...\0" .align 2, 0 .global gUnknown_81011E4 gUnknown_81011E4: @ 81011E4 .string " Last time, this is where\n" -.string "{ARG_POKEMON_3}'s gang appeared.{EXTRA_MSG}" -.string " Did they find {ARG_POKEMON_2}\n" +.string "{POKEMON_3}'s gang appeared.{EXTRA_MSG}" +.string " Did they find {POKEMON_2}\n" .string "already, I wonder?\0" .align 2, 0 @@ -10670,22 +10670,22 @@ gTeamMeaniesReFightDialogue_2: @ 8101240 .global gUnknown_8101264 gUnknown_8101264: @ 8101264 -.string " Huh? It's {ARG_POKEMON_3}!{EXTRA_MSG}" -.string " Why is {ARG_POKEMON_3}'s gang\n" +.string " Huh? It's {POKEMON_3}!{EXTRA_MSG}" +.string " Why is {POKEMON_3}'s gang\n" .string "following us?\0" .align 2, 0 .global gUnknown_810129C gUnknown_810129C: @ 810129C -.string " Huh? It's {ARG_POKEMON_3}!{EXTRA_MSG}" -.string " Why is the {ARG_POKEMON_3}\n" +.string " Huh? It's {POKEMON_3}!{EXTRA_MSG}" +.string " Why is the {POKEMON_3}\n" .string "gang following us?\0" .align 2, 0 .global gUnknown_81012D4 gUnknown_81012D4: @ 81012D4 -.string " Hah? It's {ARG_POKEMON_3}!{EXTRA_MSG}" -.string " Why is {ARG_POKEMON_3}'s\n" +.string " Hah? It's {POKEMON_3}!{EXTRA_MSG}" +.string " Why is {POKEMON_3}'s\n" .string "crew coming after us?\0" .align 2, 0 @@ -10726,7 +10726,7 @@ gTeamMeaniesReFightDialogue_5: @ 8101408 .global gUnknown_8101414 gUnknown_8101414: @ 8101414 -.string " This is it, {ARG_POKEMON_1}!\n" +.string " This is it, {POKEMON_1}!\n" .string "You're going down!\0" .align 2, 0 @@ -10773,19 +10773,19 @@ gUnknown_8101504: @ 8101504 .global gUnknown_810151C gUnknown_810151C: @ 810151C -.string " Hey! {ARG_POKEMON_3}!\n" +.string " Hey! {POKEMON_3}!\n" .string "Where are you?!{EXTRA_MSG}" .string " We came to rescue\n" -.string "{ARG_POKEMON_2}!\n" +.string "{POKEMON_2}!\n" .string "Come out!\0" .align 2, 0 .global gUnknown_810155C gUnknown_810155C: @ 810155C -.string " Hey! {ARG_POKEMON_3}!\n" +.string " Hey! {POKEMON_3}!\n" .string "Where are you?!{EXTRA_MSG}" .string " We came to rescue\n" -.string "{ARG_POKEMON_2}!\n" +.string "{POKEMON_2}!\n" .string "Show yourself!\0" .align 2, 0 @@ -10849,24 +10849,24 @@ gUnknown_810165C: @ 810165C .global gUnknown_8101680 gUnknown_8101680: @ 8101680 -.string " Hey, {ARG_POKEMON_3}!\n" -.string "We demand you release {ARG_POKEMON_2}!{EXTRA_MSG}" +.string " Hey, {POKEMON_3}!\n" +.string "We demand you release {POKEMON_2}!{EXTRA_MSG}" .string " We're a Pokémon rescue\n" .string "team!\0" .align 2, 0 .global gUnknown_81016CC gUnknown_81016CC: @ 81016CC -.string " Hey, {ARG_POKEMON_3}!\n" -.string "Release {ARG_POKEMON_2}!{EXTRA_MSG}" +.string " Hey, {POKEMON_3}!\n" +.string "Release {POKEMON_2}!{EXTRA_MSG}" .string " We're a Pokémon rescue\n" .string "team!\0" .align 2, 0 .global gUnknown_8101708 gUnknown_8101708: @ 8101708 -.string " Hey, {ARG_POKEMON_3}!\n" -.string "Let {ARG_POKEMON_2} go!{EXTRA_MSG}" +.string " Hey, {POKEMON_3}!\n" +.string "Let {POKEMON_2} go!{EXTRA_MSG}" .string " A Pokémon rescue team!\n" .string "That's what we are!\0" .align 2, 0 @@ -10919,21 +10919,21 @@ gZapdosReFightDialogue_1: @ 81017E4 .global gUnknown_8101808 gUnknown_8101808: @ 8101808 -.string " Hey, {ARG_POKEMON_3}!\n" +.string " Hey, {POKEMON_3}!\n" .string "We're here again!{EXTRA_MSG}" .string " Show yourself!\0" .align 2, 0 .global gUnknown_810183C gUnknown_810183C: @ 810183C -.string " Hey, {ARG_POKEMON_3}!\n" +.string " Hey, {POKEMON_3}!\n" .string "We're back!{EXTRA_MSG}" .string " Come out!\0" .align 2, 0 .global gUnknown_8101864 gUnknown_8101864: @ 8101864 -.string " Hey, {ARG_POKEMON_3}!\n" +.string " Hey, {POKEMON_3}!\n" .string "Guess who's back?!{EXTRA_MSG}" .string " Show yourself!\0" .align 2, 0 @@ -11252,7 +11252,7 @@ gMoltresPreFightDialogue_11: @ 81020D4 .global gUnknown_81020E0 gUnknown_81020E0: @ 81020E0 -.string " I am {ARG_POKEMON_2}!\n" +.string " I am {POKEMON_2}!\n" .string "The warrior of fire am I!\0" .align 2, 0 @@ -11278,7 +11278,7 @@ gMoltresReFightDialogue_1: @ 8102158 .global gUnknown_8102164 gUnknown_8102164: @ 8102164 .string " ............{WAIT_PRESS}\n" -.string "Maybe {ARG_POKEMON_2} isn't around...\0" +.string "Maybe {POKEMON_2} isn't around...\0" .align 2, 0 .global gMoltresReFightDialogue_2 @@ -11392,7 +11392,7 @@ gMoltresPostStoryPreFightDialogue_3: @ 81023C4 .global gUnknown_81023D0 gUnknown_81023D0: @ 81023D0 .string " So be it!{WAIT_PRESS}\n" -.string "I am the warrior of fire, {ARG_POKEMON_2}!\0" +.string "I am the warrior of fire, {POKEMON_2}!\0" .align 2, 0 .global gMoltresPostStoryPreFightDialogue_4 @@ -11470,7 +11470,7 @@ gArticunoPreFightDialogue_3: @ 81025D4 .global gUnknown_81025E0 gUnknown_81025E0: @ 81025E0 .string " ...Huh?{WAIT_PRESS}\n" -.string "{ARG_POKEMON_0}, did you just say something?\0" +.string "{POKEMON_0}, did you just say something?\0" .align 2, 0 .global gArticunoPreFightDialogue_4 @@ -11570,7 +11570,7 @@ gUnknown_810284C: @ 810284C .global gUnknown_810284C gUnknown_810284C: @ 810284C -.string " I am {ARG_POKEMON_2}!{WAIT_PRESS}\n" +.string " I am {POKEMON_2}!{WAIT_PRESS}\n" .string "The warder of ice!\0" .global gArticunoPreFightDialogue_11 @@ -11780,7 +11780,7 @@ MagmaCavernMidDialogue_5: @ 8102C30 .global gUnknown_8102C3C gUnknown_8102C3C: @ 8102C3C -.string " Hey! {ARG_POKEMON_0}!\n" +.string " Hey! {POKEMON_0}!\n" .string "Over there!\0" .align 2, 0 @@ -11844,7 +11844,7 @@ MagmaCavernMidDialogue_9: @ 8102CF8 .global gUnknown_8102D04 gUnknown_8102D04: @ 8102D04 .string " We challenged...\n" -.string "{ARG_POKEMON_2}...{WAIT_PRESS}\n" +.string "{POKEMON_2}...{WAIT_PRESS}\n" .string "And wiped out...\n\0" .align 2, 0 @@ -11856,7 +11856,7 @@ MagmaCavernMidDialogue_10: @ 8102D34 .global gUnknown_8102D40 gUnknown_8102D40: @ 8102D40 -.string " G-{ARG_POKEMON_2}?!\0" +.string " G-{POKEMON_2}?!\0" .align 2, 0 .global MagmaCavernMidDialogue_11 @@ -11883,15 +11883,15 @@ MagmaCavernMidDialogue_12: @ 8102D7C .global gUnknown_8102D94 gUnknown_8102D94: @ 8102D94 .string " That's right.{WAIT_PRESS}\n" -.string "What happened to {ARG_POKEMON_3}?\n" -.string "Where is {ARG_POKEMON_3}?\0" +.string "What happened to {POKEMON_3}?\n" +.string "Where is {POKEMON_3}?\0" .align 2, 0 .global gUnknown_8102DCC gUnknown_8102DCC: @ 8102DCC .string " Wait...{WAIT_PRESS}\n" -.string "What about {ARG_POKEMON_3}?\n" -.string "Where did {ARG_POKEMON_3} go?\0" +.string "What about {POKEMON_3}?\n" +.string "Where did {POKEMON_3} go?\0" .align 2, 0 .global MagmaCavernMidDialogue_13 @@ -11902,8 +11902,8 @@ MagmaCavernMidDialogue_13: @ 8102DFC .global gUnknown_8102E08 gUnknown_8102E08: @ 8102E08 -.string " {ARG_POKEMON_3} is...{WAIT_PRESS}\n" -.string "Still battling {ARG_POKEMON_2}...\0" +.string " {POKEMON_3} is...{WAIT_PRESS}\n" +.string "Still battling {POKEMON_2}...\0" .align 2, 0 .global MagmaCavernMidDialogue_14 @@ -11915,7 +11915,7 @@ MagmaCavernMidDialogue_14: @ 8102E2C .global gUnknown_8102E38 gUnknown_8102E38: @ 8102E38 -.string " {ARG_POKEMON_0}!\n" +.string " {POKEMON_0}!\n" .string "We've got to hurry!\0" .global MagmaCavernMidDialogue_15 @@ -11940,13 +11940,13 @@ GroudonPreFightDialogue_1: @ 8102E70 .global gUnknown_8102E88 gUnknown_8102E88: @ 8102E88 -.string " It's {ARG_POKEMON_3}!\n" +.string " It's {POKEMON_3}!\n" .string "Are you OK?!\0" .align 2, 0 .global gUnknown_8102EA4 gUnknown_8102EA4: @ 8102EA4 -.string " Oh! {ARG_POKEMON_3}!\n" +.string " Oh! {POKEMON_3}!\n" .string "Are you OK?!\0" .align 2, 0 @@ -12040,8 +12040,8 @@ GroudonPreFightDialogue_9: @ 8102FC4 .global gUnknown_8102FD0 gUnknown_8102FD0: @ 8102FD0 -@ The "A-" only makes sense when ARG_POKEMON_3 is "Alakazam" (which it is when this is used). Kinda funny. -.string " A-{ARG_POKEMON_3}!\0" +@ The "A-" only makes sense when POKEMON_3 is "Alakazam" (which it is when this is used). Kinda funny. +.string " A-{POKEMON_3}!\0" .global GroudonPreFightDialogue_10 GroudonPreFightDialogue_10: @ 8102FD8 @@ -12054,14 +12054,14 @@ GroudonPreFightDialogue_10: @ 8102FD8 .global gUnknown_8102FF0 gUnknown_8102FF0: @ 8102FF0 -.string " {ARG_POKEMON_3} is gone!{EXTRA_MSG}" +.string " {POKEMON_3} is gone!{EXTRA_MSG}" .string " Maybe...{WAIT_PRESS}\n" .string "Was he defeated?!\0" .align 2, 0 .global gUnknown_8103020 gUnknown_8103020: @ 8103020 -.string " {ARG_POKEMON_3}'s gone!{EXTRA_MSG}" +.string " {POKEMON_3}'s gone!{EXTRA_MSG}" .string " Was he maybe...{WAIT_PRESS}\n" .string "knocked out?!\0" .align 2, 0 @@ -12130,13 +12130,13 @@ GroudonPreFightDialogue_14: @ 8103140 .global gUnknown_8103158 gUnknown_8103158: @ 8103158 -.string " {ARG_POKEMON_0}!\n" +.string " {POKEMON_0}!\n" .string "Let's do our best!\0" .align 2, 0 .global gUnknown_8103174 gUnknown_8103174: @ 8103174 -.string " {ARG_POKEMON_0}!\n" +.string " {POKEMON_0}!\n" .string "Hang tough!\0" .align 2, 0 @@ -12152,17 +12152,17 @@ gGroudonReFightDialogue_1: @ 8103188 .global gUnknown_81031A0 gUnknown_81031A0: @ 81031A0 .string " Here it comes!\n" -.string "{ARG_POKEMON_0}!{EXTRA_MSG}" +.string "{POKEMON_0}!{EXTRA_MSG}" .string " Let's make sure we subdue\n" -.string "{ARG_POKEMON_2} this time!\0" +.string "{POKEMON_2} this time!\0" .align 2, 0 .global gUnknown_81031E4 gUnknown_81031E4: @ 81031E4 .string " Here it comes!\n" -.string "{ARG_POKEMON_0}!{EXTRA_MSG}" +.string "{POKEMON_0}!{EXTRA_MSG}" .string " We've got to settle\n" -.string "{ARG_POKEMON_2} down this time!\0" +.string "{POKEMON_2} down this time!\0" .align 2, 0 .global gGroudonReFightDialogue_2 @@ -12219,13 +12219,13 @@ gGroudonReFightDialogue_4: @ 8103340 .global gUnknown_8103358 gUnknown_8103358: @ 8103358 -.string " {ARG_POKEMON_0}!\n" +.string " {POKEMON_0}!\n" .string "Let's give it our all!\0" .align 2, 0 .global gUnknown_8103378 gUnknown_8103378: @ 8103378 -.string " {ARG_POKEMON_0}!\n" +.string " {POKEMON_0}!\n" .string "Let's give it what we've got!\0" .align 2, 0 @@ -12318,13 +12318,13 @@ gRayquazaPreFightDialogue_3: @ 8103578 .global gUnknown_8103590 gUnknown_8103590: @ 8103590 .string " That voice...{WAIT_PRESS}\n" -.string "Could it be {ARG_POKEMON_2}?\0" +.string "Could it be {POKEMON_2}?\0" .align 2, 0 .global gUnknown_81035B4 gUnknown_81035B4: @ 81035B4 .string " That voice...{WAIT_PRESS}\n" -.string "Is that {ARG_POKEMON_2}?\0" +.string "Is that {POKEMON_2}?\0" .align 2, 0 .global gRayquazaPreFightDialogue_4 @@ -12719,7 +12719,7 @@ gMewtwoPreFightDialogue_2: @ 8103F0C .global gUnknown_8103F18 gUnknown_8103F18: @ 8103F18 -.string " My name is {ARG_POKEMON_2}.{WAIT_PRESS}\n" +.string " My name is {POKEMON_2}.{WAIT_PRESS}\n" .string "I came into being only to fight.\0" .align 2, 0 @@ -12793,7 +12793,7 @@ gMewtwoReFightDialogue_3: @ 81040CC .global gUnknown_81040D8 gUnknown_81040D8: @ 81040D8 -.string " I am {ARG_POKEMON_2}.{WAIT_PRESS}\n" +.string " I am {POKEMON_2}.{WAIT_PRESS}\n" .string "A Pokémon created only to fight...{WAIT_PRESS}\n" .string "And...\0" .align 2, 0 @@ -12837,7 +12837,7 @@ gEnteiPreFightDialogue_2: @ 81041AC .global gUnknown_81041B8 gUnknown_81041B8: @ 81041B8 -.string " I am {ARG_POKEMON_2}!{WAIT_PRESS}\n" +.string " I am {POKEMON_2}!{WAIT_PRESS}\n" .string "I live surrounded by the fiery lava of\n" .string "volcanoes!\0" .align 2, 0 @@ -12864,7 +12864,7 @@ gEnteiReFightDialogue_1: @ 8104240 gUnknown_810424C: @ 810424C .string " Did I not say to never\n" .string "return?{EXTRA_MSG}" -.string " This is the {COLOR_1 YELLOW_4}Fiery Field{END_COLOR_TEXT_1}!{WAIT_PRESS}\n" +.string " This is the {COLOR YELLOW_D}Fiery Field{RESET}!{WAIT_PRESS}\n" .string "It is no place for your kind!\0" .align 2, 0 @@ -12895,9 +12895,9 @@ gEnteiPostStoryPreFightDialogue_1: @ 8104310 .global gUnknown_810431C gUnknown_810431C: @ 810431C -.string " This is the {COLOR_1 YELLOW_4}Fiery Field{END_COLOR_TEXT_1}!{WAIT_PRESS}\n" +.string " This is the {COLOR YELLOW_D}Fiery Field{RESET}!{WAIT_PRESS}\n" .string "It is no place for your kind!{EXTRA_MSG}" -.string " I am {ARG_POKEMON_2}!{WAIT_PRESS}\n" +.string " I am {POKEMON_2}!{WAIT_PRESS}\n" .string "I live surrounded by the fiery lava of\n" .string "volcanoes!\0" .align 2, 0 @@ -12947,7 +12947,7 @@ gRaikouPreFightDialogue_1: @ 8104450 gUnknown_810445C: @ 810445C .string " Why...{WAIT_PRESS}\n" .string "Why have you come...?{EXTRA_MSG}" -.string " This is {COLOR_1 YELLOW_4}Lightning Field{END_COLOR_TEXT_1}.{WAIT_PRESS}\n" +.string " This is {COLOR YELLOW_D}Lightning Field{RESET}.{WAIT_PRESS}\n" .string "It is my...{WAIT_PRESS}" .string "domain!\0" .align 2, 0 @@ -12960,7 +12960,7 @@ gRaikouPreFightDialogue_2: @ 81044B4 .global gUnknown_81044C0 gUnknown_81044C0: @ 81044C0 -.string " I am {ARG_POKEMON_2}!{WAIT_PRESS}\n" +.string " I am {POKEMON_2}!{WAIT_PRESS}\n" .string "One who races with lightning!{EXTRA_MSG}" .string " A body like roiling rain\n" .string "clouds!\0" @@ -13057,7 +13057,7 @@ gRaikouPostStoryPreFightDialogue_1: @ 81046CC .global gUnknown_81046D8 gUnknown_81046D8: @ 81046D8 -.string " This is {COLOR_1 YELLOW_4}Lightning Field{END_COLOR_TEXT_1}!{WAIT_PRESS}\n" +.string " This is {COLOR YELLOW_D}Lightning Field{RESET}!{WAIT_PRESS}\n" .string "My domain!{EXTRA_MSG}" .string " All those who enter...{WAIT_PRESS}\n" .string "I show no mercy, no matter what!\0" @@ -13126,7 +13126,7 @@ gSuicunePreFightDialogue_4: @ 810484C .global gUnknown_8104858 gUnknown_8104858: @ 8104858 -.string " I am {ARG_POKEMON_2}!{WAIT_PRESS}\n" +.string " I am {POKEMON_2}!{WAIT_PRESS}\n" .string "One who runs with the north wind!\0" .align 2, 0 @@ -13262,7 +13262,7 @@ gUnknown_8104AE0: @ 8104AE0 .string " Fought through many dangerous\n" .string "situations...{EXTRA_MSG}" .string " and finally ascended to the very peak\n" -.string "of {COLOR_1 YELLOW_4}Mt. Faraway{END_COLOR_TEXT_1}!{EXTRA_MSG}" +.string "of {COLOR YELLOW_D}Mt. Faraway{RESET}!{EXTRA_MSG}" .string " Truly, only the chosen have reached\n" .string "the summit.{EXTRA_MSG}" .string " However!\0" @@ -13287,7 +13287,7 @@ gHoOhPreFightDialogue_3: @ 8104C10 .global gUnknown_8104C1C gUnknown_8104C1C: @ 8104C1C -.string " I am {ARG_POKEMON_2}!{WAIT_PRESS}\n" +.string " I am {POKEMON_2}!{WAIT_PRESS}\n" .string "The builder of rainbows across the sky!\0" .align 2, 0 @@ -13395,7 +13395,7 @@ gUnknown_8104E6C: @ 8104E6C .string "I see. You're trying to get your TMs back.{EXTRA_MSG}" .string " But!{EXTRA_MSG}" .string " Nobody can stop me!{EXTRA_MSG}" -.string " I'm the Eon Pokémon {ARG_POKEMON_2}!\0" +.string " I'm the Eon Pokémon {POKEMON_2}!\0" .align 2, 0 .global gLatiosPreFightDialogue_2 @@ -13478,8 +13478,8 @@ gRegirockPostFightDialogue_1: @ 8105040 .global gUnknown_810504C gUnknown_810504C: @ 810504C .string "{CENTER_ALIGN}Something fell from\n" -.string "{CENTER_ALIGN}{COLOR_1 CYAN_3}Regirock{END_COLOR_TEXT_1}'s body.{EXTRA_MSG}" -.string "{CENTER_ALIGN}{COLOR_1 CYAN_3}Regirock{END_COLOR_TEXT_1} was apparently\n" +.string "{CENTER_ALIGN}{COLOR CYAN_M}Regirock{RESET}'s body.{EXTRA_MSG}" +.string "{CENTER_ALIGN}{COLOR CYAN_M}Regirock{RESET} was apparently\n" .string "{CENTER_ALIGN}guarding this item.\0" .align 2, 0 @@ -13491,9 +13491,9 @@ gRegirockPostFightDialogue_2: @ 81050B4 .global gUnknown_81050C0 gUnknown_81050C0: @ 81050C0 -.string "{CENTER_ALIGN}{ARG_POKEMON_0} obtained\n" -.string "{CENTER_ALIGN}the {COLOR_1 GREEN_2}Rock Part{END_COLOR_TEXT_1}...{EXTRA_MSG}" -.string "{CENTER_ALIGN}that {COLOR_1 CYAN_3}Regirock{END_COLOR_TEXT_1} was guarding!\0" +.string "{CENTER_ALIGN}{POKEMON_0} obtained\n" +.string "{CENTER_ALIGN}the {COLOR GREEN_I}Rock Part{RESET}...{EXTRA_MSG}" +.string "{CENTER_ALIGN}that {COLOR CYAN_M}Regirock{RESET} was guarding!\0" .align 2, 0 .global gRegicePostFightDialogue_1 @@ -13505,8 +13505,8 @@ gRegicePostFightDialogue_1: @ 810510C .global gUnknown_8105118 gUnknown_8105118: @ 8105118 .string "{CENTER_ALIGN}Something fell from\n" -.string "{CENTER_ALIGN}{COLOR_1 CYAN_3}Regice{END_COLOR_TEXT_1}'s body.{EXTRA_MSG}" -.string "{CENTER_ALIGN}{COLOR_1 CYAN_3}Regice{END_COLOR_TEXT_1} was apparently\n" +.string "{CENTER_ALIGN}{COLOR CYAN_M}Regice{RESET}'s body.{EXTRA_MSG}" +.string "{CENTER_ALIGN}{COLOR CYAN_M}Regice{RESET} was apparently\n" .string "{CENTER_ALIGN}guarding this item.\0" .align 2, 0 @@ -13518,9 +13518,9 @@ gRegicePostFightDialogue_2: @ 810517C .global gUnknown_8105188 gUnknown_8105188: @ 8105188 -.string "{CENTER_ALIGN}{ARG_POKEMON_0} obtained\n" -.string "{CENTER_ALIGN}the {COLOR_1 GREEN_2}Ice Part{END_COLOR_TEXT_1}...{EXTRA_MSG}" -.string "{CENTER_ALIGN}that {COLOR_1 CYAN_3}Regice{END_COLOR_TEXT_1} was guarding!\0" +.string "{CENTER_ALIGN}{POKEMON_0} obtained\n" +.string "{CENTER_ALIGN}the {COLOR GREEN_I}Ice Part{RESET}...{EXTRA_MSG}" +.string "{CENTER_ALIGN}that {COLOR CYAN_M}Regice{RESET} was guarding!\0" .align 2, 0 .global gRegisteelPostFightDialogue_1 @@ -13532,8 +13532,8 @@ gRegisteelPostFightDialogue_1: @ 81051D0 .global gUnknown_81051DC gUnknown_81051DC: @ 81051DC .string "{CENTER_ALIGN}Something fell from\n" -.string "{CENTER_ALIGN}{COLOR_1 CYAN_3}Registeel{END_COLOR_TEXT_1}'s body.{EXTRA_MSG}" -.string "{CENTER_ALIGN}{COLOR_1 CYAN_3}Registeel{END_COLOR_TEXT_1} was apparently\n" +.string "{CENTER_ALIGN}{COLOR CYAN_M}Registeel{RESET}'s body.{EXTRA_MSG}" +.string "{CENTER_ALIGN}{COLOR CYAN_M}Registeel{RESET} was apparently\n" .string "{CENTER_ALIGN}guarding this item.\0" .align 2, 0 @@ -13545,16 +13545,16 @@ gRegisteelPostFightDialogue_2: @ 8105244 .global gUnknown_8105250 gUnknown_8105250: @ 8105250 -.string "{CENTER_ALIGN}{ARG_POKEMON_0} obtained\n" -.string "{CENTER_ALIGN}the {COLOR_1 GREEN_2}Steel Part{END_COLOR_TEXT_1}...{EXTRA_MSG}" -.string "{CENTER_ALIGN}that {COLOR_1 CYAN_3}Registeel{END_COLOR_TEXT_1} was guarding!\0" +.string "{CENTER_ALIGN}{POKEMON_0} obtained\n" +.string "{CENTER_ALIGN}the {COLOR GREEN_I}Steel Part{RESET}...{EXTRA_MSG}" +.string "{CENTER_ALIGN}that {COLOR CYAN_M}Registeel{RESET} was guarding!\0" .align 2, 0 .global gUnknown_81052A0 gUnknown_81052A0: @ 81052A0 .string "{CENTER_ALIGN}That means...{EXTRA_MSG}" -.string "{CENTER_ALIGN}By finding the {COLOR_1 GREEN_2}Rock Part{END_COLOR_TEXT_1},\n" -.string "{CENTER_ALIGN}{COLOR_1 GREEN_2}Ice Part{END_COLOR_TEXT_1}, and {COLOR_1 GREEN_2}Steel Part{END_COLOR_TEXT_1}...{EXTRA_MSG}" +.string "{CENTER_ALIGN}By finding the {COLOR GREEN_I}Rock Part{RESET},\n" +.string "{CENTER_ALIGN}{COLOR GREEN_I}Ice Part{RESET}, and {COLOR GREEN_I}Steel Part{RESET}...{EXTRA_MSG}" .string "{CENTER_ALIGN}All three parts are yours!\0" .align 2, 0 @@ -13578,7 +13578,7 @@ gUnknown_8105360: @ 8105360 gUnknown_8105364: @ 8105364 .string "{CENTER_ALIGN}The three parts\n" .string "{CENTER_ALIGN}fit together...{EXTRA_MSG}" -.string "{CENTER_ALIGN}and became a {COLOR_1 GREEN_2}Music Box{END_COLOR_TEXT_1}!\0" +.string "{CENTER_ALIGN}and became a {COLOR GREEN_I}Music Box{RESET}!\0" .align 2, 0 .global gUnknown_81053A8 @@ -13588,9 +13588,9 @@ gUnknown_81053A8: @ 81053A8 .global gUnknown_81053AC gUnknown_81053AC: @ 81053AC -.string "{CENTER_ALIGN}{ARG_POKEMON_0} obtained\n" -.string "{CENTER_ALIGN}the {COLOR_1 GREEN_2}Music Box{END_COLOR_TEXT_1}!{EXTRA_MSG}" -.string "{CENTER_ALIGN}The {COLOR_1 GREEN_2}Music Box{END_COLOR_TEXT_1} only needs\n" +.string "{CENTER_ALIGN}{POKEMON_0} obtained\n" +.string "{CENTER_ALIGN}the {COLOR GREEN_I}Music Box{RESET}!{EXTRA_MSG}" +.string "{CENTER_ALIGN}The {COLOR GREEN_I}Music Box{RESET} only needs\n" .string "{CENTER_ALIGN}to be in the Toolbox for it to\n" .string "{CENTER_ALIGN}attract a special something!\0" .align 2, 0 @@ -13635,7 +13635,7 @@ gJirachiPreFightDialogue_3: @ 81054E4 .global gUnknown_81054F0 gUnknown_81054F0: @ 81054F0 -.string " I'm {ARG_POKEMON_2}.\n" +.string " I'm {POKEMON_2}.\n" .string "Who are you?\0" .align 2, 0 @@ -13681,9 +13681,9 @@ gUnknown_81055F4: @ 81055F4 .global gUnknown_8105600 gUnknown_8105600: @ 8105600 -.string "{CENTER_ALIGN}{COLOR_1 CYAN_3}{ARG_POKEMON_2}{END_COLOR_TEXT_1} fell\n" +.string "{CENTER_ALIGN}{COLOR CYAN_M}{POKEMON_2}{RESET} fell\n" .string "{CENTER_ALIGN}back into a deep sleep...{EXTRA_MSG}" -.string "{CENTER_ALIGN}Apparently, {COLOR_1 CYAN_3}{ARG_POKEMON_2}{END_COLOR_TEXT_1}\n" +.string "{CENTER_ALIGN}Apparently, {COLOR CYAN_M}{POKEMON_2}{RESET}\n" .string "{CENTER_ALIGN}was fighting in its sleep...\0" .align 2, 0 @@ -13728,7 +13728,7 @@ gUnknown_81056DC: @ 81056DC gUnknown_81056E8: @ 81056E8 .string " I don't know why, but I'm\n" .string "wide awake!{EXTRA_MSG}" -.string " I'm {ARG_POKEMON_2}.{EXTRA_MSG}" +.string " I'm {POKEMON_2}.{EXTRA_MSG}" .string " When I awaken, I grant\n" .string "a wish.\n" .string "I have to.{EXTRA_MSG}" @@ -13739,7 +13739,7 @@ gUnknown_81056E8: @ 81056E8 .global gUnknown_8105778 gUnknown_8105778: @ 8105778 -.string "{COLOR_1 YELLOW_5}{ARG_POKEMON_2}{END_COLOR_TEXT_1}: What is your \n" +.string "{COLOR YELLOW_N}{POKEMON_2}{RESET}: What is your \n" .string "wish?\0" .align 2, 0 @@ -13847,7 +13847,7 @@ gUnknown_810593C: @ 810593C .global gUnknown_8105948 gUnknown_8105948: @ 8105948 -.string "{CENTER_ALIGN}{COLOR_1 CYAN_3}{ARG_POKEMON_2}{END_COLOR_TEXT_1} fell\n" +.string "{CENTER_ALIGN}{COLOR CYAN_M}{POKEMON_2}{RESET} fell\n" .string "{CENTER_ALIGN}back into a deep sleep...\0" .align 2, 0 @@ -13920,9 +13920,9 @@ gUnknown_8105B68: @ 8105B68 .global gUnknown_8105B74 gUnknown_8105B74: @ 8105B74 -.string "{CENTER_ALIGN}{COLOR_1 CYAN_3}{ARG_POKEMON_0}{END_COLOR_TEXT_1} obtained\n" +.string "{CENTER_ALIGN}{COLOR CYAN_M}{POKEMON_0}{RESET} obtained\n" .string "{CENTER_ALIGN}the Friend Area\n" -.string "{CENTER_ALIGN}{COLOR_1 UNK_COLOR_5}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}!\0" +.string "{CENTER_ALIGN}{COLOR GREEN_H}{MOVE_ITEM_0}{RESET}!\0" .align 2, 0 .global gUnknown_8105BA8 @@ -13951,7 +13951,7 @@ gUnknown_8105C00: @ 8105C00 .string "all over the dungeon that may make you \n" .string "stronger.{EXTRA_MSG}" .string " But don't use them now.{WAIT_PRESS}\n" -.string "When you leave the {COLOR_1 YELLOW_4}Wish Cave{END_COLOR_TEXT_1}, your\n" +.string "When you leave the {COLOR YELLOW_D}Wish Cave{RESET}, your\n" .string "powers go back to their original state.{EXTRA_MSG}" .string " So, you should only use\n" .string "those items after you take them back.{EXTRA_MSG}" @@ -14023,7 +14023,7 @@ gUnknown_8105E94: @ 8105E94 .string " Why...{WAIT_PRESS}\n" .string "Why have you come here...?{EXTRA_MSG}" .string " This is...{WAIT_PRESS}" -.string "the {COLOR_1 YELLOW_4}Silver Trench{END_COLOR_TEXT_1}.{WAIT_PRESS}\n" +.string "the {COLOR YELLOW_D}Silver Trench{RESET}.{WAIT_PRESS}\n" .string "This is my territory!\0" .align 2, 0 @@ -14035,7 +14035,7 @@ gLugiaPreFightDialogue_2: @ 8105EF8 .global gUnknown_8105F04 gUnknown_8105F04: @ 8105F04 -.string " My name is {ARG_POKEMON_2}!{WAIT_PRESS}\n" +.string " My name is {POKEMON_2}!{WAIT_PRESS}\n" .string "I am the guardian of the seas!\0" .align 2, 0 @@ -14154,7 +14154,7 @@ gKyogrePreFightDialogue_4: @ 8106140 .global gUnknown_810614C gUnknown_810614C: @ 810614C -.string " My duels against {ARG_POKEMON_3} left\n" +.string " My duels against {POKEMON_3} left\n" .string "us both exhausted...{WAIT_PRESS}\n" .string "I took to a long and deep sleep...{EXTRA_MSG}" .string " All the time, I waited.\n" @@ -14171,7 +14171,7 @@ gKyogrePreFightDialogue_5: @ 8106214 .global gUnknown_8106220 gUnknown_8106220: @ 8106220 -.string " I am {ARG_POKEMON_2}!{WAIT_PRESS}\n" +.string " I am {POKEMON_2}!{WAIT_PRESS}\n" .string "The lord of the sea!\0" .align 2, 0 @@ -14229,7 +14229,7 @@ gUnknown_81062F4: @ 81062F4 .string " There was a sudden explosion...{WAIT_PRESS}\n" .string "And I awakened to this...{EXTRA_MSG}" .string " What is this place?{EXTRA_MSG}" -.string " I am {ARG_POKEMON_2}.{WAIT_PRESS}\n" +.string " I am {POKEMON_2}.{WAIT_PRESS}\n" .string "I came from space.\0" .align 2, 0 @@ -14284,7 +14284,7 @@ gCelebiJoinDialogue_2: @ 8106400 .global gPurityForestCelebiIntroText gPurityForestCelebiIntroText: @ 810640C .string "{CENTER_ALIGN}It's...{WAIT_PRESS}\n" -.string "{CENTER_ALIGN}The Time Travel Pokémon {ARG_POKEMON_2}!\0" +.string "{CENTER_ALIGN}The Time Travel Pokémon {POKEMON_2}!\0" .align 2, 0 .global gCelebiJoinDialogue_3 @@ -14295,7 +14295,7 @@ gCelebiJoinDialogue_3: @ 810643C .global gPurityForestCelebiWantsToJoinText gPurityForestCelebiWantsToJoinText: @ 8106448 -.string "{CENTER_ALIGN}{ARG_POKEMON_2} wants to join the team.\0" +.string "{CENTER_ALIGN}{POKEMON_2} wants to join the team.\0" .align 2, 0 .global gCelebiJoinDialogue_4 @@ -14306,7 +14306,7 @@ gCelebiJoinDialogue_4: @ 8106468 .global gPurityForestCelebiJoinedText gPurityForestCelebiJoinedText: @ 8106474 -.string "{CENTER_ALIGN}{ARG_POKEMON_2} joined the team! \0" +.string "{CENTER_ALIGN}{POKEMON_2} joined the team! \0" .align 2, 0 .global gCelebiJoinDialogue_5 @@ -14317,7 +14317,7 @@ gCelebiJoinDialogue_5: @ 810648C .global gPurityForestCelebiVeryHappyText gPurityForestCelebiVeryHappyText: @ 8106498 -.string "{CENTER_ALIGN}{ARG_POKEMON_3} appears to\n" +.string "{CENTER_ALIGN}{POKEMON_3} appears to\n" .string "{CENTER_ALIGN}be very happy!\0" .align 2, 0 @@ -14341,7 +14341,7 @@ gCelebiJoinDialogue_7: @ 8106500 .global gPurityForestTurnedDownOfferText gPurityForestTurnedDownOfferText: @ 810650C -.string "{CENTER_ALIGN}{ARG_POKEMON_0} turned down\n" +.string "{CENTER_ALIGN}{POKEMON_0} turned down\n" .string "{CENTER_ALIGN}the offer to join.\0" .align 2, 0 @@ -14364,13 +14364,13 @@ gCelebiJoinDialogue_9: @ 8106560 .global gPurityForestCelebiLeftDejectedlyText gPurityForestCelebiLeftDejectedlyText: @ 810656C -.string "{CENTER_ALIGN}{ARG_POKEMON_2} left\n" +.string "{CENTER_ALIGN}{POKEMON_2} left\n" .string "{CENTER_ALIGN}dejectedly...\0" .align 2, 0 .global gPurityForestAllowCelebiToJoinText gPurityForestAllowCelebiToJoinText: @ 8106588 -.string "{CENTER_ALIGN}Allow {ARG_POKEMON_2}\n" +.string "{CENTER_ALIGN}Allow {POKEMON_2}\n" .string "{CENTER_ALIGN}to join the team?\0" .align 2, 0 diff --git a/data/data_8106A4C.s b/data/data_8106A4C.s index db706210..4d46c6ff 100644 --- a/data/data_8106A4C.s +++ b/data/data_8106A4C.s @@ -48,7 +48,7 @@ gUnknown_8106AEC: @ 8106AEC .global gUnknown_8106B50 gUnknown_8106B50: @ 8106B50 - .string "{COLOR_1}%c%s\0" + .string "{COLOR}%c%s\0" @@ -177,7 +177,7 @@ gUnknown_8106C90: @ 8106C90 .global gUnknown_8106C98 gUnknown_8106C98: @ 8106C98 - .string "{ARG_MOVE_ITEM_0}\0" + .string "{MOVE_ITEM_0}\0" .align 2,0 .global gUnknown_8106C9C @@ -201,7 +201,7 @@ gUnknown_8106CAC: @ 8106CAC .global gUnknown_8106CC4 gUnknown_8106CC4: @ 8106CC4 - .string "{ARG_MOVE_ITEM_0}\0" + .string "{MOVE_ITEM_0}\0" .align 2,0 .global gUnknown_8106CC8 @@ -210,7 +210,7 @@ gUnknown_8106CC8: @ 8106CC8 .global gUnknown_8106CCC gUnknown_8106CCC: @ 8106CCC - .string "{ARG_POKEMON_0}\0" + .string "{POKEMON_0}\0" @ ??? .align 2,0 @@ -255,7 +255,7 @@ gUnknown_8106D68: @ 8106D68 .global gUnknown_8106D8C gUnknown_8106D8C: @ 8106D8C - .string "{COLOR_2}%d{ARG_POKEMON_0}\0" + .string "{color}%d{POKEMON_0}\0" @ ??? .align 2,0 @@ -279,7 +279,7 @@ gUnknown_8106DC8: @ 8106DC8 .global gUnknown_8106E28 gUnknown_8106E28: @ 8106E28 - .string "{ARG_POKEMON_0}\0" + .string "{POKEMON_0}\0" .align 2,0 .global gUnknown_8106E2C @@ -292,12 +292,12 @@ gUnknown_8106E30: @ 8106E30 .global gUnknown_8106E34 gUnknown_8106E34: @ 8106E34 - .string "{ARG_MOVE_ITEM_0}{COLOR_2 CYAN}$v02:{ARG_POKEMON_0}{END_COLOR_TEXT_2}\0" + .string "{MOVE_ITEM_0}{color CYAN}$v02:{POKEMON_0}{reset}\0" .align 2,0 .global gUnknown_8106E48 gUnknown_8106E48: @ 8106E48 - .string "{ARG_MOVE_ITEM_0}{COLOR_2 YELLOW}$v02:{ARG_POKEMON_0}{END_COLOR_TEXT_2}\0" + .string "{MOVE_ITEM_0}{color YELLOW}$v02:{POKEMON_0}{reset}\0" .align 2,0 .global gUnknown_8106E5C @@ -309,7 +309,7 @@ gUnknown_8106E5C: @ 8106E5C .global gUnknown_8106E6C gUnknown_8106E6C: @ 8106E6C .string "Say bye to\n" - .string "{ARG_VALUE_0} more\0" + .string "{VALUE_0} more\0" .align 2,0 .global gUnknown_8106E80 diff --git a/data/data_8106F7C.s b/data/data_8106F7C.s index d6800f83..16f15156 100644 --- a/data/data_8106F7C.s +++ b/data/data_8106F7C.s @@ -10,4 +10,4 @@ gUnknown_8106F7C: @ 8106F7C .global gUnknown_8106FA4 gUnknown_8106FA4: @ 8106FA4 - .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0" + .string "{color}%c%s{reset}\0" diff --git a/data/data_8107010.s b/data/data_8107010.s index 827ee4a6..71b51f09 100644 --- a/data/data_8107010.s +++ b/data/data_8107010.s @@ -258,12 +258,12 @@ gUnknown_81075F4: @ 81075F4 .global gUnknown_8107600 gUnknown_8107600: @ 8107600 -.string "{COLOR_2 YELLOW_2}%s{END_COLOR_TEXT_2}" +.string "{color YELLOW_RAW}%s{reset}" .align 2,0 .global gUnknown_8107608 gUnknown_8107608: @ 8107608 -.string "{COLOR_2 CYAN_2}%s{END_COLOR_TEXT_2}" +.string "{color CYAN_RAW}%s{reset}" .align 2,0 .global gUnownLetters @@ -283,7 +283,7 @@ gUnknown_8107638: @ 8107638 .global gUnknown_810763C gUnknown_810763C: @ 810763C -.string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0" +.string "{color}%c%s{reset}\0" .global gUnknown_8107645 gUnknown_8107645: @ 8107645 @@ -378,7 +378,7 @@ gUnknown_8107770: @ 8107770 .global gUnknown_8107784 gUnknown_8107784: @ 8107784 -.string "{ARG_MOVE_ITEM_1}\0" +.string "{MOVE_ITEM_1}\0" .align 2,0 .global gUnknown_8107788 @@ -391,7 +391,7 @@ gUnknown_810778C: @ 810778C .global gUnknown_8107790 gUnknown_8107790: @ 8107790 -.string "{ARG_MOVE_ITEM_0}{ARG_MOVE_ITEM_1}\0" +.string "{MOVE_ITEM_0}{MOVE_ITEM_1}\0" .align 2,0 .global gUnknown_8107798 @@ -1222,17 +1222,17 @@ gUnknown_8108EC0: @ 8108EC0 .global gUnknown_8108F10 gUnknown_8108F10: @ 8108F10 -.string "{COLOR_2 YELLOW_4}%s{END_COLOR_TEXT_2}\0" +.string "{color YELLOW_D}%s{reset}\0" .align 2,0 .global gUnknown_8108F18 gUnknown_8108F18: @ 8108F18 -.string "{COLOR_2 YELLOW_4}%s{END_COLOR_TEXT_2}　{COLOR_2 CYAN}%d{END_COLOR_TEXT_2}F\0" +.string "{color YELLOW_D}%s{reset}　{color CYAN}%d{reset}F\0" .align 2,0 .global gUnknown_8108F2C gUnknown_8108F2C: @ 8108F2C -.string "{COLOR_2 YELLOW_4}%s{END_COLOR_TEXT_2}　B{COLOR_2 CYAN}%d{END_COLOR_TEXT_2}F\0" +.string "{color YELLOW_D}%s{reset}　B{color CYAN}%d{reset}F\0" .align 2,0 .global gUnknown_8108F40 @@ -1423,13 +1423,13 @@ gUnknown_810978C: @ 810978C .global gUnknown_8109794 gUnknown_8109794: @ 8109794 @ replacing .incbin "baserom.gba", 0x00109794, 0x10 -.string "%s{UNK_MACRO_3D}%c{COLOR_1 UNK_COLOR_4}%s{END_COLOR_TEXT_1}\0" +.string "%s{UNK_MACRO_3D}%c{COLOR GREEN_RAW}%s{RESET}\0" .align 2, 0 .global gUnknown_81097A4 gUnknown_81097A4: @ 81097A4 @ replacing .incbin "baserom.gba", 0x001097a4, 0xc -.string "%s{COLOR_1 UNK_COLOR_4}%s{END_COLOR_TEXT_1}\0" +.string "%s{COLOR GREEN_RAW}%s{RESET}\0" .align 2, 0 .global gPowersOfTen @@ -1546,12 +1546,12 @@ gUnknown_8109888: @ 8109888 .global sUnknown_81098A4 sUnknown_81098A4: @ 81098A4 -.string "{COLOR_2 UNK_COLOR_4}%s{END_COLOR_TEXT_2}\0" +.string "{color GREEN_RAW}%s{reset}\0" .align 2,0 .global sUnknown_81098AC sUnknown_81098AC: @ 81098AC -.string "%s{UNK_MACRO_3D}%c{COLOR_1 UNK_COLOR_4}%s{END_COLOR_TEXT_1}\0" +.string "%s{UNK_MACRO_3D}%c{COLOR GREEN_RAW}%s{RESET}\0" .align 2,0 @ END friend_area.c @ moves.c @@ -1574,12 +1574,12 @@ gUnknown_81098DC: @ 81098DC .global gUnknown_81098E0 gUnknown_81098E0: @ 81098E0 -.string "{COLOR_2}%c%s%s{END_COLOR_TEXT_2}\0" +.string "{color}%c%s%s{reset}\0" .align 2,0 .global gUnknown_81098EC gUnknown_81098EC: @ 81098EC -.string "{COLOR_2}%c#:%s%s%s#;%c%2d/%2d{END_COLOR_TEXT_2}\0" +.string "{color}%c#:%s%s%s#;%c%2d/%2d{reset}\0" .align 2,0 .global gUnknown_8109908 @@ -1592,7 +1592,7 @@ gUnknown_810990C: @ 810990C .global gUnknown_8109910 gUnknown_8109910: @ 8109910 -.string "{COLOR_2}%c%s%s%s{UNK_MACRO_3D}%c%2d/%2d{END_COLOR_TEXT_2}\0" +.string "{color}%c%s%s%s{UNK_MACRO_3D}%c%2d/%2d{reset}\0" .align 2,0 .global gUnknown_8109928 @@ -1610,7 +1610,7 @@ gUnknown_810992C: @ 810992C .global gUnknown_8109930 gUnknown_8109930: @ 8109930 -.string "{ARG_POKEMON_0}\0" +.string "{POKEMON_0}\0" .align 2,0 @ ??? .string "pksdir0\0" diff --git a/data/data_810AE24.s b/data/data_810AE24.s index 29bf286a..ee12c0bb 100644 --- a/data/data_810AE24.s +++ b/data/data_810AE24.s @@ -250,32 +250,32 @@ AllFriendAreas_810B2A4: @ 810B2A4 .global NumFloorsExplored_810B2C4 NumFloorsExplored_810B2C4: @ 810B2C4 -.string "{ARG_VALUE_0} floors were explored.\0" +.string "{VALUE_0} floors were explored.\0" .align 2,0 .global NumThievingAttempts_810B2E0 NumThievingAttempts_810B2E0: @ 810B2E0 -.string "{ARG_VALUE_0} thieving attempts succeeded.\0" +.string "{VALUE_0} thieving attempts succeeded.\0" .align 2,0 .global NumPokemonJoined_810B304 NumPokemonJoined_810B304: @ 810B304 -.string "{ARG_VALUE_0} Pokémon joined the team.\0" +.string "{VALUE_0} Pokémon joined the team.\0" .align 2,0 .global NumPokemonEvolved_810B324 NumPokemonEvolved_810B324: @ 810B324 -.string "{ARG_VALUE_0} Pokémon evolved.\0" +.string "{VALUE_0} Pokémon evolved.\0" .align 2,0 .global NumFriendRescues_810B33C NumFriendRescues_810B33C: @ 810B33C -.string "{ARG_VALUE_0} Friend Rescues were successful.\0" +.string "{VALUE_0} Friend Rescues were successful.\0" .align 2,0 .global NumMoves_810B360 NumMoves_810B360: @ 810B360 -.string "{ARG_VALUE_0} moves were learned.\0" +.string "{VALUE_0} moves were learned.\0" .align 2,0 .global SpottedMunchlax_810B378 @@ -905,387 +905,387 @@ AbilityDescriptions: @ 810B988 .global AbilityDescriptionShieldDust AbilityDescriptionShieldDust: -.string "{COLOR_2 RED}Shield Dust{END_COLOR_TEXT_2}: Blocks the added\neffects of moves.\0" +.string "{color RED}Shield Dust{reset}: Blocks the added\neffects of moves.\0" .align 2,0 .global AbilityDescriptionPurePower AbilityDescriptionPurePower: -.string "{COLOR_2 RED}Pure Power{END_COLOR_TEXT_2}: Occasionally\nboosts Attack.\0" +.string "{color RED}Pure Power{reset}: Occasionally\nboosts Attack.\0" .align 2,0 .global AbilityDescriptionChlorophyll AbilityDescriptionChlorophyll: -.string "{COLOR_2 RED}Chlorophyll{END_COLOR_TEXT_2}: Boosts attack\nfrequency if the weather is\nsunny.\0" +.string "{color RED}Chlorophyll{reset}: Boosts attack\nfrequency if the weather is\nsunny.\0" .align 2,0 .global AbilityDescriptionVitalSpirit AbilityDescriptionVitalSpirit: -.string "{COLOR_2 RED}Vital Spirit{END_COLOR_TEXT_2}: Prevents sleep.\0" +.string "{color RED}Vital Spirit{reset}: Prevents sleep.\0" .align 2,0 .global AbilityDescriptionFlashFire AbilityDescriptionFlashFire: -.string "{COLOR_2 RED}Flash Fire{END_COLOR_TEXT_2}: Zeroes damage\nfrom Fire-type move hits,\nand boosts own Fire moves.\0" +.string "{color RED}Flash Fire{reset}: Zeroes damage\nfrom Fire-type move hits,\nand boosts own Fire moves.\0" .align 2,0 .global AbilityDescriptionPickup AbilityDescriptionPickup: -.string "{COLOR_2 RED}Pickup{END_COLOR_TEXT_2}: Finds items if\nthe Pokémon is not holding\nanything.\0" +.string "{color RED}Pickup{reset}: Finds items if\nthe Pokémon is not holding\nanything.\0" .align 2,0 .global AbilityDescriptionBlaze AbilityDescriptionBlaze: -.string "{COLOR_2 RED}Blaze{END_COLOR_TEXT_2}: Boosts the power\nof Fire-type moves when\nHP is low.\0" +.string "{color RED}Blaze{reset}: Boosts the power\nof Fire-type moves when\nHP is low.\0" .align 2,0 .global AbilityDescriptionImmunity AbilityDescriptionImmunity: -.string "{COLOR_2 RED}Immunity{END_COLOR_TEXT_2}: Prevents\nbecoming poisoned or badly\npoisoned.\0" +.string "{color RED}Immunity{reset}: Prevents\nbecoming poisoned or badly\npoisoned.\0" .align 2,0 .global AbilityDescriptionCuteCharm AbilityDescriptionCuteCharm: -.string "{COLOR_2 RED}Cute Charm{END_COLOR_TEXT_2}: Causes\nattackers to become\ninfatuated.\0" +.string "{color RED}Cute Charm{reset}: Causes\nattackers to become\ninfatuated.\0" .align 2,0 .global AbilityDescriptionSwarm AbilityDescriptionSwarm: -.string "{COLOR_2 RED}Swarm{END_COLOR_TEXT_2}: Boosts the power\nof Bug-type moves when\nHP is low.\0" +.string "{color RED}Swarm{reset}: Boosts the power\nof Bug-type moves when\nHP is low.\0" .align 2,0 .global AbilityDescriptionWaterVeil AbilityDescriptionWaterVeil: -.string "{COLOR_2 RED}Water Veil{END_COLOR_TEXT_2}: Prevents burns.\0" +.string "{color RED}Water Veil{reset}: Prevents burns.\0" .align 2,0 .global AbilityDescriptionMagmaArmor AbilityDescriptionMagmaArmor: -.string "{COLOR_2 RED}Magma Armor{END_COLOR_TEXT_2}: Prevents\nfreezing.\0" +.string "{color RED}Magma Armor{reset}: Prevents\nfreezing.\0" .align 2,0 .global AbilityDescriptionOwnTempo AbilityDescriptionOwnTempo: -.string "{COLOR_2 RED}Own Tempo{END_COLOR_TEXT_2}: Prevents\nconfusion.\0" +.string "{color RED}Own Tempo{reset}: Prevents\nconfusion.\0" .align 2,0 .global AbilityDescriptionMinus AbilityDescriptionMinus: -.string "{COLOR_2 RED}Minus{END_COLOR_TEXT_2}: Boosts Special Attack\nif there is a Pokémon with\nthe Plus ability.\0" +.string "{color RED}Minus{reset}: Boosts Special Attack\nif there is a Pokémon with\nthe Plus ability.\0" .align 2,0 .global AbilityDescriptionFlameBody AbilityDescriptionFlameBody: -.string "{COLOR_2 RED}Flame Body{END_COLOR_TEXT_2}: Afflicts\nattackers with burns.\0" +.string "{color RED}Flame Body{reset}: Afflicts\nattackers with burns.\0" .align 2,0 .global AbilityDescriptionEffectSpore AbilityDescriptionEffectSpore: -.string "{COLOR_2 RED}Effect Spore{END_COLOR_TEXT_2}: Attackers are\npoisoned, paralyzed, or put\nto sleep.\0" +.string "{color RED}Effect Spore{reset}: Attackers are\npoisoned, paralyzed, or put\nto sleep.\0" .align 2,0 .global AbilityDescriptionSoundproof AbilityDescriptionSoundproof: -.string "{COLOR_2 RED}Soundproof{END_COLOR_TEXT_2}: Blocks the\neffects of all moves that\nuse sound.\0" +.string "{color RED}Soundproof{reset}: Blocks the\neffects of all moves that\nuse sound.\0" .align 2,0 .global AbilityDescriptionColorChange AbilityDescriptionColorChange: -.string "{COLOR_2 RED}Color Change{END_COLOR_TEXT_2}: Changes the\nPokémon's type to that of\nthe move that hit it last.\0" +.string "{color RED}Color Change{reset}: Changes the\nPokémon's type to that of\nthe move that hit it last.\0" .align 2,0 .global AbilityDescriptionLiquidOoze AbilityDescriptionLiquidOoze: -.string "{COLOR_2 RED}Liquid Ooze{END_COLOR_TEXT_2}: Inflicts damage\non the foe if hit by a move\nthat drains HP.\0" +.string "{color RED}Liquid Ooze{reset}: Inflicts damage\non the foe if hit by a move\nthat drains HP.\0" .align 2,0 .global AbilityDescriptionPressure AbilityDescriptionPressure: -.string "{COLOR_2 RED}Pressure{END_COLOR_TEXT_2}: If hit by a foe's\nmove, the foe uses more PP\nthan usual.\0" +.string "{color RED}Pressure{reset}: If hit by a foe's\nmove, the foe uses more PP\nthan usual.\0" .align 2,0 .global AbilityDescriptionPlus AbilityDescriptionPlus: -.string "{COLOR_2 RED}Plus{END_COLOR_TEXT_2}: Boosts Special Attack\nif there is a Pokémon with\nthe Minus ability.\0" +.string "{color RED}Plus{reset}: Boosts Special Attack\nif there is a Pokémon with\nthe Minus ability.\0" .align 2,0 .global AbilityDescriptionLevitate AbilityDescriptionLevitate: -.string "{COLOR_2 RED}Levitate{END_COLOR_TEXT_2}: Blocks all\nGround-type moves.\0" +.string "{color RED}Levitate{reset}: Blocks all\nGround-type moves.\0" .align 2,0 .global AbilityDescriptionInsomnia AbilityDescriptionInsomnia: -.string "{COLOR_2 RED}Insomnia{END_COLOR_TEXT_2}: Prevents sleep.\0" +.string "{color RED}Insomnia{reset}: Prevents sleep.\0" .align 2,0 .global AbilityDescriptionWonderGuard AbilityDescriptionWonderGuard: -.string "{COLOR_2 RED}Wonder Guard{END_COLOR_TEXT_2}: Only\nsuper-effective moves can\ninflict damage.\0" +.string "{color RED}Wonder Guard{reset}: Only\nsuper-effective moves can\ninflict damage.\0" .align 2,0 .global AbilityDescriptionMarvelScale AbilityDescriptionMarvelScale: -.string "{COLOR_2 RED}Marvel Scale{END_COLOR_TEXT_2}: Boosts\nDefense if there is a status\nproblem.\0" +.string "{color RED}Marvel Scale{reset}: Boosts\nDefense if there is a status\nproblem.\0" .align 2,0 .global AbilityDescriptionCompoundeyes AbilityDescriptionCompoundeyes: -.string "{COLOR_2 RED}Compoundeyes{END_COLOR_TEXT_2}: Boosts\nthe Accuracy of moves.\0" +.string "{color RED}Compoundeyes{reset}: Boosts\nthe Accuracy of moves.\0" .align 2,0 .global AbilityDescriptionLightningrod AbilityDescriptionLightningrod: -.string "{COLOR_2 RED}Lightningrod{END_COLOR_TEXT_2}: Attracts\nElectric-type moves.\0" +.string "{color RED}Lightningrod{reset}: Attracts\nElectric-type moves.\0" .align 2,0 .global AbilityDescriptionDrought AbilityDescriptionDrought: -.string "{COLOR_2 RED}Drought{END_COLOR_TEXT_2}: Changes the\nweather to sunny.\0" +.string "{color RED}Drought{reset}: Changes the\nweather to sunny.\0" .align 2,0 .global AbilityDescriptionHustle AbilityDescriptionHustle: -.string "{COLOR_2 RED}Hustle{END_COLOR_TEXT_2}: Boosts Attack but\nlowers Accuracy.\0" +.string "{color RED}Hustle{reset}: Boosts Attack but\nlowers Accuracy.\0" .align 2,0 .global AbilityDescriptionEarlyBird AbilityDescriptionEarlyBird: -.string "{COLOR_2 RED}Early Bird{END_COLOR_TEXT_2}: Awakens quickly\nfrom sleep.\0" +.string "{color RED}Early Bird{reset}: Awakens quickly\nfrom sleep.\0" .align 2,0 .global AbilityDescriptionIlluminate AbilityDescriptionIlluminate: -.string "{COLOR_2 RED}Illuminate{END_COLOR_TEXT_2}: If damaged,\na wild Pokémon appears \non the dungeon floor.\0" +.string "{color RED}Illuminate{reset}: If damaged,\na wild Pokémon appears \non the dungeon floor.\0" .align 2,0 .global AbilityDescriptionCloudNine AbilityDescriptionCloudNine: -.string "{COLOR_2 RED}Cloud Nine{END_COLOR_TEXT_2}: Changes the\nweather to clear.\0" +.string "{color RED}Cloud Nine{reset}: Changes the\nweather to clear.\0" .align 2,0 .global AbilityDescriptionStickyHold AbilityDescriptionStickyHold: -.string "{COLOR_2 RED}Sticky Hold{END_COLOR_TEXT_2}: Prevents the\nPokémon's hold item from\nbeing taken.\0" +.string "{color RED}Sticky Hold{reset}: Prevents the\nPokémon's hold item from\nbeing taken.\0" .align 2,0 .global AbilityDescriptionRunAway AbilityDescriptionRunAway: -.string "{COLOR_2 RED}Run Away{END_COLOR_TEXT_2}: Becomes terrified\nand flees when HP gets low.\nLeaders will resist this urge.\0" +.string "{color RED}Run Away{reset}: Becomes terrified\nand flees when HP gets low.\nLeaders will resist this urge.\0" .align 2,0 .global AbilityDescriptionTruant AbilityDescriptionTruant: -.string "{COLOR_2 RED}Truant{END_COLOR_TEXT_2}: Prevents action in\nyour next turn after using\na move or a Wonder Orb.\0" +.string "{color RED}Truant{reset}: Prevents action in\nyour next turn after using\na move or a Wonder Orb.\0" .align 2,0 .global AbilityDescriptionOblivious AbilityDescriptionOblivious: -.string "{COLOR_2 RED}Oblivious{END_COLOR_TEXT_2}: Prevents\ninfatuation.\0" +.string "{color RED}Oblivious{reset}: Prevents\ninfatuation.\0" .align 2,0 .global AbilityDescriptionTrace AbilityDescriptionTrace: -.string "{COLOR_2 RED}Trace{END_COLOR_TEXT_2}: Changes ability to\nthat of the foe attacking\nor using a move.\0" +.string "{color RED}Trace{reset}: Changes ability to\nthat of the foe attacking\nor using a move.\0" .align 2,0 .global AbilityDescriptionPoisonPoint AbilityDescriptionPoisonPoint: -.string "{COLOR_2 RED}Poison Point{END_COLOR_TEXT_2}: Poisons\nattackers.\0" +.string "{color RED}Poison Point{reset}: Poisons\nattackers.\0" .align 2,0 .global AbilityDescriptionSereneGrace AbilityDescriptionSereneGrace: -.string "{COLOR_2 RED}Serene Grace{END_COLOR_TEXT_2}: Improves the\nchances of triggering the\nadded effects of moves.\0" +.string "{color RED}Serene Grace{reset}: Improves the\nchances of triggering the\nadded effects of moves.\0" .align 2,0 .global AbilityDescriptionForecast AbilityDescriptionForecast: -.string "{COLOR_2 RED}Forecast{END_COLOR_TEXT_2}: The Pokémon's\ntype changes with the\nweather.\0" +.string "{color RED}Forecast{reset}: The Pokémon's\ntype changes with the\nweather.\0" .align 2,0 .global AbilityDescriptionWaterAbsorb AbilityDescriptionWaterAbsorb: -.string "{COLOR_2 RED}Water Absorb{END_COLOR_TEXT_2}: Restores HP\nif hit by a Water-type move.\0" +.string "{color RED}Water Absorb{reset}: Restores HP\nif hit by a Water-type move.\0" .align 2,0 .global AbilityDescriptionVoltAbsorb AbilityDescriptionVoltAbsorb: -.string "{COLOR_2 RED}Volt Absorb{END_COLOR_TEXT_2}: Restores HP\nif damaged by an Electric-\ntype move.\0" +.string "{color RED}Volt Absorb{reset}: Restores HP\nif damaged by an Electric-\ntype move.\0" .align 2,0 .global AbilityDescriptionHugePower AbilityDescriptionHugePower: -.string "{COLOR_2 RED}Huge Power{END_COLOR_TEXT_2}: Occasionally\nboosts Attack.\0" +.string "{color RED}Huge Power{reset}: Occasionally\nboosts Attack.\0" .align 2,0 .global AbilityDescriptionShedSkin AbilityDescriptionShedSkin: -.string "{COLOR_2 RED}Shed Skin{END_COLOR_TEXT_2}: Recovers easily\nfrom status problems.\0" +.string "{color RED}Shed Skin{reset}: Recovers easily\nfrom status problems.\0" .align 2,0 .global AbilityDescriptionStatic AbilityDescriptionStatic: -.string "{COLOR_2 RED}Static{END_COLOR_TEXT_2}: Paralyzes attackers.\0" +.string "{color RED}Static{reset}: Paralyzes attackers.\0" .align 2,0 .global AbilityDescriptionInnerFocus AbilityDescriptionInnerFocus: -.string "{COLOR_2 RED}Inner Focus{END_COLOR_TEXT_2}: Prevents\ncringing.\0" +.string "{color RED}Inner Focus{reset}: Prevents\ncringing.\0" .align 2,0 .global AbilityDescriptionKeenEye AbilityDescriptionKeenEye: -.string "{COLOR_2 RED}Keen Eye{END_COLOR_TEXT_2}: Prevents Accuracy\nfrom going down.\0" +.string "{color RED}Keen Eye{reset}: Prevents Accuracy\nfrom going down.\0" .align 2,0 .global AbilityDescriptionSandVeil AbilityDescriptionSandVeil: -.string "{COLOR_2 RED}Sand Veil{END_COLOR_TEXT_2}: Boosts Evasion\nif there is a sandstorm.\0" +.string "{color RED}Sand Veil{reset}: Boosts Evasion\nif there is a sandstorm.\0" .align 2,0 .global AbilityDescriptionSandStream AbilityDescriptionSandStream: -.string "{COLOR_2 RED}Sand Stream{END_COLOR_TEXT_2}: Changes the\nweather to a sandstorm.\0" +.string "{color RED}Sand Stream{reset}: Changes the\nweather to a sandstorm.\0" .align 2,0 .global AbilityDescriptionSwiftSwim AbilityDescriptionSwiftSwim: -.string "{COLOR_2 RED}Swift Swim{END_COLOR_TEXT_2}: Boosts attack\nfrequency if it is raining.\0" +.string "{color RED}Swift Swim{reset}: Boosts attack\nfrequency if it is raining.\0" .align 2,0 .global AbilityDescriptionOvergrow AbilityDescriptionOvergrow: -.string "{COLOR_2 RED}Overgrow{END_COLOR_TEXT_2}: Boosts the power\nof Grass-type moves when\nHP is low.\0" +.string "{color RED}Overgrow{reset}: Boosts the power\nof Grass-type moves when\nHP is low.\0" .align 2,0 .global AbilityDescriptionSynchronize AbilityDescriptionSynchronize: -.string "{COLOR_2 RED}Synchronize{END_COLOR_TEXT_2}: Shares\nstatus problems with any\nPokémon in reach.\0" +.string "{color RED}Synchronize{reset}: Shares\nstatus problems with any\nPokémon in reach.\0" .align 2,0 .global AbilityDescriptionWhiteSmoke AbilityDescriptionWhiteSmoke: -.string "{COLOR_2 RED}White Smoke{END_COLOR_TEXT_2}: Prevents\nreduction of stats.\0" +.string "{color RED}White Smoke{reset}: Prevents\nreduction of stats.\0" .align 2,0 .global AbilityDescriptionMagnetPull AbilityDescriptionMagnetPull: -.string "{COLOR_2 RED}Magnet Pull{END_COLOR_TEXT_2}: Immobilizes\nSteel-type attackers.\0" +.string "{color RED}Magnet Pull{reset}: Immobilizes\nSteel-type attackers.\0" .align 2,0 .global AbilityDescriptionLimber AbilityDescriptionLimber: -.string "{COLOR_2 RED}Limber{END_COLOR_TEXT_2}: Prevents paralysis.\0" +.string "{color RED}Limber{reset}: Prevents paralysis.\0" .align 2,0 .global AbilityDescriptionDamp AbilityDescriptionDamp: -.string "{COLOR_2 RED}Damp{END_COLOR_TEXT_2}: Prevents any\nexplosions on the dungeon\nfloor.\0" +.string "{color RED}Damp{reset}: Prevents any\nexplosions on the dungeon\nfloor.\0" .align 2,0 .global AbilityDescriptionNaturalCure AbilityDescriptionNaturalCure: -.string "{COLOR_2 RED}Natural Cure{END_COLOR_TEXT_2}: Recovers\nquickly from status\nproblems.\0" +.string "{color RED}Natural Cure{reset}: Recovers\nquickly from status\nproblems.\0" .align 2,0 .global AbilityDescriptionShellArmor AbilityDescriptionShellArmor: -.string "{COLOR_2 RED}Shell Armor{END_COLOR_TEXT_2}: Blocks\ncritical hits.\0" +.string "{color RED}Shell Armor{reset}: Blocks\ncritical hits.\0" .align 2,0 .global AbilityDescriptionRoughSkin AbilityDescriptionRoughSkin: -.string "{COLOR_2 RED}Rough Skin{END_COLOR_TEXT_2}: Inflicts damage\non attackers.\0" +.string "{color RED}Rough Skin{reset}: Inflicts damage\non attackers.\0" .align 2,0 .global AbilityDescriptionGuts AbilityDescriptionGuts: -.string "{COLOR_2 RED}Guts{END_COLOR_TEXT_2}: Boosts Attack if the\nPokémon has any status\nproblems.\0" +.string "{color RED}Guts{reset}: Boosts Attack if the\nPokémon has any status\nproblems.\0" .align 2,0 .global AbilityDescriptionTorrent AbilityDescriptionTorrent: -.string "{COLOR_2 RED}Torrent{END_COLOR_TEXT_2}: Boosts the power\nof Water-type moves when\nHP is low.\0" +.string "{color RED}Torrent{reset}: Boosts the power\nof Water-type moves when\nHP is low.\0" .align 2,0 .global AbilityDescriptionClearBody AbilityDescriptionClearBody: -.string "{COLOR_2 RED}Clear Body{END_COLOR_TEXT_2}: Prevents\nreduction of stats.\0" +.string "{color RED}Clear Body{reset}: Prevents\nreduction of stats.\0" .align 2,0 .global AbilityDescriptionSuctionCups AbilityDescriptionSuctionCups: -.string "{COLOR_2 RED}Suction Cups{END_COLOR_TEXT_2}: Prevents\nforced movement.\0" +.string "{color RED}Suction Cups{reset}: Prevents\nforced movement.\0" .align 2,0 .global AbilityDescriptionSturdy AbilityDescriptionSturdy: -.string "{COLOR_2 RED}Sturdy{END_COLOR_TEXT_2}: Blocks\none-hit KO moves.\0" +.string "{color RED}Sturdy{reset}: Blocks\none-hit KO moves.\0" .align 2,0 .global AbilityDescriptionBattleArmor AbilityDescriptionBattleArmor: -.string "{COLOR_2 RED}Battle Armor{END_COLOR_TEXT_2}: Blocks\ncritical hits.\0" +.string "{color RED}Battle Armor{reset}: Blocks\ncritical hits.\0" .align 2,0 .global AbilityDescriptionSpeedBoost AbilityDescriptionSpeedBoost: -.string "{COLOR_2 RED}Speed Boost{END_COLOR_TEXT_2}: The Pokémon's\nMovement Speed accelerates.\0" +.string "{color RED}Speed Boost{reset}: The Pokémon's\nMovement Speed accelerates.\0" .align 2,0 .global AbilityDescriptionShadowTag AbilityDescriptionShadowTag: -.string "{COLOR_2 RED}Shadow Tag{END_COLOR_TEXT_2}: Immobilizes\nattackers.\0" +.string "{color RED}Shadow Tag{reset}: Immobilizes\nattackers.\0" .align 2,0 .global AbilityDescriptionHyperCutter AbilityDescriptionHyperCutter: -.string "{COLOR_2 RED}Hyper Cutter{END_COLOR_TEXT_2}: Prevents\nAttack from being lowered.\0" +.string "{color RED}Hyper Cutter{reset}: Prevents\nAttack from being lowered.\0" .align 2,0 .global AbilityDescriptionAirLock AbilityDescriptionAirLock: -.string "{COLOR_2 RED}Air Lock{END_COLOR_TEXT_2}: Changes the\nweather to clear.\0" +.string "{color RED}Air Lock{reset}: Changes the\nweather to clear.\0" .align 2,0 .global AbilityDescriptionRockHead AbilityDescriptionRockHead: -.string "{COLOR_2 RED}Rock Head{END_COLOR_TEXT_2}: Prevents damage\nfrom the recoil of moves\nsuch as Take Down.\0" +.string "{color RED}Rock Head{reset}: Prevents damage\nfrom the recoil of moves\nsuch as Take Down.\0" .align 2,0 .global AbilityDescriptionIntimidate AbilityDescriptionIntimidate: -.string "{COLOR_2 RED}Intimidate{END_COLOR_TEXT_2}: Lowers the\nPhysical Attack power of\nattackers.\0" +.string "{color RED}Intimidate{reset}: Lowers the\nPhysical Attack power of\nattackers.\0" .align 2,0 .global AbilityDescriptionArenaTrap AbilityDescriptionArenaTrap: -.string "{COLOR_2 RED}Arena Trap{END_COLOR_TEXT_2}: Immobilizes any\nattacker except Flying-type\nfoes and those with Levitate.\0" +.string "{color RED}Arena Trap{reset}: Immobilizes any\nattacker except Flying-type\nfoes and those with Levitate.\0" .align 2,0 .global AbilityDescriptionDrizzle AbilityDescriptionDrizzle: -.string "{COLOR_2 RED}Drizzle{END_COLOR_TEXT_2}: Changes the\nweather to rainy.\0" +.string "{color RED}Drizzle{reset}: Changes the\nweather to rainy.\0" .align 2,0 .global AbilityDescriptionRainDish AbilityDescriptionRainDish: -.string "{COLOR_2 RED}Rain Dish{END_COLOR_TEXT_2}: Improves HP gain\nif it is raining.\0" +.string "{color RED}Rain Dish{reset}: Improves HP gain\nif it is raining.\0" .align 2,0 .global AbilityDescriptionThickFat AbilityDescriptionThickFat: -.string "{COLOR_2 RED}Thick Fat{END_COLOR_TEXT_2}: Resistant to\nFire- and Ice-type moves.\0" +.string "{color RED}Thick Fat{reset}: Resistant to\nFire- and Ice-type moves.\0" .align 2,0 .global AbilityDescriptionStench AbilityDescriptionStench: -.string "{COLOR_2 RED}Stench{END_COLOR_TEXT_2}: May terrify an\nattacking foe.\0" +.string "{color RED}Stench{reset}: May terrify an\nattacking foe.\0" .align 2,0 .global AbilityDescriptionNone AbilityDescriptionNone: -.string "{COLOR_2 RED}-------\0" +.string "{color RED}-------\0" .align 2,0 .global gRangeNames @@ -1557,7 +1557,7 @@ MoveRangeThreeTilesDiagonally: .global RangeText RangeText: -.string "Range{UNK_MACRO_3D M3D_64}{ARG_POKEMON_0} \0" +.string "Range{UNK_MACRO_3D M3D_64}{POKEMON_0} \0" .align 2,0 .global gUnknown_810CF00 @@ -2024,253 +2024,253 @@ gFormattedStatusNames: @ 810D628 .4byte sUnknown_810D7A4 .4byte sUnknown_810D78C sUnknown_810D78C: @ 810D78C -.string "{COLOR_2 CYAN}Stair Spotter{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Stair Spotter{reset} \0" .align 2, 0 sUnknown_810D7A4: @ 810D7A4 -.string "{COLOR_2 CYAN}Doubled Attack{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Doubled Attack{reset} \0" .align 2, 0 sUnknown_810D7BC: @ 810D7BC -.string "{COLOR_2 CYAN}Perish Song{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Perish Song{reset} \0" .align 2, 0 sUnknown_810D7D0: @ 810D7D0 -.string "{COLOR_2 CYAN}Terrified{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Terrified{reset} \0" .align 2, 0 sUnknown_810D7E4: @ 810D7E4 -.string "{COLOR_2 CYAN}Exposed{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Exposed{reset} \0" .align 2, 0 sUnknown_810D7F4: @ 810D7F4 -.string "{COLOR_2 CYAN}Grudge{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Grudge{reset} \0" .align 2, 0 sUnknown_810D804: @ 810D804 -.string "{COLOR_2 CYAN}Scanning{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Scanning{reset} \0" .align 2, 0 sUnknown_810D814: @ 810D814 -.string "{COLOR_2 CYAN}Power Ears{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Power Ears{reset} \0" .align 2, 0 sUnknown_810D828: @ 810D828 -.string "{COLOR_2 CYAN}Stockpiling{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Stockpiling{reset} \0" .align 2, 0 sUnknown_810D83C: @ 810D83C -.string "{COLOR_2 CYAN}Muzzled{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Muzzled{reset} \0" .align 2, 0 sUnknown_810D84C: @ 810D84C -.string "{COLOR_2 CYAN}Eyedrops{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Eyedrops{reset} \0" .align 2, 0 sUnknown_810D85C: @ 810D85C -.string "{COLOR_2 CYAN}Cross-Eyed{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Cross-Eyed{reset} \0" .align 2, 0 sUnknown_810D870: @ 810D870 -.string "{COLOR_2 CYAN}Blinker{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Blinker{reset} \0" .align 2, 0 sUnknown_810D880: @ 810D880 -.string "{COLOR_2 CYAN}Mobile{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Mobile{reset} \0" .align 2, 0 sUnknown_810D890: @ 810D890 -.string "{COLOR_2 CYAN}Transformed{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Transformed{reset} \0" .align 2, 0 sUnknown_810D8A4: @ 810D8A4 -.string "{COLOR_2 CYAN}Invisible{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Invisible{reset} \0" .align 2, 0 sUnknown_810D8B8: @ 810D8B8 -.string "{COLOR_2 CYAN}Pierce{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Pierce{reset} \0" .align 2, 0 sUnknown_810D8C8: @ 810D8C8 -.string "{COLOR_2 CYAN}Long Toss{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Long Toss{reset} \0" .align 2, 0 sUnknown_810D8DC: @ 810D8DC -.string "{COLOR_2 CYAN}Focus Energy{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Focus Energy{reset} \0" .align 2, 0 sUnknown_810D8F0: @ 810D8F0 -.string "{COLOR_2 CYAN}Set Damage{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Set Damage{reset} \0" .align 2, 0 sUnknown_810D904: @ 810D904 -.string "{COLOR_2 CYAN}Whiffer{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Whiffer{reset} \0" .align 2, 0 sUnknown_810D914: @ 810D914 -.string "{COLOR_2 CYAN}Sure Shot{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Sure Shot{reset} \0" .align 2, 0 sUnknown_810D928: @ 810D928 -.string "{COLOR_2 CYAN}Destiny Bond{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Destiny Bond{reset} \0" .align 2, 0 sUnknown_810D93C: @ 810D93C -.string "{COLOR_2 CYAN}Leech Seed{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Leech Seed{reset} \0" .align 2, 0 sUnknown_810D950: @ 810D950 -.string "{COLOR_2 CYAN}Hungry Pal{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Hungry Pal{reset} \0" .align 2, 0 sUnknown_810D964: @ 810D964 -.string "{COLOR_2 CYAN}Snatch{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Snatch{reset} \0" .align 2, 0 sUnknown_810D974: @ 810D974 -.string "{COLOR_2 CYAN}Decoy{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Decoy{reset} \0" .align 2, 0 sUnknown_810D984: @ 810D984 -.string "{COLOR_2 CYAN}Cursed{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Cursed{reset} \0" .align 2, 0 sUnknown_810D994: @ 810D994 -.string "{COLOR_2 CYAN}Weakened{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Weakened{reset} \0" .align 2, 0 sUnknown_810D9A4: @ 810D9A4 -.string "{COLOR_2 CYAN}Mist{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Mist{reset} \0" .align 2, 0 sUnknown_810D9B0: @ 810D9B0 -.string "{COLOR_2 CYAN}Vital Throw{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Vital Throw{reset} \0" .align 2, 0 sUnknown_810D9C4: @ 810D9C4 -.string "{COLOR_2 CYAN}Conversion 2{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Conversion 2{reset} \0" .align 2, 0 sUnknown_810D9D8: @ 810D9D8 -.string "{COLOR_2 CYAN}Mirror Move{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Mirror Move{reset} \0" .align 2, 0 sUnknown_810D9EC: @ 810D9EC -.string "{COLOR_2 CYAN}Mini Counter{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Mini Counter{reset} \0" .align 2, 0 sUnknown_810DA00: @ 810DA00 -.string "{COLOR_2 CYAN}Enduring{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Enduring{reset} \0" .align 2, 0 sUnknown_810DA10: @ 810DA10 -.string "{COLOR_2 CYAN}Mirror Coat{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Mirror Coat{reset} \0" .align 2, 0 sUnknown_810DA24: @ 810DA24 -.string "{COLOR_2 CYAN}Protect{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Protect{reset} \0" .align 2, 0 sUnknown_810DA34: @ 810DA34 -.string "{COLOR_2 CYAN}Wish{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Wish{reset} \0" .align 2, 0 sUnknown_810DA40: @ 810DA40 -.string "{COLOR_2 CYAN}Magic Coat{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Magic Coat{reset} \0" .align 2, 0 sUnknown_810DA54: @ 810DA54 -.string "{COLOR_2 CYAN}Counter{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Counter{reset} \0" .align 2, 0 sUnknown_810DA64: @ 810DA64 -.string "{COLOR_2 CYAN}Light Screen{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Light Screen{reset} \0" .align 2, 0 sUnknown_810DA78: @ 810DA78 -.string "{COLOR_2 CYAN}Safeguard{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Safeguard{reset} \0" .align 2, 0 sUnknown_810DA8C: @ 810DA8C -.string "{COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Reflect{reset} \0" .align 2, 0 sUnknown_810DA9C: @ 810DA9C -.string "{COLOR_2 CYAN}Half Speed{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Half Speed{reset} \0" .align 2, 0 sUnknown_810DAB0: @ 810DAB0 -.string "{COLOR_2 CYAN}Enraged{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Enraged{reset} \0" .align 2, 0 sUnknown_810DAC0: @ 810DAC0 -.string "{COLOR_2 CYAN}Charging{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Charging{reset} \0" .align 2, 0 sUnknown_810DAD0: @ 810DAD0 -.string "{COLOR_2 CYAN}Digging{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Digging{reset} \0" .align 2, 0 sUnknown_810DAE0: @ 810DAE0 -.string "{COLOR_2 CYAN}Diving{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Diving{reset} \0" .align 2, 0 sUnknown_810DAF0: @ 810DAF0 -.string "{COLOR_2 CYAN}Bouncing{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Bouncing{reset} \0" .align 2, 0 sUnknown_810DB00: @ 810DB00 -.string "{COLOR_2 CYAN}Flying{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Flying{reset} \0" .align 2, 0 sUnknown_810DB10: @ 810DB10 -.string "{COLOR_2 CYAN}Skull Bash{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Skull Bash{reset} \0" .align 2, 0 sUnknown_810DB24: @ 810DB24 -.string "{COLOR_2 CYAN}Focus Punch{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Focus Punch{reset} \0" .align 2, 0 sUnknown_810DB38: @ 810DB38 -.string "{COLOR_2 CYAN}Razor Wind{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Razor Wind{reset} \0" .align 2, 0 sUnknown_810DB4C: @ 810DB4C -.string "{COLOR_2 CYAN}Sky Attack{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Sky Attack{reset} \0" .align 2, 0 sUnknown_810DB60: @ 810DB60 -.string "{COLOR_2 CYAN}Solarbeam{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Solarbeam{reset} \0" .align 2, 0 sUnknown_810DB74: @ 810DB74 -.string "{COLOR_2 CYAN}Bide{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Bide{reset} \0" .align 2, 0 sUnknown_810DB80: @ 810DB80 -.string "{COLOR_2 CYAN}Double Speed{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Double Speed{reset} \0" .align 2, 0 sUnknown_810DB94: @ 810DB94 -.string "{COLOR_2 CYAN}Infatuated{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Infatuated{reset} \0" .align 2, 0 sUnknown_810DBA8: @ 810DBA8 -.string "{COLOR_2 CYAN}Encore{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Encore{reset} \0" .align 2, 0 sUnknown_810DBB8: @ 810DBB8 -.string "{COLOR_2 CYAN}Taunted{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Taunted{reset} \0" .align 2, 0 sUnknown_810DBC8: @ 810DBC8 -.string "{COLOR_2 CYAN}Cowering{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Cowering{reset} \0" .align 2, 0 sUnknown_810DBD8: @ 810DBD8 -.string "{COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Paused{reset} \0" .align 2, 0 sUnknown_810DBE8: @ 810DBE8 -.string "{COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Confused{reset} \0" .align 2, 0 sUnknown_810DBF8: @ 810DBF8 -.string "{COLOR_2 CYAN}Cringe{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Cringe{reset} \0" .align 2, 0 sUnknown_810DC08: @ 810DC08 -.string "{COLOR_2 CYAN}Famished{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Famished{reset} \0" .align 2, 0 sUnknown_810DC18: @ 810DC18 -.string "{COLOR_2 CYAN}Constriction{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Constriction{reset} \0" .align 2, 0 sUnknown_810DC2C: @ 810DC2C -.string "{COLOR_2 CYAN}Petrified{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Petrified{reset} \0" .align 2, 0 sUnknown_810DC40: @ 810DC40 -.string "{COLOR_2 CYAN}Ingrain{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Ingrain{reset} \0" .align 2, 0 sUnknown_810DC50: @ 810DC50 -.string "{COLOR_2 CYAN}Wrapped{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Wrapped{reset} \0" .align 2, 0 sUnknown_810DC60: @ 810DC60 -.string "{COLOR_2 CYAN}Wrap{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Wrap{reset} \0" .align 2, 0 sUnknown_810DC6C: @ 810DC6C -.string "{COLOR_2 CYAN}Leg Hold{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Leg Hold{reset} \0" .align 2, 0 sUnknown_810DC7C: @ 810DC7C -.string "{COLOR_2 CYAN}Frozen{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Frozen{reset} \0" .align 2, 0 sUnknown_810DC8C: @ 810DC8C -.string "{COLOR_2 CYAN}Identifying{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Identifying{reset} \0" .align 2, 0 sUnknown_810DCA0: @ 810DCA0 -.string "{COLOR_2 CYAN}Paralysis{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Paralysis{reset} \0" .align 2, 0 sUnknown_810DCB4: @ 810DCB4 -.string "{COLOR_2 CYAN}Badly Poisoned{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Badly Poisoned{reset} \0" .align 2, 0 sUnknown_810DCCC: @ 810DCCC -.string "{COLOR_2 CYAN}Poisoned{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Poisoned{reset} \0" .align 2, 0 sUnknown_810DCDC: @ 810DCDC -.string "{COLOR_2 CYAN}Burn{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Burn{reset} \0" .align 2, 0 sUnknown_810DCE8: @ 810DCE8 -.string "{COLOR_2 CYAN}Low HP{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Low HP{reset} \0" .align 2, 0 sUnknown_810DCF8: @ 810DCF8 -.string "{COLOR_2 CYAN}Napping{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Napping{reset} \0" .align 2, 0 sUnknown_810DD08: @ 810DD08 -.string "{COLOR_2 CYAN}Yawning{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Yawning{reset} \0" .align 2, 0 sUnknown_810DD18: @ 810DD18 -.string "{COLOR_2 CYAN}Nightmare{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Nightmare{reset} \0" .align 2, 0 sUnknown_810DD2C: @ 810DD2C -.string "{COLOR_2 CYAN}Sleepless{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Sleepless{reset} \0" .align 2, 0 sUnknown_810DD40: @ 810DD40 -.string "{COLOR_2 CYAN}Sleep{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Sleep{reset} \0" .align 2, 0 sUnknown_810DD50: @ 810DD50 @@ -2294,7 +2294,7 @@ gIQSkill810DD68_Ptr: @ 810DD68 .global Level_810DD6C Level_810DD6C: @ 810DD6C -.string "Level: {UNK_MACRO_3E M3E_82}{ARG_VALUE_0} \0" +.string "Level: {UNK_MACRO_3E M3E_82}{VALUE_0} \0" .align 2,0 .global gLevel810DD6C_Ptr @@ -2303,7 +2303,7 @@ gLevel810DD6C_Ptr: @ 810DD80 .global ExpPts_810DD84 ExpPts_810DD84: @ 810DD84 -.string "Exp. Pts.: {UNK_MACRO_3E M3E_82}{ARG_VALUE_1} \0" +.string "Exp. Pts.: {UNK_MACRO_3E M3E_82}{VALUE_1} \0" .align 2,0 .global gExpPts810DD9C_Ptr @@ -2312,7 +2312,7 @@ gExpPts810DD9C_Ptr: @ 810DD9C .global ToNextLevel_810DDA0 ToNextLevel_810DDA0: @ 810DDA0 -.string "To next level:{UNK_MACRO_3E M3E_82}{ARG_VALUE_0}\0" +.string "To next level:{UNK_MACRO_3E M3E_82}{VALUE_0}\0" .align 2,0 .global gUnknown_810DDB8 @@ -2357,7 +2357,7 @@ gUnknown_810DE0C: @ 810DE0C .global UnkText_810DE10 UnkText_810DE10: @ 810DE10 -.string "{UNK_MACRO_3E M3E_92}{COLOR_2 RED}$v03{END_COLOR_TEXT_2}/\0" +.string "{UNK_MACRO_3E M3E_92}{color RED}$v03{reset}/\0" .align 2,0 .global gUnknown_810DE20 @@ -2383,7 +2383,7 @@ gUnknown_810DE38: @ 810DE38 .global UnkText_810DE3C UnkText_810DE3C: @ 810DE3C -.string "{UNK_MACRO_3E M3E_118}{COLOR_2 RED}$v03{END_COLOR_TEXT_2}\0" +.string "{UNK_MACRO_3E M3E_118}{color RED}$v03{reset}\0" .align 2,0 .global gUnknown_810DE4C @@ -2404,7 +2404,7 @@ gUnknown_810DE58: @ 810DE58 .global Item_810DE5C Item_810DE5C: @ 810DE5C -.string "Item:{UNK_MACRO_3E M3E_46}{ARG_MOVE_ITEM_0} \0" +.string "Item:{UNK_MACRO_3E M3E_46}{MOVE_ITEM_0} \0" .align 2,0 .global gUnknown_810DE6C @@ -2413,7 +2413,7 @@ gUnknown_810DE6C: @ 810DE6C .global IQ_810DE70 IQ_810DE70: @ 810DE70 -.string "IQ:{UNK_MACRO_3E M3E_52}{ARG_POKEMON_0} \0" +.string "IQ:{UNK_MACRO_3E M3E_52}{POKEMON_0} \0" .align 2,0 .global gUnknown_810DE80 @@ -2422,7 +2422,7 @@ gUnknown_810DE80: @ 810DE80 .global Tactics_810DE84 Tactics_810DE84: @ 810DE84 -.string "Tactics:{UNK_MACRO_3E M3E_52}{ARG_POKEMON_0} \0" +.string "Tactics:{UNK_MACRO_3E M3E_52}{POKEMON_0} \0" .align 2,0 .global gUnknown_810DE98 @@ -2431,7 +2431,7 @@ gUnknown_810DE98: @ 810DE98 .global Species_810DE9C Species_810DE9C: @ 810DE9C -.string "Species:{UNK_MACRO_3E M3E_54}{COLOR_1 YELLOW}{ARG_POKEMON_0}{END_COLOR_TEXT_1} \0" +.string "Species:{UNK_MACRO_3E M3E_54}{COLOR YELLOW}{POKEMON_0}{RESET} \0" .align 2,0 .global gUnknown_810DEB4 @@ -2449,7 +2449,7 @@ gUnknown_810DEC8: @ 810DEC8 .global gUnknown_810DECC gUnknown_810DECC: @ 810DECC -.string "{UNK_MACRO_3E M3E_22}{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}\0" +.string "{UNK_MACRO_3E M3E_22}{COLOR GREEN}{MOVE_ITEM_0}{RESET}\0" .align 2,0 .global gUnknown_810DEDC @@ -2458,7 +2458,7 @@ gUnknown_810DEDC: @ 810DEDC .global gUnknown_810DEE0 gUnknown_810DEE0: @ 810DEE0 -.string "{COLOR_1 CYAN}{ARG_POKEMON_0} Pokémon{END_COLOR_TEXT_1} \0" +.string "{COLOR CYAN}{POKEMON_0} Pokémon{RESET} \0" .align 2,0 .global gUnknown_810DEF4 @@ -2468,25 +2468,25 @@ gUnknown_810DEF4: @ 810DEF4 .global gUnknown_810DEF8 gUnknown_810DEF8: @ 810DEF8 -.string "Type:{UNK_MACRO_3E M3E_44}{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}/{COLOR_1 CYAN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} \0" +.string "Type:{UNK_MACRO_3E M3E_44}{COLOR CYAN}{POKEMON_0}{RESET}/{COLOR CYAN}{POKEMON_1}{RESET} \0" .align 2, 0 .4byte gUnknown_810DEF8 .global gUnknown_810DF1C gUnknown_810DF1C: @ 810DF1C -.string "Type:{UNK_MACRO_3E M3E_44}{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1} \0" +.string "Type:{UNK_MACRO_3E M3E_44}{COLOR CYAN}{POKEMON_0}{RESET} \0" .align 2, 0 .4byte gUnknown_810DF1C .global gUnknown_810DF34 gUnknown_810DF34: @ 810DF34 -.string "Ability:{UNK_MACRO_3E M3E_44}{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1} \0" +.string "Ability:{UNK_MACRO_3E M3E_44}{COLOR CYAN}{POKEMON_0}{RESET} \0" .align 2, 0 .4byte gUnknown_810DF34 .global gUnknown_810DF50 gUnknown_810DF50: @ 810DF50 -.string "{UNK_MACRO_3E M3E_44}{COLOR_1 CYAN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}\0" +.string "{UNK_MACRO_3E M3E_44}{COLOR CYAN}{POKEMON_1}{RESET}\0" .align 2, 0 .4byte gUnknown_810DF50 @@ -2510,7 +2510,7 @@ gUnknown_810DF84: @ 810DF84 .global Size_810DF88 Size_810DF88: @ 810DF88 -.string "Size:{UNK_MACRO_3E M3E_82}{ARG_POKEMON_0}\0" +.string "Size:{UNK_MACRO_3E M3E_82}{POKEMON_0}\0" .align 2,0 .global gUnknown_810DF98 @@ -2528,7 +2528,7 @@ gUnknown_810DFB4: @ 810DFB4 .global ItemPlaceholder_810DFB8 ItemPlaceholder_810DFB8: @ 810DFB8 -.string "{UNK_MACRO_3E M3E_22}{COLOR_1 CYAN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}\0" +.string "{UNK_MACRO_3E M3E_22}{COLOR CYAN}{MOVE_ITEM_0}{RESET}\0" .align 2,0 .global gUnknown_810DFC8 @@ -2801,24 +2801,24 @@ gStatusDescriptions: @ 810E074 .4byte 0 sUnknown_810E38C: @ 810E38C .string "Physical Attack moves are those based on\n" -.string "the stats {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.\n" +.string "the stats {color YELLOW}Attack{reset} and {color YELLOW}Defense{reset}.\n" .string "Physical Attack moves are of the types\n" .string "Normal, Fighting, Poison, Ground, Flying,\n" .string "Bug, Rock, Ghost, and Steel.\0" .align 2, 0 sUnknown_810E45C: @ 810E45C -.string "{COLOR_2 CYAN}Physical Attack Moves{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Physical Attack Moves{reset} \0" .align 2, 0 sUnknown_810E47C: @ 810E47C .string "Special Attack moves are those based on\n" -.string "the stats {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} and\n" -.string "{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}.\n" +.string "the stats {color YELLOW}Special Attack{reset} and\n" +.string "{color YELLOW}Special Defense{reset}.\n" .string "Special Attack moves are of the types\n" .string "Fire, Water, Grass, Electric, Ice, Psychic,\n" .string "Dragon, and Dark.\0" .align 2, 0 sUnknown_810E550: @ 810E550 -.string "{COLOR_2 CYAN}Special Attack Moves{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Special Attack Moves{reset} \0" .align 2, 0 sUnknown_810E56C: @ 810E56C .string "The Pokémon gains the ability to pinpoint\n" @@ -2829,8 +2829,8 @@ sUnknown_810E56C: @ 810E56C sUnknown_810E5F4: @ 810E5F4 .string "Because of moves, special abilities, etc.,\n" .string "the Pokémon is weakened in terms of such\n" -.string "stats as {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2},\n" -.string "and {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}. It is possible to heal\n" +.string "stats as {color YELLOW}Attack{reset}, {color YELLOW}Defense{reset}, {color YELLOW}Special Attack{reset},\n" +.string "and {color YELLOW}Special Defense{reset}. It is possible to heal\n" .string "this condition with a Wonder Tile, etc.\n" .string "Moving to the next floor will also heal it.\0" .align 2, 0 @@ -2839,18 +2839,18 @@ sUnknown_810E714: @ 810E714 .string "to use them in succession in one turn.\n" .string "Although linked moves can be powerful,\n" .string "they also make the Pokémon hungry faster.\n" -.string "The link is broken if the {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} of a linked\n" +.string "The link is broken if the {color YELLOW}PP{reset} of a linked\n" .string "move is used up.\0" .align 2, 0 sUnknown_810E7F8: @ 810E7F8 -.string "{COLOR_2 CYAN}Link{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Link{reset} \0" .align 2, 0 sUnknown_810E804: @ 810E804 .string "The floor's status changes to Water Sport.\n" .string "The power of Fire-type moves is halved.\0" .align 2, 0 sUnknown_810E85C: @ 810E85C -.string "{COLOR_2 CYAN}Water Sport{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Water Sport{reset} \0" .align 2, 0 sUnknown_810E870: @ 810E870 .string "The floor's status changes to Mud Sport.\n" @@ -2858,11 +2858,11 @@ sUnknown_810E870: @ 810E870 .string "halved.\0" .align 2, 0 sUnknown_810E8C8: @ 810E8C8 -.string "{COLOR_2 CYAN}Mud Sport{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Mud Sport{reset} \0" .align 2, 0 sUnknown_810E8DC: @ 810E8DC .string "The Pokémon is sped up.\n" -.string "Its {COLOR_2 YELLOW}attack frequency{END_COLOR_TEXT_2} has been boosted.\0" +.string "Its {color YELLOW}attack frequency{reset} has been boosted.\0" .align 2, 0 sUnknown_810E920: @ 810E920 .string "Any Pokémon hearing Perish Song\n" @@ -2901,50 +2901,50 @@ sUnknown_810EB60: @ 810EB60 .align 2, 0 sUnknown_810EBF4: @ 810EBF4 .string "The Pokémon is storing power with the\n" -.string "move {COLOR_2 GREEN}Stockpile{END_COLOR_TEXT_2}.\n" +.string "move {color GREEN}Stockpile{reset}.\n" .string "The more power Stockpiled, the more\n" -.string "powerful the move {COLOR_2 GREEN}Spit Up{END_COLOR_TEXT_2}{END_COLOR_TEXT_2} becomes.\n" +.string "powerful the move {color GREEN}Spit Up{reset}{reset} becomes.\n" .string "The stored power is lost if the Pokémon\n" .string "goes on to the next floor.\0" .align 2, 0 sUnknown_810ECC4: @ 810ECC4 -.string "The Pokémon's {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} is\n" +.string "The Pokémon's {color YELLOW}Movement Speed{reset} is\n" .string "reduced from its usual level.\0" .align 2, 0 sUnknown_810ED0C: @ 810ED0C -.string "The Pokémon's {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} is boosted\n" +.string "The Pokémon's {color YELLOW}Movement Speed{reset} is boosted\n" .string "over its usual level.\0" .align 2, 0 sUnknown_810ED54: @ 810ED54 .string "The Pokémon (or trap) explodes savagely\n" .string "and inflicts damage on all Pokémon within\n" .string "a 2-tile range.\n" -.string "The huge explosion halves the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of\n" +.string "The huge explosion halves the {color YELLOW}HP{reset} of\n" .string "rescue team members. It also destroys\n" .string "walls and items within the 2-tile range.\0" .align 2, 0 sUnknown_810EE30: @ 810EE30 -.string "{COLOR_2 CYAN}Huge Explosion{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Huge Explosion{reset} \0" .align 2, 0 sUnknown_810EE48: @ 810EE48 .string "The Pokémon (or trap) explodes and\n" .string "inflicts damage on all Pokémon within\n" .string "a 1-tile range.\n" -.string "The explosion halves the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of rescue\n" +.string "The explosion halves the {color YELLOW}HP{reset} of rescue\n" .string "team members. It also destroys walls and\n" .string "items within the 1-tile range.\0" .align 2, 0 sUnknown_810EF14: @ 810EF14 -.string "{COLOR_2 CYAN}Explode{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Explode{reset} \0" .align 2, 0 sUnknown_810EF24: @ 810EF24 .string "There is a raging snowstorm.\n" .string "This weather condition boosts the\n" -.string "{COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} of Ice-type Pokémon\n" +.string "{color YELLOW}Movement Speed{reset} of Ice-type Pokémon\n" .string "by one level.\0" .align 2, 0 sUnknown_810EF9C: @ 810EF9C -.string "{COLOR_2 CYAN}Snow{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Snow{reset} \0" .align 2, 0 sUnknown_810EFA8: @ 810EFA8 .string "The weather is foggy.\n" @@ -2952,16 +2952,16 @@ sUnknown_810EFA8: @ 810EFA8 .string "of Electric-type moves.\0" .align 2, 0 sUnknown_810EFF8: @ 810EFF8 -.string "{COLOR_2 CYAN}Fog{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Fog{reset} \0" .align 2, 0 sUnknown_810F004: @ 810F004 .string "The weather is cloudy and dark.\n" -.string "This condition lowers the {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}\n" -.string "and {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} of all Pokémon\n" +.string "This condition lowers the {color YELLOW}Attack{reset}\n" +.string "and {color YELLOW}Special Attack{reset} of all Pokémon\n" .string "except for the Normal type.\0" .align 2, 0 sUnknown_810F090: @ 810F090 -.string "{COLOR_2 CYAN}Cloudy{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Cloudy{reset} \0" .align 2, 0 sUnknown_810F0A0: @ 810F0A0 .string "There is a raging sandstorm.\n" @@ -2970,7 +2970,7 @@ sUnknown_810F0A0: @ 810F0A0 .string "Rock, and Steel types.\0" .align 2, 0 sUnknown_810F128: @ 810F128 -.string "{COLOR_2 CYAN}Sandstorm{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Sandstorm{reset} \0" .align 2, 0 sUnknown_810F13C: @ 810F13C .string "The sun is blazing.\n" @@ -2978,7 +2978,7 @@ sUnknown_810F13C: @ 810F13C .string "and weakens Water-type moves.\0" .align 2, 0 sUnknown_810F198: @ 810F198 -.string "{COLOR_2 CYAN}Sunny{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Sunny{reset} \0" .align 2, 0 sUnknown_810F1A8: @ 810F1A8 .string "The weather is rainy.\n" @@ -2986,7 +2986,7 @@ sUnknown_810F1A8: @ 810F1A8 .string "and weakens Fire-type moves.\0" .align 2, 0 sUnknown_810F204: @ 810F204 -.string "{COLOR_2 CYAN}Rain{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Rain{reset} \0" .align 2, 0 sUnknown_810F210: @ 810F210 .string "The weather is bitterly cold with hail.\n" @@ -2994,7 +2994,7 @@ sUnknown_810F210: @ 810F210 .string "all Pokémon except the Ice type.\0" .align 2, 0 sUnknown_810F27C: @ 810F27C -.string "{COLOR_2 CYAN}Hail{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Hail{reset} \0" .align 2, 0 sUnknown_810F288: @ 810F288 .string "The Pokémon becomes famished and\n" @@ -3011,7 +3011,7 @@ sUnknown_810F334: @ 810F334 .string "of the move it used last.\0" .align 2, 0 sUnknown_810F3A0: @ 810F3A0 -.string "{COLOR_2 CYAN}Grudge Effect{END_COLOR_TEXT_2} \0" +.string "{color CYAN}Grudge Effect{reset} \0" .align 2, 0 sUnknown_810F3B8: @ 810F3B8 .string "The Pokémon is prevented from using\n" @@ -3124,7 +3124,7 @@ sUnknown_810FCDC: @ 810FCDC sUnknown_810FD84: @ 810FD84 .string "A Leech Seed is planted on the\n" .string "Pokémon. The Leech Seed drains the\n" -.string "Pokémon's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} every several turns.\n" +.string "Pokémon's {color YELLOW}HP{reset} every several turns.\n" .string "This effect lasts a set amount of turns.\0" .align 2, 0 sUnknown_810FE18: @ 810FE18 @@ -3149,9 +3149,9 @@ sUnknown_810FF58: @ 810FF58 .align 2, 0 sUnknown_8110004: @ 8110004 .string "The Pokémon is protected from any\n" -.string "reduction of the stats {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2},\n" -.string "{COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2},\n" -.string "{COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2}, and {COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2}.\n" +.string "reduction of the stats {color YELLOW}Attack{reset}, {color YELLOW}Defense{reset},\n" +.string "{color YELLOW}Special Attack{reset}, {color YELLOW}Special Defense{reset},\n" +.string "{color YELLOW}Accuracy{reset}, and {color YELLOW}Evasion{reset}.\n" .string "This condition lasts a set amount of turns.\0" .align 2, 0 sUnknown_81100DC: @ 81100DC @@ -3178,7 +3178,7 @@ sUnknown_8110234: @ 8110234 sUnknown_811030C: @ 811030C .string "If the Pokémon takes damage that would\n" .string "usually cause it to faint, it will hold on\n" -.string "with just {COLOR_2 YELLOW}1HP{END_COLOR_TEXT_2}.\n" +.string "with just {color YELLOW}1HP{reset}.\n" .string "This effect lasts a set amount of turns.\0" .align 2, 0 sUnknown_81103A0: @ 81103A0 @@ -3196,7 +3196,7 @@ sUnknown_8110470: @ 8110470 .string "This condition lasts a set amount of turns.\0" .align 2, 0 sUnknown_8110530: @ 8110530 -.string "The Pokémon regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} faster than usual.\n" +.string "The Pokémon regains {color YELLOW}HP{reset} faster than usual.\n" .string "This effect lasts a set amount of turns.\0" .align 2, 0 sUnknown_8110588: @ 8110588 @@ -3239,14 +3239,14 @@ sUnknown_811088C: @ 811088C .string "move used right after charging.\0" .align 2, 0 sUnknown_81108FC: @ 81108FC -.string "Using the move {COLOR_2 GREEN}Dig{END_COLOR_TEXT_2}, \n" +.string "Using the move {color GREEN}Dig{reset}, \n" .string "the Pokémon has gone underground to\n" .string "prepare for its attack.\n" .string "It will strike on the next turn to inflict\n" .string "damage.\0" .align 2, 0 sUnknown_8110988: @ 8110988 -.string "Using the move {COLOR_2 GREEN}Dive{END_COLOR_TEXT_2}, \n" +.string "Using the move {color GREEN}Dive{reset}, \n" .string "the Pokémon has gone underwater to\n" .string "prepare for its attack.\n" .string "It will strike on the next turn to inflict\n" @@ -3266,32 +3266,32 @@ sUnknown_8110A84: @ 8110A84 .align 2, 0 sUnknown_8110B00: @ 8110B00 .string "The Pokémon is preparing to use\n" -.string "the move {COLOR_2 GREEN}Skull Bash{END_COLOR_TEXT_2}.\n" -.string "On the next turn, {COLOR_2 GREEN}Skull Bash{END_COLOR_TEXT_2} will be\n" +.string "the move {color GREEN}Skull Bash{reset}.\n" +.string "On the next turn, {color GREEN}Skull Bash{reset} will be\n" .string "unleashed.\0" .align 2, 0 sUnknown_8110B74: @ 8110B74 .string "The Pokémon is preparing to use\n" -.string "the move {COLOR_2 GREEN}Focus Punch{END_COLOR_TEXT_2}.\n" -.string "On the next turn, {COLOR_2 GREEN}Focus Punch{END_COLOR_TEXT_2} will be\n" +.string "the move {color GREEN}Focus Punch{reset}.\n" +.string "On the next turn, {color GREEN}Focus Punch{reset} will be\n" .string "unleashed.\0" .align 2, 0 sUnknown_8110BE8: @ 8110BE8 .string "The Pokémon is preparing to use\n" -.string "the move {COLOR_2 GREEN}Razor Wind{END_COLOR_TEXT_2}.\n" -.string "On the next turn, {COLOR_2 GREEN}Razor Wind{END_COLOR_TEXT_2} will be\n" +.string "the move {color GREEN}Razor Wind{reset}.\n" +.string "On the next turn, {color GREEN}Razor Wind{reset} will be\n" .string "unleashed.\0" .align 2, 0 sUnknown_8110C5C: @ 8110C5C .string "The Pokémon is preparing to use\n" -.string "the move {COLOR_2 GREEN}Sky Attack{END_COLOR_TEXT_2}.\n" -.string "On the next turn, {COLOR_2 GREEN}Sky Attack{END_COLOR_TEXT_2} will be\n" +.string "the move {color GREEN}Sky Attack{reset}.\n" +.string "On the next turn, {color GREEN}Sky Attack{reset} will be\n" .string "unleashed.\0" .align 2, 0 sUnknown_8110CD0: @ 8110CD0 .string "The Pokémon is preparing to launch\n" -.string "the move {COLOR_2 GREEN}Solarbeam{END_COLOR_TEXT_2}.\n" -.string "On the next turn, {COLOR_2 GREEN}Solarbeam{END_COLOR_TEXT_2} will be\n" +.string "the move {color GREEN}Solarbeam{reset}.\n" +.string "On the next turn, {color GREEN}Solarbeam{reset} will be\n" .string "unleashed.\0" .align 2, 0 sUnknown_8110D44: @ 8110D44 @@ -3326,7 +3326,7 @@ sUnknown_8110FA4: @ 8110FA4 sUnknown_811100C: @ 811100C .string "The Pokémon lays down roots in the\n" .string "ground. It becomes immobilized, but\n" -.string "it regenerates {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} every several turns.\n" +.string "it regenerates {color YELLOW}HP{reset} every several turns.\n" .string "These effects last a set amount of turns.\0" .align 2, 0 sUnknown_81110AC: @ 81110AC @@ -3362,17 +3362,17 @@ sUnknown_81112BC: @ 81112BC sUnknown_8111398: @ 8111398 .string "The Pokémon is on the verge of collapse\n" .string "from hunger. Every action results in a\n" -.string "loss of {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\n" +.string "loss of {color YELLOW}HP{reset}.\n" .string "This condition will persist until the\n" -.string "Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is filled.\0" +.string "Pokémon's {color YELLOW}Belly{reset} is filled.\0" .align 2, 0 sUnknown_8111440: @ 8111440 .string "The Pokémon gains the ability to identify\n" .string "if other Pokémon are holding items or not.\0" .align 2, 0 sUnknown_8111498: @ 8111498 -.string "The Pokémon's {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} and\n" -.string "{COLOR_2 YELLOW}attack frequency{END_COLOR_TEXT_2} are reduced.\n" +.string "The Pokémon's {color YELLOW}Movement Speed{reset} and\n" +.string "{color YELLOW}attack frequency{reset} are reduced.\n" .string "Attacks and moves become unusable.\n" .string "Wonder Orbs also won't work, but other\n" .string "items will.\n" @@ -3381,7 +3381,7 @@ sUnknown_8111498: @ 8111498 sUnknown_8111568: @ 8111568 .string "The Pokémon takes damage every\n" .string "two turns. It is also prevented from \n" -.string "regenerating {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}. This condition does not\n" +.string "regenerating {color YELLOW}HP{reset}. This condition does not\n" .string "disappear over turns.\n" .string "Heal it quickly by using certain moves or\n" .string "items, or by going to the next floor.\n\0" @@ -3389,7 +3389,7 @@ sUnknown_8111568: @ 8111568 sUnknown_8111644: @ 8111644 .string "The Pokémon takes damage every ten\n" .string "turns. It is also prevented from \n" -.string "regenerating {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\n" +.string "regenerating {color YELLOW}HP{reset}.\n" .string "Poison does not disappear over turns.\n" .string "Heal it quickly by using certain moves or\n" .string "items, or by going to the next floor.\0" @@ -3402,15 +3402,15 @@ sUnknown_8111718: @ 8111718 .string "going to the next floor.\0" .align 2, 0 sUnknown_81117BC: @ 81117BC -.string "The Pokémon's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} is low from taking\n" +.string "The Pokémon's {color YELLOW}HP{reset} is low from taking\n" .string "damage. It is in danger.\n" -.string "Do something to restore {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}!\0" +.string "Do something to restore {color YELLOW}HP{reset}!\0" .align 2, 0 sUnknown_8111824: @ 8111824 .string "The Pokémon falls asleep and becomes\n" .string "incapable of any action.\n" .string "Upon awakening, the Pokémon fully\n" -.string "regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} and heals from any\n" +.string "regains {color YELLOW}HP{reset} and heals from any\n" .string "status problems.\0" .align 2, 0 sUnknown_81118BC: @ 81118BC @@ -4353,7 +4353,7 @@ gUnknown_8112778: @ 8112778 gUnknown_81127DC: @ 81127DC .string "When battling several foes, the Pokémon\n" .string "will first target Pokémon with the lowest\n" -.string "{COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\0" +.string "{color YELLOW}HP{reset}.\0" .align 2, 0 .global gUnknown_811283C @@ -4372,7 +4372,7 @@ gUnknown_81128A8: @ 81128A8 .global gUnknown_8112914 gUnknown_8112914: @ 8112914 -.string "If it becomes {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} or is {COLOR_2 CYAN}Cowering{END_COLOR_TEXT_2},\n" +.string "If it becomes {color CYAN}Confused{reset} or is {color CYAN}Cowering{reset},\n" .string "the Pokémon's wildly thrown\n" .string "attacks will not hit friends.\0" .align 2, 0 @@ -4381,7 +4381,7 @@ gUnknown_8112914: @ 8112914 gUnknown_8112984: @ 8112984 .string "The Pokémon will stop using linked moves\n" .string "that are on the verge of delinking.\n" -.string "It also stops using moves with no {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} left.\0" +.string "It also stops using moves with no {color YELLOW}PP{reset} left.\0" .align 2, 0 .global gUnknown_8112A04 @@ -4538,14 +4538,14 @@ gUnknown_8112E08: @ 8112E08 .global gUnknown_8112E4C gUnknown_8112E4C: @ 8112E4C -.string "The Pokémon will stop moving if its {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}\n" +.string "The Pokémon will stop moving if its {color YELLOW}HP{reset}\n" .string "is low.\0" .align 2, 0 .global gUnknown_8112E80 gUnknown_8112E80: @ 8112E80 .string "The Pokémon will try to avoid foes if its\n" -.string "{COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} is low.\0" +.string "{color YELLOW}HP{reset} is low.\0" .align 2, 0 .global gUnknown_8112EBC @@ -4938,7 +4938,7 @@ gUnknown_811380C: @ 811380C .global gUnknown_811382C gUnknown_811382C: @ 811382C -.string "{ARG_POKEMON_0}'s {ARG_MOVE_ITEM_0}.\0" +.string "{POKEMON_0}'s {MOVE_ITEM_0}.\0" .align 2, 0 .global gUnknown_811383C @@ -4947,7 +4947,7 @@ gUnknown_811383C: @ 811383C .global PlaceText PlaceText: -.string "{CENTER_ALIGN}Place: {ARG_POKEMON_0}\0" +.string "{CENTER_ALIGN}Place: {POKEMON_0}\0" .align 2,0 .global gUnknown_8113850 @@ -4956,7 +4956,7 @@ gUnknown_8113850: @ 8113850 .global DefeatedbyText DefeatedbyText: -.string "{ARG_POKEMON_1} was defeated by\0" +.string "{POKEMON_1} was defeated by\0" .global gUnknown_8113868 gUnknown_8113868: @ 8113868 @@ -4964,7 +4964,7 @@ gUnknown_8113868: @ 8113868 .global Monster_811386C Monster_811386C: @ 811386C -.string "{ARG_POKEMON_1}\0" +.string "{POKEMON_1}\0" .align 2,0 .global gUnknown_8113870 @@ -4973,7 +4973,7 @@ gUnknown_8113870: @ 8113870 .global Level_8113874 Level_8113874: @ 8113874 -.string "Level {UNK_MACRO_3E M3E_42}{ARG_VALUE_1}{UNK_MACRO_3E M3E_64}Exp. Pts. {ARG_VALUE_0} \0" +.string "Level {UNK_MACRO_3E M3E_42}{VALUE_1}{UNK_MACRO_3E M3E_64}Exp. Pts. {VALUE_0} \0" .align 2,0 .global gUnknown_8113898 @@ -4982,7 +4982,7 @@ gUnknown_8113898: @ 8113898 .global Level_811389C Level_811389C: @ 811389C -.string "Level {UNK_MACRO_3E M3E_35}{ARG_VALUE_1}{UNK_MACRO_3E M3E_64}Exp. Pts.{ARG_VALUE_0} \0" +.string "Level {UNK_MACRO_3E M3E_35}{VALUE_1}{UNK_MACRO_3E M3E_64}Exp. Pts.{VALUE_0} \0" .align 2,0 .global gUnknown_81138C0 @@ -4991,7 +4991,7 @@ gUnknown_81138C0: @ 81138C0 .global HP_81138C4 HP_81138C4: @ 81138C4 -.string "HP{UNK_MACRO_3E M3E_42}{ARG_VALUE_0} \0" +.string "HP{UNK_MACRO_3E M3E_42}{VALUE_0} \0" .align 2,0 .global gUnknown_81138D0 @@ -5000,7 +5000,7 @@ gUnknown_81138D0: @ 81138D0 .global Attack_81138D4 Attack_81138D4: @ 81138D4 -.string "Attack{UNK_MACRO_3E M3E_42}{ARG_VALUE_0} \0" +.string "Attack{UNK_MACRO_3E M3E_42}{VALUE_0} \0" .align 2,0 .global gUnknown_81138E4 @@ -5009,7 +5009,7 @@ gUnknown_81138E4: @ 81138E4 .global Defense_81138E8 Defense_81138E8: @ 81138E8 -.string "{UNK_MACRO_3E M3E_80}Defense{UNK_MACRO_3E M3E_128}{ARG_VALUE_1} \0" +.string "{UNK_MACRO_3E M3E_80}Defense{UNK_MACRO_3E M3E_128}{VALUE_1} \0" .align 2,0 .global gUnknown_8113900 @@ -5018,7 +5018,7 @@ gUnknown_8113900: @ 8113900 .global SpAtk_8113904 SpAtk_8113904: @ 8113904 -.string "Sp. Atk.{UNK_MACRO_3E M3E_42}{ARG_VALUE_0} \0" +.string "Sp. Atk.{UNK_MACRO_3E M3E_42}{VALUE_0} \0" .align 2,0 .global gUnknown_8113918 @@ -5027,7 +5027,7 @@ gUnknown_8113918: @ 8113918 .global SpDef_811391C SpDef_811391C: @ 811391C -.string "{UNK_MACRO_3E M3E_80}Sp. Def.{UNK_MACRO_3E M3E_128}{ARG_VALUE_1} \0" +.string "{UNK_MACRO_3E M3E_80}Sp. Def.{UNK_MACRO_3E M3E_128}{VALUE_1} \0" .align 2,0 .global gUnknown_8113934 @@ -5036,7 +5036,7 @@ gUnknown_8113934: @ 8113934 .global Attack_8113938 Attack_8113938: @ 8113938 -.string "Attack{UNK_MACRO_3E M3E_42}{COLOR_2 RED}{ARG_VALUE_0}{END_COLOR_TEXT_2} \0" +.string "Attack{UNK_MACRO_3E M3E_42}{color RED}{VALUE_0}{reset} \0" .align 2,0 .global gUnknown_8113950 @@ -5045,7 +5045,7 @@ gUnknown_8113950: @ 8113950 .global Defense_8113954 Defense_8113954: @ 8113954 -.string "{UNK_MACRO_3E M3E_80}Defense{UNK_MACRO_3E M3E_128}{COLOR_2 RED}{ARG_VALUE_1}{END_COLOR_TEXT_2} \0" +.string "{UNK_MACRO_3E M3E_80}Defense{UNK_MACRO_3E M3E_128}{color RED}{VALUE_1}{reset} \0" .align 2,0 .global gUnknown_8113974 @@ -5054,7 +5054,7 @@ gUnknown_8113974: @ 8113974 .global SpAtk_8113978 SpAtk_8113978: @ 8113978 -.string "Sp. Atk.{UNK_MACRO_3E M3E_42}{COLOR_2 RED}{ARG_VALUE_0}{END_COLOR_TEXT_2} \0" +.string "Sp. Atk.{UNK_MACRO_3E M3E_42}{color RED}{VALUE_0}{reset} \0" .align 2,0 .global gUnknown_8113990 @@ -5063,7 +5063,7 @@ gUnknown_8113990: @ 8113990 .global SpDef_8113994 SpDef_8113994: @ 8113994 -.string "{UNK_MACRO_3E M3E_80}Sp. Def.{UNK_MACRO_3E M3E_128}{COLOR_2 RED}{ARG_VALUE_1}{END_COLOR_TEXT_2} \0" +.string "{UNK_MACRO_3E M3E_80}Sp. Def.{UNK_MACRO_3E M3E_128}{color RED}{VALUE_1}{reset} \0" .align 2,0 .global gUnknown_81139B4 @@ -5076,7 +5076,7 @@ gUnknown_81139B8: @ 81139B8 .global Item_81139BC Item_81139BC: @ 81139BC -.string "Item:{UNK_MACRO_3E M3E_42}{ARG_MOVE_ITEM_0} \0" +.string "Item:{UNK_MACRO_3E M3E_42}{MOVE_ITEM_0} \0" .align 2,0 .global gUnknown_81139CC @@ -6052,7 +6052,7 @@ gUnknown_8115960: @ 8115960 .global PPD0Text PPD0Text: -.string "PP {ARG_VALUE_0} \0" +.string "PP {VALUE_0} \0" .global gPtrPPD0Text gPtrPPD0Text: @ 8115970 @@ -6081,9 +6081,9 @@ gUnknown_8115A2C: @ 8115A2C .global ItemLimitText_8105A30 ItemLimitText_8105A30: @ 8105A30 -.string "Only {ARG_VALUE_0} items may be brought into\n" +.string "Only {VALUE_0} items may be brought into\n" .string "this dungeon.\n" -.string "Please put away {ARG_VALUE_1} item(s).\0" +.string "Please put away {VALUE_1} item(s).\0" .align 2,0 .global gUnknown_8115A80 @@ -6092,9 +6092,9 @@ gUnknown_8115A80: @ 8115A80 .global ItemLimitAlsoText_8105A84 ItemLimitAlsoText_8105A84: @ 8105A84 -.string "Also, only {ARG_VALUE_0} items may be brought\n" +.string "Also, only {VALUE_0} items may be brought\n" .string "into this dungeon.\n" -.string "Please put away {ARG_VALUE_1} item(s).\0" +.string "Please put away {VALUE_1} item(s).\0" .align 2,0 .global gUnknown_8115ADC @@ -6103,7 +6103,7 @@ gUnknown_8115ADC: @ 8115ADC .global PartyMemberLimitText_8115AE0 PartyMemberLimitText_8115AE0: @ 8115AE0 -.string "Your client, {ARG_POKEMON_0}, could not join\n" +.string "Your client, {POKEMON_0}, could not join\n" .string "the team because there are too many\n" .string "members already.\0" .align 2,0 @@ -6114,7 +6114,7 @@ gUnknown_8115B3C: @ 8115B3C .global PartyMemberLimitText_8115B40 PartyMemberLimitText_8115B40: @ 8115B40 -.string "Also, your client, {ARG_POKEMON_0}, could not\n" +.string "Also, your client, {POKEMON_0}, could not\n" .string "join the team because there are too many\n" .string "members already.\0" .align 2,0 @@ -6125,7 +6125,7 @@ gUnknown_8115BA4: @ 8115BA4 .global SizeLimitText_8115BA8 SizeLimitText_8115BA8: @ 8115BA8 -.string "Your client, {ARG_POKEMON_0}, could not join\n" +.string "Your client, {POKEMON_0}, could not join\n" .string "the team because there is no space.\0" .align 2,0 @@ -6135,7 +6135,7 @@ gUnknown_8115BF4: @ 8115BF4 .global SizeLimitText_8115BF8 SizeLimitText_8115BF8: @ 8115BF8 -.string "Also, your client, {ARG_POKEMON_0}, could not\n" +.string "Also, your client, {POKEMON_0}, could not\n" .string "join the team because there is no space.\0" .align 2,0 @@ -6146,8 +6146,8 @@ gUnknown_8115C4C: @ 8115C4C .global MoveReqText_8115C50 MoveReqText_8115C50: @ 8115C50 .string "To enter this dungeon, the team must have\n" -.string "a Pokémon with the move {ARG_MOVE_ITEM_0}\n" -.string "or have the Hidden Machine {ARG_MOVE_ITEM_0}.\0" +.string "a Pokémon with the move {MOVE_ITEM_0}\n" +.string "or have the Hidden Machine {MOVE_ITEM_0}.\0" .align 2,0 .global gUnknown_8115CB8 @@ -6157,8 +6157,8 @@ gUnknown_8115CB8: @ 8115CB8 .global MoveReqText_8115CBC MoveReqText_8115CBC: @ 8115CBC .string "Also, the team must have a Pokémon with\n" -.string "the move {ARG_MOVE_ITEM_0} or have the\n" -.string "Hidden Machine {ARG_MOVE_ITEM_0}.\0" +.string "the move {MOVE_ITEM_0} or have the\n" +.string "Hidden Machine {MOVE_ITEM_0}.\0" .align 2,0 .global gUnknown_8115D14 diff --git a/data/data_8115F5C.s b/data/data_8115F5C.s index 059514b4..ac098778 100644 --- a/data/data_8115F5C.s +++ b/data/data_8115F5C.s @@ -86,12 +86,12 @@ gUnknown_8116148: @ 8116148 .global gInvalidityText gInvalidityText: @ 811615C -.string "{COLOR_1 RED_2}invalidity{END_COLOR_TEXT_1}\0" +.string "{COLOR RED_W}invalidity{RESET}\0" .align 2,0 .global gUndefineText gUndefineText: @ 811616C -.string "{COLOR_1 RED_2}undefine{END_COLOR_TEXT_1}\0" +.string "{COLOR RED_W}undefine{RESET}\0" .align 2,0 .global gSpeechBubbleChar @@ -100,11 +100,11 @@ gSpeechBubbleChar: @ 811617C .global gFormattedSpeechBubble gFormattedSpeechBubble: @ 8116180 -.string "{COLOR_1 YELLOW_5}{SPEECH_BUBBLE}{END_COLOR_TEXT_1}\0" +.string "{COLOR YELLOW_N}{SPEECH_BUBBLE}{RESET}\0" .global gUnknown_8116188 gUnknown_8116188: @ 8116188 -.string "{COLOR_1 YELLOW_5}%s{END_COLOR_TEXT_1}\0" +.string "{COLOR YELLOW_N}%s{RESET}\0" .align 2,0 .global gUnknown_8116190 @@ -285,20 +285,20 @@ gUnknown_8116318: @ 8116318 .global gUnknown_811633C gUnknown_811633C: @ 811633C -.string "{CENTER_ALIGN}{ARG_NICKNAME_0}'s team received\n" -.string "{CENTER_ALIGN}the {ARG_MOVE_ITEM_0} cash reward.\0" +.string "{CENTER_ALIGN}{NAME_0}'s team received\n" +.string "{CENTER_ALIGN}the {MOVE_ITEM_0} cash reward.\0" .align 2, 0 .global gUnknown_811636C gUnknown_811636C: @ 811636C .string "{CENTER_ALIGN}The team also received\n" -.string "{CENTER_ALIGN}one {ARG_MOVE_ITEM_0}.\0" +.string "{CENTER_ALIGN}one {MOVE_ITEM_0}.\0" .align 2, 0 .global gUnknown_8116390 gUnknown_8116390: @ 8116390 -.string "{CENTER_ALIGN}{ARG_NICKNAME_0}'s team received\n" -.string "{CENTER_ALIGN}the reward {ARG_MOVE_ITEM_0}.\0" +.string "{CENTER_ALIGN}{NAME_0}'s team received\n" +.string "{CENTER_ALIGN}the reward {MOVE_ITEM_0}.\0" .align 2, 0 .global gUnknown_81163BC @@ -317,18 +317,18 @@ gUnknown_81163BC: @ 81163BC .global gUnknown_81163E4 gUnknown_81163E4: @ 81163E4 -.string "{COLOR_1 LIGHT_BLUE}%d{END_COLOR_TEXT_1} %s\0" +.string "{COLOR CYAN_G}%d{RESET} %s\0" .align 2,0 .global gUnknown_81163F0 gUnknown_81163F0: @ 81163F0 -.string "{CENTER_ALIGN}However, {ARG_NICKNAME_0}'s team\n" +.string "{CENTER_ALIGN}However, {NAME_0}'s team\n" .string "{CENTER_ALIGN}had too much money already...\0" .align 2,0 .global gUnknown_811642C gUnknown_811642C: @ 811642C -.string "{CENTER_ALIGN}However, {ARG_NICKNAME_0}'s team\n" +.string "{CENTER_ALIGN}However, {NAME_0}'s team\n" .string "{CENTER_ALIGN}had too many items already...\0" .align 2,0 .string "pksdir0\0" @@ -540,7 +540,7 @@ gUnknown_81167E8: @ 81167E8 .global gUnknown_81167EC gUnknown_81167EC: @ 81167EC .string "{CENTER_ALIGN}The rescue rank went up from\n" -.string "{CENTER_ALIGN}{ARG_MOVE_ITEM_0} to {ARG_MOVE_ITEM_1}!\0" +.string "{CENTER_ALIGN}{MOVE_ITEM_0} to {MOVE_ITEM_1}!\0" .align 2,0 .global gUnknown_811681C @@ -747,12 +747,12 @@ gUnknown_8117000: @ 8117000 .global gUnknown_811709C gUnknown_811709C: @ 811709C -.string "{COLOR_1 RED_2}invalidity{END_COLOR_TEXT_1}\0" +.string "{COLOR RED_W}invalidity{RESET}\0" .align 2,0 .global gUnknown_81170AC gUnknown_81170AC: @ 81170AC -.string "{COLOR_1 YELLOW_3}scene{END_COLOR_TEXT_1}\0" +.string "{COLOR YELLOW_C}scene{RESET}\0" .align 2,0 .global gUnknown_81170B8 @@ -762,7 +762,7 @@ gUnknown_81170B8: @ 81170B8 .global gUnknown_81170C4 gUnknown_81170C4: @ 81170C4 -.string "{COLOR_1 YELLOW_3}direction{END_COLOR_TEXT_1}\0" +.string "{COLOR YELLOW_C}direction{RESET}\0" .align 2,0 .global gUnknown_81170D4 @@ -1943,7 +1943,7 @@ gUnknown_8118250: @ 8118250 .global gGroundLives_InvalidityText gGroundLives_InvalidityText: @ 811825C -.string "{COLOR_1 RED_2}invalidity{END_COLOR_TEXT_1}\0" +.string "{COLOR RED_W}invalidity{RESET}\0" .align 2,0 .global GroundLives_ActionText diff --git a/data/friend_rescue.s b/data/friend_rescue.s index d5eba689..4586c99a 100644 --- a/data/friend_rescue.s +++ b/data/friend_rescue.s @@ -26,24 +26,24 @@ gUnknown_80E2CD4: @ 80E2CD4 .global gUnknown_80E2CE8 gUnknown_80E2CE8: @ 80E2CE8 -.string "Please choose the {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} that should\n" +.string "Please choose the {COLOR CYAN_G}A-OK Mail{RESET} that should\n" .string "be sent to your friend.\0" .align 2,0 .global gUnknown_80E2D30 gUnknown_80E2D30: @ 80E2D30 -.string "This {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} will be sent.\n" +.string "This {COLOR CYAN_G}A-OK Mail{RESET} will be sent.\n" .string "Is that OK?\0" .align 2,0 .global gUnknown_80E2D60 gUnknown_80E2D60: @ 80E2D60 - .string "There is no {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.\0" + .string "There is no {COLOR CYAN_G}A-OK Mail{RESET}.\0" .align 2,0 .global gUnknown_80E2D7C gUnknown_80E2D7C: @ 80E2D7C -.string "Connect the {COLOR_1 LIGHT_BLUE}Game Link cable{END_COLOR_TEXT_1}.\n" +.string "Connect the {COLOR CYAN_G}Game Link cable{RESET}.\n" .string "When your friend is ready, begin\n" .string "communication.\0" .align 2,0 @@ -77,19 +77,19 @@ gUnknown_80E2EB4: @ 80E2EB4 .global gUnknown_80E2F14 gUnknown_80E2F14: @ 80E2F14 -.string "There is no {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} on\n" +.string "There is no {COLOR CYAN_G}SOS Mail{RESET} on\n" .string "the GBA Game Pak.\0" .align 2,0 .global gUnknown_80E2F44 gUnknown_80E2F44: @ 80E2F44 -.string "Please choose an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}\n" +.string "Please choose an {COLOR CYAN_G}SOS Mail{RESET}\n" .string "on the GBA Game Pak.\0" .align 2,0 .global gUnknown_80E2F78 gUnknown_80E2F78: @ 80E2F78 -.string "Is it OK to accept this {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}?\0" +.string "Is it OK to accept this {COLOR CYAN_G}SOS Mail{RESET}?\0" .align 2,0 .global gUnknown_80E2FA0 @@ -101,7 +101,7 @@ gUnknown_80E2FA0: @ 80E2FA0 .global gUnknown_80E2FEC gUnknown_80E2FEC: @ 80E2FEC -.string "The {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} has been received.\n" +.string "The {COLOR CYAN_G}SOS Mail{RESET} has been received.\n" .string "Your adventure will be saved.\0" .align 2,0 @@ -113,28 +113,28 @@ gUnknown_80E3030: @ 80E3030 .global gUnknown_80E3078 gUnknown_80E3078: @ 80E3078 -.string "Please enter the {COLOR_1 LIGHT_BLUE}SOS Mail password{END_COLOR_TEXT_1}.\0" +.string "Please enter the {COLOR CYAN_G}SOS Mail password{RESET}.\0" .align 2,0 .global gUnknown_80E30A4 gUnknown_80E30A4: @ 80E30A4 -.string "Is it OK to send this {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?\0" +.string "Is it OK to send this {COLOR CYAN_G}Thank-You Mail{RESET}?\0" .align 2,0 .global gUnknown_80E30D0 gUnknown_80E30D0: @ 80E30D0 -.string "Please choose the {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} that\n" +.string "Please choose the {COLOR CYAN_G}Thank-You Mail{RESET} that\n" .string "should be sent to your friend.\0" .align 2,0 .global gUnknown_80E311C gUnknown_80E311C: @ 80E311C -.string "Please enter the {COLOR_1 LIGHT_BLUE}Thank-You Mail password{END_COLOR_TEXT_1}.\0" +.string "Please enter the {COLOR CYAN_G}Thank-You Mail password{RESET}.\0" .align 2,0 .global gUnknown_80E314C gUnknown_80E314C: @ 80E314C -.string "The {COLOR_1 LIGHT_BLUE}Thank-You Mail password{END_COLOR_TEXT_1} will be\n" +.string "The {COLOR CYAN_G}Thank-You Mail password{RESET} will be\n" .string "shown.\0" .align 2,0 @@ -146,7 +146,7 @@ gUnknown_80E317C: @ 80E317C .global gUnknown_80E319C gUnknown_80E319C: @ 80E319C .string "Steps will now be taken to receive the\n" - .string "{COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.\0" + .string "{COLOR CYAN_G}Thank-You Mail{RESET}.\0" .align 2,0 .global gUnknown_80E31D8 @@ -156,30 +156,30 @@ gUnknown_80E31D8: @ 80E31D8 .global gUnknown_80E31FC gUnknown_80E31FC: @ 80E31FC - .string "The {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} was sent.\0" + .string "The {COLOR CYAN_G}Thank-You Mail{RESET} was sent.\0" .align 2,0 .global gUnknown_80E3220 gUnknown_80E3220: @ 80E3220 - .string "You received the {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.\0" + .string "You received the {COLOR CYAN_G}Thank-You Mail{RESET}.\0" .align 2,0 .global gUnknown_80E3248 gUnknown_80E3248: @ 80E3248 - .string "The {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} was sent.\n" + .string "The {COLOR CYAN_G}Thank-You Mail{RESET} was sent.\n" .string "Your adventure will be saved.\0" .align 2,0 .global gUnknown_80E3288 gUnknown_80E3288: @ 80E3288 .string "Steps will now be taken to send your\n" - .string "{COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.\0" + .string "{COLOR CYAN_G}Thank-You Mail{RESET}.\0" .align 2,0 .global gUnknown_80E32C4 gUnknown_80E32C4: @ 80E32C4 .string "OK. You're good to go.\n" - .string "{COLOR_1 YELLOW_5}%s{END_COLOR_TEXT_1}, I hope your sense of\n" + .string "{COLOR YELLOW_N}%s{RESET}, I hope your sense of\n" .string "gratitude reaches your friend.\0" .align 2,0 @@ -204,14 +204,14 @@ gUnknown_80E339C: @ 80E339C .global gUnknown_80E33D8 gUnknown_80E33D8: @ 80E33D8 .string "Would you like to choose\n" -.string "a {COLOR_1 LIGHT_BLUE}reward item{END_COLOR_TEXT_1} from storage and\n" +.string "a {COLOR CYAN_G}reward item{RESET} from storage and\n" .string "send it with your mail?\0" .align 2,0 .global gUnknown_80E3430 gUnknown_80E3430: @ 80E3430 .string "This mail already has an attached\n" -.string "{COLOR_1 LIGHT_BLUE}reward item{END_COLOR_TEXT_1}.{EXTRA_MSG}Once an item has been chosen, it may not\n" +.string "{COLOR CYAN_G}reward item{RESET}.{EXTRA_MSG}Once an item has been chosen, it may not\n" .string "be exchanged with another item.\0" .align 2,0 @@ -223,13 +223,13 @@ gUnknown_80E34B0: @ 80E34B0 .global gUnknown_80E34F0 gUnknown_80E34F0: @ 80E34F0 -.string "Please select a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}\n" +.string "Please select a {COLOR CYAN_G}Thank-You Mail{RESET}\n" .string "from the GBA Game Pak.\0" .align 2,0 .global gUnknown_80E352C gUnknown_80E352C: @ 80E352C - .string "Is it OK to accept this {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?\0" + .string "Is it OK to accept this {COLOR CYAN_G}Thank-You Mail{RESET}?\0" .align 2,0 .global gUnknown_80E355C @@ -241,24 +241,24 @@ gUnknown_80E355C: @ 80E355C .global gUnknown_80E35AC gUnknown_80E35AC: @ 80E35AC .string "The GBA Game Pak does not have\n" - .string "a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} on it.\0" + .string "a {COLOR CYAN_G}Thank-You Mail{RESET} on it.\0" .align 2,0 .global gUnknown_80E35E8 gUnknown_80E35E8: @ 80E35E8 - .string "There is no {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.\0" + .string "There is no {COLOR CYAN_G}Thank-You Mail{RESET}.\0" .align 2,0 .global gUnknown_80E360C gUnknown_80E360C: @ 80E360C .string "How would you like to send\n" - .string "your {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?\0" + .string "your {COLOR CYAN_G}Thank-You Mail{RESET}?\0" .align 2,0 .global gUnknown_80E3644 gUnknown_80E3644: @ 80E3644 .string "How would you like to receive\n" - .string "the {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?\0" + .string "the {COLOR CYAN_G}Thank-You Mail{RESET}?\0" .align 2,0 .global gUnknown_80E367C @@ -269,13 +269,13 @@ gUnknown_80E367C: @ 80E367C .global gUnknown_80E3690 gUnknown_80E3690: @ 80E3690 .string "If your team is defeated and in need\n" -.string "of rescuing, send an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}\n" +.string "of rescuing, send an {COLOR CYAN_G}SOS Mail{RESET}\n" .string "to a friend.{EXTRA_MSG}Once you send your mail, you must wait\n" .string "for your friend to send you\n" -.string "an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}If the {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} arrives, your\n" +.string "an {COLOR CYAN_G}A-OK Mail{RESET}.{EXTRA_MSG}If the {COLOR CYAN_G}A-OK Mail{RESET} arrives, your\n" .string "team can be revived to resume exploring\n" .string "the dungeon it was in.{EXTRA_MSG}When your team is revived, don't forget\n" -.string "to send a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} to the friend\n" +.string "to send a {COLOR CYAN_G}Thank-You Mail{RESET} to the friend\n" .string "who came to your rescue.\0" .align 2,0 @@ -283,9 +283,9 @@ gUnknown_80E3690: @ 80E3690 gUnknown_80E3818: @ 80E3818 .string "If your team is defeated in\n" .string "a dungeon, you may send a friend\n" -.string "an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} for help.{EXTRA_MSG}However, there are some places\n" +.string "an {COLOR CYAN_G}SOS Mail{RESET} for help.{EXTRA_MSG}However, there are some places\n" .string "where it is impossible for you to\n" -.string "call for a rescue.{EXTRA_MSG}Also, if you send an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1},\n" +.string "call for a rescue.{EXTRA_MSG}Also, if you send an {COLOR CYAN_G}SOS Mail{RESET},\n" .string "you may not continue with your\n" .string "adventure while awaiting rescue.{EXTRA_MSG}If you cannot wait to be rescued,\n" .string "you will have to give up and return\n" @@ -296,11 +296,11 @@ gUnknown_80E3818: @ 80E3818 gUnknown_80E3998: @ 80E3998 .string "If your friend successfully rescues\n" .string "your team, accept your friend's\n" -.string "{COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}Once the {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} is received,\n" +.string "{COLOR CYAN_G}A-OK Mail{RESET}.{EXTRA_MSG}Once the {COLOR CYAN_G}A-OK Mail{RESET} is received,\n" .string "you may revive your team and resume\n" -.string "exploring the dungeon you were in.{EXTRA_MSG}Using a {COLOR_1 LIGHT_BLUE}Game Link cable{END_COLOR_TEXT_1},\n" +.string "exploring the dungeon you were in.{EXTRA_MSG}Using a {COLOR CYAN_G}Game Link cable{RESET},\n" .string "your friend can also send you\n" -.string "a {COLOR_1 LIGHT_BLUE}helper Pokémon{END_COLOR_TEXT_1}.{EXTRA_MSG}However, the {COLOR_1 LIGHT_BLUE}helper Pokémon{END_COLOR_TEXT_1} will not\n" +.string "a {COLOR CYAN_G}helper Pokémon{RESET}.{EXTRA_MSG}However, the {COLOR CYAN_G}helper Pokémon{RESET} will not\n" .string "be able to bring an item with it when\n" .string "joining your team.\0" .align 2,0 @@ -308,50 +308,50 @@ gUnknown_80E3998: @ 80E3998 .global gUnknown_80E3B1C gUnknown_80E3B1C: @ 80E3B1C .string "If your team has been rescued, be sure\n" -.string "to send a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} to the friend\n" -.string "that came to your help.{EXTRA_MSG}You may also attach a {COLOR_1 LIGHT_BLUE}reward item{END_COLOR_TEXT_1}\n" -.string "from storage to your {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}\n" +.string "to send a {COLOR CYAN_G}Thank-You Mail{RESET} to the friend\n" +.string "that came to your help.{EXTRA_MSG}You may also attach a {COLOR CYAN_G}reward item{RESET}\n" +.string "from storage to your {COLOR CYAN_G}Thank-You Mail{RESET}\n" .string "and send it to your friend.\0" .align 2,0 .global gUnknown_80E3BF8 gUnknown_80E3BF8: @ 80E3BF8 .string "If your friend's team needs rescuing,\n" -.string "you must first receive an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}\n" +.string "you must first receive an {COLOR CYAN_G}SOS Mail{RESET}\n" .string "from your friend.{EXTRA_MSG}When you get the mail, you may embark\n" .string "on your rescue mission from the\n" -.string "{COLOR_1 LIGHT_BLUE}Pelipper Post Office{END_COLOR_TEXT_1}.{EXTRA_MSG}If you rescue your friend's defeated\n" -.string "team, send an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} to your\n" +.string "{COLOR CYAN_G}Pelipper Post Office{RESET}.{EXTRA_MSG}If you rescue your friend's defeated\n" +.string "team, send an {COLOR CYAN_G}A-OK Mail{RESET} to your\n" .string "friend.{EXTRA_MSG}If you rescue a friend, you will be eligible\n" -.string "to receive a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}If you have quicksaved inside a dungeon,\n" -.string "you may not choose {COLOR_1 LIGHT_BLUE}Go Rescue{END_COLOR_TEXT_1}.\n" +.string "to receive a {COLOR CYAN_G}Thank-You Mail{RESET}.{EXTRA_MSG}If you have quicksaved inside a dungeon,\n" +.string "you may not choose {COLOR CYAN_G}Go Rescue{RESET}.\n" .string "Your last save must be out of a dungeon.\0" .align 2,0 .global gUnknown_80E3DE4 gUnknown_80E3DE4: @ 80E3DE4 -.string "You may receive an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} from\n" +.string "You may receive an {COLOR CYAN_G}SOS Mail{RESET} from\n" .string "a friend's team that lies defeated in\n" .string "a dungeon.{EXTRA_MSG}If there is no space for new mail, delete\n" -.string "old mail at the {COLOR_1 LIGHT_BLUE}Pelipper Post Office{END_COLOR_TEXT_1}.\0" +.string "old mail at the {COLOR CYAN_G}Pelipper Post Office{RESET}.\0" .align 2,0 .global gUnknown_80E3E98 gUnknown_80E3E98: @ 80E3E98 .string "If you successfully rescue your friend's\n" -.string "team, send your friend an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}Using a {COLOR_1 LIGHT_BLUE}Game Link cable{END_COLOR_TEXT_1}, you may\n" +.string "team, send your friend an {COLOR CYAN_G}A-OK Mail{RESET}.{EXTRA_MSG}Using a {COLOR CYAN_G}Game Link cable{RESET}, you may\n" .string "also send your friend a Pokémon from\n" .string "your Friend Area as a helper.{EXTRA_MSG}Don't worry--sending a Pokémon as\n" .string "a helper will not make it disappear from\n" .string "its Friend Area.{EXTRA_MSG}If there is no space for new mail, delete\n" -.string "old mail at the {COLOR_1 LIGHT_BLUE}Pelipper Post Office{END_COLOR_TEXT_1}.\0" +.string "old mail at the {COLOR CYAN_G}Pelipper Post Office{RESET}.\0" .align 2,0 .global gUnknown_80E4014 gUnknown_80E4014: @ 80E4014 -.string "When you receive an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1},\n" +.string "When you receive an {COLOR CYAN_G}SOS Mail{RESET},\n" .string "you may embark on your rescue mission\n" -.string "from the {COLOR_1 LIGHT_BLUE}Pelipper Post Office{END_COLOR_TEXT_1}.{EXTRA_MSG}Beware--if you do not have access to\n" +.string "from the {COLOR CYAN_G}Pelipper Post Office{RESET}.{EXTRA_MSG}Beware--if you do not have access to\n" .string "the dungeon they are in, you may not go\n" .string "on a rescue mission there.{EXTRA_MSG}Accept challenging rescues only\n" .string "if you are ready and qualified!\0" @@ -359,31 +359,31 @@ gUnknown_80E4014: @ 80E4014 .global gUnknown_80E4130 gUnknown_80E4130: @ 80E4130 -.string "If you send an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}, you may\n" -.string "receive a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} in return\n" -.string "from your friend.{EXTRA_MSG}The {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} may also come\n" -.string "with a {COLOR_1 LIGHT_BLUE}reward item{END_COLOR_TEXT_1} attached.\0" +.string "If you send an {COLOR CYAN_G}A-OK Mail{RESET}, you may\n" +.string "receive a {COLOR CYAN_G}Thank-You Mail{RESET} in return\n" +.string "from your friend.{EXTRA_MSG}The {COLOR CYAN_G}Thank-You Mail{RESET} may also come\n" +.string "with a {COLOR CYAN_G}reward item{RESET} attached.\0" .align 2,0 .global gUnknown_80E41DC gUnknown_80E41DC: @ 80E41DC -.string "Using the {COLOR_1 LIGHT_BLUE}Dual Slot{END_COLOR_TEXT_1} function,\n" +.string "Using the {COLOR CYAN_G}Dual Slot{RESET} function,\n" .string "you may perform rescue operations with\n" .string "friends using the GBA Game Pak version.{EXTRA_MSG}Insert the DS Game Card and the GBA\n" .string "Game Pak in your Nintendo DS system,\n" .string "then turn on the power.{EXTRA_MSG}Friend Rescue missions using\n" -.string "the {COLOR_1 LIGHT_BLUE}Dual Slot{END_COLOR_TEXT_1} function will be\n" +.string "the {COLOR CYAN_G}Dual Slot{RESET} function will be\n" .string "available on the main menu. \0" .align 2,0 .global gUnknown_80E4314 gUnknown_80E4314: @ 80E4314 .string "Friends can rescue each other's defeated\n" -.string "teams using a {COLOR_1 LIGHT_BLUE}Game Link cable{END_COLOR_TEXT_1},\n" -.string "{COLOR_1 LIGHT_BLUE}passwords{END_COLOR_TEXT_1}, and so on.{EXTRA_MSG}You may go on a rescue mission to save\n" +.string "teams using a {COLOR CYAN_G}Game Link cable{RESET},\n" +.string "{COLOR CYAN_G}passwords{RESET}, and so on.{EXTRA_MSG}You may go on a rescue mission to save\n" .string "your friend's team that has been defeated\n" .string "in a dungeon.{EXTRA_MSG}Or, you may call for help from a friend\n" -.string "to save your fallen team in a dungeon.{EXTRA_MSG}Using {COLOR_1 LIGHT_BLUE}passwords{END_COLOR_TEXT_1}, you can even\n" +.string "to save your fallen team in a dungeon.{EXTRA_MSG}Using {COLOR CYAN_G}passwords{RESET}, you can even\n" .string "exchange help with faraway friends.\0" .align 2,0 @@ -435,25 +435,25 @@ gUnknown_80E4650: @ 80E4650 .global gUnknown_80E468C gUnknown_80E468C: @ 80E468C .string "You do not appear eligible to receive\n" -.string "this {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.\0" +.string "this {COLOR CYAN_G}A-OK Mail{RESET}.\0" .align 2,0 .global gUnknown_80E46C8 gUnknown_80E46C8: @ 80E46C8 .string "Your friend is not eligible to receive\n" -.string "this {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.\0" +.string "this {COLOR CYAN_G}A-OK Mail{RESET}.\0" .align 2,0 .global gUnknown_80E4704 gUnknown_80E4704: @ 80E4704 .string "You do not appear eligible to receive\n" -.string "this {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.\0" +.string "this {COLOR CYAN_G}Thank-You Mail{RESET}.\0" .align 2,0 .global gUnknown_80E4744 gUnknown_80E4744: @ 80E4744 .string "Your friend is not eligible to receive\n" -.string "this {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.\0" +.string "this {COLOR CYAN_G}Thank-You Mail{RESET}.\0" .align 2,0 .global gUnknown_80E4788 @@ -486,19 +486,19 @@ gUnknown_80E48A8: @ 80E48A8 .global gUnknown_80E48E8 gUnknown_80E48E8: @ 80E48E8 .string "This password does not appear to be\n" -.string "that of an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}.\0" +.string "that of an {COLOR CYAN_G}SOS Mail{RESET}.\0" .align 2,0 .global gUnknown_80E4928 gUnknown_80E4928: @ 80E4928 -.string "Received the {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}.\n" +.string "Received the {COLOR CYAN_G}SOS Mail{RESET}.\n" .string "Your adventure will be saved.\0" .align 2,0 .global gUnknown_80E4964 gUnknown_80E4964: @ 80E4964 .string "This password does not appear to be\n" -.string "an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.\0" +.string "an {COLOR CYAN_G}A-OK Mail{RESET}.\0" .align 2,0 .global gUnknown_80E499C @@ -509,5 +509,5 @@ gUnknown_80E499C: @ 80E499C .global gUnknown_80E49C4 gUnknown_80E49C4: @ 80E49C4 .string "This password does not appear to be\n" -.string "that of a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.\0" +.string "that of a {COLOR CYAN_G}Thank-You Mail{RESET}.\0" .align 2,0 diff --git a/data/item/item_descriptions.s b/data/item/item_descriptions.s index 8fbcb249..c7376731 100644 --- a/data/item/item_descriptions.s +++ b/data/item/item_descriptions.s @@ -8,19 +8,19 @@ ItemDescriptionSpike: .global ItemDescriptionRock ItemDescriptionRock: -.string "A throwing item that flies in an arc to{NEW_LINE}clear obstacles and strike the target.{NEW_LINE}It is not affected by {COLOR_2 CYAN}Pierce{END_COLOR_TEXT_2} or {COLOR_2 CYAN}Long Toss{END_COLOR_TEXT_2}{NEW_LINE}statuses.\n\0" +.string "A throwing item that flies in an arc to{NEW_LINE}clear obstacles and strike the target.{NEW_LINE}It is not affected by {color CYAN}Pierce{reset} or {color CYAN}Long Toss{reset}{NEW_LINE}statuses.\n\0" .global ItemDescriptionMobileScarf ItemDescriptionMobileScarf: -.string "A hold item that enables the Pokémon to{NEW_LINE}move and attack through walls and on{NEW_LINE}magma, etc.{NEW_LINE}The Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} will go down faster{NEW_LINE}while traveling through walls, however.\n\0" +.string "A hold item that enables the Pokémon to{NEW_LINE}move and attack through walls and on{NEW_LINE}magma, etc.{NEW_LINE}The Pokémon's {color YELLOW}Belly{reset} will go down faster{NEW_LINE}while traveling through walls, however.\n\0" .global ItemDescriptionHealRibbon ItemDescriptionHealRibbon: -.string "A hold item that speeds up the Pokémon's{NEW_LINE}natural {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} regeneration.{NEW_LINE}The Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} will go down faster,{NEW_LINE}however.\n\0" +.string "A hold item that speeds up the Pokémon's{NEW_LINE}natural {color YELLOW}HP{reset} regeneration.{NEW_LINE}The Pokémon's {color YELLOW}Belly{reset} will go down faster,{NEW_LINE}however.\n\0" .global ItemDescriptionTwistBand ItemDescriptionTwistBand: -.string "A hold item that prevents the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} from going{NEW_LINE}down.\n\0" +.string "A hold item that prevents the Pokémon's{NEW_LINE}{color YELLOW}Attack{reset} and {color YELLOW}Special Attack{reset} from going{NEW_LINE}down.\n\0" .global ItemDescriptionScopeLens ItemDescriptionScopeLens: @@ -48,19 +48,19 @@ ItemDescriptionXRaySpecs: .global ItemDescriptionPersimBand ItemDescriptionPersimBand: -.string "A hold item that prevents the Pokémon{NEW_LINE}from becoming {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that prevents the Pokémon{NEW_LINE}from becoming {color CYAN}Confused{reset}.\n\0" .global ItemDescriptionPowerBand ItemDescriptionPowerBand: -.string "A hold item that boosts the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that boosts the Pokémon's{NEW_LINE}{color YELLOW}Attack{reset}.\n\0" .global ItemDescriptionPechaScarf ItemDescriptionPechaScarf: -.string "A hold item that prevents the Pokémon{NEW_LINE}from being {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2} or {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that prevents the Pokémon{NEW_LINE}from being {color CYAN}poisoned{reset} or {color CYAN}badly poisoned{reset}.\n\0" .global ItemDescriptionInsomniscope ItemDescriptionInsomniscope: -.string "A hold item that prevents the Pokémon{NEW_LINE}from going to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}, {COLOR_2 CYAN}napping{END_COLOR_TEXT_2}, having{NEW_LINE}a {COLOR_2 CYAN}nightmare{END_COLOR_TEXT_2}, or {COLOR_2 CYAN}yawning{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that prevents the Pokémon{NEW_LINE}from going to {color CYAN}sleep{reset}, {color CYAN}napping{reset}, having{NEW_LINE}a {color CYAN}nightmare{reset}, or {color CYAN}yawning{reset}.\n\0" .global ItemDescriptionWarpScarf ItemDescriptionWarpScarf: @@ -68,7 +68,7 @@ ItemDescriptionWarpScarf: .global ItemDescriptionTightBelt ItemDescriptionTightBelt: -.string "A hold item that prevents the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} from going down each turn.\n\0" +.string "A hold item that prevents the Pokémon's{NEW_LINE}{color YELLOW}Belly{reset} from going down each turn.\n\0" .global ItemDescriptionSneakScarf ItemDescriptionSneakScarf: @@ -80,11 +80,11 @@ ItemDescriptionGoldRibbon: .global ItemDescriptionGoggleSpecs ItemDescriptionGoggleSpecs: -.string "A hold item that improves the Pokémon's{NEW_LINE}vision.{NEW_LINE}It reveals hidden traps and {COLOR_2 CYAN}invisible{END_COLOR_TEXT_2}{NEW_LINE}Pokémon.\n\0" +.string "A hold item that improves the Pokémon's{NEW_LINE}vision.{NEW_LINE}It reveals hidden traps and {color CYAN}invisible{reset}{NEW_LINE}Pokémon.\n\0" .global ItemDescriptionDietRibbon ItemDescriptionDietRibbon: -.string "A hold item that changes the Pokémon's{NEW_LINE}status to {COLOR_2 CYAN}Hungry Pal{END_COLOR_TEXT_2} and prevents{NEW_LINE}its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} from filling.{NEW_LINE}If the team leader is holding it, its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}{NEW_LINE}will go down faster.\n\0" +.string "A hold item that changes the Pokémon's{NEW_LINE}status to {color CYAN}Hungry Pal{reset} and prevents{NEW_LINE}its {color YELLOW}Belly{reset} from filling.{NEW_LINE}If the team leader is holding it, its {color YELLOW}Belly{reset}{NEW_LINE}will go down faster.\n\0" .global ItemDescriptionTrapScarf ItemDescriptionTrapScarf: @@ -96,11 +96,11 @@ ItemDescriptionRacketBand: .global ItemDescriptionDefScarf ItemDescriptionDefScarf: -.string "A hold item that boosts the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that boosts the Pokémon's{NEW_LINE}{color YELLOW}Defense{reset}.\n\0" .global ItemDescriptionStaminaBand ItemDescriptionStaminaBand: -.string "A hold item that slows how quickly the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} goes down.\n\0" +.string "A hold item that slows how quickly the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset} goes down.\n\0" .global ItemDescriptionPlainRibbon ItemDescriptionPlainRibbon: @@ -108,15 +108,15 @@ ItemDescriptionPlainRibbon: .global ItemDescriptionSpecialBand ItemDescriptionSpecialBand: -.string "A hold item that boosts the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that boosts the Pokémon's{NEW_LINE}{color YELLOW}Special Attack{reset}.\n\0" .global ItemDescriptionZincBand ItemDescriptionZincBand: -.string "A hold item that boosts the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that boosts the Pokémon's{NEW_LINE}{color YELLOW}Special Defense{reset}.\n\0" .global ItemDescriptionDetectBand ItemDescriptionDetectBand: -.string "A hold item that boosts the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that boosts the Pokémon's{NEW_LINE}{color YELLOW}Evasion{reset}.\n\0" .global ItemDescriptionAlertSpecs ItemDescriptionAlertSpecs: @@ -132,7 +132,7 @@ ItemDescriptionBounceBand: .global ItemDescriptionCurveBand ItemDescriptionCurveBand: -.string "A hold item that makes thrown items{NEW_LINE}bounce off walls and fly sideways.{NEW_LINE}It has no effect if the Pokémon's status{NEW_LINE}is {COLOR_2 CYAN}Pierce{END_COLOR_TEXT_2} or if a rock is thrown.\n\0" +.string "A hold item that makes thrown items{NEW_LINE}bounce off walls and fly sideways.{NEW_LINE}It has no effect if the Pokémon's status{NEW_LINE}is {color CYAN}Pierce{reset} or if a rock is thrown.\n\0" .global ItemDescriptionWhiffSpecs ItemDescriptionWhiffSpecs: @@ -148,11 +148,11 @@ ItemDescriptionLockonSpecs: .global ItemDescriptionMunchBelt ItemDescriptionMunchBelt: -.string "A hold item that slightly boosts the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}.{NEW_LINE}However, it also makes the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} go down faster.\n\0" +.string "A hold item that slightly boosts the{NEW_LINE}Pokémon's {color YELLOW}Attack{reset} and {color YELLOW}Special Attack{reset}.{NEW_LINE}However, it also makes the Pokémon's{NEW_LINE}{color YELLOW}Belly{reset} go down faster.\n\0" .global ItemDescriptionPassScarf ItemDescriptionPassScarf: -.string "A hold item that can enable the{NEW_LINE}Pokémon to pass off the effects of{NEW_LINE}attacks and certain kinds of hostile moves{NEW_LINE}to a Pokémon next to it. However, it also{NEW_LINE}makes the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} go down.\n\0" +.string "A hold item that can enable the{NEW_LINE}Pokémon to pass off the effects of{NEW_LINE}attacks and certain kinds of hostile moves{NEW_LINE}to a Pokémon next to it. However, it also{NEW_LINE}makes the Pokémon's {color YELLOW}Belly{reset} go down.\n\0" .global ItemDescriptionWeatherBand ItemDescriptionWeatherBand: @@ -188,211 +188,211 @@ ItemDescriptionRingF: .global ItemDescriptionHealSeed ItemDescriptionHealSeed: -.string "A food item that heals all status problems.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that heals all status problems.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionWishStone ItemDescriptionWishStone: -.string "A mysterious stone shaped like a musical{NEW_LINE}note.{NEW_LINE}It is said to make a wish come true if it{NEW_LINE}is held while exploring the depths of{NEW_LINE}{COLOR_1 YELLOW_4}Wish Cave{END_COLOR_TEXT_1}.\n\0" +.string "A mysterious stone shaped like a musical{NEW_LINE}note.{NEW_LINE}It is said to make a wish come true if it{NEW_LINE}is held while exploring the depths of{NEW_LINE}{COLOR YELLOW_D}Wish Cave{RESET}.\n\0" .global ItemDescriptionOranBerry ItemDescriptionOranBerry: -.string "A food item that restores {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that restores {color YELLOW}HP{reset}.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionSitrusBerry ItemDescriptionSitrusBerry: -.string "A food item that restores {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.{NEW_LINE}If the Pokémon has full {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}, eating this{NEW_LINE}item will slightly boost its {COLOR_2 YELLOW}Maximum HP{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that restores {color YELLOW}HP{reset}.{NEW_LINE}If the Pokémon has full {color YELLOW}HP{reset}, eating this{NEW_LINE}item will slightly boost its {color YELLOW}Maximum HP{reset}.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionEyedropSeed ItemDescriptionEyedropSeed: -.string "A food item that changes the Pokémon's{NEW_LINE}status to {COLOR_2 CYAN}Eyedrops{END_COLOR_TEXT_2}.{NEW_LINE}It reveals hidden traps and {COLOR_2 CYAN}invisible{END_COLOR_TEXT_2}{NEW_LINE}Pokémon.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that changes the Pokémon's{NEW_LINE}status to {color CYAN}Eyedrops{reset}.{NEW_LINE}It reveals hidden traps and {color CYAN}invisible{reset}{NEW_LINE}Pokémon.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionReviverSeed ItemDescriptionReviverSeed: -.string "An item that could revive a fainted{NEW_LINE}Pokémon.{NEW_LINE}It becomes a Plain Seed after use.{NEW_LINE}If held, it revives only the holder.{NEW_LINE}It can only be used by an {COLOR_2 YELLOW}Item Master{END_COLOR_TEXT_2}.\n\0" +.string "An item that could revive a fainted{NEW_LINE}Pokémon.{NEW_LINE}It becomes a Plain Seed after use.{NEW_LINE}If held, it revives only the holder.{NEW_LINE}It can only be used by an {color YELLOW}Item Master{reset}.\n\0" .global ItemDescriptionBlinkerSeed ItemDescriptionBlinkerSeed: -.string "A food item that gives the Pokémon{NEW_LINE}{COLOR_2 CYAN}Blinker{END_COLOR_TEXT_2} status.{NEW_LINE}It makes other Pokémon, unclaimed{NEW_LINE}items, and the ground impossible to see.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that gives the Pokémon{NEW_LINE}{color CYAN}Blinker{reset} status.{NEW_LINE}It makes other Pokémon, unclaimed{NEW_LINE}items, and the ground impossible to see.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionDoomSeed ItemDescriptionDoomSeed: -.string "A food item that lowers the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}level{END_COLOR_TEXT_2} by one.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that lowers the Pokémon's{NEW_LINE}{color YELLOW}level{reset} by one.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionAllureSeed ItemDescriptionAllureSeed: -.string "A food item that gives the Pokémon{NEW_LINE}{COLOR_2 CYAN}Cross-Eyed{END_COLOR_TEXT_2} status.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that gives the Pokémon{NEW_LINE}{color CYAN}Cross-Eyed{reset} status.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionLifeSeed ItemDescriptionLifeSeed: -.string "A food item that slightly boosts the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Maximum HP{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that slightly boosts the{NEW_LINE}Pokémon's {color YELLOW}Maximum HP{reset}.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionRawstBerry ItemDescriptionRawstBerry: -.string "A food item that heals the Pokémon's {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that heals the Pokémon's {color CYAN}burn{reset}.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionHungerSeed ItemDescriptionHungerSeed: -.string "A food item that slightly lowers the{NEW_LINE}Pokémon's maximum {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.{NEW_LINE}If used by a Pokémon other than the{NEW_LINE}leader, its status changes to {COLOR_2 CYAN}Hungry Pal{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that slightly lowers the{NEW_LINE}Pokémon's maximum {color YELLOW}Belly{reset} size.{NEW_LINE}If used by a Pokémon other than the{NEW_LINE}leader, its status changes to {color CYAN}Hungry Pal{reset}.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionQuickSeed ItemDescriptionQuickSeed: -.string "A food item that boosts the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by one level.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that boosts the Pokémon's{NEW_LINE}{color YELLOW}Movement Speed{reset} by one level.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionPechaBerry ItemDescriptionPechaBerry: -.string "A food item that heals the Pokémon when{NEW_LINE}{COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2} or {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that heals the Pokémon when{NEW_LINE}{color CYAN}poisoned{reset} or {color CYAN}badly poisoned{reset}.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionCheriBerry ItemDescriptionCheriBerry: -.string "A food item that heals the Pokémon from{NEW_LINE}{COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that heals the Pokémon from{NEW_LINE}{color CYAN}paralysis{reset}.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionTotterSeed ItemDescriptionTotterSeed: -.string "A food item that makes the Pokémon{NEW_LINE}{COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.{NEW_LINE}The Pokémon's movements turn erratic,{NEW_LINE}and its attacks and moves may hit friends.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that makes the Pokémon{NEW_LINE}{color CYAN}confused{reset}.{NEW_LINE}The Pokémon's movements turn erratic,{NEW_LINE}and its attacks and moves may hit friends.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionSleepSeed ItemDescriptionSleepSeed: -.string "A food item that makes the user{NEW_LINE}{COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}.{NEW_LINE}The Pokémon will be unable to do anything.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that makes the user{NEW_LINE}{color CYAN}sleep{reset}.{NEW_LINE}The Pokémon will be unable to do anything.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionPlainSeed ItemDescriptionPlainSeed: -.string "A food item that has no special effect.{NEW_LINE}It does slightly fill the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that has no special effect.{NEW_LINE}It does slightly fill the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionWarpSeed ItemDescriptionWarpSeed: -.string "A food item that warps the Pokémon to{NEW_LINE}a different place on the same floor.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that warps the Pokémon to{NEW_LINE}a different place on the same floor.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionBlastSeed ItemDescriptionBlastSeed: -.string "A food item that makes the Pokémon{NEW_LINE}breathe highly damaging fire.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that makes the Pokémon{NEW_LINE}breathe highly damaging fire.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionGinseng ItemDescriptionGinseng: -.string "A drink that boosts the power of the{NEW_LINE}Pokémon's set move.{NEW_LINE}It may not have any effect on certain{NEW_LINE}kinds of moves.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A drink that boosts the power of the{NEW_LINE}Pokémon's set move.{NEW_LINE}It may not have any effect on certain{NEW_LINE}kinds of moves.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionJoySeed ItemDescriptionJoySeed: -.string "A food item that raises the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}level{END_COLOR_TEXT_2} by one.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that raises the Pokémon's{NEW_LINE}{color YELLOW}level{reset} by one.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionChestoBerry ItemDescriptionChestoBerry: -.string "A food item that causes the Pokémon to{NEW_LINE}become {COLOR_2 CYAN}sleepless{END_COLOR_TEXT_2}.{NEW_LINE}The Pokémon will not be able to go to{NEW_LINE}{COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that causes the Pokémon to{NEW_LINE}become {color CYAN}sleepless{reset}.{NEW_LINE}The Pokémon will not be able to go to{NEW_LINE}{color CYAN}sleep{reset}.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionStunSeed ItemDescriptionStunSeed: -.string "A food item that causes the Pokémon to{NEW_LINE}become {COLOR_2 CYAN}petrified{END_COLOR_TEXT_2}.{NEW_LINE}The Pokémon will be unable to do anything{NEW_LINE}until it takes damage.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that causes the Pokémon to{NEW_LINE}become {color CYAN}petrified{reset}.{NEW_LINE}The Pokémon will be unable to do anything{NEW_LINE}until it takes damage.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionMaxElixir ItemDescriptionMaxElixir: -.string "A drink that completely restores the{NEW_LINE}{COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} of all the Pokémon's moves.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A drink that completely restores the{NEW_LINE}{color YELLOW}PP{reset} of all the Pokémon's moves.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionProtein ItemDescriptionProtein: -.string "A drink that boosts the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A drink that boosts the Pokémon's{NEW_LINE}{color YELLOW}Attack{reset}.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionCalcium ItemDescriptionCalcium: -.string "A drink that boosts the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A drink that boosts the Pokémon's{NEW_LINE}{color YELLOW}Special Attack{reset}.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionIron ItemDescriptionIron: -.string "A drink that boosts the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A drink that boosts the Pokémon's{NEW_LINE}{color YELLOW}Defense{reset}.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionZinc ItemDescriptionZinc: -.string "A drink that boosts the Pokémon's{NEW_LINE}{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A drink that boosts the Pokémon's{NEW_LINE}{color YELLOW}Special Defense{reset}.{NEW_LINE}It also slightly fills the Pokémon's {color YELLOW}Belly{reset}.\n\0" .global ItemDescriptionApple ItemDescriptionApple: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}Eating this when its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is full will{NEW_LINE}slightly enlarge its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}Eating this when its {color YELLOW}Belly{reset} is full will{NEW_LINE}slightly enlarge its {color YELLOW}Belly{reset} size.\n\0" .global ItemDescriptionBigApple ItemDescriptionBigApple: -.string "A food item that amply fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}Eating this when its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is full will{NEW_LINE}slightly enlarge its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.\n\0" +.string "A food item that amply fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}Eating this when its {color YELLOW}Belly{reset} is full will{NEW_LINE}slightly enlarge its {color YELLOW}Belly{reset} size.\n\0" .global ItemDescriptionGrimyFood ItemDescriptionGrimyFood: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}However, it will cause a variety of{NEW_LINE}status problems.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}However, it will cause a variety of{NEW_LINE}status problems.\n\0" .global ItemDescriptionHugeApple ItemDescriptionHugeApple: -.string "A food item that completely fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly enlarges the {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.\n\0" +.string "A food item that completely fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}It also slightly enlarges the {color YELLOW}Belly{reset} size.\n\0" .global ItemDescriptionWhiteGummi ItemDescriptionWhiteGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Normal-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Normal-type Pokémon like it the best.\n\0" .global ItemDescriptionRedGummi ItemDescriptionRedGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Fire-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Fire-type Pokémon like it the best.\n\0" .global ItemDescriptionBlueGummi ItemDescriptionBlueGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Water-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Water-type Pokémon like it the best.\n\0" .global ItemDescriptionGrassGummi ItemDescriptionGrassGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Grass-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Grass-type Pokémon like it the best.\n\0" .global ItemDescriptionYellowGummi ItemDescriptionYellowGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Electric-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Electric-type Pokémon like it the best.\n\0" .global ItemDescriptionClearGummi ItemDescriptionClearGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Ice-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Ice-type Pokémon like it the best.\n\0" .global ItemDescriptionOrangeGummi ItemDescriptionOrangeGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Fighting-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Fighting-type Pokémon like it the best.\n\0" .global ItemDescriptionPinkGummi ItemDescriptionPinkGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Poison-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Poison-type Pokémon like it the best.\n\0" .global ItemDescriptionBrownGummi ItemDescriptionBrownGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Ground-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Ground-type Pokémon like it the best.\n\0" .global ItemDescriptionSkyGummi ItemDescriptionSkyGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Flying-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Flying-type Pokémon like it the best.\n\0" .global ItemDescriptionGoldGummi ItemDescriptionGoldGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Psychic-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Psychic-type Pokémon like it the best.\n\0" .global ItemDescriptionGreenGummi ItemDescriptionGreenGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Bug-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Bug-type Pokémon like it the best.\n\0" .global ItemDescriptionGrayGummi ItemDescriptionGrayGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Rock-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Rock-type Pokémon like it the best.\n\0" .global ItemDescriptionPurpleGummi ItemDescriptionPurpleGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Ghost-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Ghost-type Pokémon like it the best.\n\0" .global ItemDescriptionRoyalGummi ItemDescriptionRoyalGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Dragon-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Dragon-type Pokémon like it the best.\n\0" .global ItemDescriptionBlackGummi ItemDescriptionBlackGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Dark-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Dark-type Pokémon like it the best.\n\0" .global ItemDescriptionSilverGummi ItemDescriptionSilverGummi: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Steel-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}When given to a rescue team member,{NEW_LINE}it raises the Pokémon's {color YELLOW}IQ{reset}.{NEW_LINE}Steel-type Pokémon like it the best.\n\0" .global ItemDescriptionBanana ItemDescriptionBanana: -.string "A rare food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}Eating this when its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is full will{NEW_LINE}slightly enlarge its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.{NEW_LINE}It is occasionally found inside walls.\n\0" +.string "A rare food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}Eating this when its {color YELLOW}Belly{reset} is full will{NEW_LINE}slightly enlarge its {color YELLOW}Belly{reset} size.{NEW_LINE}It is occasionally found inside walls.\n\0" .global ItemDescriptionChestnut ItemDescriptionChestnut: -.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}Mankey love to eat this.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon's {color YELLOW}Belly{reset}.{NEW_LINE}Mankey love to eat this.\n\0" .global ItemDescriptionPoke ItemDescriptionPoke: @@ -408,15 +408,15 @@ ItemDescriptionEvolutionItemMulti: .global ItemDescriptionIcePart ItemDescriptionIcePart: -.string "An item that was guarded by {COLOR_1 YELLOW_5}Regice{END_COLOR_TEXT_1}.{NEW_LINE}It may be related to this saying about the{NEW_LINE}{COLOR_1 YELLOW_4}Buried Relic{END_COLOR_TEXT_1}: “Three parts guarded by{NEW_LINE}three servants. When they are one again,{NEW_LINE}a mirage shall appear to the bearer.”\n\0" +.string "An item that was guarded by {COLOR YELLOW_N}Regice{RESET}.{NEW_LINE}It may be related to this saying about the{NEW_LINE}{COLOR YELLOW_D}Buried Relic{RESET}: “Three parts guarded by{NEW_LINE}three servants. When they are one again,{NEW_LINE}a mirage shall appear to the bearer.”\n\0" .global ItemDescriptionSteelPart ItemDescriptionSteelPart: -.string "A mysterious item that was guarded by{NEW_LINE}{COLOR_1 YELLOW_5}Registeel{END_COLOR_TEXT_1}.{NEW_LINE}{COLOR_1 YELLOW_5}Regirock{END_COLOR_TEXT_1} and {COLOR_1 YELLOW_5}Regice{END_COLOR_TEXT_1} also guarded parts{NEW_LINE}in similar fashion.{NEW_LINE}What is the secret behind these parts?\n\0" +.string "A mysterious item that was guarded by{NEW_LINE}{COLOR YELLOW_N}Registeel{RESET}.{NEW_LINE}{COLOR YELLOW_N}Regirock{RESET} and {COLOR YELLOW_N}Regice{RESET} also guarded parts{NEW_LINE}in similar fashion.{NEW_LINE}What is the secret behind these parts?\n\0" .global ItemDescriptionRockPart ItemDescriptionRockPart: -.string "A mysterious item that was jealously{NEW_LINE}guarded by {COLOR_1 YELLOW_5}Regirock{END_COLOR_TEXT_1}.{NEW_LINE}How it is to be used remains unknown,{NEW_LINE}however.\n\0" +.string "A mysterious item that was jealously{NEW_LINE}guarded by {COLOR YELLOW_N}Regirock{RESET}.{NEW_LINE}How it is to be used remains unknown,{NEW_LINE}however.\n\0" .global ItemDescriptionMusicBox ItemDescriptionMusicBox: @@ -428,219 +428,219 @@ ItemDescriptionKey: .global ItemDescriptionUsedTM ItemDescriptionUsedTM: -.string "The remains of the item {ARG_MOVE_ITEM_0}{NEW_LINE}after use.{NEW_LINE}It can be restored using the move {COLOR_2 GREEN}Recycle{END_COLOR_TEXT_2}.{NEW_LINE}This item cannot be placed in storage.\n\0" +.string "The remains of the item {MOVE_ITEM_0}{NEW_LINE}after use.{NEW_LINE}It can be restored using the move {color GREEN}Recycle{reset}.{NEW_LINE}This item cannot be placed in storage.\n\0" .global ItemDescriptionFocusPunch ItemDescriptionFocusPunch: -.string "Teaches the move {COLOR_2 GREEN}Focus Punch{END_COLOR_TEXT_2}.{NEW_LINE}The user's status changes to {COLOR_2 CYAN}Focus Punch{END_COLOR_TEXT_2},{NEW_LINE}and it attacks on the next turn.{NEW_LINE}It is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\n\0" +.string "Teaches the move {color GREEN}Focus Punch{reset}.{NEW_LINE}The user's status changes to {color CYAN}Focus Punch{reset},{NEW_LINE}and it attacks on the next turn.{NEW_LINE}It is not possible to {color CYAN}link{reset} this move.\n\0" .global ItemDescriptionDragonClaw ItemDescriptionDragonClaw: -.string "Teaches the move {COLOR_2 GREEN}Dragon Claw{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.\n\0" +.string "Teaches the move {color GREEN}Dragon Claw{reset}.{NEW_LINE}It inflicts damage on the target.\n\0" .global ItemDescriptionWaterPulse ItemDescriptionWaterPulse: -.string "Teaches the move {COLOR_2 GREEN}Water Pulse{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance.{NEW_LINE}It may also leave the target {COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\n\0" +.string "Teaches the move {color GREEN}Water Pulse{reset}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance.{NEW_LINE}It may also leave the target {color CYAN}confused{reset}.\n\0" .global ItemDescriptionCalmMind ItemDescriptionCalmMind: -.string "Teaches the move {COLOR_2 GREEN}Calm Mind{END_COLOR_TEXT_2}.{NEW_LINE}It raises the Pokémon's {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}{NEW_LINE}and {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\n\0" +.string "Teaches the move {color GREEN}Calm Mind{reset}.{NEW_LINE}It raises the Pokémon's {color YELLOW}Special Attack{reset}{NEW_LINE}and {color YELLOW}Special Defense{reset} by one level.\n\0" .global ItemDescriptionRoar ItemDescriptionRoar: -.string "Teaches the move {COLOR_2 GREEN}Roar{END_COLOR_TEXT_2}.{NEW_LINE}It sends the target flying.{NEW_LINE}If the foe hits a wall or another{NEW_LINE}Pokémon, it sustains damage.\n\0" +.string "Teaches the move {color GREEN}Roar{reset}.{NEW_LINE}It sends the target flying.{NEW_LINE}If the foe hits a wall or another{NEW_LINE}Pokémon, it sustains damage.\n\0" .global ItemDescriptionToxic ItemDescriptionToxic: -.string "Teaches the move {COLOR_2 GREEN}Toxic{END_COLOR_TEXT_2}.{NEW_LINE}It {COLOR_2 CYAN}badly poisons{END_COLOR_TEXT_2} the foe Pokémon.{NEW_LINE}If a Pokémon is {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}, it{NEW_LINE}sustains damage over several turns.\n\0" +.string "Teaches the move {color GREEN}Toxic{reset}.{NEW_LINE}It {color CYAN}badly poisons{reset} the foe Pokémon.{NEW_LINE}If a Pokémon is {color CYAN}badly poisoned{reset}, it{NEW_LINE}sustains damage over several turns.\n\0" .global ItemDescriptionHail ItemDescriptionHail: -.string "An item that changes the dungeon floor's{NEW_LINE}weather to {COLOR_2 CYAN}Hail{END_COLOR_TEXT_2} for several turns.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" +.string "An item that changes the dungeon floor's{NEW_LINE}weather to {color CYAN}Hail{reset} for several turns.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" .global ItemDescriptionBulkUp ItemDescriptionBulkUp: -.string "Teaches the move {COLOR_2 GREEN}Bulk Up{END_COLOR_TEXT_2}.{NEW_LINE}It boosts the user's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}{NEW_LINE}by one level.\n\0" +.string "Teaches the move {color GREEN}Bulk Up{reset}.{NEW_LINE}It boosts the user's {color YELLOW}Attack{reset} and {color YELLOW}Defense{reset}{NEW_LINE}by one level.\n\0" .global ItemDescriptionBulletSeed ItemDescriptionBulletSeed: -.string "Teaches the move {COLOR_2 GREEN}Bullet Seed{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance.{NEW_LINE}It hits two to five times per use.\n\0" +.string "Teaches the move {color GREEN}Bullet Seed{reset}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance.{NEW_LINE}It hits two to five times per use.\n\0" .global ItemDescriptionHiddenPower ItemDescriptionHiddenPower: -.string "Teaches the move {COLOR_2 GREEN}Hidden Power{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}Its type and power change with the{NEW_LINE}dungeon.\n\0" +.string "Teaches the move {color GREEN}Hidden Power{reset}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}Its type and power change with the{NEW_LINE}dungeon.\n\0" .global ItemDescriptionSunnyDay ItemDescriptionSunnyDay: -.string "An item that changes the dungeon floor's{NEW_LINE}weather to {COLOR_2 CYAN}Sunny{END_COLOR_TEXT_2} for several turns.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" +.string "An item that changes the dungeon floor's{NEW_LINE}weather to {color CYAN}Sunny{reset} for several turns.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" .global ItemDescriptionTaunt ItemDescriptionTaunt: -.string "Teaches the move {COLOR_2 GREEN}Taunt{END_COLOR_TEXT_2}.{NEW_LINE}The targeted Pokémon's status changes{NEW_LINE}to {COLOR_2 CYAN}Taunted{END_COLOR_TEXT_2}.\n\0" +.string "Teaches the move {color GREEN}Taunt{reset}.{NEW_LINE}The targeted Pokémon's status changes{NEW_LINE}to {color CYAN}Taunted{reset}.\n\0" .global ItemDescriptionIceBeam ItemDescriptionIceBeam: -.string "Teaches the move {COLOR_2 GREEN}Ice Beam{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. It may also leave the target{NEW_LINE}{COLOR_2 CYAN}frozen{END_COLOR_TEXT_2} and incapable of action.\n\0" +.string "Teaches the move {color GREEN}Ice Beam{reset}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. It may also leave the target{NEW_LINE}{color CYAN}frozen{reset} and incapable of action.\n\0" .global ItemDescriptionBlizzard ItemDescriptionBlizzard: -.string "Teaches the move {COLOR_2 GREEN}Blizzard{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also leave the target {COLOR_2 CYAN}frozen{END_COLOR_TEXT_2} and{NEW_LINE}incapable of action.\n\0" +.string "Teaches the move {color GREEN}Blizzard{reset}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also leave the target {color CYAN}frozen{reset} and{NEW_LINE}incapable of action.\n\0" .global ItemDescriptionHyperBeam ItemDescriptionHyperBeam: -.string "Teaches the move {COLOR_2 GREEN}Hyper Beam{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. However, it also makes the user{NEW_LINE}{COLOR_2 CYAN}paused{END_COLOR_TEXT_2} and incapable of action.\n\0" +.string "Teaches the move {color GREEN}Hyper Beam{reset}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. However, it also makes the user{NEW_LINE}{color CYAN}paused{reset} and incapable of action.\n\0" .global ItemDescriptionLightScreen ItemDescriptionLightScreen: -.string "Teaches the move {COLOR_2 GREEN}Light Screen{END_COLOR_TEXT_2}.{NEW_LINE}It makes the user's status {COLOR_2 CYAN}Light Screen{END_COLOR_TEXT_2}.{NEW_LINE}It halves the damage from{NEW_LINE}{COLOR_2 CYAN}Special Attack moves{END_COLOR_TEXT_2}.\n\0" +.string "Teaches the move {color GREEN}Light Screen{reset}.{NEW_LINE}It makes the user's status {color CYAN}Light Screen{reset}.{NEW_LINE}It halves the damage from{NEW_LINE}{color CYAN}Special Attack moves{reset}.\n\0" .global ItemDescriptionProtect ItemDescriptionProtect: -.string "Teaches the move {COLOR_2 GREEN}Protect{END_COLOR_TEXT_2}.{NEW_LINE}It changes the Pokémon's status to{NEW_LINE}{COLOR_2 CYAN}Protect{END_COLOR_TEXT_2} and prevents damage from{NEW_LINE}enemy attacks and moves.\n\0" +.string "Teaches the move {color GREEN}Protect{reset}.{NEW_LINE}It changes the Pokémon's status to{NEW_LINE}{color CYAN}Protect{reset} and prevents damage from{NEW_LINE}enemy attacks and moves.\n\0" .global ItemDescriptionRainDance ItemDescriptionRainDance: -.string "An item that changes the dungeon floor's{NEW_LINE}weather to {COLOR_2 CYAN}Rain{END_COLOR_TEXT_2} for several turns.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" +.string "An item that changes the dungeon floor's{NEW_LINE}weather to {color CYAN}Rain{reset} for several turns.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" .global ItemDescriptionGigaDrain ItemDescriptionGigaDrain: -.string "Teaches the move {COLOR_2 GREEN}Giga Drain{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It also restores the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} based{NEW_LINE}on the damage it inflicted.\n\0" +.string "Teaches the move {color GREEN}Giga Drain{reset}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It also restores the user's {color YELLOW}HP{reset} based{NEW_LINE}on the damage it inflicted.\n\0" .global ItemDescriptionSafeguard ItemDescriptionSafeguard: -.string "Teaches the move {COLOR_2 GREEN}Safeguard{END_COLOR_TEXT_2}.{NEW_LINE}It changes the status of the user and team{NEW_LINE}members in the same room to {COLOR_2 CYAN}Safeguard{END_COLOR_TEXT_2}{NEW_LINE}and prevents status problems.\n\0" +.string "Teaches the move {color GREEN}Safeguard{reset}.{NEW_LINE}It changes the status of the user and team{NEW_LINE}members in the same room to {color CYAN}Safeguard{reset}{NEW_LINE}and prevents status problems.\n\0" .global ItemDescriptionFrustration ItemDescriptionFrustration: -.string "Teaches the move {COLOR_2 GREEN}Frustration{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target and{NEW_LINE}inflicts greater damage if the user's{NEW_LINE}{COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2} is low.\n\0" +.string "Teaches the move {color GREEN}Frustration{reset}.{NEW_LINE}It inflicts damage on the target and{NEW_LINE}inflicts greater damage if the user's{NEW_LINE}{color YELLOW}IQ{reset} is low.\n\0" .global ItemDescriptionSolarBeam ItemDescriptionSolarBeam: -.string "Teaches the move {COLOR_2 GREEN}Solarbeam{END_COLOR_TEXT_2}.{NEW_LINE}The user's status becomes {COLOR_2 CYAN}Solarbeam{END_COLOR_TEXT_2},{NEW_LINE}and it attacks on the next turn.{NEW_LINE}It is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\n\0" +.string "Teaches the move {color GREEN}Solarbeam{reset}.{NEW_LINE}The user's status becomes {color CYAN}Solarbeam{reset},{NEW_LINE}and it attacks on the next turn.{NEW_LINE}It is not possible to {color CYAN}link{reset} this move.\n\0" .global ItemDescriptionIronTail ItemDescriptionIronTail: -.string "Teaches the move {COLOR_2 GREEN}Iron Tail{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also lower the target's {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}{NEW_LINE}by one level.\n\0" +.string "Teaches the move {color GREEN}Iron Tail{reset}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also lower the target's {color YELLOW}Defense{reset}{NEW_LINE}by one level.\n\0" .global ItemDescriptionThunderbolt ItemDescriptionThunderbolt: -.string "Teaches the move {COLOR_2 GREEN}Thunderbolt{END_COLOR_TEXT_2}.{NEW_LINE}It damages all foes around the user.{NEW_LINE}It may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}, which{NEW_LINE}prevents attacks and moves.\n\0" +.string "Teaches the move {color GREEN}Thunderbolt{reset}.{NEW_LINE}It damages all foes around the user.{NEW_LINE}It may also cause {color CYAN}paralysis{reset}, which{NEW_LINE}prevents attacks and moves.\n\0" .global ItemDescriptionThunder ItemDescriptionThunder: -.string "Teaches the move {COLOR_2 GREEN}Thunder{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target{NEW_LINE}and may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}.{NEW_LINE}Its accuracy is affected by the weather.\n\0" +.string "Teaches the move {color GREEN}Thunder{reset}.{NEW_LINE}It inflicts damage on the target{NEW_LINE}and may also cause {color CYAN}paralysis{reset}.{NEW_LINE}Its accuracy is affected by the weather.\n\0" .global ItemDescriptionEarthquake ItemDescriptionEarthquake: -.string "Teaches the move {COLOR_2 GREEN}Earthquake{END_COLOR_TEXT_2}.{NEW_LINE}It damages all Pokémon in the same room.{NEW_LINE}It inflicts double damage on any {COLOR_2 CYAN}digging{END_COLOR_TEXT_2}{NEW_LINE}Pokémon.\n\0" +.string "Teaches the move {color GREEN}Earthquake{reset}.{NEW_LINE}It damages all Pokémon in the same room.{NEW_LINE}It inflicts double damage on any {color CYAN}digging{reset}{NEW_LINE}Pokémon.\n\0" .global ItemDescriptionReturn ItemDescriptionReturn: -.string "Teaches the move {COLOR_2 GREEN}Return{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}Its power rises with the user's {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.\n\0" +.string "Teaches the move {color GREEN}Return{reset}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}Its power rises with the user's {color YELLOW}IQ{reset}.\n\0" .global ItemDescriptionDig ItemDescriptionDig: -.string "Teaches the move {COLOR_2 GREEN}Dig{END_COLOR_TEXT_2}.{NEW_LINE}The user's status becomes {COLOR_2 CYAN}Digging{END_COLOR_TEXT_2},{NEW_LINE}and it attacks on the next turn.{NEW_LINE}It is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\n\0" +.string "Teaches the move {color GREEN}Dig{reset}.{NEW_LINE}The user's status becomes {color CYAN}Digging{reset},{NEW_LINE}and it attacks on the next turn.{NEW_LINE}It is not possible to {color CYAN}link{reset} this move.\n\0" .global ItemDescriptionPsychic ItemDescriptionPsychic: -.string "Teaches the move {COLOR_2 GREEN}Psychic{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also lower the target's {COLOR_2 YELLOW}Special{NEW_LINE}Defense{END_COLOR_TEXT_2} by one level.\n\0" +.string "Teaches the move {color GREEN}Psychic{reset}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also lower the target's {color YELLOW}Special{NEW_LINE}Defense{reset} by one level.\n\0" .global ItemDescriptionShadowBall ItemDescriptionShadowBall: -.string "Teaches the move {COLOR_2 GREEN}Shadow Ball{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. It may also lower the target's{NEW_LINE}{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\n\0" +.string "Teaches the move {color GREEN}Shadow Ball{reset}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. It may also lower the target's{NEW_LINE}{color YELLOW}Special Defense{reset} by one level.\n\0" .global ItemDescriptionBrickBreak ItemDescriptionBrickBreak: -.string "Teaches the move {COLOR_2 GREEN}Brick Break{END_COLOR_TEXT_2}.{NEW_LINE}It shatters the target's {COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2}{NEW_LINE}or {COLOR_2 CYAN}Light Screen{END_COLOR_TEXT_2} to inflict damage.\n\0" +.string "Teaches the move {color GREEN}Brick Break{reset}.{NEW_LINE}It shatters the target's {color CYAN}Reflect{reset}{NEW_LINE}or {color CYAN}Light Screen{reset} to inflict damage.\n\0" .global ItemDescriptionDoubleTeam ItemDescriptionDoubleTeam: -.string "An item that raises the user's {COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2}{NEW_LINE}by one level.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: User\n\0" +.string "An item that raises the user's {color YELLOW}Evasion{reset}{NEW_LINE}by one level.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionReflect ItemDescriptionReflect: -.string "Teaches the move {COLOR_2 GREEN}Reflect{END_COLOR_TEXT_2}.{NEW_LINE}It makes the user's status {COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2}{NEW_LINE}and halves the damage from all{NEW_LINE}{COLOR_2 CYAN}Physical Attack moves{END_COLOR_TEXT_2} and{NEW_LINE}regular attacks.\n\0" +.string "Teaches the move {color GREEN}Reflect{reset}.{NEW_LINE}It makes the user's status {color CYAN}Reflect{reset}{NEW_LINE}and halves the damage from all{NEW_LINE}{color CYAN}Physical Attack moves{reset} and{NEW_LINE}regular attacks.\n\0" .global ItemDescriptionShockWave ItemDescriptionShockWave: -.string "Teaches the move {COLOR_2 GREEN}Shock Wave{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance.{NEW_LINE}It never misses.\n\0" +.string "Teaches the move {color GREEN}Shock Wave{reset}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance.{NEW_LINE}It never misses.\n\0" .global ItemDescriptionFlamethrower ItemDescriptionFlamethrower: -.string "Teaches the move {COLOR_2 GREEN}Flamethrower{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. It may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.{NEW_LINE}It thaws and frees frozen Pokémon.\n\0" +.string "Teaches the move {color GREEN}Flamethrower{reset}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. It may also cause a {color CYAN}burn{reset}.{NEW_LINE}It thaws and frees frozen Pokémon.\n\0" .global ItemDescriptionSludgeBomb ItemDescriptionSludgeBomb: -.string "Teaches the move {COLOR_2 GREEN}Sludge Bomb{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. It may also leave the target{NEW_LINE}{COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}, damaging it over several turns.\n\0" +.string "Teaches the move {color GREEN}Sludge Bomb{reset}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. It may also leave the target{NEW_LINE}{color CYAN}poisoned{reset}, damaging it over several turns.\n\0" .global ItemDescriptionSandstorm ItemDescriptionSandstorm: -.string "An item that changes the dungeon floor's{NEW_LINE}weather to {COLOR_2 CYAN}Sandstorm{END_COLOR_TEXT_2} for several turns.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" +.string "An item that changes the dungeon floor's{NEW_LINE}weather to {color CYAN}Sandstorm{reset} for several turns.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" .global ItemDescriptionFireBlast ItemDescriptionFireBlast: -.string "Teaches the move {COLOR_2 GREEN}Fire Blast{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.{NEW_LINE}It thaws and frees frozen Pokémon.\n\0" +.string "Teaches the move {color GREEN}Fire Blast{reset}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also cause a {color CYAN}burn{reset}.{NEW_LINE}It thaws and frees frozen Pokémon.\n\0" .global ItemDescriptionRockTomb ItemDescriptionRockTomb: -.string "It inflicts damage on the target.{NEW_LINE}It also lowers the target's {COLOR_2 YELLOW}Movement{NEW_LINE}Speed{END_COLOR_TEXT_2} by one level.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" +.string "It inflicts damage on the target.{NEW_LINE}It also lowers the target's {color YELLOW}Movement{NEW_LINE}Speed{reset} by one level.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionAerialAce ItemDescriptionAerialAce: -.string "Teaches the move {COLOR_2 GREEN}Aerial Ace{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It never misses.\n\0" +.string "Teaches the move {color GREEN}Aerial Ace{reset}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It never misses.\n\0" .global ItemDescriptionTorment ItemDescriptionTorment: -.string "Teaches the move {COLOR_2 GREEN}Torment{END_COLOR_TEXT_2}.{NEW_LINE}It prevents the targeted Pokémon from{NEW_LINE}repeating its last move while it{NEW_LINE}remains on the floor.\n\0" +.string "Teaches the move {color GREEN}Torment{reset}.{NEW_LINE}It prevents the targeted Pokémon from{NEW_LINE}repeating its last move while it{NEW_LINE}remains on the floor.\n\0" .global ItemDescriptionFacade ItemDescriptionFacade: -.string "Teaches the move {COLOR_2 GREEN}Facade{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}If the user is {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}, {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2},{NEW_LINE}or has a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}, its power is doubled.\n\0" +.string "Teaches the move {color GREEN}Facade{reset}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}If the user is {color CYAN}poisoned{reset}, {color CYAN}badly poisoned{reset},{NEW_LINE}or has a {color CYAN}burn{reset}, its power is doubled.\n\0" .global ItemDescriptionSecretPower ItemDescriptionSecretPower: -.string "Teaches the move {COLOR_2 GREEN}Secret Power{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also trigger other effects{NEW_LINE}depending on the terrain.\n\0" +.string "Teaches the move {color GREEN}Secret Power{reset}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also trigger other effects{NEW_LINE}depending on the terrain.\n\0" .global ItemDescriptionRest ItemDescriptionRest: -.string "Teaches the move {COLOR_2 GREEN}Rest{END_COLOR_TEXT_2}.{NEW_LINE}It makes the user go to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}.{NEW_LINE}Upon awakening, the Pokémon regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}{NEW_LINE}and recovers from any status problems.\n\0" +.string "Teaches the move {color GREEN}Rest{reset}.{NEW_LINE}It makes the user go to {color CYAN}sleep{reset}.{NEW_LINE}Upon awakening, the Pokémon regains {color YELLOW}HP{reset}{NEW_LINE}and recovers from any status problems.\n\0" .global ItemDescriptionAttract ItemDescriptionAttract: -.string "Teaches the move {COLOR_2 GREEN}Attract{END_COLOR_TEXT_2}.{NEW_LINE}It changes the target's status to{NEW_LINE}{COLOR_2 CYAN}Infatuated{END_COLOR_TEXT_2}.\n\0" +.string "Teaches the move {color GREEN}Attract{reset}.{NEW_LINE}It changes the target's status to{NEW_LINE}{color CYAN}Infatuated{reset}.\n\0" .global ItemDescriptionThief ItemDescriptionThief: -.string "Teaches the move {COLOR_2 GREEN}Thief{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It also snatches the target's hold item{NEW_LINE}and makes it the user's hold item.\n\0" +.string "Teaches the move {color GREEN}Thief{reset}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It also snatches the target's hold item{NEW_LINE}and makes it the user's hold item.\n\0" .global ItemDescriptionSteelWIng ItemDescriptionSteelWIng: -.string "Teaches the move {COLOR_2 GREEN}Steel Wing{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also raise the user's {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by{NEW_LINE}one level.\n\0" +.string "Teaches the move {color GREEN}Steel Wing{reset}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also raise the user's {color YELLOW}Defense{reset} by{NEW_LINE}one level.\n\0" .global ItemDescriptionSkillSwap ItemDescriptionSkillSwap: -.string "Teaches the move {COLOR_2 GREEN}Skill Swap{END_COLOR_TEXT_2}.{NEW_LINE}It switches the user's {COLOR_2 YELLOW}Special Ability{END_COLOR_TEXT_2} with{NEW_LINE}that of the target.\n\0" +.string "Teaches the move {color GREEN}Skill Swap{reset}.{NEW_LINE}It switches the user's {color YELLOW}Special Ability{reset} with{NEW_LINE}that of the target.\n\0" .global ItemDescriptionSnatch ItemDescriptionSnatch: -.string "It switches the user's status to {COLOR_2 CYAN}Snatch{END_COLOR_TEXT_2}.{NEW_LINE}It steals the moves of Pokémon on{NEW_LINE}the same floor.{NEW_LINE}{NEW_LINE}Range: User\n\0" +.string "It switches the user's status to {color CYAN}Snatch{reset}.{NEW_LINE}It steals the moves of Pokémon on{NEW_LINE}the same floor.{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionOverheat ItemDescriptionOverheat: -.string "Teaches the move {COLOR_2 GREEN}Overheat{END_COLOR_TEXT_2}.{NEW_LINE}It damages all foes around the user, but it{NEW_LINE}also lowers the user's {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}{NEW_LINE}by two levels and thaws frozen Pokémon.\n\0" +.string "Teaches the move {color GREEN}Overheat{reset}.{NEW_LINE}It damages all foes around the user, but it{NEW_LINE}also lowers the user's {color YELLOW}Special Attack{reset}{NEW_LINE}by two levels and thaws frozen Pokémon.\n\0" .global ItemDescriptionWideSlash ItemDescriptionWideSlash: -.string "Teaches the move {COLOR_2 GREEN}Wide Slash{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on foes on the 3{NEW_LINE}tiles diagonally and directly in front.\n\0" +.string "Teaches the move {color GREEN}Wide Slash{reset}.{NEW_LINE}It inflicts damage on foes on the 3{NEW_LINE}tiles diagonally and directly in front.\n\0" .global ItemDescriptionExcavate ItemDescriptionExcavate: -.string "Teaches the move {COLOR_2 GREEN}Excavate{END_COLOR_TEXT_2}.{NEW_LINE}It digs through the wall the user is facing.\n\0" +.string "Teaches the move {color GREEN}Excavate{reset}.{NEW_LINE}It digs through the wall the user is facing.\n\0" .global ItemDescriptionSpinSlash ItemDescriptionSpinSlash: -.string "Teaches the move {COLOR_2 GREEN}Spin Slash{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on all foes surrounding{NEW_LINE}the user.\n\0" +.string "Teaches the move {color GREEN}Spin Slash{reset}.{NEW_LINE}It inflicts damage on all foes surrounding{NEW_LINE}the user.\n\0" .global ItemDescriptionSeeTrapOrb ItemDescriptionSeeTrapOrb: @@ -652,7 +652,7 @@ ItemDescriptionMugOrb: .global ItemDescriptionReboundOrb ItemDescriptionReboundOrb: -.string "Changes the user's status to {COLOR_2 CYAN}Mini Counter{END_COLOR_TEXT_2}.{NEW_LINE}Any damage from {COLOR_2 CYAN}Physical Attack moves{END_COLOR_TEXT_2}{NEW_LINE}or a regular attack is partially returned.{NEW_LINE}{NEW_LINE}Range: User\n\0" +.string "Changes the user's status to {color CYAN}Mini Counter{reset}.{NEW_LINE}Any damage from {color CYAN}Physical Attack moves{reset}{NEW_LINE}or a regular attack is partially returned.{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionLobOrb ItemDescriptionLobOrb: @@ -676,11 +676,11 @@ ItemDescriptionTransferOrb: .global ItemDescriptionSlowOrb ItemDescriptionSlowOrb: -.string "Lowers the {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} of foes in{NEW_LINE}the same room by one level.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" +.string "Lowers the {color YELLOW}Movement Speed{reset} of foes in{NEW_LINE}the same room by one level.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" .global ItemDescriptionQuickOrb ItemDescriptionQuickOrb: -.string "Boosts the {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} of the user{NEW_LINE}and team members in the room by one{NEW_LINE}level.{NEW_LINE}{NEW_LINE}Range: All team members in room\n\0" +.string "Boosts the {color YELLOW}Movement Speed{reset} of the user{NEW_LINE}and team members in the room by one{NEW_LINE}level.{NEW_LINE}{NEW_LINE}Range: All team members in room\n\0" .global ItemDescriptionLuminousOrb ItemDescriptionLuminousOrb: @@ -688,11 +688,11 @@ ItemDescriptionLuminousOrb: .global ItemDescriptionPetrifyOrb ItemDescriptionPetrifyOrb: -.string "Changes the status of foes in the room to{NEW_LINE}{COLOR_2 CYAN}Petrified{END_COLOR_TEXT_2}, making them incapable of action.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" +.string "Changes the status of foes in the room to{NEW_LINE}{color CYAN}Petrified{reset}, making them incapable of action.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" .global ItemDescriptionStayawayOrb ItemDescriptionStayawayOrb: -.string "Changes the status of the target to{NEW_LINE}{COLOR_2 CYAN}Petrified{END_COLOR_TEXT_2} and warps it near the stairs.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" +.string "Changes the status of the target to{NEW_LINE}{color CYAN}Petrified{reset} and warps it near the stairs.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionPounceOrb ItemDescriptionPounceOrb: @@ -708,27 +708,27 @@ ItemDescriptionCleanseOrb: .global ItemDescriptionObserverOrb ItemDescriptionObserverOrb: -.string "Changes the status of the target to{NEW_LINE}{COLOR_2 CYAN}Paused{END_COLOR_TEXT_2}, making it incapable of action.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" +.string "Changes the status of the target to{NEW_LINE}{color CYAN}Paused{reset}, making it incapable of action.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionDecoyOrb ItemDescriptionDecoyOrb: -.string "Changes the status of the target to{NEW_LINE}{COLOR_2 CYAN}Decoy{END_COLOR_TEXT_2}, making it the target of its fellow{NEW_LINE}Pokémon.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" +.string "Changes the status of the target to{NEW_LINE}{color CYAN}Decoy{reset}, making it the target of its fellow{NEW_LINE}Pokémon.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionSlumberOrb ItemDescriptionSlumberOrb: -.string "Changes the status of foes in the same{NEW_LINE}room to {COLOR_2 CYAN}Sleep{END_COLOR_TEXT_2}, making them incapable{NEW_LINE}of action.{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" +.string "Changes the status of foes in the same{NEW_LINE}room to {color CYAN}Sleep{reset}, making them incapable{NEW_LINE}of action.{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" .global ItemDescriptionTotterOrb ItemDescriptionTotterOrb: -.string "Changes the status of foes in the same{NEW_LINE}room to {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2}, making their{NEW_LINE}attacks and movements erratic.{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" +.string "Changes the status of foes in the same{NEW_LINE}room to {color CYAN}Confused{reset}, making their{NEW_LINE}attacks and movements erratic.{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" .global ItemDescriptionTwoEdgeOrb ItemDescriptionTwoEdgeOrb: -.string "Drops the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of foes in the same{NEW_LINE}room to one. If it hits, it also halves{NEW_LINE}the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" +.string "Drops the {color YELLOW}HP{reset} of foes in the same{NEW_LINE}room to one. If it hits, it also halves{NEW_LINE}the user's {color YELLOW}HP{reset}.{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" .global ItemDescriptionSilenceOrb ItemDescriptionSilenceOrb: -.string "Changes the status of the target to{NEW_LINE}{COLOR_2 CYAN}Muzzled{END_COLOR_TEXT_2}, making it incapable of attacks or{NEW_LINE}moves using its mouth.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" +.string "Changes the status of the target to{NEW_LINE}{color CYAN}Muzzled{reset}, making it incapable of attacks or{NEW_LINE}moves using its mouth.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionEscapeOrb ItemDescriptionEscapeOrb: @@ -756,7 +756,7 @@ ItemDescriptionRollcallOrb: .global ItemDescriptionInvisifyOrb ItemDescriptionInvisifyOrb: -.string "The user becomes {COLOR_2 CYAN}invisible{END_COLOR_TEXT_2} to other{NEW_LINE}Pokémon.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: User\n\0" +.string "The user becomes {color CYAN}invisible{reset} to other{NEW_LINE}Pokémon.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionOneShotOrb ItemDescriptionOneShotOrb: @@ -768,7 +768,7 @@ ItemDescriptionIdentifyOrb: .global ItemDescriptionVacuumCut ItemDescriptionVacuumCut: -.string "Teaches the move {COLOR_2 GREEN}Vacuum Cut{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on all foes in the room.\n\0" +.string "Teaches the move {color GREEN}Vacuum Cut{reset}.{NEW_LINE}It inflicts damage on all foes in the room.\n\0" .global ItemDescriptionReviverOrb ItemDescriptionReviverOrb: @@ -776,7 +776,7 @@ ItemDescriptionReviverOrb: .global ItemDescriptionShockerOrb ItemDescriptionShockerOrb: -.string "Changes the target's status to {COLOR_2 CYAN}Cowering{END_COLOR_TEXT_2},{NEW_LINE}making its attacks go in the opposite{NEW_LINE}direction.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" +.string "Changes the target's status to {color CYAN}Cowering{reset},{NEW_LINE}making its attacks go in the opposite{NEW_LINE}direction.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionSizebustOrb ItemDescriptionSizebustOrb: @@ -808,7 +808,7 @@ ItemDescriptionHurlOrb: .global ItemDescriptionMobileOrb ItemDescriptionMobileOrb: -.string "Changes the user's status to {COLOR_2 CYAN}Mobile{END_COLOR_TEXT_2},{NEW_LINE}enabling it to move and attack through{NEW_LINE}walls and on lava, water, and clouds.{NEW_LINE}{NEW_LINE}Range: User\n\0" +.string "Changes the user's status to {color CYAN}Mobile{reset},{NEW_LINE}enabling it to move and attack through{NEW_LINE}walls and on lava, water, and clouds.{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionTossOrb ItemDescriptionTossOrb: @@ -820,47 +820,47 @@ ItemDescriptionStairsOrb: .global ItemDescriptionLongtossOrb ItemDescriptionLongtossOrb: -.string "Changes the user's status to {COLOR_2 CYAN}Long Toss{END_COLOR_TEXT_2}.{NEW_LINE}Items thrown by the user will fly until{NEW_LINE}they hit a wall or a Pokémon.{NEW_LINE}{NEW_LINE}Range: User\n\0" +.string "Changes the user's status to {color CYAN}Long Toss{reset}.{NEW_LINE}Items thrown by the user will fly until{NEW_LINE}they hit a wall or a Pokémon.{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionPierceOrb ItemDescriptionPierceOrb: -.string "Changes the user's status to {COLOR_2 CYAN}Pierce{END_COLOR_TEXT_2}.{NEW_LINE}Items thrown by the user will fly through{NEW_LINE}walls and Pokémon without stopping.{NEW_LINE}{NEW_LINE}Range: User\n\0" +.string "Changes the user's status to {color CYAN}Pierce{reset}.{NEW_LINE}Items thrown by the user will fly through{NEW_LINE}walls and Pokémon without stopping.{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionCut ItemDescriptionCut: -.string "Teaches the move {COLOR_2 GREEN}Cut{END_COLOR_TEXT_2}. It does not break,{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move damages all foes around the{NEW_LINE}user.\n\0" +.string "Teaches the move {color GREEN}Cut{reset}. It does not break,{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move damages all foes around the{NEW_LINE}user.\n\0" .global ItemDescriptionFly ItemDescriptionFly: -.string "Teaches the move {COLOR_2 GREEN}Fly{END_COLOR_TEXT_2}. It does not break,{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move makes the user's status {COLOR_2 CYAN}Flying{END_COLOR_TEXT_2},{NEW_LINE}making it attack on the next turn.\n\0" +.string "Teaches the move {color GREEN}Fly{reset}. It does not break,{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move makes the user's status {color CYAN}Flying{reset},{NEW_LINE}making it attack on the next turn.\n\0" .global ItemDescriptionSurf ItemDescriptionSurf: -.string "Teaches the move {COLOR_2 GREEN}Surf{END_COLOR_TEXT_2}. It does not break,{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move damages the target.{NEW_LINE}Inflicts double damage on a {COLOR_2 CYAN}diving{END_COLOR_TEXT_2} foe.\n\0" +.string "Teaches the move {color GREEN}Surf{reset}. It does not break,{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move damages the target.{NEW_LINE}Inflicts double damage on a {color CYAN}diving{reset} foe.\n\0" .global ItemDescriptionStrength ItemDescriptionStrength: -.string "Teaches the move {COLOR_2 GREEN}Strength{END_COLOR_TEXT_2}. It does not{NEW_LINE}break, but cannot be used in a dungeon.{NEW_LINE}The move hurls the target at another{NEW_LINE}Pokémon to inflict damage.\n\0" +.string "Teaches the move {color GREEN}Strength{reset}. It does not{NEW_LINE}break, but cannot be used in a dungeon.{NEW_LINE}The move hurls the target at another{NEW_LINE}Pokémon to inflict damage.\n\0" .global ItemDescriptionFlash ItemDescriptionFlash: -.string "Teaches the move {COLOR_2 GREEN}Flash{END_COLOR_TEXT_2}. It does not break,{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move lowers the target's {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2}{NEW_LINE}by one level.\n\0" +.string "Teaches the move {color GREEN}Flash{reset}. It does not break,{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move lowers the target's {color YELLOW}Accuracy{reset}{NEW_LINE}by one level.\n\0" .global ItemDescriptionRockSmash ItemDescriptionRockSmash: -.string "Teaches the move {COLOR_2 GREEN}Rock Smash{END_COLOR_TEXT_2}. It does not{NEW_LINE}break, but cannot be used in a dungeon.{NEW_LINE}The move digs through the wall the user{NEW_LINE}is facing.\n\0" +.string "Teaches the move {color GREEN}Rock Smash{reset}. It does not{NEW_LINE}break, but cannot be used in a dungeon.{NEW_LINE}The move digs through the wall the user{NEW_LINE}is facing.\n\0" .global ItemDescriptionWaterfall ItemDescriptionWaterfall: -.string "Teaches the move {COLOR_2 GREEN}Waterfall{END_COLOR_TEXT_2}. It does not{NEW_LINE}break, but cannot be used in a dungeon.{NEW_LINE}The move damages the target.\n\0" +.string "Teaches the move {color GREEN}Waterfall{reset}. It does not{NEW_LINE}break, but cannot be used in a dungeon.{NEW_LINE}The move damages the target.\n\0" .global ItemDescriptionDive ItemDescriptionDive: -.string "Teaches the move {COLOR_2 GREEN}Dive{END_COLOR_TEXT_2}. It does not break,{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move makes the user's status {COLOR_2 CYAN}Diving{END_COLOR_TEXT_2},{NEW_LINE}making it attack strongly on the next turn.\n\0" +.string "Teaches the move {color GREEN}Dive{reset}. It does not break,{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move makes the user's status {color CYAN}Diving{reset},{NEW_LINE}making it attack strongly on the next turn.\n\0" .global ItemDescriptionLinkBox ItemDescriptionLinkBox: -.string "A marvelous box that enables the user to{NEW_LINE}{COLOR_2 CYAN}link{END_COLOR_TEXT_2} and delink moves.{NEW_LINE}{COLOR_2 CYAN}Linked{END_COLOR_TEXT_2} moves become separated if{NEW_LINE}their combined {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} drops to zero.\n\0" +.string "A marvelous box that enables the user to{NEW_LINE}{color CYAN}link{reset} and delink moves.{NEW_LINE}{color CYAN}Linked{reset} moves become separated if{NEW_LINE}their combined {color YELLOW}PP{reset} drops to zero.\n\0" .global ItemDescriptionSwitchBox ItemDescriptionSwitchBox: diff --git a/data/move/move_names.s b/data/move/move_names.s index 26be26ac..e6e22777 100644 --- a/data/move/move_names.s +++ b/data/move/move_names.s @@ -270,7 +270,7 @@ MoveNamePlaceholder: .global MoveUseTextBide MoveUseTextBide: -.string "{ARG_POKEMON_0} can't take it anymore!\0" +.string "{POKEMON_0} can't take it anymore!\0" .align 2,0 .global MoveNameBide2 @@ -290,7 +290,7 @@ MoveNameIsWatching: .global MoveUseTextRegularAttack MoveUseTextRegularAttack: -.string "{ARG_POKEMON_0} attacked!\0" +.string "{POKEMON_0} attacked!\0" .align 2,0 .global MoveDescriptionNull @@ -320,7 +320,7 @@ MoveNameAeroblast: .global MoveDescriptionStruggle MoveDescriptionStruggle: -.string "Inflicts damage on the target.\nHowever, the user also takes damage one\nquarter of its {COLOR_2 YELLOW}maximum HP{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nHowever, the user also takes damage one\nquarter of its {color YELLOW}maximum HP{reset}.\0" .align 2,0 .global MoveNameStruggle @@ -340,7 +340,7 @@ MoveNameRockBlast: .global MoveDescriptionLockOn MoveDescriptionLockOn: -.string "Gives the user the {COLOR_2 CYAN}Sure Shot{END_COLOR_TEXT_2} status,\nmaking all its moves and attacks\ncompletely accurate.\0" +.string "Gives the user the {color CYAN}Sure Shot{reset} status,\nmaking all its moves and attacks\ncompletely accurate.\0" .align 2,0 .global MoveNameLockOn @@ -350,7 +350,7 @@ MoveNameLockOn: .global MoveDescriptionSkullBash MoveDescriptionSkullBash: -.string "The user gains the {COLOR_2 CYAN}Skull Bash{END_COLOR_TEXT_2} status,\ncausing it to attack strongly on the\nnext turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {color CYAN}Skull Bash{reset} status,\ncausing it to attack strongly on the\nnext turn.\nIt is not possible to {color CYAN}link{reset} this move.\0" .align 2,0 .global MoveNameSkullBash @@ -370,7 +370,7 @@ MoveNameFuryCutter: .global MoveDescriptionIceBeam MoveDescriptionIceBeam: -.string "Inflicts damage on the target, even at a\ndistance. It may also leave the target\n{COLOR_2 CYAN}frozen{END_COLOR_TEXT_2} and incapable of action.\0" +.string "Inflicts damage on the target, even at a\ndistance. It may also leave the target\n{color CYAN}frozen{reset} and incapable of action.\0" .align 2,0 .global MoveNameIceBeam @@ -385,7 +385,7 @@ MoveNameIcePunch: .global MoveDescriptionDragonDance MoveDescriptionDragonDance: -.string "Boosts the user's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Movement\nSpeed{END_COLOR_TEXT_2} by one level.\0" +.string "Boosts the user's {color YELLOW}Attack{reset} and {color YELLOW}Movement\nSpeed{reset} by one level.\0" .align 2,0 .global MoveNameDragonDance @@ -395,7 +395,7 @@ MoveNameDragonDance: .global MoveDescriptionDragonbreath MoveDescriptionDragonbreath: -.string "Inflicts damage on the target, even at a\ndistance. It may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2},\npreventing any attacks or moves.\0" +.string "Inflicts damage on the target, even at a\ndistance. It may also cause {color CYAN}paralysis{reset},\npreventing any attacks or moves.\0" .align 2,0 .global MoveNameDragonbreath @@ -430,7 +430,7 @@ MoveNameRefresh: .global MoveDescriptionReflect MoveDescriptionReflect: -.string "The user gains the {COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2} status,\nhalving the damage from all\n{COLOR_2 CYAN}Physical Attack moves{END_COLOR_TEXT_2} and\nregular attacks.\0" +.string "The user gains the {color CYAN}Reflect{reset} status,\nhalving the damage from all\n{color CYAN}Physical Attack moves{reset} and\nregular attacks.\0" .align 2,0 .global MoveNameReflect @@ -440,7 +440,7 @@ MoveNameReflect: .global MoveDescriptionRecycle MoveDescriptionRecycle: -.string "Repairs the item {COLOR_2 GREEN}{TM}Used TM{END_COLOR_TEXT_2} and restores\nit to its original, unused state.\0" +.string "Repairs the item {color GREEN}{TM}Used TM{reset} and restores\nit to its original, unused state.\0" .align 2,0 .global MoveNameRecycle @@ -460,7 +460,7 @@ MoveNameLusterPurge: .global MoveDescriptionSnatch MoveDescriptionSnatch: -.string "The user gains the {COLOR_2 CYAN}Snatch{END_COLOR_TEXT_2} status.\nIt steals the moves of Pokémon on\nthe same floor.\0" +.string "The user gains the {color CYAN}Snatch{reset} status.\nIt steals the moves of Pokémon on\nthe same floor.\0" .align 2,0 .global MoveNameSnatch @@ -470,7 +470,7 @@ MoveNameSnatch: .global MoveDescriptionAcid MoveDescriptionAcid: -.string "Inflicts damage on the target.\nIt may also lower the user's {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by\none level.\0" +.string "Inflicts damage on the target.\nIt may also lower the user's {color YELLOW}Defense{reset} by\none level.\0" .align 2,0 .global MoveNameAcid @@ -480,7 +480,7 @@ MoveNameAcid: .global MoveDescriptionDreamEater MoveDescriptionDreamEater: -.string "Inflicts damage on the target and restores\nthe user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\nEffective only against sleeping foes.\0" +.string "Inflicts damage on the target and restores\nthe user's {color YELLOW}HP{reset}.\nEffective only against sleeping foes.\0" .align 2,0 .global MoveNameDreamEater @@ -500,7 +500,7 @@ MoveNameMetronome: .global MoveDescriptionLeechSeed MoveDescriptionLeechSeed: -.string "Inflicts the {COLOR_2 CYAN}Leech Seed{END_COLOR_TEXT_2} status\non the target.\nThe target's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} is leeched every several\nturns to restore the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\0" +.string "Inflicts the {color CYAN}Leech Seed{reset} status\non the target.\nThe target's {color YELLOW}HP{reset} is leeched every several\nturns to restore the user's {color YELLOW}HP{reset}.\0" .align 2,0 .global MoveNameLeechSeed @@ -510,7 +510,7 @@ MoveNameLeechSeed: .global MoveDescriptionFrustration MoveDescriptionFrustration: -.string "Inflicts damage on the target.\nIt inflicts greater damage if the user's\n{COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2} is low.\0" +.string "Inflicts damage on the target.\nIt inflicts greater damage if the user's\n{color YELLOW}IQ{reset} is low.\0" .align 2,0 .global MoveNameFrustration @@ -530,7 +530,7 @@ MoveNameMimic: .global MoveDescriptionAttract MoveDescriptionAttract: -.string "Inflicts the {COLOR_2 CYAN}Infatuated{END_COLOR_TEXT_2} status on\nthe target.\0" +.string "Inflicts the {color CYAN}Infatuated{reset} status on\nthe target.\0" .align 2,0 .global MoveNameAttract @@ -540,7 +540,7 @@ MoveNameAttract: .global MoveDescriptionMetalClaw MoveDescriptionMetalClaw: -.string "Inflicts damage on the target.\nIt may also boost the user's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by\none level.\0" +.string "Inflicts damage on the target.\nIt may also boost the user's {color YELLOW}Attack{reset} by\none level.\0" .align 2,0 .global MoveNameMetalClaw @@ -580,7 +580,7 @@ MoveNameMegaDrain: .global MoveDescriptionCalmMind MoveDescriptionCalmMind: -.string "Boosts the Pokémon's {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} and\n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\0" +.string "Boosts the Pokémon's {color YELLOW}Special Attack{reset} and\n{color YELLOW}Special Defense{reset} by one level.\0" .align 2,0 .global MoveNameCalmMind @@ -590,7 +590,7 @@ MoveNameCalmMind: .global MoveDescriptionMilkDrink MoveDescriptionMilkDrink: -.string "Restores the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of the user and its\nteam members on the floor by one quarter\nof their {COLOR_2 YELLOW}maximum HP{END_COLOR_TEXT_2}.\0" +.string "Restores the {color YELLOW}HP{reset} of the user and its\nteam members on the floor by one quarter\nof their {color YELLOW}maximum HP{reset}.\0" .align 2,0 .global MoveNameMilkDrink @@ -605,7 +605,7 @@ MoveNameFutureSight: .global MoveDescriptionMirrorCoat MoveDescriptionMirrorCoat: -.string "The user gains the {COLOR_2 CYAN}Mirror Coat{END_COLOR_TEXT_2} status.\nThe user returns the damage it takes from\nany {COLOR_2 CYAN}Special Attack moves{END_COLOR_TEXT_2} used\nby a foe beside it.\0" +.string "The user gains the {color CYAN}Mirror Coat{reset} status.\nThe user returns the damage it takes from\nany {color CYAN}Special Attack moves{reset} used\nby a foe beside it.\0" .align 2,0 .global MoveNameMirrorCoat @@ -615,7 +615,7 @@ MoveNameMirrorCoat: .global MoveDescriptionForesight MoveDescriptionForesight: -.string "Resets the boosted {COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2} of the target.\nGhost-type foes become {COLOR_2 CYAN}exposed{END_COLOR_TEXT_2}.\0" +.string "Resets the boosted {color YELLOW}Evasion{reset} of the target.\nGhost-type foes become {color CYAN}exposed{reset}.\0" .align 2,0 .global MoveNameForesight @@ -625,7 +625,7 @@ MoveNameForesight: .global MoveDescriptionFalseSwipe MoveDescriptionFalseSwipe: -.string "Inflicts damage on the target.\nIt leaves the target with one {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} if its\ndamage would have made the target faint.\0" +.string "Inflicts damage on the target.\nIt leaves the target with one {color YELLOW}HP{reset} if its\ndamage would have made the target faint.\0" .align 2,0 .global MoveNameFalseSwipe @@ -635,7 +635,7 @@ MoveNameFalseSwipe: .global MoveDescriptionDestinyBond MoveDescriptionDestinyBond: -.string "The user and the target gain the\n{COLOR_2 CYAN}Destiny Bond{END_COLOR_TEXT_2} status.\nThe target sustains the same damage\nas the user in this state.\0" +.string "The user and the target gain the\n{color CYAN}Destiny Bond{reset} status.\nThe target sustains the same damage\nas the user in this state.\0" .align 2,0 .global MoveNameDestinyBond @@ -655,7 +655,7 @@ MoveNameFuryAttack: .global MoveDescriptionWaterPulse MoveDescriptionWaterPulse: -.string "Inflicts damage on the target, even at a\ndistance.\nIt may also leave the target {COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target, even at a\ndistance.\nIt may also leave the target {color CYAN}confused{reset}.\0" .align 2,0 .global MoveNameWaterPulse @@ -665,7 +665,7 @@ MoveNameWaterPulse: .global MoveDescriptionMistBall MoveDescriptionMistBall: -.string "Inflicts damage on the target.\nIt may lower the target's {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}\nby one level.\0" +.string "Inflicts damage on the target.\nIt may lower the target's {color YELLOW}Special Attack{reset}\nby one level.\0" .align 2,0 .global MoveNameMistBall @@ -680,7 +680,7 @@ MoveNameWaterGun: .global MoveDescriptionWaterSport MoveDescriptionWaterSport: -.string "Changes the floor's status to {COLOR_2 CYAN}Water Sport{END_COLOR_TEXT_2},\nwhich halves the power of Fire-type\nmoves.\0" +.string "Changes the floor's status to {color CYAN}Water Sport{reset},\nwhich halves the power of Fire-type\nmoves.\0" .align 2,0 .global MoveNameWaterSport @@ -700,7 +700,7 @@ MoveNameDetect: .global MoveDescriptionSubstitute MoveDescriptionSubstitute: -.string "The target gains the {COLOR_2 CYAN}Decoy{END_COLOR_TEXT_2} status,\nmaking it the target of its fellow\nPokémon.\0" +.string "The target gains the {color CYAN}Decoy{reset} status,\nmaking it the target of its fellow\nPokémon.\0" .align 2,0 .global MoveNameSubstitute @@ -720,7 +720,7 @@ MoveNameDefenseCurl: .global MoveDescriptionProtect MoveDescriptionProtect: -.string "The user gains the {COLOR_2 CYAN}Protect{END_COLOR_TEXT_2} status,\npreventing damage from enemy attacks\nand moves.\0" +.string "The user gains the {color CYAN}Protect{reset} status,\npreventing damage from enemy attacks\nand moves.\0" .align 2,0 .global MoveNameProtect @@ -740,7 +740,7 @@ MoveNameMudShot: .global MoveDescriptionMagicCoat MoveDescriptionMagicCoat: -.string "The user gains the {COLOR_2 CYAN}Magic Coat{END_COLOR_TEXT_2} status.\nThe user reflects several moves directly\nback to the foes.\0" +.string "The user gains the {color CYAN}Magic Coat{reset} status.\nThe user reflects several moves directly\nback to the foes.\0" .align 2,0 .global MoveNameMagicCoat @@ -755,7 +755,7 @@ MoveNameMagicalLeaf: .global MoveDescriptionMagnitude MoveDescriptionMagnitude: -.string "Damages all Pokémon in the same room.\nThe amount of damage varies.\nIt inflicts double damage on any {COLOR_2 CYAN}digging{END_COLOR_TEXT_2}\nPokémon.\0" +.string "Damages all Pokémon in the same room.\nThe amount of damage varies.\nIt inflicts double damage on any {color CYAN}digging{reset}\nPokémon.\0" .align 2,0 .global MoveNameMagnitude @@ -770,7 +770,7 @@ MoveDescriptionSpikes: .global MoveDescriptionWrap MoveDescriptionWrap: -.string "The user gains the {COLOR_2 CYAN}Wrap{END_COLOR_TEXT_2} status, and\nthe {COLOR_2 CYAN}Wrapped{END_COLOR_TEXT_2} status is inflicted on\nthe target.\nBoth Pokémon become incapable of action.\0" +.string "The user gains the {color CYAN}Wrap{reset} status, and\nthe {color CYAN}Wrapped{reset} status is inflicted on\nthe target.\nBoth Pokémon become incapable of action.\0" .align 2,0 .global MoveNameWrap @@ -780,7 +780,7 @@ MoveNameWrap: .global MoveDescriptionPerishSong MoveDescriptionPerishSong: -.string "Inflicts the {COLOR_2 CYAN}Perish Song{END_COLOR_TEXT_2} status on all foes\non the floor. The affected foes faint\nafter several turns.\0" +.string "Inflicts the {color CYAN}Perish Song{reset} status on all foes\non the floor. The affected foes faint\nafter several turns.\0" .align 2,0 .global MoveNamePerishSong @@ -795,7 +795,7 @@ MoveNameFirePunch: .global MoveDescriptionFireSpin MoveDescriptionFireSpin: -.string "Inflicts damage on the target.\nIt may also cause {COLOR_2 CYAN}constriction{END_COLOR_TEXT_2}.\nIt thaws and frees frozen Pokémon.\0" +.string "Inflicts damage on the target.\nIt may also cause {color CYAN}constriction{reset}.\nIt thaws and frees frozen Pokémon.\0" .align 2,0 .global MoveNameFireSpin @@ -820,7 +820,7 @@ MoveNameBoneClub: .global MoveDescriptionTailGlow MoveDescriptionTailGlow: -.string "Boosts the user's {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} by\ntwo levels.\0" +.string "Boosts the user's {color YELLOW}Special Attack{reset} by\ntwo levels.\0" .align 2,0 .global MoveNameTailGlow @@ -855,7 +855,7 @@ MoveNameRoar: .global MoveDescriptionPoisonTail MoveDescriptionPoisonTail: -.string "Inflicts damage on the target.\nIt may also leave the target {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}.\nIt has a high critical-hit rate.\0" +.string "Inflicts damage on the target.\nIt may also leave the target {color CYAN}poisoned{reset}.\nIt has a high critical-hit rate.\0" .align 2,0 .global MoveNamePoisonTail @@ -865,7 +865,7 @@ MoveNamePoisonTail: .global MoveDescriptionTransform MoveDescriptionTransform: -.string "The user gains the {COLOR_2 CYAN}Transformed{END_COLOR_TEXT_2} status.\nThe user transforms into a hostile\nPokémon that appears on the floor.\0" +.string "The user gains the {color CYAN}Transformed{reset} status.\nThe user transforms into a hostile\nPokémon that appears on the floor.\0" .align 2,0 .global MoveNameGlare @@ -875,7 +875,7 @@ MoveNameGlare: .global MoveDescriptionSludgeBomb MoveDescriptionSludgeBomb: -.string "Inflicts damage on the target, even at a\ndistance. It may also leave the target\n{COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}, damaging it for several turns.\0" +.string "Inflicts damage on the target, even at a\ndistance. It may also leave the target\n{color CYAN}poisoned{reset}, damaging it for several turns.\0" .align 2,0 .global MoveNameSludgeBomb @@ -885,17 +885,17 @@ MoveNameSludgeBomb: .global MoveDescriptionSludge MoveDescriptionSludge: -.string "Inflicts damage on the target.\nIt may also leave the target {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2},\ndamaging it for several turns.\0" +.string "Inflicts damage on the target.\nIt may also leave the target {color CYAN}poisoned{reset},\ndamaging it for several turns.\0" .align 2,0 .global MoveDescriptionEruption MoveDescriptionEruption: -.string "Inflicts damage on the target.\nThe higher the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}, the greater\nthe damage.\nIt thaws and frees frozen Pokémon.\0" +.string "Inflicts damage on the target.\nThe higher the user's {color YELLOW}HP{reset}, the greater\nthe damage.\nIt thaws and frees frozen Pokémon.\0" .align 2,0 .global MoveDescriptionPresent MoveDescriptionPresent: -.string "Either inflicts damage on the target\nor restores its {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\0" +.string "Either inflicts damage on the target\nor restores its {color YELLOW}HP{reset}.\0" .align 2,0 .global MoveNamePresent @@ -905,7 +905,7 @@ MoveNamePresent: .global MoveDescriptionBlazeKick MoveDescriptionBlazeKick: -.string "Inflicts damage on the target.\nIt may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.\nIt thaws and frees frozen Pokémon.\nIt has a high critical-hit rate.\0" +.string "Inflicts damage on the target.\nIt may also cause a {color CYAN}burn{reset}.\nIt thaws and frees frozen Pokémon.\nIt has a high critical-hit rate.\0" .align 2,0 .global MoveNameBlazeKick @@ -920,7 +920,7 @@ MoveNameCrushClaw: .global MoveDescriptionTeeterDance MoveDescriptionTeeterDance: -.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on all\nPokémon on the floor, making their attacks\nand movements erratic.\0" +.string "Inflicts the {color CYAN}Confused{reset} status on all\nPokémon on the floor, making their attacks\nand movements erratic.\0" .align 2,0 .global MoveNameTeeterDance @@ -935,7 +935,7 @@ MoveNameFlash: .global MoveDescriptionBlastBurn MoveDescriptionBlastBurn: -.string "Inflicts damage on the target. However, it\nalso inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} status on the user.\nIt also thaws and frees frozen Pokémon.\0" +.string "Inflicts damage on the target. However, it\nalso inflicts the {color CYAN}Paused{reset} status on the user.\nIt also thaws and frees frozen Pokémon.\0" .align 2,0 .global MoveNameBlastBurn @@ -975,7 +975,7 @@ MoveNameWhirlwind: .global MoveDescriptionFeatherdance MoveDescriptionFeatherdance: -.string "Lowers the target's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by two levels.\0" +.string "Lowers the target's {color YELLOW}Attack{reset} by two levels.\0" .align 2,0 .global MoveNameFeatherdance @@ -985,7 +985,7 @@ MoveNameFeatherdance: .global MoveDescriptionImprison MoveDescriptionImprison: -.string "Inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} status on the target,\nmaking it incapable of action.\0" +.string "Inflicts the {color CYAN}Paused{reset} status on the target,\nmaking it incapable of action.\0" .align 2,0 .global MoveNameImprison @@ -995,7 +995,7 @@ MoveNameImprison: .global MoveDescriptionBulkUp MoveDescriptionBulkUp: -.string "Raises the user's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}\nby one level.\0" +.string "Raises the user's {color YELLOW}Attack{reset} and {color YELLOW}Defense{reset}\nby one level.\0" .align 2,0 .global MoveNameBulkUp @@ -1035,7 +1035,7 @@ MoveNameScratch: .global MoveDescriptionLightScreen MoveDescriptionLightScreen: -.string "The user gains the {COLOR_2 CYAN}Light Screen{END_COLOR_TEXT_2} status.\nIt halves the damage from\n{COLOR_2 CYAN}Special Attack moves{END_COLOR_TEXT_2}.\0" +.string "The user gains the {color CYAN}Light Screen{reset} status.\nIt halves the damage from\n{color CYAN}Special Attack moves{reset}.\0" .align 2,0 .global MoveNameLightScreen @@ -1045,7 +1045,7 @@ MoveNameLightScreen: .global MoveDescriptionBellyDrum MoveDescriptionBellyDrum: -.string "Boosts the user's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} to maximum,\nbut empties its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} to just one.\nIt has no effect if the {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is one or less.\0" +.string "Boosts the user's {color YELLOW}Attack{reset} to maximum,\nbut empties its {color YELLOW}Belly{reset} to just one.\nIt has no effect if the {color YELLOW}Belly{reset} is one or less.\0" .align 2,0 .global MoveNameBellyDrum @@ -1055,7 +1055,7 @@ MoveNameBellyDrum: .global MoveDescriptionFixedDamage MoveDescriptionFixedDamage: -.string "The user gains the {COLOR_2 CYAN}Set Damage{END_COLOR_TEXT_2} status.\nIn this state, all damage inflicted by the\nuser will remain constant.\0" +.string "The user gains the {color CYAN}Set Damage{reset} status.\nIn this state, all damage inflicted by the\nuser will remain constant.\0" .align 2,0 .global MoveNameDoomDesire @@ -1080,7 +1080,7 @@ MoveNameSplash: .global MoveDescriptionPetalDance MoveDescriptionPetalDance: -.string "Hits the target two to five times in\nsuccession. However it also makes the\nuser {COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" +.string "Hits the target two to five times in\nsuccession. However it also makes the\nuser {color CYAN}confused{reset}.\0" .align 2,0 .global MoveNamePetalDance @@ -1135,7 +1135,7 @@ MoveNameGuillotine: .global MoveDescriptionDynamicpunch MoveDescriptionDynamicpunch: -.string "Inflicts damage on the target.\nIt also leaves the target {COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIt also leaves the target {color CYAN}confused{reset}.\0" .align 2,0 .global MoveNameDynamicpunch @@ -1145,7 +1145,7 @@ MoveNameDynamicpunch: .global MoveDescriptionSpitUp MoveDescriptionSpitUp: -.string "Inflicts damage on the target.\nIts power depends on how often the move\n{COLOR_2 GREEN}Stockpile{END_COLOR_TEXT_2} was used before.\0" +.string "Inflicts damage on the target.\nIts power depends on how often the move\n{color GREEN}Stockpile{reset} was used before.\0" .align 2,0 .global MoveNameSpitUp @@ -1155,7 +1155,7 @@ MoveNameSpitUp: .global MoveDescriptionSteelWing MoveDescriptionSteelWing: -.string "Inflicts damage on the target.\nIt may also raise the user's {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by\none level.\0" +.string "Inflicts damage on the target.\nIt may also raise the user's {color YELLOW}Defense{reset} by\none level.\0" .align 2,0 .global MoveNameSteelWing @@ -1165,12 +1165,12 @@ MoveNameSteelWing: .global MoveDescriptionSuperpower MoveDescriptionSuperpower: -.string "Inflicts damage on the target.\nHowever, it also lowers the user's\n{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target.\nHowever, it also lowers the user's\n{color YELLOW}Attack{reset} and {color YELLOW}Defense{reset} by one level.\0" .align 2,0 .global MoveDescriptionHyperBeam MoveDescriptionHyperBeam: -.string "Inflicts damage on the target, even at a\ndistance. It also inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} status\non the user, making it incapable of action.\0" +.string "Inflicts damage on the target, even at a\ndistance. It also inflicts the {color CYAN}Paused{reset} status\non the user, making it incapable of action.\0" .align 2,0 .global MoveNameHyperBeam @@ -1195,7 +1195,7 @@ MoveNameHydroPump: .global MoveDescriptionHydroCannon MoveDescriptionHydroCannon: -.string "Inflicts damage on the target, even at a\ndistance. It also inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2}\nstatus on the user, making it incapable\nof action.\0" +.string "Inflicts damage on the target, even at a\ndistance. It also inflicts the {color CYAN}Paused{reset}\nstatus on the user, making it incapable\nof action.\0" .align 2,0 .global MoveNameHydroCannon @@ -1205,7 +1205,7 @@ MoveNameHydroCannon: .global MoveDescriptionFrenzyPlant MoveDescriptionFrenzyPlant: -.string "Inflicts damage on the target.\nHowever, it also inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} status\non the user, making it incapable of action.\0" +.string "Inflicts damage on the target.\nHowever, it also inflicts the {color CYAN}Paused{reset} status\non the user, making it incapable of action.\0" .align 2,0 .global MoveNameFrenzyPlant @@ -1215,7 +1215,7 @@ MoveNameFrenzyPlant: .global MoveDescriptionCurse MoveDescriptionCurse: -.string "Boosts the user's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by\none level, but also lowers {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2}\nby one level. If used by a Ghost type, the\ntarget is {COLOR_2 CYAN}cursed{END_COLOR_TEXT_2}, and the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} halved.\0" +.string "Boosts the user's {color YELLOW}Attack{reset} and {color YELLOW}Defense{reset} by\none level, but also lowers {color YELLOW}Movement Speed{reset}\nby one level. If used by a Ghost type, the\ntarget is {color CYAN}cursed{reset}, and the user's {color YELLOW}HP{reset} halved.\0" .align 2,0 .global MoveNameCurse @@ -1225,7 +1225,7 @@ MoveNameCurse: .global MoveDescriptionSwallow MoveDescriptionSwallow: -.string "Restores the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\nThe {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} recovered depends on how often\nthe move {COLOR_2 GREEN}Stockpile{END_COLOR_TEXT_2} was used before.\0" +.string "Restores the user's {color YELLOW}HP{reset}.\nThe {color YELLOW}HP{reset} recovered depends on how often\nthe move {color GREEN}Stockpile{reset} was used before.\0" .align 2,0 .global MoveNameBodySlam @@ -1235,7 +1235,7 @@ MoveNameBodySlam: .global MoveDescriptionConfuseChance MoveDescriptionConfuseChance: -.string "Inflicts damage on the target.\nIt may also leave the target {COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIt may also leave the target {color CYAN}confused{reset}.\0" .align 2,0 .global MoveNameConfusion @@ -1245,7 +1245,7 @@ MoveNameConfusion: .global MoveDescriptionIngrain MoveDescriptionIngrain: -.string "The user gains the {COLOR_2 CYAN}Ingrain{END_COLOR_TEXT_2} status.\nThe user becomes incapable of moving,\nbut regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} over several turns.\0" +.string "The user gains the {color CYAN}Ingrain{reset} status.\nThe user becomes incapable of moving,\nbut regains {color YELLOW}HP{reset} over several turns.\0" .align 2,0 .global MoveNameIngrain @@ -1255,7 +1255,7 @@ MoveNameIngrain: .global MoveDescriptionRest MoveDescriptionRest: -.string "The user gains the {COLOR_2 CYAN}Napping{END_COLOR_TEXT_2} status.\nUpon awakening, the Pokémon regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}\nand recovers from any status problems.\0" +.string "The user gains the {color CYAN}Napping{reset} status.\nUpon awakening, the Pokémon regains {color YELLOW}HP{reset}\nand recovers from any status problems.\0" .align 2,0 .global MoveNameRest @@ -1265,7 +1265,7 @@ MoveNameRest: .global MoveDescriptionSleepPowder MoveDescriptionSleepPowder: -.string "Makes all foes around the user go to\n{COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}, making them incapable of action.\0" +.string "Makes all foes around the user go to\n{color CYAN}sleep{reset}, making them incapable of action.\0" .align 2,0 .global MoveNameSleepPowder @@ -1275,7 +1275,7 @@ MoveNameSleepPowder: .global MoveDescriptionHeatWave MoveDescriptionHeatWave: -.string "Inflicts damage on foes in the room.\nIt may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.\nIt thaws and frees frozen Pokémon.\0" +.string "Inflicts damage on foes in the room.\nIt may also cause a {color CYAN}burn{reset}.\nIt thaws and frees frozen Pokémon.\0" .align 2,0 .global MoveNameHeatWave @@ -1285,7 +1285,7 @@ MoveNameHeatWave: .global MoveUseTextAssist MoveUseTextAssist: -.string "{ARG_POKEMON_0} chose {ARG_MOVE_ITEM_0}!\0" +.string "{POKEMON_0} chose {MOVE_ITEM_0}!\0" .align 2,0 .global MoveDescriptionAssist @@ -1320,7 +1320,7 @@ MoveNameSleepTalk: .global MoveDescriptionFakeOut MoveDescriptionFakeOut: -.string "Inflicts damage on the target.\nIt may also make the target {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}.\nIt reaches up to two tiles ahead.\0" +.string "Inflicts damage on the target.\nIt may also make the target {color CYAN}cringe{reset}.\nIt reaches up to two tiles ahead.\0" .align 2,0 .global MoveNameFakeOut @@ -1330,7 +1330,7 @@ MoveNameFakeOut: .global MoveDescriptionWish MoveDescriptionWish: -.string "The user gains the {COLOR_2 CYAN}Wish{END_COLOR_TEXT_2} status.\nIt boosts the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} recovery rate.\0" +.string "The user gains the {color CYAN}Wish{reset} status.\nIt boosts the user's {color YELLOW}HP{reset} recovery rate.\0" .align 2,0 .global MoveNameLeer @@ -1340,7 +1340,7 @@ MoveNameLeer: .global MoveDescriptionSunnyDay MoveDescriptionSunnyDay: -.string "Changes the dungeon floor's weather to\n{COLOR_2 CYAN}Sunny{END_COLOR_TEXT_2} over several turns.\0" +.string "Changes the dungeon floor's weather to\n{color CYAN}Sunny{reset} over several turns.\0" .align 2,0 .global MoveNameSunnyDay @@ -1365,7 +1365,7 @@ MoveNameNeedleArm: .global MoveDescriptionRolePlay MoveDescriptionRolePlay: -.string "Copies the target's {COLOR_2 YELLOW}Special Ability{END_COLOR_TEXT_2}.\nThe user regains its own {COLOR_2 YELLOW}Special Ability{END_COLOR_TEXT_2}\nwhen it leaves the floor.\0" +.string "Copies the target's {color YELLOW}Special Ability{reset}.\nThe user regains its own {color YELLOW}Special Ability{reset}\nwhen it leaves the floor.\0" .align 2,0 .global MoveNameRolePlay @@ -1375,7 +1375,7 @@ MoveNameRolePlay: .global MoveDescriptionSurf MoveDescriptionSurf: -.string "Inflicts damage on the target.\nInflicts double damage on a {COLOR_2 CYAN}diving{END_COLOR_TEXT_2} foe.\0" +.string "Inflicts damage on the target.\nInflicts double damage on a {color CYAN}diving{reset} foe.\0" .align 2,0 .global MoveNameSurf @@ -1390,7 +1390,7 @@ MoveNameSlackOff: .global MoveDescriptionGrowl MoveDescriptionGrowl: -.string "Lowers the {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} of all foes in the room\nby one level.\0" +.string "Lowers the {color YELLOW}Attack{reset} of all foes in the room\nby one level.\0" .align 2,0 .global MoveNameGrowl @@ -1400,7 +1400,7 @@ MoveNameGrowl: .global MoveDescriptionNightShade MoveDescriptionNightShade: -.string "Damages all foes around the user.\nThe amount of damage depends on the\nuser's {COLOR_2 YELLOW}level{END_COLOR_TEXT_2}.\0" +.string "Damages all foes around the user.\nThe amount of damage depends on the\nuser's {color YELLOW}level{reset}.\0" .align 2,0 .global MoveNameNightShade @@ -1410,7 +1410,7 @@ MoveNameNightShade: .global MoveDescriptionAmnesia MoveDescriptionAmnesia: -.string "Boosts the user's {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by\ntwo levels.\0" +.string "Boosts the user's {color YELLOW}Special Defense{reset} by\ntwo levels.\0" .align 2,0 .global MoveNameAmnesia @@ -1430,7 +1430,7 @@ MoveNameThief: .global MoveDescriptionMudSlap MoveDescriptionMudSlap: -.string "Inflicts damage on the target.\nIt also lowers the target's {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2} by\none level.\0" +.string "Inflicts damage on the target.\nIt also lowers the target's {color YELLOW}Accuracy{reset} by\none level.\0" .align 2,0 .global MoveNameMudSlap @@ -1440,7 +1440,7 @@ MoveNameMudSlap: .global MoveDescriptionMudSport MoveDescriptionMudSport: -.string "Changes the floor's status to {COLOR_2 CYAN}Mud Sport{END_COLOR_TEXT_2},\nwhich halves the power of Electric-type\nmoves.\0" +.string "Changes the floor's status to {color CYAN}Mud Sport{reset},\nwhich halves the power of Electric-type\nmoves.\0" .align 2,0 .global MoveNameMudSport @@ -1480,7 +1480,7 @@ MoveNameDragonClaw: .global MoveDescriptionTriAttack MoveDescriptionTriAttack: -.string "Inflicts damage on the target.\nIt may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2},\n{COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}, or leave the target {COLOR_2 CYAN}frozen{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIt may also cause a {color CYAN}burn{reset},\n{color CYAN}paralysis{reset}, or leave the target {color CYAN}frozen{reset}.\0" .align 2,0 .global MoveNameTriAttack @@ -1495,7 +1495,7 @@ MoveNameHiJumpKick: .global MoveDescriptionBounce MoveDescriptionBounce: -.string "The user gains the {COLOR_2 CYAN}Bouncing{END_COLOR_TEXT_2} status,\nmaking it attack strongly on the next turn.\nIt may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {color CYAN}Bouncing{reset} status,\nmaking it attack strongly on the next turn.\nIt may also cause {color CYAN}paralysis{reset}.\nIt is not possible to {color CYAN}link{reset} this move.\0" .align 2,0 .global MoveDescriptionJumpKick @@ -1540,7 +1540,7 @@ MoveNamePoisonpowder: .global MoveDescriptionPoisonFang MoveDescriptionPoisonFang: -.string "Inflicts damage on the target.\nIt may also leave the target\n{COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}, damaging it over\nseveral turns.\0" +.string "Inflicts damage on the target.\nIt may also leave the target\n{color CYAN}badly poisoned{reset}, damaging it over\nseveral turns.\0" .align 2,0 .global MoveNamePoisonFang @@ -1550,7 +1550,7 @@ MoveNamePoisonFang: .global MoveDescriptionToxic MoveDescriptionToxic: -.string "{COLOR_2 CYAN}Badly poisons{END_COLOR_TEXT_2} the target.\nIf a Pokémon is {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}, it\nsustains damage over several turns.\0" +.string "{color CYAN}Badly poisons{reset} the target.\nIf a Pokémon is {color CYAN}badly poisoned{reset}, it\nsustains damage over several turns.\0" .align 2,0 .global MoveNameToxic @@ -1560,7 +1560,7 @@ MoveNameToxic: .global MoveDescriptionPoison MoveDescriptionPoison: -.string "{COLOR_2 CYAN}Poisons{END_COLOR_TEXT_2} the target.\nIf a Pokémon is {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}, it sustains\ndamage over several turns.\0" +.string "{color CYAN}Poisons{reset} the target.\nIf a Pokémon is {color CYAN}poisoned{reset}, it sustains\ndamage over several turns.\0" .align 2,0 .global MoveNameHowl @@ -1570,7 +1570,7 @@ MoveNameHowl: .global MoveDescriptionBlock MoveDescriptionBlock: -.string "Inflicts the {COLOR_2 CYAN}Leg Hold{END_COLOR_TEXT_2} status on the\ntarget, making it incapable of movement.\0" +.string "Inflicts the {color CYAN}Leg Hold{reset} status on the\ntarget, making it incapable of movement.\0" .align 2,0 .global MoveNameBlock @@ -1580,7 +1580,7 @@ MoveNameBlock: .global MoveDescriptionZapCannon MoveDescriptionZapCannon: -.string "Inflicts damage on the target, even at a\ndistance. It also causes {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2},\npreventing any attacks or moves.\0" +.string "Inflicts damage on the target, even at a\ndistance. It also causes {color CYAN}paralysis{reset},\npreventing any attacks or moves.\0" .align 2,0 .global MoveNameZapCannon @@ -1630,7 +1630,7 @@ MoveNameTeleport: .global MoveDescriptionBoostDefenseTwo MoveDescriptionBoostDefenseTwo: -.string "Boosts the user's {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by two levels.\0" +.string "Boosts the user's {color YELLOW}Defense{reset} by two levels.\0" .align 2,0 .global MoveNameIronDefense @@ -1640,7 +1640,7 @@ MoveNameIronDefense: .global MoveDescriptionHelpingHand MoveDescriptionHelpingHand: -.string "Boosts the {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} of\nteam members in the same room by one\nlevel.\0" +.string "Boosts the {color YELLOW}Attack{reset} and {color YELLOW}Special Attack{reset} of\nteam members in the same room by one\nlevel.\0" .align 2,0 .global MoveNameHelpingHand @@ -1650,7 +1650,7 @@ MoveNameHelpingHand: .global MoveDescriptionConversion2 MoveDescriptionConversion2: -.string "The user gains the {COLOR_2 CYAN}Conversion 2{END_COLOR_TEXT_2} status.\nIt changes the user's type to one that is\nstrong against the move type it took last.\0" +.string "The user gains the {color CYAN}Conversion 2{reset} status.\nIt changes the user's type to one that is\nstrong against the move type it took last.\0" .align 2,0 .global MoveNameConversion2 @@ -1675,7 +1675,7 @@ MoveNameVineWhip: .global MoveDescriptionSwordsDance MoveDescriptionSwordsDance: -.string "Boosts the user's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by two levels.\0" +.string "Boosts the user's {color YELLOW}Attack{reset} by two levels.\0" .align 2,0 .global MoveNameSwordsDance @@ -1720,12 +1720,12 @@ MoveNamePeck: .global MoveDescriptionMoonlight MoveDescriptionMoonlight: -.string "Restores the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of the user and team\nmembers on the same floor. The amount of\n{COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} recovered depends on the weather.\0" +.string "Restores the {color YELLOW}HP{reset} of the user and team\nmembers on the same floor. The amount of\n{color YELLOW}HP{reset} recovered depends on the weather.\0" .align 2,0 .global MoveDescriptionTaunt MoveDescriptionTaunt: -.string "Inflicts the {COLOR_2 CYAN}Taunted{END_COLOR_TEXT_2} status\non the targeted Pokémon.\0" +.string "Inflicts the {color CYAN}Taunted{reset} status\non the targeted Pokémon.\0" .align 2,0 .global MoveNameTaunt @@ -1735,7 +1735,7 @@ MoveNameTaunt: .global MoveDescriptionConfuse MoveDescriptionConfuse: -.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on the\ntarget, making its attacks and\nmovements erratic.\0" +.string "Inflicts the {color CYAN}Confused{reset} status on the\ntarget, making its attacks and\nmovements erratic.\0" .align 2,0 .global MoveNameSupersonic @@ -1745,7 +1745,7 @@ MoveNameSupersonic: .global MoveDescriptionSeismicToss MoveDescriptionSeismicToss: -.string "Inflicts damage on the target.\nThe amount of damage depends on the\nuser's {COLOR_2 YELLOW}level{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nThe amount of damage depends on the\nuser's {color YELLOW}level{reset}.\0" .align 2,0 .global MoveNameSeismicToss @@ -1775,7 +1775,7 @@ MoveNameEggBomb: .global MoveDescriptionSoftboiled MoveDescriptionSoftboiled: -.string "Restores the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of the user and team\nmembers in the same room by one quarter\nof their {COLOR_2 YELLOW}maximum HP{END_COLOR_TEXT_2}.\0" +.string "Restores the {color YELLOW}HP{reset} of the user and team\nmembers in the same room by one quarter\nof their {color YELLOW}maximum HP{reset}.\0" .align 2,0 .global MoveNameSoftboiled @@ -1785,7 +1785,7 @@ MoveNameSoftboiled: .global MoveDescriptionTwineedle MoveDescriptionTwineedle: -.string "Hits the target twice, even at a distance.\nIt may also leave the target {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2},\ndamaging it over several turns.\0" +.string "Hits the target twice, even at a distance.\nIt may also leave the target {color CYAN}poisoned{reset},\ndamaging it over several turns.\0" .align 2,0 .global MoveNameTwineedle @@ -1805,7 +1805,7 @@ MoveNameBulletSeed: .global MoveDescriptionTwister MoveDescriptionTwister: -.string "Inflicts damage on the target. It may also\ncause the target to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}, making\nit incapable of action. Doubles damage\non a {COLOR_2 CYAN}flying{END_COLOR_TEXT_2} or {COLOR_2 CYAN}bouncing{END_COLOR_TEXT_2} Pokémon.\0" +.string "Inflicts damage on the target. It may also\ncause the target to {color CYAN}cringe{reset}, making\nit incapable of action. Doubles damage\non a {color CYAN}flying{reset} or {color CYAN}bouncing{reset} Pokémon.\0" .align 2,0 .global MoveNameTwister @@ -1820,7 +1820,7 @@ MoveNameSlam: .global MoveDescriptionStockpile MoveDescriptionStockpile: -.string "Stockpiles power for up to three turns.\nThe stored power boosts the performance\nof the moves {COLOR_2 GREEN}Swallow{END_COLOR_TEXT_2} and {COLOR_2 GREEN}Spit Up{END_COLOR_TEXT_2}.\0" +.string "Stockpiles power for up to three turns.\nThe stored power boosts the performance\nof the moves {color GREEN}Swallow{reset} and {color GREEN}Spit Up{reset}.\0" .align 2,0 .global MoveNameStockpile @@ -1830,7 +1830,7 @@ MoveNameStockpile: .global MoveDescriptionMuddyWater MoveDescriptionMuddyWater: -.string "Inflicts damage on the target.\nIt may also lower the target's {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2}\nby one level.\0" +.string "Inflicts damage on the target.\nIt may also lower the target's {color YELLOW}Accuracy{reset}\nby one level.\0" .align 2,0 .global MoveNameMuddyWater @@ -1850,7 +1850,7 @@ MoveNameFireBlast: .global MoveDescriptionDive MoveDescriptionDive: -.string "The user gains the {COLOR_2 CYAN}Diving{END_COLOR_TEXT_2} status,\nmaking it attack strongly on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\nIt can't be used without water.\0" +.string "The user gains the {color CYAN}Diving{reset} status,\nmaking it attack strongly on the next turn.\nIt is not possible to {color CYAN}link{reset} this move.\nIt can't be used without water.\0" .align 2,0 .global MoveNameDive @@ -1860,7 +1860,7 @@ MoveNameDive: .global MoveDescriptionExplosion MoveDescriptionExplosion: -.string "Makes the user blow up in\na {COLOR_2 CYAN}huge explosion{END_COLOR_TEXT_2}, inflicting damage on all\nsurrounding Pokémon. It also destroys\nsurrounding items and walls.\0" +.string "Makes the user blow up in\na {color CYAN}huge explosion{reset}, inflicting damage on all\nsurrounding Pokémon. It also destroys\nsurrounding items and walls.\0" .align 2,0 .global MoveNameExplosion @@ -1875,7 +1875,7 @@ MoveNameTackle: .global MoveDescriptionFly MoveDescriptionFly: -.string "The user gains the {COLOR_2 CYAN}Flying{END_COLOR_TEXT_2} status, \nmaking it attack strongly on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {color CYAN}Flying{reset} status, \nmaking it attack strongly on the next turn.\nIt is not possible to {color CYAN}link{reset} this move.\0" .align 2,0 .global MoveNameFly @@ -1895,7 +1895,7 @@ MoveNameSonicboom: .global MoveDescriptionSolarbeam MoveDescriptionSolarbeam: -.string "The user gains the {COLOR_2 CYAN}Solarbeam{END_COLOR_TEXT_2} status,\nmaking it attack strongly on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {color CYAN}Solarbeam{reset} status,\nmaking it attack strongly on the next turn.\nIt is not possible to {color CYAN}link{reset} this move.\0" .align 2,0 .global MoveNameSolarbeam @@ -1915,7 +1915,7 @@ MoveNameSheerCold: .global MoveDescriptionSacredFire MoveDescriptionSacredFire: -.string "Inflicts damage on the target.\nIt may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIt may also cause a {color CYAN}burn{reset}.\0" .align 2,0 .global MoveNameSacredFire @@ -1925,7 +1925,7 @@ MoveNameSacredFire: .global MoveDescriptionGrowth MoveDescriptionGrowth: -.string "Boosts the user's {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} by one\nlevel.\0" +.string "Boosts the user's {color YELLOW}Special Attack{reset} by one\nlevel.\0" .align 2,0 .global MoveNameGrowth @@ -1935,7 +1935,7 @@ MoveNameGrowth: .global MoveDescriptionPoisonChance MoveDescriptionPoisonChance: -.string "Inflicts damage on the target.\nIt may also leave the target {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2},\ndamaging it over several turns.\0" +.string "Inflicts damage on the target.\nIt may also leave the target {color CYAN}poisoned{reset},\ndamaging it over several turns.\0" .align 2,0 .global MoveNameSmog @@ -1965,7 +1965,7 @@ MoveNameSandTomb: .global MoveDescriptionLowerAccuracy MoveDescriptionLowerAccuracy: -.string "Lowers the target's {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2} by one level.\0" +.string "Lowers the target's {color YELLOW}Accuracy{reset} by one level.\0" .align 2,0 .global MoveNameSandAttack @@ -1975,7 +1975,7 @@ MoveNameSandAttack: .global MoveDescriptionSandstorm MoveDescriptionSandstorm: -.string "Changes the dungeon floor's weather to\n{COLOR_2 CYAN}Sandstorm{END_COLOR_TEXT_2} for several turns.\0" +.string "Changes the dungeon floor's weather to\n{color CYAN}Sandstorm{reset} for several turns.\0" .align 2,0 .global MoveNameSandstorm @@ -1995,7 +1995,7 @@ MoveNameHeadbutt: .global MoveDescriptionSketch MoveDescriptionSketch: -.string "Copies the move last used by the target\nand makes it the user's.\n{COLOR_2 GREEN}Sketch{END_COLOR_TEXT_2} disappears after it copies a move.\0" +.string "Copies the move last used by the target\nand makes it the user's.\n{color GREEN}Sketch{reset} disappears after it copies a move.\0" .align 2,0 .global MoveNameSketch @@ -2005,7 +2005,7 @@ MoveNameSketch: .global MoveDescriptionSkillSwap MoveDescriptionSkillSwap: -.string "Switches the user's {COLOR_2 YELLOW}Special Ability{END_COLOR_TEXT_2} with\nthat of the target.\0" +.string "Switches the user's {color YELLOW}Special Ability{reset} with\nthat of the target.\0" .align 2,0 .global MoveNameSkillSwap @@ -2015,7 +2015,7 @@ MoveNameSkillSwap: .global MoveDescriptionSkyUppercut MoveDescriptionSkyUppercut: -.string "Inflicts damage on the target.\nIt hits even a Pokémon that is either\n{COLOR_2 CYAN}flying{END_COLOR_TEXT_2} or {COLOR_2 CYAN}bouncing{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIt hits even a Pokémon that is either\n{color CYAN}flying{reset} or {color CYAN}bouncing{reset}.\0" .align 2,0 .global MoveNameSkyUppercut @@ -2030,7 +2030,7 @@ MoveNameAbsorb: .global MoveDescriptionSafeguard MoveDescriptionSafeguard: -.string "The user and team members in the same\nroom gain the {COLOR_2 CYAN}Safeguard{END_COLOR_TEXT_2} status,\nwhich prevents status problems.\0" +.string "The user and team members in the same\nroom gain the {color CYAN}Safeguard{reset} status,\nwhich prevents status problems.\0" .align 2,0 .global MoveNameSafeguard @@ -2040,7 +2040,7 @@ MoveNameSafeguard: .global MoveDescriptionExtrasensory MoveDescriptionExtrasensory: -.string "Inflicts damage on the target.\nIt may also cause the target to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2},\nmaking it incapable of attacking\nor using moves.\0" +.string "Inflicts damage on the target.\nIt may also cause the target to {color CYAN}cringe{reset},\nmaking it incapable of attacking\nor using moves.\0" .align 2,0 .global MoveNameExtrasensory @@ -2070,7 +2070,7 @@ MoveNameFissure: .global MoveDescriptionMist MoveDescriptionMist: -.string "The user gains the {COLOR_2 CYAN}Mist{END_COLOR_TEXT_2} status.\nIt prevents {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Special\nAttack{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2}, and\n{COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2} from being reduced.\0" +.string "The user gains the {color CYAN}Mist{reset} status.\nIt prevents {color YELLOW}Attack{reset}, {color YELLOW}Defense{reset}, {color YELLOW}Special\nAttack{reset}, {color YELLOW}Special Defense{reset}, {color YELLOW}Accuracy{reset}, and\n{color YELLOW}Evasion{reset} from being reduced.\0" .align 2,0 .global MoveNameMist @@ -2080,7 +2080,7 @@ MoveNameMist: .global MoveDescriptionThunderbolt MoveDescriptionThunderbolt: -.string "Damages all foes around the user.\nIt may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2} and prevent\nany attacks or moves.\0" +.string "Damages all foes around the user.\nIt may also cause {color CYAN}paralysis{reset} and prevent\nany attacks or moves.\0" .align 2,0 .global MoveNameThunderbolt @@ -2090,7 +2090,7 @@ MoveNameThunderbolt: .global MoveDescriptionCharge MoveDescriptionCharge: -.string "The user gains the {COLOR_2 CYAN}Charging{END_COLOR_TEXT_2} status.\nIt boosts the power of the Electric-type\nmove to be used next.\0" +.string "The user gains the {color CYAN}Charging{reset} status.\nIt boosts the power of the Electric-type\nmove to be used next.\0" .align 2,0 .global MoveNameCharge @@ -2100,7 +2100,7 @@ MoveNameCharge: .global MoveDescriptionShadowBall MoveDescriptionShadowBall: -.string "Inflicts damage on the target, even at a\ndistance. It may also lower the target's\n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target, even at a\ndistance. It may also lower the target's\n{color YELLOW}Special Defense{reset} by one level.\0" .align 2,0 .global MoveNameShadowBall @@ -2125,7 +2125,7 @@ MoveNameBind: .global MoveDescriptionStunSpore MoveDescriptionStunSpore: -.string "Causes {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2} in surrounding foes.\nA Pokémon affected by {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2} is\nincapable of attacking or using moves.\0" +.string "Causes {color CYAN}paralysis{reset} in surrounding foes.\nA Pokémon affected by {color CYAN}paralysis{reset} is\nincapable of attacking or using moves.\0" .align 2,0 .global MoveNameStunSpore @@ -2135,7 +2135,7 @@ MoveNameStunSpore: .global MoveDescriptionSelfdestruct MoveDescriptionSelfdestruct: -.string "Makes the user {COLOR_2 CYAN}explode{END_COLOR_TEXT_2}, inflicting\ndamage on all surrounding Pokémon.\nIt also destroys surrounding items.\0" +.string "Makes the user {color CYAN}explode{reset}, inflicting\ndamage on all surrounding Pokémon.\nIt also destroys surrounding items.\0" .align 2,0 .global MoveNameSelfdestruct @@ -2145,7 +2145,7 @@ MoveNameSelfdestruct: .global MoveDescriptionLowerDefense MoveDescriptionLowerDefense: -.string "Lowers the target's {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by one level.\0" +.string "Lowers the target's {color YELLOW}Defense{reset} by one level.\0" .align 2,0 .global MoveNameTailWhip @@ -2155,7 +2155,7 @@ MoveNameTailWhip: .global MoveDescriptionFlail MoveDescriptionFlail: -.string "Inflicts damage on the target.\nThe lower the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}, the greater\nthe damage.\0" +.string "Inflicts damage on the target.\nThe lower the user's {color YELLOW}HP{reset}, the greater\nthe damage.\0" .align 2,0 .global MoveNameFlail @@ -2180,7 +2180,7 @@ MoveNameNaturePower: .global MoveDescriptionEarthquake MoveDescriptionEarthquake: -.string "Damages all Pokémon in the same room.\nIt inflicts double damage on any {COLOR_2 CYAN}digging{END_COLOR_TEXT_2}\nPokémon.\0" +.string "Damages all Pokémon in the same room.\nIt inflicts double damage on any {color CYAN}digging{reset}\nPokémon.\0" .align 2,0 .global MoveNameEarthquake @@ -2190,7 +2190,7 @@ MoveNameEarthquake: .global MoveDescriptionRecover MoveDescriptionRecover: -.string "Restores the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} by half its\n{COLOR_2 YELLOW}maximum HP{END_COLOR_TEXT_2}.\0" +.string "Restores the user's {color YELLOW}HP{reset} by half its\n{color YELLOW}maximum HP{reset}.\0" .align 2,0 .global MoveNameRecover @@ -2210,7 +2210,7 @@ MoveNameSubmission: .global MoveDescriptionPsychUp MoveDescriptionPsychUp: -.string "Copies the target's levels for stats such\nas {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.\0" +.string "Copies the target's levels for stats such\nas {color YELLOW}Attack{reset} and {color YELLOW}Defense{reset}.\0" .align 2,0 .global MoveNamePsychUp @@ -2225,7 +2225,7 @@ MoveNameSignalBeam: .global MoveDescriptionWaterSpout MoveDescriptionWaterSpout: -.string "Inflicts damage on the target.\nThe higher the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}, the greater\nthe damage.\0" +.string "Inflicts damage on the target.\nThe higher the user's {color YELLOW}HP{reset}, the greater\nthe damage.\0" .align 2,0 .global MoveNameWaterSpout @@ -2235,7 +2235,7 @@ MoveNameWaterSpout: .global MoveDescriptionUproar MoveDescriptionUproar: -.string "The user and team members in the room\ngain the {COLOR_2 CYAN}Sleepless{END_COLOR_TEXT_2} status,\nso they cannot fall asleep.\nIt also awakens sleeping team members.\0" +.string "The user and team members in the room\ngain the {color CYAN}Sleepless{reset} status,\nso they cannot fall asleep.\nIt also awakens sleeping team members.\0" .align 2,0 .global MoveNameUproar @@ -2245,7 +2245,7 @@ MoveNameUproar: .global MoveDescriptionPsychoBoost MoveDescriptionPsychoBoost: -.string "Inflicts damage on the target.\nHowever, it also lowers the user's {COLOR_2 YELLOW}Special\nAttack{END_COLOR_TEXT_2} by two levels.\0" +.string "Inflicts damage on the target.\nHowever, it also lowers the user's {color YELLOW}Special\nAttack{reset} by two levels.\0" .align 2,0 .global MoveNamePsychoBoost @@ -2260,7 +2260,7 @@ MoveNamePsychic: .global MoveDescriptionPsywave MoveDescriptionPsywave: -.string "Inflicts damage on the target, even at a\ndistance. The amount of damage depends\non the user's {COLOR_2 YELLOW}level{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target, even at a\ndistance. The amount of damage depends\non the user's {color YELLOW}level{reset}.\0" .align 2,0 .global MoveNamePsywave @@ -2270,7 +2270,7 @@ MoveNamePsywave: .global MoveDescriptionConfuseChanceDistance MoveDescriptionConfuseChanceDistance: -.string "Inflicts damage on the target, even at a\ndistance. It may also leave the target\n{COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target, even at a\ndistance. It may also leave the target\n{color CYAN}confused{reset}.\0" .align 2,0 .global MoveNamePsybeam @@ -2280,7 +2280,7 @@ MoveNamePsybeam: .global MoveDescriptionLowerSpeed MoveDescriptionLowerSpeed: -.string "Lowers the target's {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by\none level.\0" +.string "Lowers the target's {color YELLOW}Movement Speed{reset} by\none level.\0" .align 2,0 .global MoveNameScaryFace @@ -2295,7 +2295,7 @@ MoveNameRollout: .global MoveDescriptionEndure MoveDescriptionEndure: -.string "The user gains the {COLOR_2 CYAN}Enduring{END_COLOR_TEXT_2} status.\nThe user will survive any attack with just\none {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\0" +.string "The user gains the {color CYAN}Enduring{reset} status.\nThe user will survive any attack with just\none {color YELLOW}HP{reset}.\0" .align 2,0 .global MoveNameEndure @@ -2305,7 +2305,7 @@ MoveNameEndure: .global MoveDescriptionMeteorMash MoveDescriptionMeteorMash: -.string "Inflicts damage on the target, even at a\ndistance. It may also boost the user's\n{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target, even at a\ndistance. It may also boost the user's\n{color YELLOW}Attack{reset} by one level.\0" .align 2,0 .global MoveNameMeteorMash @@ -2315,7 +2315,7 @@ MoveNameMeteorMash: .global MoveDescriptionFollowMe MoveDescriptionFollowMe: -.string "The user gains the {COLOR_2 CYAN}Decoy{END_COLOR_TEXT_2} status,\nmaking it the primary target of foes.\0" +.string "The user gains the {color CYAN}Decoy{reset} status,\nmaking it the primary target of foes.\0" .align 2,0 .global MoveNameFollowMe @@ -2325,7 +2325,7 @@ MoveNameFollowMe: .global MoveDescriptionFreezeChanceRoom MoveDescriptionFreezeChanceRoom: -.string "Inflicts damage on the target.\nIt may also leave the target {COLOR_2 CYAN}frozen{END_COLOR_TEXT_2} and\nincapable of action.\0" +.string "Inflicts damage on the target.\nIt may also leave the target {color CYAN}frozen{reset} and\nincapable of action.\0" .align 2,0 .global MoveNamePowderSnow @@ -2335,7 +2335,7 @@ MoveNamePowderSnow: .global MoveDescriptionSkyAttack MoveDescriptionSkyAttack: -.string "The user gains the {COLOR_2 CYAN}Sky Attack{END_COLOR_TEXT_2} status,\nand it attacks strongly on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {color CYAN}Sky Attack{reset} status,\nand it attacks strongly on the next turn.\nIt is not possible to {color CYAN}link{reset} this move.\0" .align 2,0 .global MoveNameSkyAttack @@ -2345,7 +2345,7 @@ MoveNameSkyAttack: .global MoveDescriptionCosmicPower MoveDescriptionCosmicPower: -.string "Boosts the user's {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special\nDefense{END_COLOR_TEXT_2} by one level.\0" +.string "Boosts the user's {color YELLOW}Defense{reset} and {color YELLOW}Special\nDefense{reset} by one level.\0" .align 2,0 .global MoveNameCosmicPower @@ -2355,7 +2355,7 @@ MoveNameCosmicPower: .global MoveDescriptionMindReader MoveDescriptionMindReader: -.string "Gives the user {COLOR_2 CYAN}Sure Shot{END_COLOR_TEXT_2} status, making\nall its moves and attacks completely\naccurate.\0" +.string "Gives the user {color CYAN}Sure Shot{reset} status, making\nall its moves and attacks completely\naccurate.\0" .align 2,0 .global MoveNameMindReader @@ -2365,7 +2365,7 @@ MoveNameMindReader: .global MoveDescriptionIcyWind MoveDescriptionIcyWind: -.string "Inflicts damage on the target, even at a\ndistance. It also lowers the target's\n{COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target, even at a\ndistance. It also lowers the target's\n{color YELLOW}Movement Speed{reset} by one level.\0" .align 2,0 .global MoveNameIcyWind @@ -2375,7 +2375,7 @@ MoveNameIcyWind: .global MoveDescriptionRapidSpin MoveDescriptionRapidSpin: -.string "Inflicts damage on the target.\nIt also frees the user from {COLOR_2 CYAN}Leech Seed{END_COLOR_TEXT_2},\n{COLOR_2 CYAN}Leg Hold{END_COLOR_TEXT_2}, {COLOR_2 CYAN}Ingrain{END_COLOR_TEXT_2}, or {COLOR_2 CYAN}Constriction{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIt also frees the user from {color CYAN}Leech Seed{reset},\n{color CYAN}Leg Hold{reset}, {color CYAN}Ingrain{reset}, or {color CYAN}Constriction{reset}.\0" .align 2,0 .global MoveNameRapidSpin @@ -2385,7 +2385,7 @@ MoveNameRapidSpin: .global MoveDescriptionAgility MoveDescriptionAgility: -.string "Boosts by one level the {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2}\nof the user and team members in the\nsame room.\0" +.string "Boosts by one level the {color YELLOW}Movement Speed{reset}\nof the user and team members in the\nsame room.\0" .align 2,0 .global MoveNameAgility @@ -2395,7 +2395,7 @@ MoveNameAgility: .global MoveDescriptionSynthesis MoveDescriptionSynthesis: -.string "Restores the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\nThe amount of {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} regained depends on\nthe weather.\0" +.string "Restores the user's {color YELLOW}HP{reset}.\nThe amount of {color YELLOW}HP{reset} regained depends on\nthe weather.\0" .align 2,0 .global MoveNameSynthesis @@ -2405,7 +2405,7 @@ MoveNameSynthesis: .global MoveDescriptionAncientpower MoveDescriptionAncientpower: -.string "Inflicts damage on the target.\nIt may also simultaneously raise by one\nlevel {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2},\n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}, and {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIt may also simultaneously raise by one\nlevel {color YELLOW}Attack{reset}, {color YELLOW}Special Attack{reset}, {color YELLOW}Defense{reset},\n{color YELLOW}Special Defense{reset}, and {color YELLOW}Movement Speed{reset}.\0" .align 2,0 .global MoveNameAncientpower @@ -2425,7 +2425,7 @@ MoveNameLowKick: .global MoveDescriptionOutrage MoveDescriptionOutrage: -.string "Hits the target two to five times in\nsuccession. However, it also makes the\nuser {COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" +.string "Hits the target two to five times in\nsuccession. However, it also makes the\nuser {color CYAN}confused{reset}.\0" .align 2,0 .global MoveNameOutrage @@ -2445,7 +2445,7 @@ MoveNameMeanLook: .global MoveDescriptionHaze MoveDescriptionHaze: -.string "Resets the {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}, etc., of all\nPokémon on the floor whether they were\nboosted or lowered.\0" +.string "Resets the {color YELLOW}Attack{reset}, {color YELLOW}Defense{reset}, etc., of all\nPokémon on the floor whether they were\nboosted or lowered.\0" .align 2,0 .global MoveNameHaze @@ -2460,7 +2460,7 @@ MoveNameCrabhammer: .global MoveDescriptionLegHolder MoveDescriptionLegHolder: -.string "Inflicts the {COLOR_2 CYAN}Leg Hold{END_COLOR_TEXT_2} status on the target,\nmaking it incapable of movement.\0" +.string "Inflicts the {color CYAN}Leg Hold{reset} status on the target,\nmaking it incapable of movement.\0" .align 2,0 .global MoveNameSpiderWeb @@ -2470,7 +2470,7 @@ MoveNameSpiderWeb: .global MoveDescriptionTickle MoveDescriptionTickle: -.string "Reduces the target's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}\nby one level.\0" +.string "Reduces the target's {color YELLOW}Attack{reset} and {color YELLOW}Defense{reset}\nby one level.\0" .align 2,0 .global MoveNameTickle @@ -2480,7 +2480,7 @@ MoveNameTickle: .global MoveDescriptionSleep MoveDescriptionSleep: -.string "Makes the target go to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}, causing it\nto be incapable of action.\0" +.string "Makes the target go to {color CYAN}sleep{reset}, causing it\nto be incapable of action.\0" .align 2,0 .global MoveNameGrasswhistle @@ -2490,7 +2490,7 @@ MoveNameGrasswhistle: .global MoveDescriptionMetalSound MoveDescriptionMetalSound: -.string "Reduces the target's {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by\nthree levels.\0" +.string "Reduces the target's {color YELLOW}Special Defense{reset} by\nthree levels.\0" .align 2,0 .global MoveNameMetalSound @@ -2500,7 +2500,7 @@ MoveNameMetalSound: .global MoveDescriptionSilverWind MoveDescriptionSilverWind: -.string "Inflicts damage on foes in the same room.\nIt may also simultaneously raise by one\nlevel {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}, {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2},\n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}, and {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on foes in the same room.\nIt may also simultaneously raise by one\nlevel {color YELLOW}Attack{reset}, {color YELLOW}Special Attack{reset}, {color YELLOW}Defense{reset},\n{color YELLOW}Special Defense{reset}, and {color YELLOW}Movement Speed{reset}.\0" .align 2,0 .global MoveNameSilverWind @@ -2520,7 +2520,7 @@ MoveNameLeechLife: .global MoveDescriptionSpore MoveDescriptionSpore: -.string "Makes all the foes in the room go to\n{COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}.\0" +.string "Makes all the foes in the room go to\n{color CYAN}sleep{reset}.\0" .align 2,0 .global MoveNameSpore @@ -2530,7 +2530,7 @@ MoveNameSpore: .global MoveDescriptionSmellingsalt MoveDescriptionSmellingsalt: -.string "Inflicts damage on the target.\nIt inflicts greater damage if the target\nhas {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}, but it also heals {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIt inflicts greater damage if the target\nhas {color CYAN}paralysis{reset}, but it also heals {color CYAN}paralysis{reset}.\0" .align 2,0 .global MoveNameSmellingsalt @@ -2540,7 +2540,7 @@ MoveNameSmellingsalt: .global MoveDescriptionReversal MoveDescriptionReversal: -.string "Inflicts damage on the target.\nThe lower the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}, the greater the\ndamage it inflicts.\0" +.string "Inflicts damage on the target.\nThe lower the user's {color YELLOW}HP{reset}, the greater the\ndamage it inflicts.\0" .align 2,0 .global MoveNameReversal @@ -2550,7 +2550,7 @@ MoveNameReversal: .global MoveDescriptionDrain MoveDescriptionDrain: -.string "Inflicts damage on the target.\nIt also restores the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} based\non the damage it inflicted.\0" +.string "Inflicts damage on the target.\nIt also restores the user's {color YELLOW}HP{reset} based\non the damage it inflicted.\0" .align 2,0 .global MoveNameGigaDrain @@ -2560,7 +2560,7 @@ MoveNameGigaDrain: .global MoveDescriptionFocusPunch MoveDescriptionFocusPunch: -.string "The user gains the {COLOR_2 CYAN}Focus Punch{END_COLOR_TEXT_2} status,\nand it attacks on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {color CYAN}Focus Punch{reset} status,\nand it attacks on the next turn.\nIt is not possible to {color CYAN}link{reset} this move.\0" .align 2,0 .global MoveNameFocusPunch @@ -2570,7 +2570,7 @@ MoveNameFocusPunch: .global MoveDescriptionFocusEnergy MoveDescriptionFocusEnergy: -.string "The user gains the {COLOR_2 CYAN}Focus Energy{END_COLOR_TEXT_2} status,\nraising its critical-hit rate.\0" +.string "The user gains the {color CYAN}Focus Energy{reset} status,\nraising its critical-hit rate.\0" .align 2,0 .global MoveNameFocusEnergy @@ -2580,7 +2580,7 @@ MoveNameFocusEnergy: .global MoveDescriptionDamageLowerSpeed MoveDescriptionDamageLowerSpeed: -.string "Inflicts damage on the target.\nIt also lowers the target's {COLOR_2 YELLOW}Movement\nSpeed{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target.\nIt also lowers the target's {color YELLOW}Movement\nSpeed{reset} by one level.\0" .align 2,0 .global MoveNameRockTomb @@ -2590,7 +2590,7 @@ MoveNameRockTomb: .global MoveDescriptionBrickBreak MoveDescriptionBrickBreak: -.string "Shatters the target's {COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2}\nor {COLOR_2 CYAN}Light Screen{END_COLOR_TEXT_2} to inflict damage.\0" +.string "Shatters the target's {color CYAN}Reflect{reset}\nor {color CYAN}Light Screen{reset} to inflict damage.\0" .align 2,0 .global MoveNameBrickBreak @@ -2600,7 +2600,7 @@ MoveNameBrickBreak: .global MoveDescriptionConstrict MoveDescriptionConstrict: -.string "Inflicts damage on the target.\nIt may also lower the target's {COLOR_2 YELLOW}Movement\nSpeed{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target.\nIt may also lower the target's {color YELLOW}Movement\nSpeed{reset} by one level.\0" .align 2,0 .global MoveNameConstrict @@ -2615,7 +2615,7 @@ MoveNameWithdraw: .global MoveDescriptionConstriction MoveDescriptionConstriction: -.string "Inflicts damage on the target.\nIt may also cause {COLOR_2 CYAN}constriction{END_COLOR_TEXT_2}, making the\nfoe incapable of movement.\0" +.string "Inflicts damage on the target.\nIt may also cause {color CYAN}constriction{reset}, making the\nfoe incapable of movement.\0" .align 2,0 .global MoveNameClamp @@ -2630,7 +2630,7 @@ MoveNameKarateChop: .global MoveDescriptionFacade MoveDescriptionFacade: -.string "Inflicts damage on the target.\nIf the user is {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}, {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2},\nor has a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}, its power is doubled.\0" +.string "Inflicts damage on the target.\nIf the user is {color CYAN}poisoned{reset}, {color CYAN}badly poisoned{reset},\nor has a {color CYAN}burn{reset}, its power is doubled.\0" .align 2,0 .global MoveNameFacade @@ -2640,7 +2640,7 @@ MoveNameFacade: .global MoveDescriptionEndeavor MoveDescriptionEndeavor: -.string "The difference between the foe's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} and\nthe user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} is applied as this move's\ndamage.\0" +.string "The difference between the foe's {color YELLOW}HP{reset} and\nthe user's {color YELLOW}HP{reset} is applied as this move's\ndamage.\0" .align 2,0 .global MoveNameEndeavor @@ -2650,7 +2650,7 @@ MoveNameEndeavor: .global MoveDescriptionParalyzeChance MoveDescriptionParalyzeChance: -.string "Inflicts damage on the target.\nIt may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2} and prevent\nany attacks or moves.\0" +.string "Inflicts damage on the target.\nIt may also cause {color CYAN}paralysis{reset} and prevent\nany attacks or moves.\0" .align 2,0 .global MoveNameThunderpunch @@ -2660,12 +2660,12 @@ MoveNameThunderpunch: .global MoveDescriptionThunder MoveDescriptionThunder: -.string "Inflicts damage on the target. It may also\ncause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}. Its accuracy is affected\nby the weather. It even hits a Pokémon\nthat is {COLOR_2 CYAN}flying{END_COLOR_TEXT_2} or {COLOR_2 CYAN}bouncing{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target. It may also\ncause {color CYAN}paralysis{reset}. Its accuracy is affected\nby the weather. It even hits a Pokémon\nthat is {color CYAN}flying{reset} or {color CYAN}bouncing{reset}.\0" .align 2,0 .global MoveDescriptionLowerSpecialDefenseChance MoveDescriptionLowerSpecialDefenseChance: -.string "Inflicts damage on the target.\nIt may also lower the target's {COLOR_2 YELLOW}Special\nDefense{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target.\nIt may also lower the target's {color YELLOW}Special\nDefense{reset} by one level.\0" .align 2,0 .global MoveNameCrunch @@ -2675,7 +2675,7 @@ MoveNameCrunch: .global MoveDescriptionBide MoveDescriptionBide: -.string "The user gains the {COLOR_2 CYAN}Bide{END_COLOR_TEXT_2} status.\nWhen {COLOR_2 CYAN}Bide{END_COLOR_TEXT_2} is released, the user looses an\nattack double the damage it took\nwhile waiting.\0" +.string "The user gains the {color CYAN}Bide{reset} status.\nWhen {color CYAN}Bide{reset} is released, the user looses an\nattack double the damage it took\nwhile waiting.\0" .align 2,0 .global MoveNameBide @@ -2685,7 +2685,7 @@ MoveNameBide: .global MoveDescriptionRazorWind MoveDescriptionRazorWind: -.string "The user gains the {COLOR_2 CYAN}Razor Wind{END_COLOR_TEXT_2} status,\nand it looses a powerful attack with a\nhigh critical-hit rate on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {color CYAN}Razor Wind{reset} status,\nand it looses a powerful attack with a\nhigh critical-hit rate on the next turn.\nIt is not possible to {color CYAN}link{reset} this move.\0" .align 2,0 .global MoveNameRazorWind @@ -2695,7 +2695,7 @@ MoveNameRazorWind: .global MoveDescriptionParalyze MoveDescriptionParalyze: -.string "Causes {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2} in the target.\nA Pokémon affected by {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2} is\nincapable of attacking or using moves.\0" +.string "Causes {color CYAN}paralysis{reset} in the target.\nA Pokémon affected by {color CYAN}paralysis{reset} is\nincapable of attacking or using moves.\0" .align 2,0 .global MoveNameDisable @@ -2705,7 +2705,7 @@ MoveNameDisable: .global MoveDescriptionBoostDefense MoveDescriptionBoostDefense: -.string "Boosts the user's {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by one level.\0" +.string "Boosts the user's {color YELLOW}Defense{reset} by one level.\0" .align 2,0 .global MoveNameHarden @@ -2715,7 +2715,7 @@ MoveNameHarden: .global MoveDescriptionGust MoveDescriptionGust: -.string "Inflicts damage on the target.\nDoubles damage on a {COLOR_2 CYAN}flying{END_COLOR_TEXT_2} or {COLOR_2 CYAN}bouncing{END_COLOR_TEXT_2}\nPokémon.\0" +.string "Inflicts damage on the target.\nDoubles damage on a {color CYAN}flying{reset} or {color CYAN}bouncing{reset}\nPokémon.\0" .align 2,0 .global MoveNameGust @@ -2725,7 +2725,7 @@ MoveNameGust: .global MoveDescriptionBoostEvasion MoveDescriptionBoostEvasion: -.string "Boosts the user's {COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2} by one level.\0" +.string "Boosts the user's {color YELLOW}Evasion{reset} by one level.\0" .align 2,0 .global MoveNameDoubleTeam @@ -2735,7 +2735,7 @@ MoveNameDoubleTeam: .global MoveDescriptionBoostAttack MoveDescriptionBoostAttack: -.string "Boosts the user's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by one level.\0" +.string "Boosts the user's {color YELLOW}Attack{reset} by one level.\0" .align 2,0 .global MoveNameSharpen @@ -2745,7 +2745,7 @@ MoveNameSharpen: .global MoveDescriptionOdorSleuth MoveDescriptionOdorSleuth: -.string "Resets the boosted {COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2} of foes in\nthe same room.\nGhost-type foes are {COLOR_2 CYAN}exposed{END_COLOR_TEXT_2}.\0" +.string "Resets the boosted {color YELLOW}Evasion{reset} of foes in\nthe same room.\nGhost-type foes are {color CYAN}exposed{reset}.\0" .align 2,0 .global MoveNameOdorSleuth @@ -2755,7 +2755,7 @@ MoveNameOdorSleuth: .global MoveDescriptionFlamethrower MoveDescriptionFlamethrower: -.string "Inflicts damage on the target, even at a\ndistance. It may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.\nIt thaws and frees frozen Pokémon.\0" +.string "Inflicts damage on the target, even at a\ndistance. It may also cause a {color CYAN}burn{reset}.\nIt thaws and frees frozen Pokémon.\0" .align 2,0 .global MoveNameFlamethrower @@ -2765,7 +2765,7 @@ MoveNameFlamethrower: .global MoveDescriptionBurnChance MoveDescriptionBurnChance: -.string "Inflicts damage on the target.\nIt may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.\nIt thaws and frees frozen Pokémon.\0" +.string "Inflicts damage on the target.\nIt may also cause a {color CYAN}burn{reset}.\nIt thaws and frees frozen Pokémon.\0" .align 2,0 .global MoveNameFlameWheel @@ -2790,7 +2790,7 @@ MoveNameStrength: .global MoveDescriptionGrudge MoveDescriptionGrudge: -.string "The user gains the {COLOR_2 CYAN}Grudge{END_COLOR_TEXT_2} status.\nIf the user is defeated, it zeroes the {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2}\nof the move last used by the foe.\0" +.string "The user gains the {color CYAN}Grudge{reset} status.\nIf the user is defeated, it zeroes the {color YELLOW}PP{reset}\nof the move last used by the foe.\0" .align 2,0 .global MoveNameGrudge @@ -2800,7 +2800,7 @@ MoveNameGrudge: .global MoveDescriptionReturn MoveDescriptionReturn: -.string "Inflicts damage on the target.\nIts power rises with the user's\n{COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIts power rises with the user's\n{color YELLOW}IQ{reset}.\0" .align 2,0 .global MoveNameReturn @@ -2810,7 +2810,7 @@ MoveNameReturn: .global MoveDescriptionWillOWisp MoveDescriptionWillOWisp: -.string "Inflicts a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2} on the target.\nA {COLOR_2 CYAN}burn{END_COLOR_TEXT_2} inflicts damage every few turns.\0" +.string "Inflicts a {color CYAN}burn{reset} on the target.\nA {color CYAN}burn{reset} inflicts damage every few turns.\0" .align 2,0 .global MoveNameWillOWisp @@ -2820,7 +2820,7 @@ MoveNameWillOWisp: .global MoveDescriptionCringe MoveDescriptionCringe: -.string "Inflicts damage on the target.\nIt may also cause the target to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2},\nmaking it incapable of action.\0" +.string "Inflicts damage on the target.\nIt may also cause the target to {color CYAN}cringe{reset},\nmaking it incapable of action.\0" .align 2,0 .global MoveNameAstonish @@ -2830,7 +2830,7 @@ MoveNameAstonish: .global MoveDescriptionFlatter MoveDescriptionFlatter: -.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on the\ntarget, but also raises its {COLOR_2 YELLOW}Special\nAttack{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts the {color CYAN}Confused{reset} status on the\ntarget, but also raises its {color YELLOW}Special\nAttack{reset} by one level.\0" .align 2,0 .global MoveNameFlatter @@ -2840,7 +2840,7 @@ MoveNameFlatter: .global MoveDescriptionOctazooka MoveDescriptionOctazooka: -.string "Inflicts damage on the target, even at a\ndistance. It may also lower the target's\n{COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target, even at a\ndistance. It may also lower the target's\n{color YELLOW}Accuracy{reset} by one level.\0" .align 2,0 .global MoveNameOctazooka @@ -2850,7 +2850,7 @@ MoveNameOctazooka: .global MoveDescriptionMemento MoveDescriptionMemento: -.string "Sharply reduces the {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special\nAttack{END_COLOR_TEXT_2} of all foes in the room. It also\ncuts the user's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} to one and warps the\nuser to a different place on the floor.\n\0" +.string "Sharply reduces the {color YELLOW}Attack{reset} and {color YELLOW}Special\nAttack{reset} of all foes in the room. It also\ncuts the user's {color YELLOW}HP{reset} to one and warps the\nuser to a different place on the floor.\n\0" .align 2,0 .global MoveNameMemento @@ -2860,7 +2860,7 @@ MoveNameMemento: .global MoveDescriptionAuroraBeam MoveDescriptionAuroraBeam: -.string "Inflicts damage on the target, even at a\ndistance. It may also halve the \ntarget's {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target, even at a\ndistance. It may also halve the \ntarget's {color YELLOW}Attack{reset}.\0" .align 2,0 .global MoveNameAuroraBeam @@ -2870,7 +2870,7 @@ MoveNameAuroraBeam: .global MoveDescriptionOverheat MoveDescriptionOverheat: -.string "Damages all foes around the user, but\nalso lowers the user's {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}\nby two levels and thaws frozen Pokémon.\0" +.string "Damages all foes around the user, but\nalso lowers the user's {color YELLOW}Special Defense{reset}\nby two levels and thaws frozen Pokémon.\0" .align 2,0 .global MoveNameOverheat @@ -2880,7 +2880,7 @@ MoveNameOverheat: .global MoveDescriptionMirrorMove MoveDescriptionMirrorMove: -.string "The user gains the {COLOR_2 CYAN}Mirror Move{END_COLOR_TEXT_2} status.\nAny move used against the user is\ncountered with the same move.\0" +.string "The user gains the {color CYAN}Mirror Move{reset} status.\nAny move used against the user is\ncountered with the same move.\0" .align 2,0 .global MoveNameMirrorMove @@ -2900,7 +2900,7 @@ MoveNameDoubleslap: .global MoveDescriptionCounter MoveDescriptionCounter: -.string "The user gains the {COLOR_2 CYAN}Counter{END_COLOR_TEXT_2} status.\nAny damage from {COLOR_2 CYAN}Physical Attack moves{END_COLOR_TEXT_2}\nor a regular attack is partially returned.\0" +.string "The user gains the {color CYAN}Counter{reset} status.\nAny damage from {color CYAN}Physical Attack moves{reset}\nor a regular attack is partially returned.\0" .align 2,0 .global MoveNamePursuit @@ -2910,7 +2910,7 @@ MoveNamePursuit: .global MoveDescriptionSmokescreen MoveDescriptionSmokescreen: -.string "Inflicts the {COLOR_2 CYAN}Whiffer{END_COLOR_TEXT_2} status on the target,\nmaking it miss almost all of its attacks\nand moves.\0" +.string "Inflicts the {color CYAN}Whiffer{reset} status on the target,\nmaking it miss almost all of its attacks\nand moves.\0" .align 2,0 .global MoveNameSmokescreen @@ -2930,7 +2930,7 @@ MoveNameAirCutter: .global MoveDescriptionSpite MoveDescriptionSpite: -.string "Zeroes the {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} of the move last used by\nthe target, making it unusable.\0" +.string "Zeroes the {color YELLOW}PP{reset} of the move last used by\nthe target, making it unusable.\0" .align 2,0 .global MoveNameSpite @@ -2940,7 +2940,7 @@ MoveNameSpite: .global MoveDescriptionSing MoveDescriptionSing: -.string "Makes the target go to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}, causing\nit to be incapable of action.\0" +.string "Makes the target go to {color CYAN}sleep{reset}, causing\nit to be incapable of action.\0" .align 2,0 .global MoveNameSing @@ -2950,7 +2950,7 @@ MoveNameSing: .global MoveDescriptionFakeTears MoveDescriptionFakeTears: -.string "Lowers the target's {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by\ntwo levels.\0" +.string "Lowers the target's {color YELLOW}Special Defense{reset} by\ntwo levels.\0" .align 2,0 .global MoveNameFakeTears @@ -2960,7 +2960,7 @@ MoveNameFakeTears: .global MoveDescriptionWhirlpool MoveDescriptionWhirlpool: -.string "Inflicts damage on the target.\nIt may also cause {COLOR_2 CYAN}constriction{END_COLOR_TEXT_2}, making the\nfoe incapable of movement.\nInflicts double damage on a {COLOR_2 CYAN}diving{END_COLOR_TEXT_2} foe.\0" +.string "Inflicts damage on the target.\nIt may also cause {color CYAN}constriction{reset}, making the\nfoe incapable of movement.\nInflicts double damage on a {color CYAN}diving{reset} foe.\0" .align 2,0 .global MoveNameWhirlpool @@ -2980,7 +2980,7 @@ MoveNameWeatherBall: .global MoveDescriptionRockSlide MoveDescriptionRockSlide: -.string "Inflicts damage on the target.\nIt may also cause the target to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}, \nmaking it incapable of action.\0" +.string "Inflicts damage on the target.\nIt may also cause the target to {color CYAN}cringe{reset}, \nmaking it incapable of action.\0" .align 2,0 .global MoveNameRockSlide @@ -3010,7 +3010,7 @@ MoveNameRockThrow: .global MoveDescriptionScreech MoveDescriptionScreech: -.string "Sharply lowers the target's {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.\0" +.string "Sharply lowers the target's {color YELLOW}Defense{reset}.\0" .align 2,0 .global MoveNameHealBell @@ -3020,7 +3020,7 @@ MoveNameHealBell: .global MoveDescriptionSnore MoveDescriptionSnore: -.string "If the user is attacked while asleep, it\ncounterattacks. It may also cause the\ntarget to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}, making it incapable\nof action.\0" +.string "If the user is attacked while asleep, it\ncounterattacks. It may also cause the\ntarget to {color CYAN}cringe{reset}, making it incapable\nof action.\0" .align 2,0 .global MoveNameSnore @@ -3030,7 +3030,7 @@ MoveNameSnore: .global MoveDescriptionSwagger MoveDescriptionSwagger: -.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on the\ntarget, but also raises its {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by\ntwo levels.\0" +.string "Inflicts the {color CYAN}Confused{reset} status on the\ntarget, but also raises its {color YELLOW}Attack{reset} by\ntwo levels.\0" .align 2,0 .global MoveNameSwagger @@ -3040,7 +3040,7 @@ MoveNameSwagger: .global MoveDescriptionStringShot MoveDescriptionStringShot: -.string "Reduces the target's {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by\none level, even at a distance.\0" +.string "Reduces the target's {color YELLOW}Movement Speed{reset} by\none level, even at a distance.\0" .align 2,0 .global MoveNameStringShot @@ -3060,7 +3060,7 @@ MoveNameTorment: .global MoveDescriptionPainSplit MoveDescriptionPainSplit: -.string "Adds the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of the user and the target,\nthen shares it equally.\0" +.string "Adds the {color YELLOW}HP{reset} of the user and the target,\nthen shares it equally.\0" .align 2,0 .global MoveNamePainSplit @@ -3070,7 +3070,7 @@ MoveNamePainSplit: .global MoveDescriptionSuperFang MoveDescriptionSuperFang: -.string "Halves the target's {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\0" +.string "Halves the target's {color YELLOW}HP{reset}.\0" .align 2,0 .global MoveNameSuperFang @@ -3080,7 +3080,7 @@ MoveNameSuperFang: .global MoveDescriptionRage MoveDescriptionRage: -.string "The user gains the {COLOR_2 CYAN}Enraged{END_COLOR_TEXT_2} status.\nIts {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} rises by one level every time\nthe user takes damage.\0" +.string "The user gains the {color CYAN}Enraged{reset} status.\nIts {color YELLOW}Attack{reset} rises by one level every time\nthe user takes damage.\0" .align 2,0 .global MoveNameRage @@ -3100,7 +3100,7 @@ MoveNameCut: .global MoveDescriptionEncore MoveDescriptionEncore: -.string "Inflicts the {COLOR_2 CYAN}Encore{END_COLOR_TEXT_2} status on the target,\nmaking it capable of using only\nthe move it last used.\0" +.string "Inflicts the {color CYAN}Encore{reset} status on the target,\nmaking it capable of using only\nthe move it last used.\0" .align 2,0 .global MoveNameEncore @@ -3110,7 +3110,7 @@ MoveNameEncore: .global MoveDescriptionLowerSpeedChanceDistance MoveDescriptionLowerSpeedChanceDistance: -.string "Inflicts damage on the target, even at a\ndistance. It may also lower the target's\n{COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target, even at a\ndistance. It may also lower the target's\n{color YELLOW}Movement Speed{reset} by one level.\0" .align 2,0 .global MoveNameBubble @@ -3130,7 +3130,7 @@ MoveNameAromatherapy: .global MoveDescriptionHail MoveDescriptionHail: -.string "Changes the dungeon floor's weather to\n{COLOR_2 CYAN}Hail{END_COLOR_TEXT_2} for several turns.\0" +.string "Changes the dungeon floor's weather to\n{color CYAN}Hail{reset} for several turns.\0" .align 2,0 .global MoveNameHail @@ -3140,7 +3140,7 @@ MoveNameHail: .global MoveDescriptionConfuseRay MoveDescriptionConfuseRay: -.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on\nthe target, making its attacks and\nmovements erratic.\0" +.string "Inflicts the {color CYAN}Confused{reset} status on\nthe target, making its attacks and\nmovements erratic.\0" .align 2,0 .global MoveNameConfuseRay @@ -3150,7 +3150,7 @@ MoveNameConfuseRay: .global MoveDescriptionRainDance MoveDescriptionRainDance: -.string "Changes the dungeon floor's weather to\n{COLOR_2 CYAN}Rain{END_COLOR_TEXT_2} over several turns.\0" +.string "Changes the dungeon floor's weather to\n{color CYAN}Rain{reset} over several turns.\0" .align 2,0 .global MoveNameRainDance @@ -3160,7 +3160,7 @@ MoveNameRainDance: .global MoveDescriptionCharm MoveDescriptionCharm: -.string "Lowers the {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} of the target\nby two levels.\0" +.string "Lowers the {color YELLOW}Attack{reset} of the target\nby two levels.\0" .align 2,0 .global MoveNameCharm @@ -3170,7 +3170,7 @@ MoveNameCharm: .global MoveDescriptionSweetScent MoveDescriptionSweetScent: -.string "Lowers the {COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2} of foes in the same\nroom by one level.\0" +.string "Lowers the {color YELLOW}Evasion{reset} of foes in the same\nroom by one level.\0" .align 2,0 .global MoveNameSweetScent @@ -3190,7 +3190,7 @@ MoveNameThrash: .global MoveDescriptionDig MoveDescriptionDig: -.string "The user gains the {COLOR_2 CYAN}Digging{END_COLOR_TEXT_2} status,\nand it attacks on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {color CYAN}Digging{reset} status,\nand it attacks on the next turn.\nIt is not possible to {color CYAN}link{reset} this move.\0" .align 2,0 .global MoveNameDig @@ -3200,7 +3200,7 @@ MoveNameDig: .global MoveDescriptionVitalThrow MoveDescriptionVitalThrow: -.string "The user gains the {COLOR_2 CYAN}Vital Throw{END_COLOR_TEXT_2} status.\nFoes that attack the user are hurled at\nother foes.\0" +.string "The user gains the {color CYAN}Vital Throw{reset} status.\nFoes that attack the user are hurled at\nother foes.\0" .align 2,0 .global MoveNameVitalThrow @@ -3210,7 +3210,7 @@ MoveNameVitalThrow: .global MoveDescriptionMorningSun MoveDescriptionMorningSun: -.string "Restores the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of the user and team\nmembers on the floor.\nThe amount of {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} regained depends on\nthe weather.\0" +.string "Restores the {color YELLOW}HP{reset} of the user and team\nmembers on the floor.\nThe amount of {color YELLOW}HP{reset} regained depends on\nthe weather.\0" .align 2,0 .global MoveNameMorningSun @@ -3220,7 +3220,7 @@ MoveNameMorningSun: .global MoveDescriptionNightmare MoveDescriptionNightmare: -.string "Inflicts the {COLOR_2 CYAN}Nightmare{END_COLOR_TEXT_2} status\non the target, making it incapable\nof action.\0" +.string "Inflicts the {color CYAN}Nightmare{reset} status\non the target, making it incapable\nof action.\0" .align 2,0 .global MoveNameNightmare @@ -3230,7 +3230,7 @@ MoveNameNightmare: .global MoveDescriptionLovelyKiss MoveDescriptionLovelyKiss: -.string "Makes all foes around the user go to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2},\ncausing them to be incapable of action.\0" +.string "Makes all foes around the user go to {color CYAN}sleep{reset},\ncausing them to be incapable of action.\0" .align 2,0 .global MoveNameLovelyKiss @@ -3240,7 +3240,7 @@ MoveNameLovelyKiss: .global MoveDescriptionYawn MoveDescriptionYawn: -.string "Inflicts the {COLOR_2 CYAN}Yawning{END_COLOR_TEXT_2} status on the target.\nA {COLOR_2 CYAN}yawning{END_COLOR_TEXT_2} Pokémon falls\nasleep sometime later.\0" +.string "Inflicts the {color CYAN}Yawning{reset} status on the target.\nA {color CYAN}yawning{reset} Pokémon falls\nasleep sometime later.\0" .align 2,0 .global MoveNameYawn @@ -3260,12 +3260,12 @@ MoveNameIceBall: .global MoveUseTextUse MoveUseTextUse: -.string "{ARG_POKEMON_0} used {ARG_MOVE_ITEM_0}!\0" +.string "{POKEMON_0} used {MOVE_ITEM_0}!\0" .align 2,0 .global MoveDescriptionLowerDefenseChance MoveDescriptionLowerDefenseChance: -.string "Inflicts damage on the target.\nIt may also lower the target's {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}\nby one level.\0" +.string "Inflicts damage on the target.\nIt may also lower the target's {color YELLOW}Defense{reset}\nby one level.\0" .align 2,0 .global MoveNameIronTail diff --git a/src/code_801B3C0.c b/src/code_801B3C0.c index b70cde78..687a7f9c 100644 --- a/src/code_801B3C0.c +++ b/src/code_801B3C0.c @@ -84,7 +84,7 @@ static void sub_801B480(void) sub_80073B8(sUnknown_203B230->unk24); preload = sUnknown_203B230->unk10[sUnknown_203B230->unk8]; strcpy(gAvailablePokemonNames, preload->pokeName); - PrintFormatStringOnWindow(16, 0, sFmtPkmn0, sUnknown_203B230->unk24, 0); // {ARG_POKEMON_0} + PrintFormatStringOnWindow(16, 0, sFmtPkmn0, sUnknown_203B230->unk24, 0); // {POKEMON_0} PrintFormatStringOnWindow(4, 16, sUnknown_203B230->unk10[sUnknown_203B230->unk8]->unk4, sUnknown_203B230->unk24, 0); sub_80073E0(sUnknown_203B230->unk24); break; diff --git a/src/code_801D014.c b/src/code_801D014.c index 1d9bbaed..64afce22 100644 --- a/src/code_801D014.c +++ b/src/code_801D014.c @@ -593,7 +593,7 @@ static void sub_801D894(void) LoadTeamRankBadge(2, 8, 6); // Have to load before TeamRank funcs - r5 = sFmtPointsCyan; // %s {COLOR_1 CYAN}%d{END_COLOR_TEXT_1} Pts. + r5 = sFmtPointsCyan; // %s {COLOR CYAN}%d{RESET} Pts. rank = GetRescueTeamRank(); sprintfStatic(buffer, r5, GetTeamRankString(rank), GetTeamRankPts()); PrintStringOnWindow(32, 4, buffer, 2, 0); diff --git a/src/code_801EE10.c b/src/code_801EE10.c index a29cb0ba..5dad8716 100644 --- a/src/code_801EE10.c +++ b/src/code_801EE10.c @@ -42,8 +42,8 @@ const UnkTextStruct2 gUnknown_80DC274 = { NULL, }; -ALIGNED(4) const u8 gUnknown_80DC28C[] = _("Moves: {COLOR_1 YELLOW}{ARG_POKEMON_0}{END_COLOR_TEXT_1} "); -ALIGNED(4) const u8 gUnknown_80DC2A0[] = _("{ARG_MOVE_ITEM_0}"); +ALIGNED(4) const u8 gUnknown_80DC28C[] = _("Moves: {COLOR YELLOW}{POKEMON_0}{RESET} "); +ALIGNED(4) const u8 gUnknown_80DC2A0[] = _("{MOVE_ITEM_0}"); u32 sub_8006544(u32 index); s32 sub_801F3F8(void); diff --git a/src/code_801F808.c b/src/code_801F808.c index b33b9094..31778982 100644 --- a/src/code_801F808.c +++ b/src/code_801F808.c @@ -43,7 +43,7 @@ static const UnkTextStruct2 sUnknown_80DC2F8 = { NULL }; -const u8 gUnknown_80DC310[] = _("{ARG_POKEMON_0}"); +const u8 gUnknown_80DC310[] = _("{POKEMON_0}"); extern void sub_801F918(s32); extern void sub_801FA58(void); diff --git a/src/code_8057824_1.c b/src/code_8057824_1.c index f7281b5b..abe9ce61 100644 --- a/src/code_8057824_1.c +++ b/src/code_8057824_1.c @@ -1664,7 +1664,7 @@ void MagmaCavernMidDialogue(void) SpriteLookAroundEffect(PartnerEntity); PlaySoundEffect(0x1c7); sub_80856E0(PartnerEntity, DIRECTION_NORTH); - // Hey! {ARG_POKEMON_0}! + // Hey! {POKEMON_0}! // Over there! DisplayDungeonDialogue(MagmaCavernMidDialogue_5); iVar3->info->unk15E = 0; @@ -1691,7 +1691,7 @@ void MagmaCavernMidDialogue(void) DisplayDungeonDialogue(MagmaCavernMidDialogue_8); sub_803E708(10,0x46); // We challenged.. - // {ARG_POKEMON_2}... + // {POKEMON_2}... // And wiped out.. DisplayDungeonDialogue(MagmaCavernMidDialogue_9); sub_803E708(10,0x46); @@ -1706,21 +1706,21 @@ void MagmaCavernMidDialogue(void) PlaySoundEffect(0x1d5); SpriteLookAroundEffect(PartnerEntity); // That's right... - // What happened to {ARG_POKEMON_3}? - // Where is {ARG_POKEMON_3}? + // What happened to {POKEMON_3}? + // Where is {POKEMON_3}? // // Wait... - // What about {ARG_POKEMON_3}? - // Where did {ARG_POKEMON_3} go? + // What about {POKEMON_3}? + // Where did {POKEMON_3} go? DisplayDungeonDialogue(MagmaCavernMidDialogue_12); sub_803E708(0x1e,0x46); - // {ARG_POKEMON_3} is... - // Still battling {ARG_POKEMON_2}... + // {POKEMON_3} is... + // Still battling {POKEMON_2}... DisplayDungeonDialogue(MagmaCavernMidDialogue_13); sub_803E708(10,0x46); sub_80869E4(PartnerEntity,4,1,2); sub_80869E4(LeaderEntity,4,2,6); - // {ARG_POKEMON_0}! + // {POKEMON_0}! // We've got to hurry! DisplayDungeonDialogue(MagmaCavernMidDialogue_14); sub_8089294(); @@ -3221,7 +3221,7 @@ void sub_808AFB0(char param_1) if ((sub_8098100(0x22) == 0) && (param_1 == 0x2E) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_ROCK_PART) != 0)) { sub_8097FD0(0x1d); SetMessageArgument(gAvailablePokemonNames,GetLeader(),0); - // {ARG_POKEMON_0} obtained the Rock Part that Regirock was guarding + // {POKEMON_0} obtained the Rock Part that Regirock was guarding DisplayDungeonDialogue(gRegirockPostFightDialogue_2); sub_80421C0(0,0xd4); sub_803E708(10,70); @@ -3239,7 +3239,7 @@ void sub_808B030(char param_1) if ((sub_8098100(0x22) == 0) && (param_1 == 0x2F) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_ICE_PART) != 0)) { sub_8097FD0(0x1d); SetMessageArgument(gAvailablePokemonNames,GetLeader(),0); - // {ARG_POKEMON_0} obtained the Ice Part that Regice was guarding + // {POKEMON_0} obtained the Ice Part that Regice was guarding DisplayDungeonDialogue(gRegicePostFightDialogue_2); sub_80421C0(0,0xd4); sub_803E708(10,70); @@ -3257,7 +3257,7 @@ void sub_808B0B0(char param_1) if ((sub_8098100(0x22) == 0) && (param_1 == 0x30) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_STEEL_PART) != 0)) { sub_8097FD0(0x1d); SetMessageArgument(gAvailablePokemonNames, GetLeader(), 0); - // {ARG_POKEMON_0} obtained the Steel Part that Registeel was guarding + // {POKEMON_0} obtained the Steel Part that Registeel was guarding DisplayDungeonDialogue(gRegisteelPostFightDialogue_2); sub_80421C0(0,0xd4); sub_803E708(10,70); @@ -4058,10 +4058,10 @@ void KyogrePreFightDialogue(void) sub_803E708(10,0x46); DungeonFadeInNewBGM(MUS_FRIEND_AREA_CRYPTIC_CAVE,0x3c); sub_808C360(); - // My duels against {ARG_POKEMON_3} (Groudon) left us both exhausted + // My duels against {POKEMON_3} (Groudon) left us both exhausted DisplayDungeonDialogue(gKyogrePreFightDialogue_4); KyogreScreenFlash(); - // I am {ARG_POKEMON_2} (Kyogre)! + // I am {POKEMON_2} (Kyogre)! // The lord of the sea! DisplayDungeonDialogue(gKyogrePreFightDialogue_5); KyogreScreenFlash(); @@ -4272,7 +4272,7 @@ void CelebiJoinDialogue(void) sub_8086598(); sub_8086598(); sub_8086598(); - // The Time-Traveling Pokemon {ARG_POKEMON_2} (Celebi)! + // The Time-Traveling Pokemon {POKEMON_2} (Celebi)! DisplayDungeonDialogue(gCelebiJoinDialogue_2); PlaySoundEffect(0x1c7); sub_806CDD4(CelebiEntity,10,DIRECTION_SOUTH); diff --git a/src/code_807CD9C.c b/src/code_807CD9C.c index f9f3c7e6..6d73a02d 100644 --- a/src/code_807CD9C.c +++ b/src/code_807CD9C.c @@ -73,12 +73,12 @@ void sub_807CD9C(Entity *pokemon, Entity *target, u32 direction) { if (pokemon == target) { SetMessageArgument(gAvailablePokemonNames,target,0); - sub_80522F4(pokemon,target,*gUnknown_80FCA10); // {ARG_POKEMON_0} couldn't be knocked flying! + sub_80522F4(pokemon,target,*gUnknown_80FCA10); // {POKEMON_0} couldn't be knocked flying! return; } SetMessageArgument(gAvailablePokemonNames,target,0); if (HasAbility(target,ABILITY_SUCTION_CUPS)) { - sub_80522F4(pokemon,target,*gUnknown_80FCBCC); // {ARG_POKEMON_0} is anchored! It can't be knocked flying! + sub_80522F4(pokemon,target,*gUnknown_80FCBCC); // {POKEMON_0} is anchored! It can't be knocked flying! return; } else @@ -86,7 +86,7 @@ void sub_807CD9C(Entity *pokemon, Entity *target, u32 direction) (target->info->action).direction = (direction + 4) & DIRECTION_MASK; sub_806CDD4(target, 6, (direction + 4) & DIRECTION_MASK); sub_80421C0(target,0x1a3); - sub_80522F4(pokemon,target,*gUnknown_80F8A0C); // {ARG_POKEMON_0} was blown away! + sub_80522F4(pokemon,target,*gUnknown_80F8A0C); // {POKEMON_0} was blown away! flag = TRUE; sp_0x28 = NULL; diff --git a/src/code_80972F4.c b/src/code_80972F4.c index fabd3dc8..149fb4e6 100644 --- a/src/code_80972F4.c +++ b/src/code_80972F4.c @@ -7,8 +7,8 @@ #include "data/story_missions.h" -ALIGNED(4) const u8 gDummyScenarioText[] = _("{COLOR_1 YELLOW_3}Scenario try dummy{END_COLOR_TEXT_1}"); -ALIGNED(4) const u8 gBlankMission[] = _("{COLOR_1 RED_2}???{END_COLOR_TEXT_1}"); +ALIGNED(4) const u8 gDummyScenarioText[] = _("{COLOR YELLOW_C}Scenario try dummy{RESET}"); +ALIGNED(4) const u8 gBlankMission[] = _("{COLOR RED_W}???{RESET}"); extern void GeneratePelipperJobs(void); diff --git a/src/data/code_801602C.h b/src/data/code_801602C.h index 8e0cd845..4d0da6c7 100644 --- a/src/data/code_801602C.h +++ b/src/data/code_801602C.h @@ -15,6 +15,6 @@ UNUSED static const UnkTextStruct2 sUnknown_80DB670 = NULL }; -ALIGNED(4) static const u8 sIsNameOKPrompt[] = _("Is the name {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1} OK?"); +ALIGNED(4) static const u8 sIsNameOKPrompt[] = _("Is the name {COLOR CYAN}{POKEMON_0}{RESET} OK?"); ALIGNED(4) static const u8 sNameTooLong[] = _("This name is too long."); ALIGNED(4) static const u8 sEnterAName[] = _("Please enter a name."); \ No newline at end of file diff --git a/src/data/code_801AFA4.h b/src/data/code_801AFA4.h index 9ca462aa..ddf6dea9 100644 --- a/src/data/code_801AFA4.h +++ b/src/data/code_801AFA4.h @@ -1,10 +1,10 @@ ALIGNED(4) static const u8 sFmtWhoWillLearnTheMove[] = _( "{CENTER_ALIGN}Who will learn the move\n" - "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}?"); + "{CENTER_ALIGN}{COLOR CYAN}{POKEMON_7}{RESET}?"); ALIGNED(4) static const u8 sFmtLearnedTheMove[] = _( - "{CENTER_ALIGN}{COLOR_1 CYAN_3}{ARG_POKEMON_8}{END_COLOR_TEXT_1} learned\n" - "{CENTER_ALIGN}the move {COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}!"); + "{CENTER_ALIGN}{COLOR CYAN_M}{POKEMON_8}{RESET} learned\n" + "{CENTER_ALIGN}the move {COLOR CYAN}{POKEMON_7}{RESET}!"); ALIGNED(4) static const u8 sFmtNoOneCanLearnThisMove[] = _( "{CENTER_ALIGN}No one in the current team\n" diff --git a/src/data/code_801B3C0.h b/src/data/code_801B3C0.h index 153be787..144d4edf 100644 --- a/src/data/code_801B3C0.h +++ b/src/data/code_801B3C0.h @@ -1 +1 @@ -ALIGNED(4) static const u8 sFmtPkmn0[] = _("{ARG_POKEMON_0}"); \ No newline at end of file +ALIGNED(4) static const u8 sFmtPkmn0[] = _("{POKEMON_0}"); \ No newline at end of file diff --git a/src/data/code_801B60C.h b/src/data/code_801B60C.h index 7d534ee6..107de37b 100644 --- a/src/data/code_801B60C.h +++ b/src/data/code_801B60C.h @@ -26,25 +26,25 @@ static const UnkTextStruct2 sUnknown_80DBA88 = { }; ALIGNED(4) static const u8 sFmtReceivedThePromised[] = _( - "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} received\n" - "{CENTER_ALIGN}the promised {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}. "); + "{CENTER_ALIGN}{COLOR YELLOW_N}{POKEMON_0}{RESET} received\n" + "{CENTER_ALIGN}the promised {COLOR GREEN}{MOVE_ITEM_0}{RESET}. "); ALIGNED(4) static const u8 sFmtTeamReceivedThePromised[] = _( - "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}'s team received\n" - "{CENTER_ALIGN}the promised {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}."); + "{CENTER_ALIGN}{COLOR YELLOW_N}{POKEMON_0}{RESET}'s team received\n" + "{CENTER_ALIGN}the promised {COLOR GREEN}{MOVE_ITEM_0}{RESET}."); ALIGNED(4) static const u8 sFmtTeamAlsoReceived[] = _( "{CENTER_ALIGN}The team also received\n" - "{CENTER_ALIGN}the item {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}."); + "{CENTER_ALIGN}the item {COLOR GREEN}{MOVE_ITEM_0}{RESET}."); ALIGNED(4) static const u8 sFmtReceivedStatue[] = _( - "{CENTER_ALIGN}Received the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}!{EXTRA_MSG}{CENTER_ALIGN}A very rare statue. It has been placed\n" + "{CENTER_ALIGN}Received the {COLOR GREEN}{MOVE_ITEM_0}{RESET}!{EXTRA_MSG}{CENTER_ALIGN}A very rare statue. It has been placed\n" "{CENTER_ALIGN}outside your rescue team base."); ALIGNED(4) static const u8 sFmtReceive1000Instead[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...\n" - "{CENTER_ALIGN}You've already acquired it.{EXTRA_MSG}{CENTER_ALIGN}Sorry to see that...{EXTRA_MSG}{CENTER_ALIGN}In its place, {COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1},\n" - "{CENTER_ALIGN}you can have {COLOR_1 LIGHT_BLUE}1,000{END_COLOR_TEXT_1} {POKE}."); + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_0}{RESET}...\n" + "{CENTER_ALIGN}You've already acquired it.{EXTRA_MSG}{CENTER_ALIGN}Sorry to see that...{EXTRA_MSG}{CENTER_ALIGN}In its place, {COLOR YELLOW_N}{POKEMON_0}{RESET},\n" + "{CENTER_ALIGN}you can have {COLOR CYAN_G}1,000{RESET} {POKE}."); ALIGNED(4) static const u8 sFmtFullSoSentToStorage[] = _( "{CENTER_ALIGN}Your Toolbox is full.\n" @@ -56,19 +56,19 @@ ALIGNED(4) static const u8 sFmtFullSoPrompt[] = _( ALIGNED(4) static const u8 sFmtConfirmThrowAway[] = _( "{CENTER_ALIGN}Is it OK to throw away\n" - "{CENTER_ALIGN}this {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?"); + "{CENTER_ALIGN}this {COLOR GREEN}{MOVE_ITEM_0}{RESET}?"); ALIGNED(4) static const u8 sFmtThrownAway[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_0}{RESET}\n" "{CENTER_ALIGN}was thrown away."); ALIGNED(4) static const u8 sFmtPutInStorageForReceive[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was put in\n" - "{CENTER_ALIGN}storage to get the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}."); + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_1}{RESET} was put in\n" + "{CENTER_ALIGN}storage to get the {COLOR GREEN}{MOVE_ITEM_0}{RESET}."); ALIGNED(4) static const u8 sFmtDiscardedForReceive[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was discarded\n" - "{CENTER_ALIGN}to get the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}."); + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_1}{RESET} was discarded\n" + "{CENTER_ALIGN}to get the {COLOR GREEN}{MOVE_ITEM_0}{RESET}."); ALIGNED(4) static const u8 sTrashToolboxItem[] = _("Trash Toolbox Item"); ALIGNED(4) static const u8 sTrashReceivedItem[] = _("Trash Received Item"); diff --git a/src/data/code_801D014.h b/src/data/code_801D014.h index 18fd1a0c..e4d342f7 100644 --- a/src/data/code_801D014.h +++ b/src/data/code_801D014.h @@ -58,6 +58,6 @@ ALIGNED(4) static const u8 sTeam[] = _("Team"); ALIGNED(4) static const u8 sJobList[] = _("Job List"); ALIGNED(4) static const u8 sOthers[] = _("Others"); ALIGNED(4) static const u8 sTripleQuestionMark[] = _("？？？"); -ALIGNED(4) static const u8 sFmtPointsCyan[] = _("%s {COLOR_1 CYAN}%d{END_COLOR_TEXT_1} Pts."); -ALIGNED(4) static const u8 sFmtMoneyCyan[] = _("Money: {COLOR_1 CYAN}%d{END_COLOR_TEXT_1} {POKE}"); +ALIGNED(4) static const u8 sFmtPointsCyan[] = _("%s {COLOR CYAN}%d{RESET} Pts."); +ALIGNED(4) static const u8 sFmtMoneyCyan[] = _("Money: {COLOR CYAN}%d{RESET} {POKE}"); ALIGNED(4) static const u8 sTeamRankBadgeFileName[] = _("tmrkpat"); diff --git a/src/data/code_80227B8.h b/src/data/code_80227B8.h index 4e7fe4fb..7098910a 100644 --- a/src/data/code_80227B8.h +++ b/src/data/code_80227B8.h @@ -37,48 +37,48 @@ ALIGNED(4) static const u8 sTripleQuestionMark[] = _("？？？"); ALIGNED(4) static const u8 sDoesNotAppearHungry[] = _("It doesn't appear to be hungry."); ALIGNED(4) static const u8 sFmtGummiBigFav[] = _( - "{ARG_POKEMON_1} took the Gummi and ate it.\n" + "{POKEMON_1} took the Gummi and ate it.\n" "This Gummi looks like a big favorite!\n" - "{ARG_POKEMON_1}'s IQ went up!"); + "{POKEMON_1}'s IQ went up!"); ALIGNED(4) static const u8 sFmtGummiFav[] = _( - "{ARG_POKEMON_1} took the Gummi and ate it.\n" + "{POKEMON_1} took the Gummi and ate it.\n" "This Gummi looks like a favorite!\n" - "{ARG_POKEMON_1}'s IQ went up!"); + "{POKEMON_1}'s IQ went up!"); ALIGNED(4) static const u8 sFmtGummiOkay[] = _( - "{ARG_POKEMON_1} took the Gummi and ate it.\n" + "{POKEMON_1} took the Gummi and ate it.\n" "It doesn't seem to dislike this Gummi.\n" - "{ARG_POKEMON_1}'s IQ went up!"); + "{POKEMON_1}'s IQ went up!"); ALIGNED(4) static const u8 sFmtGummiSatisfied[] = _( - "{ARG_POKEMON_1} took the Gummi and ate it.\n" + "{POKEMON_1} took the Gummi and ate it.\n" "It appears to be just a little satisfied.\n" - "{ARG_POKEMON_1}'s IQ went up!"); + "{POKEMON_1}'s IQ went up!"); ALIGNED(4) static const u8 sFmtIQHelpedLearn[] = _( - "{ARG_POKEMON_1}'s IQ helped it learn how to\n" - "use {ARG_MOVE_ITEM_1}!"); + "{POKEMON_1}'s IQ helped it learn how to\n" + "use {MOVE_ITEM_1}!"); ALIGNED(4) static const u8 sFmtPlusEverything[] = _( - "Yes! {ARG_POKEMON_1} grew explosively!\n" + "Yes! {POKEMON_1} grew explosively!\n" "Attack, Defense, and so on rose by 1!"); ALIGNED(4) static const u8 sFmtPlusAtk[] = _( "Yes!\n" - "{ARG_POKEMON_1}'s Attack rose by 1!"); + "{POKEMON_1}'s Attack rose by 1!"); ALIGNED(4) static const u8 sFmtPlusSpAtk[] = _( "Yes!\n" - "{ARG_POKEMON_1}'s Special Attack rose by 1!"); + "{POKEMON_1}'s Special Attack rose by 1!"); ALIGNED(4) static const u8 sFmtPlusDef[] = _( "Yes!\n" - "{ARG_POKEMON_1}'s Defense rose by 1!"); + "{POKEMON_1}'s Defense rose by 1!"); ALIGNED(4) static const u8 sFmtPlusSpDef[] = _( "Yes!\n" - "{ARG_POKEMON_1}'s Special Defense rose by 1!"); + "{POKEMON_1}'s Special Defense rose by 1!"); ALIGNED(4) static const u8 sNoGummis[] = _("You don't have any Gummis."); ALIGNED(4) static const u8 sNoItem[] = _("You don't have an item."); diff --git a/src/data/code_8023144.h b/src/data/code_8023144.h index 4f54cb23..22430504 100644 --- a/src/data/code_8023144.h +++ b/src/data/code_8023144.h @@ -19,4 +19,4 @@ static const UnkTextStruct2 sUnknown_80DC91C = }; ALIGNED(4) static const u8 sPokemon[] = _("Pokémon"); -ALIGNED(4) static const u8 sFmtColoredString[] = _("{COLOR_2}%c%s{END_COLOR_TEXT_2}"); \ No newline at end of file +ALIGNED(4) static const u8 sFmtColoredString[] = _("{color}%c%s{reset}"); \ No newline at end of file diff --git a/src/data/code_8023868.h b/src/data/code_8023868.h index 34ff5033..ada6340f 100644 --- a/src/data/code_8023868.h +++ b/src/data/code_8023868.h @@ -22,6 +22,6 @@ const u8 sUnknown_80DC980[] = _("Friends"); ALIGNED(4) //static // MAKE STATIC WHEN code_8023868.s IS DONE const u8 sUnknown_80DC988[] = _("Pokémon Friends"); ALIGNED(4) //static // MAKE STATIC WHEN code_8023868.s IS DONE -const u8 sUnknown_80DC998[] = _("{COLOR_2}%c%s{END_COLOR_TEXT_2}"); +const u8 sUnknown_80DC998[] = _("{color}%c%s{reset}"); ALIGNED(4) //static // MAKE STATIC WHEN code_8023868.s IS DONE const u8 sUnknown_80DC9A4[] = _("%s"); \ No newline at end of file diff --git a/src/data/code_802DB28.h b/src/data/code_802DB28.h index 7b43cf9d..6a13906a 100644 --- a/src/data/code_802DB28.h +++ b/src/data/code_802DB28.h @@ -11,16 +11,16 @@ ALIGNED(4) static const u8 sThanksForRescuingMe[] = _(" Thank you for rescuing m ALIGNED(4) static const u8 sThanksForRescuingThem[] = _( " Thank you for rescuing\n" - "{COLOR_1 CYAN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}!"); + "{COLOR CYAN}{POKEMON_1}{RESET}!"); ALIGNED(4) static const u8 sThanksForEscortingMe[] = _( " Thank you for escorting me\n" - "to {COLOR_1 CYAN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}! "); + "to {COLOR CYAN}{POKEMON_1}{RESET}! "); ALIGNED(4) static const u8 sThanksForDelivering[] = _( " Thank you for delivering\n" - "the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}!"); + "the {COLOR GREEN}{MOVE_ITEM_0}{RESET}!"); ALIGNED(4) static const u8 sThanksForGetting[] = _( " Thank you for getting me\n" - "the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}!"); \ No newline at end of file + "the {COLOR GREEN}{MOVE_ITEM_0}{RESET}!"); \ No newline at end of file diff --git a/src/data/common_strings_felicity_bank.h b/src/data/common_strings_felicity_bank.h index b65a46e3..bcf5f8fc 100644 --- a/src/data/common_strings_felicity_bank.h +++ b/src/data/common_strings_felicity_bank.h @@ -90,7 +90,7 @@ ALIGNED(4) static const u8 sUnknown_80D4A58[] = _( ALIGNED(4) static const u8 sUnknown_80D4C14[] = _( " {POKE}... Purr...\n" - "Very well, {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n" + "Very well, {COLOR CYAN}{VALUE_0}{RESET} {POKE}.\n" "Here you are."); ALIGNED(4) static const u8 sUnknown_80D4C50[] = _( @@ -111,7 +111,7 @@ ALIGNED(4) static const u8 sUnknown_80D4D20[] = _( ALIGNED(4) static const u8 sUnknown_80D4D44[] = _( " Zzz...\n" - "{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}... Very well...{WAIT_PRESS}\n" + "{COLOR CYAN}{VALUE_0}{RESET} {POKE}... Very well...{WAIT_PRESS}\n" "I will guard it jealously..."); ALIGNED(4) static const u8 sUnknown_80D4D8C[] = _( @@ -146,7 +146,7 @@ ALIGNED(4) static const u8 sUnknown_80D4F08[] = _( ALIGNED(4) static const u8 sUnknown_80D4F24[] = _( " Sssnore... Purr...\n" - "Your account contains {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}...\n" + "Your account contains {COLOR CYAN}{VALUE_0}{RESET} {POKE}...\n" "How may I serve you?"); ALIGNED(4) static const u8 sUnknown_80D4F74[] = _( @@ -174,7 +174,7 @@ ALIGNED(4) static const u8 sUnknown_80D4FC8[] = _( " Simple, isn't it?"); ALIGNED(4) static const u8 sUnknown_80D5158[] = _( - " Very well, {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n" + " Very well, {COLOR CYAN}{VALUE_0}{RESET} {POKE}.\n" "Here you are."); ALIGNED(4) static const u8 sUnknown_80D5184[] = _( @@ -191,7 +191,7 @@ ALIGNED(4) static const u8 sUnknown_80D5224[] = _( "withdraw?"); ALIGNED(4) static const u8 sUnknown_80D5244[] = _( - " {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}. Very well.{WAIT_PRESS}\n" + " {COLOR CYAN}{VALUE_0}{RESET} {POKE}. Very well.{WAIT_PRESS}\n" "I will guard it jealously."); ALIGNED(4) static const u8 sUnknown_80D527C[] = _( @@ -214,7 +214,7 @@ ALIGNED(4) static const u8 sUnknown_80D5380[] = _(" Very well."); ALIGNED(4) static const u8 sUnknown_80D538C[] = _( " Your account contains\n" - "{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n" + "{COLOR CYAN}{VALUE_0}{RESET} {POKE}.\n" "How may I serve you?"); ALIGNED(4) static const u8 sUnknown_80D53C8[] = _(" How may I serve you?"); diff --git a/src/data/common_strings_gulpin_shop.h b/src/data/common_strings_gulpin_shop.h index 4780eef6..b23d162c 100644 --- a/src/data/common_strings_gulpin_shop.h +++ b/src/data/common_strings_gulpin_shop.h @@ -112,16 +112,16 @@ ALIGNED(4) static const u8 sUnknown_80D8950[] = _( "I'd go broke if it weren't for those\n" "forgetful Pokémon...{EXTRA_MSG}" " Zzz... Gwaaah...\n" - "Especially that {COLOR_1 CYAN}{ARG_POKEMON_4}{END_COLOR_TEXT_1}...\n" + "Especially that {COLOR CYAN}{POKEMON_4}{RESET}...\n" "It seems to be forgetful...{EXTRA_MSG}" " Sssnore...\n" "I hope it forgets more moves...\n" "So it needs to see me...{EXTRA_MSG}" " Zzz... Mumble...\n" "But we decided to get rid of that\n" - "{COLOR_1 CYAN}{ARG_POKEMON_4}{END_COLOR_TEXT_1}...{EXTRA_MSG}" + "{COLOR CYAN}{POKEMON_4}{RESET}...{EXTRA_MSG}" " Gwaaaah... Gweh...\n" - "{COLOR_1 CYAN}{ARG_POKEMON_4}{END_COLOR_TEXT_1} won't be coming around\n" + "{COLOR CYAN}{POKEMON_4}{RESET} won't be coming around\n" "anymore... "); ALIGNED(4) static const u8 sUnknown_80D8AB8[] = _( @@ -161,8 +161,8 @@ ALIGNED(4) static const u8 sUnknown_80D8CC8[] = _( " Fwaaah hah!\n" "There...{EXTRA_MSG}" " Zzz... Mutter...\n" - "{COLOR_1 CYAN}{ARG_POKEMON_5}{END_COLOR_TEXT_1} forgot...\n" - "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and moves linked to it..."); + "{COLOR CYAN}{POKEMON_5}{RESET} forgot...\n" + "{COLOR GREEN}{POKEMON_1}{RESET} and moves linked to it..."); ALIGNED(4) static const u8 sUnknown_80D8D64[] = _( " Fgwaaah...\n" @@ -172,17 +172,17 @@ ALIGNED(4) static const u8 sUnknown_80D8D64[] = _( " Fwaaah hah!\n" "There...{EXTRA_MSG}" " Zzz... Mumble...\n" - "{COLOR_1 CYAN}{ARG_POKEMON_5}{END_COLOR_TEXT_1} forgot...\n" - "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}..."); + "{COLOR CYAN}{POKEMON_5}{RESET} forgot...\n" + "{COLOR GREEN}{POKEMON_1}{RESET}..."); ALIGNED(4) static const u8 sUnknown_80D8DE8[] = _( " Zzz... Fwaah? Forget...?\n" - "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and any moves\n" + "{COLOR GREEN}{POKEMON_1}{RESET} and any moves\n" "linked to it?"); ALIGNED(4) static const u8 sUnknown_80D8E28[] = _( " Zzz... Forget...?\n" - "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}?"); + "{COLOR GREEN}{POKEMON_1}{RESET}?"); ALIGNED(4) static const u8 sUnknown_80D8E48[] = _( " Zzznork...? Hunh?\n" @@ -202,10 +202,10 @@ ALIGNED(4) static const u8 sUnknown_80D8EC4[] = _( " Fwaaah hah!\n" "There...{EXTRA_MSG}" " Zzz... Mumble...\n" - "{COLOR_1 CYAN_3}{ARG_POKEMON_5}{END_COLOR_TEXT_1}'s OK...{EXTRA_MSG}" + "{COLOR CYAN_M}{POKEMON_5}{RESET}'s OK...{EXTRA_MSG}" " Sssnork... Forgotten...\n" - "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and moves linked to it...\n" - "Remembered {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}..."); + "{COLOR GREEN}{POKEMON_1}{RESET} and moves linked to it...\n" + "Remembered {COLOR CYAN}{POKEMON_0}{RESET}..."); ALIGNED(4) static const u8 sUnknown_80D8F98[] = _( " Fgwaah...\n" @@ -214,30 +214,30 @@ ALIGNED(4) static const u8 sUnknown_80D8F98[] = _( "Gggggggg...{WAIT_PRESS} Pwah! Gulpin!{EXTRA_MSG}" " Fwaah hah!\n" "There...{EXTRA_MSG}" - " Zzz... Zzz... {COLOR_1 CYAN_3}{ARG_POKEMON_5}{END_COLOR_TEXT_1}\n" - "forgot {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}...\n" - "Remembered {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}..."); + " Zzz... Zzz... {COLOR CYAN_M}{POKEMON_5}{RESET}\n" + "forgot {COLOR GREEN}{POKEMON_1}{RESET}...\n" + "Remembered {COLOR CYAN}{POKEMON_0}{RESET}..."); ALIGNED(4) static const u8 sUnknown_80D9034[] = _( " Zzz? Fnurf? \n" - "Forget {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}...and moves linked\n" - "to it? Remember {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?"); + "Forget {COLOR GREEN}{POKEMON_1}{RESET}...and moves linked\n" + "to it? Remember {COLOR CYAN}{POKEMON_0}{RESET}?"); ALIGNED(4) static const u8 sUnknown_80D9080[] = _( " Zzznort... Grumble...\n" - "Forget {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}?\n" - "Remember {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?"); + "Forget {COLOR GREEN}{POKEMON_1}{RESET}?\n" + "Remember {COLOR CYAN}{POKEMON_0}{RESET}?"); ALIGNED(4) static const u8 sUnknown_80D90BC[] = _( " Zzzznort... Move...?\n" - "Remember {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?{EXTRA_MSG}" + "Remember {COLOR CYAN}{POKEMON_0}{RESET}?{EXTRA_MSG}" " Fwaah...\n" "Gggggggggggg...{WAIT_PRESS} Gulpin!{EXTRA_MSG}" " Fgwaah...\n" "There...{EXTRA_MSG}" " Zzz... Zzz...\n" - "{COLOR_1 CYAN_3}{ARG_POKEMON_5}{END_COLOR_TEXT_1} remembered...\n" - "Hunh? That move, {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}..."); + "{COLOR CYAN_M}{POKEMON_5}{RESET} remembered...\n" + "Hunh? That move, {COLOR CYAN}{POKEMON_0}{RESET}..."); ALIGNED(4) static const u8 sUnknown_80D9168[] = _( " Zzz... Fgwah...?\n" @@ -300,9 +300,9 @@ ALIGNED(4) static const u8 sUnknown_80D9498[] = _( "Two or more moves can be used one after\n" "another in one turn!{EXTRA_MSG}" " For example, if the moves\n" - "{COLOR_1 CYAN}Scratch{END_COLOR_TEXT_1} and {COLOR_1 CYAN}Growl{END_COLOR_TEXT_1} are\n" + "{COLOR CYAN}Scratch{RESET} and {COLOR CYAN}Growl{RESET} are\n" "linked...{EXTRA_MSG}" - " Both {COLOR_1 CYAN}Scratch{END_COLOR_TEXT_1} and {COLOR_1 CYAN}Growl{END_COLOR_TEXT_1} are\n" + " Both {COLOR CYAN}Scratch{RESET} and {COLOR CYAN}Growl{RESET} are\n" "used in one turn!{WAIT_PRESS}\n" "See? Amazing, huh?{EXTRA_MSG}" " Using links, heheh...{WAIT_PRESS}\n" @@ -345,8 +345,8 @@ ALIGNED(4) static const u8 sUnknown_80D9904[] = _( " Gggggggg...{WAIT_PRESS} Poof!{EXTRA_MSG}" " There!\n" "Success!{EXTRA_MSG}" - " {COLOR_1 CYAN}{ARG_POKEMON_5}{END_COLOR_TEXT_1} has forgotten\n" - "the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and any moves\n" + " {COLOR CYAN}{POKEMON_5}{RESET} has forgotten\n" + "the move {COLOR GREEN}{POKEMON_1}{RESET} and any moves\n" "linked to it!"); ALIGNED(4) static const u8 sUnknown_80D9988[] = _( @@ -354,16 +354,16 @@ ALIGNED(4) static const u8 sUnknown_80D9988[] = _( " Gggggggg...{WAIT_PRESS} Poof!{EXTRA_MSG}" " There!\n" "Success!{EXTRA_MSG}" - " {COLOR_1 CYAN}{ARG_POKEMON_5}{END_COLOR_TEXT_1} has forgotten\n" - "the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}!"); + " {COLOR CYAN}{POKEMON_5}{RESET} has forgotten\n" + "the move {COLOR GREEN}{POKEMON_1}{RESET}!"); ALIGNED(4) static const u8 sUnknown_80D99F0[] = _( " So, forget the move\n" - "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and any moves linked to it?"); + "{COLOR GREEN}{POKEMON_1}{RESET} and any moves linked to it?"); ALIGNED(4) static const u8 sUnknown_80D9A2C[] = _( " So, forget the move\n" - "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}?"); + "{COLOR GREEN}{POKEMON_1}{RESET}?"); ALIGNED(4) static const u8 sUnknown_80D9A50[] = _( " Uh... Huh?{WAIT_PRESS}\n" @@ -382,39 +382,39 @@ ALIGNED(4) static const u8 sUnknown_80D9B1C[] = _( " Gggggggg...{WAIT_PRESS} Pwah! Gulpin!{EXTRA_MSG}" " There!\n" "Success!{EXTRA_MSG}" - " {COLOR_1 CYAN_3}{ARG_POKEMON_5}{END_COLOR_TEXT_1} is done!{EXTRA_MSG}" + " {COLOR CYAN_M}{POKEMON_5}{RESET} is done!{EXTRA_MSG}" " It's forgotten the move\n" - "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and any moves linked to it,\n" - "and {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1} has been remembered!"); + "{COLOR GREEN}{POKEMON_1}{RESET} and any moves linked to it,\n" + "and {COLOR CYAN}{POKEMON_0}{RESET} has been remembered!"); ALIGNED(4) static const u8 sUnknown_80D9BD8[] = _( " OK, here goes!{EXTRA_MSG}" " Gggggggg...{WAIT_PRESS} Pwah! Gulpin!{EXTRA_MSG}" " There!\n" "Success!{EXTRA_MSG}" - " {COLOR_1 CYAN_3}{ARG_POKEMON_5}{END_COLOR_TEXT_1} has forgotten\n" - "the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and remembered\n" - "the move {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}!"); + " {COLOR CYAN_M}{POKEMON_5}{RESET} has forgotten\n" + "the move {COLOR GREEN}{POKEMON_1}{RESET} and remembered\n" + "the move {COLOR CYAN}{POKEMON_0}{RESET}!"); ALIGNED(4) static const u8 sUnknown_80D9C68[] = _( - " So, forget {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}\n" + " So, forget {COLOR GREEN}{POKEMON_1}{RESET}\n" "and any moves linked to it, and remember\n" - "the move {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?"); + "the move {COLOR CYAN}{POKEMON_0}{RESET}?"); ALIGNED(4) static const u8 sUnknown_80D9CC0[] = _( " So, forget the move\n" - "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and remember the move\n" - "{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?"); + "{COLOR GREEN}{POKEMON_1}{RESET} and remember the move\n" + "{COLOR CYAN}{POKEMON_0}{RESET}?"); ALIGNED(4) static const u8 sUnknown_80D9D00[] = _( - " So, the move {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}\n" + " So, the move {COLOR CYAN}{POKEMON_0}{RESET}\n" "is the one to be remembered?{WAIT_PRESS}\n" "OK, here goes!{EXTRA_MSG}" " Gggggggggggg...{WAIT_PRESS} Gulpin!{EXTRA_MSG}" " There!\n" "Success!{EXTRA_MSG}" - " {COLOR_1 CYAN_3}{ARG_POKEMON_5}{END_COLOR_TEXT_1} has\n" - "remembered the move {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}!"); + " {COLOR CYAN_M}{POKEMON_5}{RESET} has\n" + "remembered the move {COLOR CYAN}{POKEMON_0}{RESET}!"); ALIGNED(4) static const u8 sUnknown_80D9DA4[] = _( " Which move would you like\n" diff --git a/src/data/common_strings_kangaskhan_storage.h b/src/data/common_strings_kangaskhan_storage.h index 3a3c05f2..d44c4080 100644 --- a/src/data/common_strings_kangaskhan_storage.h +++ b/src/data/common_strings_kangaskhan_storage.h @@ -107,7 +107,7 @@ ALIGNED(4) static const u8 sUnknown_80D5590[] = _( ALIGNED(4) static const u8 sUnknown_80D55C0[] = _( " Zzz... Zzz...\n" - "That {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...\n" + "That {COLOR GREEN}{MOVE_ITEM_0}{RESET}...\n" "Can't store it..."); ALIGNED(4) static const u8 sUnknown_80D55F4[] = _( @@ -135,7 +135,7 @@ ALIGNED(4) static const u8 sUnknown_80D56CC[] = _( ALIGNED(4) static const u8 sUnknown_80D5710[] = _( " Hunh...? Taking...?\n" - "Oh... You want your {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...\n" + "Oh... You want your {COLOR GREEN}{MOVE_ITEM_0}{RESET}...\n" "OK?"); ALIGNED(4) static const u8 sUnknown_80D574C[] = _( @@ -158,7 +158,7 @@ ALIGNED(4) static const u8 sUnknown_80D57F4[] = _( ALIGNED(4) static const u8 sUnknown_80D5844[] = _( " Zzz... Store something?\n" - "Gonna put {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} in storage...\n" + "Gonna put {COLOR GREEN}{MOVE_ITEM_0}{RESET} in storage...\n" "OK?"); ALIGNED(4) static const u8 sUnknown_80D5884[] = _( @@ -182,7 +182,7 @@ ALIGNED(4) static const u8 sUnknown_80D5934[] = _( ALIGNED(4) static const u8 sUnknown_80D5954[] = _( " Zzz... Zzz...\n" "Hello, there...\n" - "{ARG_POKEMON_6} Storage..."); + "{POKEMON_6} Storage..."); ALIGNED(4) static const u8 sUnknown_80D5984[] = _( " I can store items that you\n" @@ -208,7 +208,7 @@ ALIGNED(4) static const u8 sUnknown_80D5B24[] = _( ALIGNED(4) static const u8 sUnknown_80D5B5C[] = _( " Oh, dear, sorry.{WAIT_PRESS}\n" - "That {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} is an item you\n" + "That {COLOR GREEN}{MOVE_ITEM_0}{RESET} is an item you\n" "can't put in storage."); ALIGNED(4) static const u8 sUnknown_80D5BAC[] = _( @@ -233,7 +233,7 @@ ALIGNED(4) static const u8 sUnknown_80D5C74[] = _( ALIGNED(4) static const u8 sUnknown_80D5CAC[] = _( " Fine, I'll take your\n" - "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} out of storage. OK?"); + "{COLOR GREEN}{MOVE_ITEM_0}{RESET} out of storage. OK?"); ALIGNED(4) static const u8 sUnknown_80D5CE4[] = _( " Would you like to take\n" @@ -254,7 +254,7 @@ ALIGNED(4) static const u8 sUnknown_80D5D8C[] = _( ALIGNED(4) static const u8 sUnknown_80D5DBC[] = _( " I'll put your\n" - "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} in storage. OK?"); + "{COLOR GREEN}{MOVE_ITEM_0}{RESET} in storage. OK?"); ALIGNED(4) static const u8 sUnknown_80D5DE8[] = _( " Do you want to store\n" @@ -273,4 +273,4 @@ ALIGNED(4) static const u8 sUnknown_80D5E84[] = _(" Anything else, dear?"); ALIGNED(4) static const u8 sUnknown_80D5E9C[] = _( " Hello, there!\n" - "Welcome to {ARG_POKEMON_6} Storage."); \ No newline at end of file + "Welcome to {POKEMON_6} Storage."); \ No newline at end of file diff --git a/src/data/common_strings_kecleon_bros.h b/src/data/common_strings_kecleon_bros.h index 5e899abc..82174ef5 100644 --- a/src/data/common_strings_kecleon_bros.h +++ b/src/data/common_strings_kecleon_bros.h @@ -261,12 +261,12 @@ ALIGNED(4) static const u8 sUnknown_80D6364[] = _( ALIGNED(4) static const u8 sUnknown_80D6394[] = _( " Zzz... Reep, what...?\n" "For all that I can buy, I will pay\n" - "{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}... OK?"); + "{COLOR CYAN}{VALUE_0}{RESET} {POKE}... OK?"); ALIGNED(4) static const u8 sUnknown_80D63E8[] = _( " Zzzzzz... Zzzzzz...?\n" - "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?\n" - "Is {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE} OK?"); + "{COLOR GREEN}{MOVE_ITEM_0}{RESET}?\n" + "Is {COLOR CYAN}{VALUE_0}{RESET} {POKE} OK?"); ALIGNED(4) static const u8 sUnknown_80D6420[] = _( " Reep reep... Eep...\n" @@ -282,7 +282,7 @@ ALIGNED(4) static const u8 sUnknown_80D6478[] = _( ALIGNED(4) static const u8 sUnknown_80D6494[] = _( " Zzzzzz...\n" - "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} is {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}...\n" + "{COLOR GREEN}{MOVE_ITEM_0}{RESET} is {COLOR CYAN}{VALUE_0}{RESET} {POKE}...\n" "OK?"); ALIGNED(4) static const u8 sUnknown_80D64C0[] = _( @@ -388,12 +388,12 @@ ALIGNED(4) static const u8 sUnknown_80D6B18[] = _( ALIGNED(4) static const u8 sUnknown_80D6B50[] = _( " For all that I can buy, I can\n" - "offer you {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n" + "offer you {COLOR CYAN}{VALUE_0}{RESET} {POKE}.\n" "Is that acceptable?"); ALIGNED(4) static const u8 sUnknown_80D6BA0[] = _( - " {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}, you say?\n" - "For that, I can offer {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n" + " {COLOR GREEN}{MOVE_ITEM_0}{RESET}, you say?\n" + "For that, I can offer {COLOR CYAN}{VALUE_0}{RESET} {POKE}.\n" "Is that acceptable?"); ALIGNED(4) static const u8 sUnknown_80D6BF4[] = _( @@ -405,8 +405,8 @@ ALIGNED(4) static const u8 sUnknown_80D6C1C[] = _( "A very good choice!"); ALIGNED(4) static const u8 sUnknown_80D6C48[] = _( - " {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}, you say?\n" - "That will be {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n" + " {COLOR GREEN}{MOVE_ITEM_0}{RESET}, you say?\n" + "That will be {COLOR CYAN}{VALUE_0}{RESET} {POKE}.\n" "Is that acceptable?"); ALIGNED(4) static const u8 sUnknown_80D6C90[] = _( @@ -492,13 +492,13 @@ ALIGNED(4) static const u8 sUnknown_80D7090[] = _( ALIGNED(4) static const u8 sUnknown_80D70B4[] = _( " Zzzzzz... Zzzzzz...?\n" - "I can pay you {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}\n" + "I can pay you {COLOR CYAN}{VALUE_0}{RESET} {POKE}\n" "for everything I can buy... OK?"); ALIGNED(4) static const u8 sUnknown_80D7108[] = _( " Zzzzzz... Zzzzzz...?\n" - "Selling that {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...?\n" - "How about {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}?"); + "Selling that {COLOR GREEN}{MOVE_ITEM_0}{RESET}...?\n" + "How about {COLOR CYAN}{VALUE_0}{RESET} {POKE}?"); ALIGNED(4) static const u8 sUnknown_80D7154[] = _( " Zzz... Meep...\n" @@ -514,8 +514,8 @@ ALIGNED(4) static const u8 sUnknown_80D71B0[] = _( ALIGNED(4) static const u8 sUnknown_80D71CC[] = _( " Zzz... Meep meep...\n" - "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...?\n" - "{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}, OK?"); + "{COLOR GREEN}{MOVE_ITEM_0}{RESET}...?\n" + "{COLOR CYAN}{VALUE_0}{RESET} {POKE}, OK?"); ALIGNED(4) static const u8 sUnknown_80D7204[] = _( " Buy? Huh, eep?\n" @@ -538,7 +538,7 @@ ALIGNED(4) static const u8 sUnknown_80D72A0[] = _( "Welcome..."); ALIGNED(4) static const u8 sUnknown_80D72B8[] = _( - " We, the {ARG_POKEMON_6}\n" + " We, the {POKEMON_6}\n" "Brothers, have a passion for selling\n" "items.{EXTRA_MSG}" " Items are useful for your\n" @@ -552,7 +552,7 @@ ALIGNED(4) static const u8 sUnknown_80D72B8[] = _( " Until then, please go to\n" "a dungeon and spend some time.\n" "Please visit on your return〜♪{EXTRA_MSG}" - " Ah, yes. The {ARG_POKEMON_6}\n" + " Ah, yes. The {POKEMON_6}\n" "Shop is a nationwide chain.{EXTRA_MSG}" " There are shops even in\n" "dungeons.\n" @@ -610,12 +610,12 @@ ALIGNED(4) static const u8 sUnknown_80D7740[] = _( ALIGNED(4) static const u8 sUnknown_80D776C[] = _( " For everything I can buy,\n" - "I can offer {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n" + "I can offer {COLOR CYAN}{VALUE_0}{RESET} {POKE}.\n" "Is that acceptable to you?"); ALIGNED(4) static const u8 sUnknown_80D77C0[] = _( - " {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?\n" - "I can offer you {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n" + " {COLOR GREEN}{MOVE_ITEM_0}{RESET}?\n" + "I can offer you {COLOR CYAN}{VALUE_0}{RESET} {POKE}.\n" "Will you sell it for that price?"); ALIGNED(4) static const u8 sUnknown_80D780C[] = _( @@ -631,8 +631,8 @@ ALIGNED(4) static const u8 sUnknown_80D785C[] = _( "It is yours to take!"); ALIGNED(4) static const u8 sUnknown_80D788C[] = _( - " {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?\n" - "That will be {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n" + " {COLOR GREEN}{MOVE_ITEM_0}{RESET}?\n" + "That will be {COLOR CYAN}{VALUE_0}{RESET} {POKE}.\n" "Is that to your liking?"); ALIGNED(4) static const u8 sUnknown_80D78CC[] = _( @@ -653,4 +653,4 @@ ALIGNED(4) static const u8 sUnknown_80D7958[] = _( ALIGNED(4) static const u8 sUnknown_80D797C[] = _( " Hello〜♪\n" - "Welcome to the {ARG_POKEMON_6} Shop〜♪ "); \ No newline at end of file + "Welcome to the {POKEMON_6} Shop〜♪ "); \ No newline at end of file diff --git a/src/data/common_strings_makuhita_dojo.h b/src/data/common_strings_makuhita_dojo.h index efdb7477..087995a0 100644 --- a/src/data/common_strings_makuhita_dojo.h +++ b/src/data/common_strings_makuhita_dojo.h @@ -78,7 +78,7 @@ ALIGNED(4) static const u8 sUnknown_80DA100[] = _( "Your reward...\n" "Promised...{EXTRA_MSG}" " Zzz... Urr!\n" - "{COLOR_1 GREEN_2}Bonsly Doll{END_COLOR_TEXT_1}..."); + "{COLOR GREEN_I}Bonsly Doll{RESET}..."); ALIGNED(4) static const u8 sUnknown_80DA204[] = _( " Ah... Zzznarr...\n" @@ -94,7 +94,7 @@ ALIGNED(4) static const u8 sUnknown_80DA248[] = _( ALIGNED(4) static const u8 sUnknown_80DA290[] = _( " Zzz... Narr...\n" - "{ARG_POKEMON_0}? 'K, go..."); + "{POKEMON_0}? 'K, go..."); ALIGNED(4) static const u8 sUnknown_80DA2B4[] = _( " Zzznarr... Zzz...\n" @@ -119,9 +119,9 @@ ALIGNED(4) static const u8 sUnknown_80DA338[] = _( "level up...{WAIT_PRESS}\n" "And toughen up your rescue team.{EXTRA_MSG}" " Also...{WAIT_PRESS}\n" - "In the {COLOR_1 YELLOW_4}Fire Maze{END_COLOR_TEXT_1} you will find only\n" + "In the {COLOR YELLOW_D}Fire Maze{RESET} you will find only\n" "Fire-type Pokémon.{EXTRA_MSG}" - " In the {COLOR_1 YELLOW_4}Water Maze{END_COLOR_TEXT_1} there\n" + " In the {COLOR YELLOW_D}Water Maze{RESET} there\n" "will only be Water-type Pokémon.{EXTRA_MSG}" " In such ways, only one type\n" "of Pokémon will be in a given room.\n" @@ -163,7 +163,7 @@ ALIGNED(4) static const u8 sUnknown_80DA688[] = _( "I promised you a reward for completing\n" "the training courses!{EXTRA_MSG}" " So... Here it is!{WAIT_PRESS}\n" - "My {COLOR_1 GREEN_2}Bonsly Doll{END_COLOR_TEXT_1}!{EXTRA_MSG}" + "My {COLOR GREEN_I}Bonsly Doll{RESET}!{EXTRA_MSG}" " Isn't it smashing? Hey?!"); ALIGNED(4) static const u8 sUnknown_80DA844[] = _( @@ -184,7 +184,7 @@ ALIGNED(4) static const u8 sUnknown_80DA908[] = _( "forward!"); ALIGNED(4) static const u8 sUnknown_80DA998[] = _( - " The {ARG_POKEMON_0}?{WAIT_PRESS}\n" + " The {POKEMON_0}?{WAIT_PRESS}\n" "Your decision stands!{WAIT_PRESS}\n" "Let the training begin!"); diff --git a/src/data/common_strings_wigglytuff_shop.h b/src/data/common_strings_wigglytuff_shop.h index f614e93f..a3a37e05 100644 --- a/src/data/common_strings_wigglytuff_shop.h +++ b/src/data/common_strings_wigglytuff_shop.h @@ -101,7 +101,7 @@ ALIGNED(4) static const u8 sUnknown_80D7A44[] = _( "their species...{EXTRA_MSG}" " Kwoo... Sssnore...\n" "See what Pokémon can live there by\n" - "checking {COLOR_1 YELLOW}Info{END_COLOR_TEXT_1}...{EXTRA_MSG}" + "checking {COLOR YELLOW}Info{RESET}...{EXTRA_MSG}" " Zzz...\n" "I don't sell some Friend Areas...{EXTRA_MSG}" " Kwoo...\n" @@ -113,14 +113,14 @@ ALIGNED(4) static const u8 sUnknown_80D7A44[] = _( ALIGNED(4) static const u8 sUnknown_80D7C94[] = _( " Sssnore...\n" - "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}...?\n" + "{COLOR GREEN}{FRIEND_AREA}{RESET}...?\n" "I can't get that Friend Area...{EXTRA_MSG}" " Zzz... Zzz...\n" "Sorry..."); ALIGNED(4) static const u8 sUnknown_80D7CE8[] = _( " Zzz... Hunh...?\n" - "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}...?\n" + "{COLOR GREEN}{FRIEND_AREA}{RESET}...?\n" "I don't know... I'll check...{EXTRA_MSG}" " Sssnore...\n" "I'll have it for sale...\n" @@ -129,12 +129,12 @@ ALIGNED(4) static const u8 sUnknown_80D7CE8[] = _( ALIGNED(4) static const u8 sUnknown_80D7D64[] = _( " Sssnore...\n" "You can already go...\n" - "Friend Area {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}..."); + "Friend Area {COLOR GREEN}{FRIEND_AREA}{RESET}..."); ALIGNED(4) static const u8 sUnknown_80D7DA0[] = _( " Dwee... Kwoo...\n" - "{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}'s Friend Area...\n" - "Zzz... {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}..."); + "{COLOR CYAN}{POKEMON_0}{RESET}'s Friend Area...\n" + "Zzz... {COLOR GREEN}{FRIEND_AREA}{RESET}..."); ALIGNED(4) static const u8 sUnknown_80D7DE0[] = _( " Another Pokémon...\n" @@ -165,23 +165,23 @@ ALIGNED(4) static const u8 sUnknown_80D7ED0[] = _( ALIGNED(4) static const u8 sUnknown_80D7F10[] = _( " Grats... Zzz...{WAIT_PRESS}\n" - "You can go to {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}...{EXTRA_MSG}" + "You can go to {COLOR GREEN}{FRIEND_AREA}{RESET}...{EXTRA_MSG}" " Dwee... Sssnore...\n" "Make friends with Pokémon in...\n" - "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}..."); + "{COLOR GREEN}{FRIEND_AREA}{RESET}..."); ALIGNED(4) static const u8 sUnknown_80D7F7C[] = _( " Zzz... Dwee... Gotcha...{WAIT_PRESS}\n" "Zzz... Let's do it...{EXTRA_MSG}" " Sssnore♪ Sssnore♪\n" - "{ARG_POKEMON_6}〜♪ {ARG_POKEMON_6}〜♪\n" + "{POKEMON_6}〜♪ {POKEMON_6}〜♪\n" "Let's be friends...{EXTRA_MSG}" " Kwoo!\n" "Taaaaaaah!"); ALIGNED(4) static const u8 sUnknown_80D8000[] = _( - " Kwoo? {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n" - "That's {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}...\n" + " Kwoo? {COLOR GREEN}{FRIEND_AREA}{RESET}?\n" + "That's {COLOR CYAN}{VALUE_0}{RESET} {POKE}...\n" "OK?"); ALIGNED(4) static const u8 sUnknown_80D8030[] = _( @@ -203,7 +203,7 @@ ALIGNED(4) static const u8 sUnknown_80D80B0[] = _( ALIGNED(4) static const u8 sUnknown_80D80D4[] = _( " Friends... Zzz...\n" - "Welcome to the {ARG_POKEMON_6} Club..."); + "Welcome to the {POKEMON_6} Club..."); ALIGNED(4) static const u8 sUnknown_80D8104[] = _( " Would you like to get more\n" @@ -222,7 +222,7 @@ ALIGNED(4) static const u8 sUnknown_80D8104[] = _( "their species.{EXTRA_MSG}" " If you're buying a Friend\n" "Area, you should confirm what Pokémon\n" - "can live there by checking {COLOR_1 YELLOW}Info{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "can live there by checking {COLOR YELLOW}Info{RESET}.{EXTRA_MSG}" " Also, there are some Friend\n" "Areas that I don't sell.{EXTRA_MSG}" " I think there are some\n" @@ -235,12 +235,12 @@ ALIGNED(4) static const u8 sUnknown_80D8104[] = _( "delighted when you make new friends!"); ALIGNED(4) static const u8 sUnknown_80D8420[] = _( - " {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n" + " {COLOR GREEN}{FRIEND_AREA}{RESET}?\n" "I can't get that Friend Area for you.{WAIT_PRESS}\n" "I'm really sorry."); ALIGNED(4) static const u8 sUnknown_80D8468[] = _( - " {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n" + " {COLOR GREEN}{FRIEND_AREA}{RESET}?\n" "I don't know much about it at all.{WAIT_PRESS}\n" "I'll check up on it.{EXTRA_MSG}" " I'll add it to the Friend\n" @@ -248,11 +248,11 @@ ALIGNED(4) static const u8 sUnknown_80D8468[] = _( ALIGNED(4) static const u8 sUnknown_80D84F8[] = _( " You can already go to the\n" - "Friend Area {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}."); + "Friend Area {COLOR GREEN}{FRIEND_AREA}{RESET}."); ALIGNED(4) static const u8 sUnknown_80D8528[] = _( - " {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}'s Friend Area\n" - "is {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}."); + " {COLOR CYAN}{POKEMON_0}{RESET}'s Friend Area\n" + "is {COLOR GREEN}{FRIEND_AREA}{RESET}."); ALIGNED(4) static const u8 sUnknown_80D8550[] = _( " Is there another Pokémon\n" @@ -282,19 +282,19 @@ ALIGNED(4) static const u8 sUnknown_80D8644[] = _( ALIGNED(4) static const u8 sUnknown_80D8674[] = _( " Congratulations!{WAIT_PRESS}\n" - "You can go to {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1} now!{EXTRA_MSG}" + "You can go to {COLOR GREEN}{FRIEND_AREA}{RESET} now!{EXTRA_MSG}" " You can recruit\n" "Pokémon that live in the Friend Area\n" - "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}."); + "{COLOR GREEN}{FRIEND_AREA}{RESET}."); ALIGNED(4) static const u8 sUnknown_80D86E4[] = _( " Gotcha! Let's do it!{WAIT_PRESS}\n" - "{ARG_POKEMON_6}〜♪ {ARG_POKEMON_6}〜♪{WAIT_PRESS}\n" + "{POKEMON_6}〜♪ {POKEMON_6}〜♪{WAIT_PRESS}\n" "Let's be friends... Yoomtaaaaaaah!"); ALIGNED(4) static const u8 sUnknown_80D8738[] = _( - " {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n" - "That will be {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n" + " {COLOR GREEN}{FRIEND_AREA}{RESET}?\n" + "That will be {COLOR CYAN}{VALUE_0}{RESET} {POKE}.\n" "Is that OK?"); ALIGNED(4) static const u8 sUnknown_80D876C[] = _( @@ -316,5 +316,5 @@ ALIGNED(4) static const u8 sUnknown_80D8818[] = _( ALIGNED(4) static const u8 sUnknown_80D883C[] = _( " Friends are my treasures!\n" - "Welcome to the {ARG_POKEMON_6} Club--\n" + "Welcome to the {POKEMON_6} Club--\n" "a circle of friends! "); \ No newline at end of file diff --git a/src/data/formatted_type_names.h b/src/data/formatted_type_names.h index 16deaad9..7b8db1ae 100644 --- a/src/data/formatted_type_names.h +++ b/src/data/formatted_type_names.h @@ -1,18 +1,18 @@ -ALIGNED(4) const char gFormattedSteelText[] = _("{COLOR_2 YELLOW}Steel{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedDarkText[] = _("{COLOR_2 YELLOW}Dark{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedDragonText[] = _("{COLOR_2 YELLOW}Dragon{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedGhostText[] = _("{COLOR_2 YELLOW}Ghost{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedRockText[] = _("{COLOR_2 YELLOW}Rock{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedBugText[] = _("{COLOR_2 YELLOW}Bug{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedPsychicText[] = _("{COLOR_2 YELLOW}Psychic{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedFlyingText[] = _("{COLOR_2 YELLOW}Flying{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedGroundText[] = _("{COLOR_2 YELLOW}Ground{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedPoisonText[] = _("{COLOR_2 YELLOW}Poison{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedFightingText[] = _("{COLOR_2 YELLOW}Fighting{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedIceText[] = _("{COLOR_2 YELLOW}Ice{END_COLOR_TEXT_2} "); -ALIGNED(4) const char gFormattedElectricText[] = _("{COLOR_2 YELLOW}Electric{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedGrassText[] = _("{COLOR_2 YELLOW}Grass{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedWaterText[] = _("{COLOR_2 YELLOW}Water{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedFireText[] = _("{COLOR_2 YELLOW}Fire{END_COLOR_TEXT_2} "); -ALIGNED(4) const char gFormattedNormalText[] = _("{COLOR_2 YELLOW}Normal{END_COLOR_TEXT_2}"); -ALIGNED(4) const char gFormattedNoneText[] = _("{COLOR_2 YELLOW}None{END_COLOR_TEXT_2}"); +ALIGNED(4) const char gFormattedSteelText[] = _("{color YELLOW}Steel{reset}"); +ALIGNED(4) const char gFormattedDarkText[] = _("{color YELLOW}Dark{reset}"); +ALIGNED(4) const char gFormattedDragonText[] = _("{color YELLOW}Dragon{reset}"); +ALIGNED(4) const char gFormattedGhostText[] = _("{color YELLOW}Ghost{reset}"); +ALIGNED(4) const char gFormattedRockText[] = _("{color YELLOW}Rock{reset}"); +ALIGNED(4) const char gFormattedBugText[] = _("{color YELLOW}Bug{reset}"); +ALIGNED(4) const char gFormattedPsychicText[] = _("{color YELLOW}Psychic{reset}"); +ALIGNED(4) const char gFormattedFlyingText[] = _("{color YELLOW}Flying{reset}"); +ALIGNED(4) const char gFormattedGroundText[] = _("{color YELLOW}Ground{reset}"); +ALIGNED(4) const char gFormattedPoisonText[] = _("{color YELLOW}Poison{reset}"); +ALIGNED(4) const char gFormattedFightingText[] = _("{color YELLOW}Fighting{reset}"); +ALIGNED(4) const char gFormattedIceText[] = _("{color YELLOW}Ice{reset} "); +ALIGNED(4) const char gFormattedElectricText[] = _("{color YELLOW}Electric{reset}"); +ALIGNED(4) const char gFormattedGrassText[] = _("{color YELLOW}Grass{reset}"); +ALIGNED(4) const char gFormattedWaterText[] = _("{color YELLOW}Water{reset}"); +ALIGNED(4) const char gFormattedFireText[] = _("{color YELLOW}Fire{reset} "); +ALIGNED(4) const char gFormattedNormalText[] = _("{color YELLOW}Normal{reset}"); +ALIGNED(4) const char gFormattedNoneText[] = _("{color YELLOW}None{reset}"); diff --git a/src/data/friend_area_action_menu.h b/src/data/friend_area_action_menu.h index 028a8ae2..d85972a1 100644 --- a/src/data/friend_area_action_menu.h +++ b/src/data/friend_area_action_menu.h @@ -63,11 +63,11 @@ ALIGNED(4) static const u8 sSayFarewellConfirm[] = _( "Will you release it anyway?"); ALIGNED(4) static const u8 sReturnedToToolbox[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n" + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_0}{RESET} was\n" "{CENTER_ALIGN}returned to the Toolbox."); ALIGNED(4) static const u8 sSentToStorage[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n{CENTER_ALIGN}sent to storage."); + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_0}{RESET} was\n{CENTER_ALIGN}sent to storage."); ALIGNED(4) static const u8 sStandBy[] = "Stand By"; ALIGNED(4) static const u8 sMakeLeader[] = "Make Leader"; @@ -79,4 +79,4 @@ ALIGNED(4) static const u8 sSummary[] = "Summary"; ALIGNED(4) static const u8 sMoves[] = "Moves"; ALIGNED(4) static const u8 sCheckIQ[] = "Check IQ"; -ALIGNED(4) static const u8 sItemBuffered[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} "); \ No newline at end of file +ALIGNED(4) static const u8 sItemBuffered[] = _("Item: {COLOR GREEN}{MOVE_ITEM_0}{RESET} "); \ No newline at end of file diff --git a/src/data/friend_list_menu.h b/src/data/friend_list_menu.h index 36327020..62d7c839 100644 --- a/src/data/friend_list_menu.h +++ b/src/data/friend_list_menu.h @@ -37,21 +37,21 @@ static const UnkTextStruct2 sUnknown_80DD190 = { ALIGNED(4) static const u8 sVisitWhoPrompt[] = "Whom would you like to visit?"; ALIGNED(4) static const u8 sItemHandedOver[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n" + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_1}{RESET} was\n" "{CENTER_ALIGN}handed over. "); ALIGNED(4) static const u8 sItemExchanged[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n" + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_1}{RESET} was\n" "{CENTER_ALIGN}handed over.{EXTRA_MSG}" - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n" + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_0}{RESET} was\n" "{CENTER_ALIGN}returned to the Toolbox."); ALIGNED(4) static const u8 sReturnedToToolbox[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n" + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_0}{RESET} was\n" "{CENTER_ALIGN}returned to the Toolbox."); ALIGNED(4) static const u8 sLeftOnStandby[] = _( - "{CENTER_ALIGN}{ARG_POKEMON_1} left the team to remain\n" + "{CENTER_ALIGN}{POKEMON_1} left the team to remain\n" "{CENTER_ALIGN}on standby in the Friend Area."); ALIGNED(4) static const u8 sGive[] = "Give"; @@ -62,4 +62,4 @@ ALIGNED(4) static const u8 sName[] = "Name"; ALIGNED(4) static const u8 sSummary[] = "Summary"; ALIGNED(4) static const u8 sMoves[] = "Moves"; ALIGNED(4) static const u8 sCheckIQ[] = "Check IQ"; -ALIGNED(4) static const u8 sItemBuffered[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} "); \ No newline at end of file +ALIGNED(4) static const u8 sItemBuffered[] = _("Item: {COLOR GREEN}{MOVE_ITEM_0}{RESET} "); \ No newline at end of file diff --git a/src/data/friend_rescue_menus.h b/src/data/friend_rescue_menus.h index 2911db27..4ec4366f 100644 --- a/src/data/friend_rescue_menus.h +++ b/src/data/friend_rescue_menus.h @@ -282,8 +282,8 @@ const MenuItem gUnknown_80E24F8[5] = { {NULL, 0x19}, }; -ALIGNED(4) const u8 GetHelp_80E2520[] = _("{COLOR_1 YELLOW}Get help{END_COLOR_TEXT_1} "); -ALIGNED(4) const u8 GoRescue_80E530[] = _("{COLOR_1 YELLOW}Go rescue{END_COLOR_TEXT_1} "); +ALIGNED(4) const u8 GetHelp_80E2520[] = _("{COLOR YELLOW}Get help{RESET} "); +ALIGNED(4) const u8 GoRescue_80E530[] = _("{COLOR YELLOW}Go rescue{RESET} "); const u8 RescueInfo_80E2540[] = "Friend Rescue Info"; extern const u8 RescueProcedures_80E25A0[]; diff --git a/src/data/ground/ground_data_a01p01_station.h b/src/data/ground/ground_data_a01p01_station.h index 98d57a76..478a88f0 100644 --- a/src/data/ground/ground_data_a01p01_station.h +++ b/src/data/ground/ground_data_a01p01_station.h @@ -42,13 +42,13 @@ static const struct ScriptCommand s_gs162_g1_s0_lives0_dlg0[] = { /* 0x820fe54 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("..................") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Where...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Where am I?") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Maybe...#W Is this a dream...?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Maybe...{WAIT_PRESS} Is this a dream...?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...Oh?#W There's someone here.") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Who is it...?#W Someone I know...?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...Oh?{WAIT_PRESS} There's someone here.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Who is it...?{WAIT_PRESS} Someone I know...?") }, { 0x2e, 0x02, 0x0000, 0x00000004, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......#WHmm... I can't remember.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......{WAIT_PRESS}Hmm... I can't remember.") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -91,18 +91,18 @@ static const struct ScriptCommand s_gs162_g2_s0_lives0_dlg0[] = { /* 0x8210190 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("........................") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...Again?#W Am I dreaming again...?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...Again?{WAIT_PRESS} Am I dreaming again...?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...It's that Pokémon again.") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Huh?#W\nThey're...talking to me...?") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...#WI can't hear them clearly.\nWhat are they saying?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Huh?{WAIT_PRESS}\nThey're...talking to me...?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...{WAIT_PRESS}I can't hear them clearly.\nWhat are they saying?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(453), { 0x97, 0x00, 0x0002, 0x00000001, 0x00000003, NULL }, WAIT(30), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Huh? It's shaking.#W An earthquake...?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Huh? It's shaking.{WAIT_PRESS} An earthquake...?") }, { 0x97, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0000, 0x0000000c, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Whoa! It's getting worse.") }, @@ -142,19 +142,19 @@ static const struct ScriptCommand s_gs162_g3_s0_lives0_dlg0[] = { /* 0x8210568 * WAIT(60), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......Again...#W\nIt's that dream again.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......Again...{WAIT_PRESS}\nIt's that dream again.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), SELECT_LIVES(-1, 1), WAIT(60), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("That Pokémon... Who could it be...?") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Huh?#W I'm hearing better this time...") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...What?#W Human?#W My role?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Huh?{WAIT_PRESS} I'm hearing better this time...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...What?{WAIT_PRESS} Human?{WAIT_PRESS} My role?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0000, 0x00000007, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("W-wait.\nPlease, tell me more.") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......#W\nI can't... Drifting off...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......{WAIT_PRESS}\nI can't... Drifting off...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("........................") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -253,34 +253,34 @@ static const struct ScriptCommand s_gs162_g4_s0_lives0_dlg0[] = { /* 0x8210c68 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("........................") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......#WAgain.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......{WAIT_PRESS}Again.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), SELECT_LIVES(-1, 1), WAIT(60), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......It's that dream again.") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I always see this silhouette...#W\nWho could it be?") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oh?#W It's saying something!") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("But... I can't quite make it out...#W\nIt's clearer than it was before, but...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I always see this silhouette...{WAIT_PRESS}\nWho could it be?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oh?{WAIT_PRESS} It's saying something!") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("But... I can't quite make it out...{WAIT_PRESS}\nIt's clearer than it was before, but...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I'll try talking to it.") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Hello.#W Please, tell me.") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("You...#W\nWho are you?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Hello.{WAIT_PRESS} Please, tell me.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("You...{WAIT_PRESS}\nWho are you?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...#WI am...") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I am $n2.") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...{WAIT_PRESS}I am...") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I am {NAME_2}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0000, 0x0000000c, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Ga-$n2...?!") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Ga-{NAME_2}...?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0f, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm so glad. Finally...#W\nI finally got to meet you...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm so glad. Finally...{WAIT_PRESS}\nI finally got to meet you...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...?#W Finally met me...?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...?{WAIT_PRESS} Finally met me...?") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("You knew me from before?\nWhat about me?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -291,7 +291,7 @@ static const struct ScriptCommand s_gs162_g4_s0_lives0_dlg0[] = { /* 0x8210c68 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0000, 0x0000000c, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oh! Wait.#W Just a little longer...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oh! Wait.{WAIT_PRESS} Just a little longer...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0000, 0x00000005, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I want to know more...") }, @@ -400,7 +400,7 @@ static const struct ScriptCommand s_gs162_g5_s0_lives0_dlg0[] = { /* 0x82116b8 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0000, 0x0000000c, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Ga...#W$n2!") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Ga...{WAIT_PRESS}{NAME_2}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -445,7 +445,7 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * FANFARE_PLAY2(477), SELECT_LIVES(-1, 1), WAIT(60), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......You're......#W $n2...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......You're......{WAIT_PRESS} {NAME_2}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -455,11 +455,11 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...$n2.#W\nThere's so much I want to ask you.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...{NAME_2}.{WAIT_PRESS}\nThere's so much I want to ask you.") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Why do you appear in my dreams?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" As an agent of spirits...#W\nI must watch over you...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" As an agent of spirits...{WAIT_PRESS}\nI must watch over you...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Because that is my role\nnow.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -471,22 +471,22 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And became a presence\nwithout a physical form like this.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Trainer...?#W\nYou mean the human that was in the\nlegend about Ninetales?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Trainer...?{WAIT_PRESS}\nYou mean the human that was in the\nlegend about Ninetales?") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("It's awful that your Trainer would abandon\nyou and run away.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.#W My Trainer was\na terrible person.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.{WAIT_PRESS} My Trainer was\na terrible person.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Mean and conniving...\nMy Trainer wasn't a nice person. Truly.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But...#W\nI don't hate my Trainer.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But...{WAIT_PRESS}\nI don't hate my Trainer.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Huh? Don't hate your Trainer?#W\nWhy not?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Huh? Don't hate your Trainer?{WAIT_PRESS}\nWhy not?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Well...#W\nI wonder why myself.\nI don't quite understand...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Well...{WAIT_PRESS}\nI wonder why myself.\nI don't quite understand...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My Trainer did some\nterrible things, but somehow, I can't\nbring myself to feel hatred...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, @@ -496,18 +496,18 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And, when it happened,\nI was desperate...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("When it happened...?#W\nYou mean Ninetales's curse?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("When it happened...?{WAIT_PRESS}\nYou mean Ninetales's curse?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I protected my Trainer\nfrom Ninetales's curse with my\nentire being.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If the Trainer is facing\ndanger...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It is our duty to protect\nthe Trainer with our lives...#W\nWe $m2 are that way.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I kept my Trainer safe...#W\nThat alone was enough to make me happy.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It is our duty to protect\nthe Trainer with our lives...{WAIT_PRESS}\nWe {POKEMON_2} are that way.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I kept my Trainer safe...{WAIT_PRESS}\nThat alone was enough to make me happy.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...Protect the Trainer even at the risk\nof your own life...)") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...It's amazing what $m2\ndid.)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...It's amazing what {POKEMON_2}\ndid.)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, @@ -523,11 +523,11 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" All things have a role.\nThey all serve a purpose.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Just as I have my own\nrole to play...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You, too, have a role to\nfill...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You have...#W\ncome here to perform a certain role...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And, for that role...#W\nyou became a Pokémon.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You have...{WAIT_PRESS}\ncome here to perform a certain role...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And, for that role...{WAIT_PRESS}\nyou became a Pokémon.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("What...?#W\nWhat are you saying?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("What...?{WAIT_PRESS}\nWhat are you saying?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(453), { 0x97, 0x00, 0x0002, 0x00000001, 0x00000003, NULL }, @@ -537,7 +537,7 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("No! Wait!#W\nI need to know more...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("No! Wait!{WAIT_PRESS}\nI need to know more...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -693,8 +693,8 @@ static const struct ScriptCommand s_gs162_g7_s0_lives0_dlg0[] = { /* 0x8212e70 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x0f, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You have...#W\ncome here to perform a certain role...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And, for that role...#W\nyou became a Pokémon.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You have...{WAIT_PRESS}\ncome here to perform a certain role...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And, for that role...{WAIT_PRESS}\nyou became a Pokémon.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -735,29 +735,29 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......I'm......#W\nIn that dream again...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......I'm......{WAIT_PRESS}\nIn that dream again...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(477), SELECT_LIVES(-1, 1), WAIT(60), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............#W$n1...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}{NAME_1}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x0f, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's tomorrow, isn't it?#W\nThat you take to that underground dungeon.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's tomorrow, isn't it?{WAIT_PRESS}\nThat you take to that underground dungeon.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Yes.#W They make it sound like one\nterrible place...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Yes.{WAIT_PRESS} They make it sound like one\nterrible place...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I wonder if we'll be OK...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000041, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You will be fine.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I am certain that you\nwill succeed, $n0.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I am certain that you\nwill succeed, {NAME_0}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You have my support.\nPlease, go with strength.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -765,12 +765,12 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I will. Thank you.") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I'm feeling a little braver now.\nI will go for it.") }, { 0x2e, 0x15, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("By the way...#W\nGardevoir, do you know?") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("What it's like underground?#W\nOr what Groudon is like?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("By the way...{WAIT_PRESS}\nGardevoir, do you know?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("What it's like underground?{WAIT_PRESS}\nOr what Groudon is like?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" No... I'm sorry to say...#W\nI can't envision it...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" No... I'm sorry to say...{WAIT_PRESS}\nI can't envision it...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...OK.") }, @@ -787,17 +787,17 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But...#W\nThere is one thing that I can foresee.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But...{WAIT_PRESS}\nThere is one thing that I can foresee.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...Huh?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Your role...#W\nis coming to its end, little by little.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Your role...{WAIT_PRESS}\nis coming to its end, little by little.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("My role...#W\nis ending...?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("My role...{WAIT_PRESS}\nis ending...?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You became a Pokémon in\norder to fulfill a certain role...") }, @@ -805,7 +805,7 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Now, that role...#W\nis finally drawing to its conclusion.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Now, that role...{WAIT_PRESS}\nis finally drawing to its conclusion.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Gardevoir, tell me!") }, @@ -999,14 +999,14 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x02, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............#WGardevoir...?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}Gardevoir...?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(477), SELECT_LIVES(-1, 1), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Gardevoir...#W\nWill you tell me now?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Gardevoir...{WAIT_PRESS}\nWill you tell me now?") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Who or what I am...?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -1015,27 +1015,27 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The time has arrived.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Why you have come here?") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I will tell you all there is\nto tell.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n0, you have...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_0}, you have...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Come to save this world.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............#W\nCame to save the world of Pokémon?#W\nI did...?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}\nCame to save the world of Pokémon?{WAIT_PRESS}\nI did...?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.#W We learned that\nthis world faced extinction.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.{WAIT_PRESS} We learned that\nthis world faced extinction.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And so we sought a hero.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But though we searched,\nnowhere could we find our hero.\nWe were becoming discouraged...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" When we came across\na human.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n0...#W\nYou were that human.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_0}...{WAIT_PRESS}\nYou were that human.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0000, 0x0000000c, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Wa... #WWait a second!#W\nHero? Me? That's too much!") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Wa... {WAIT_PRESS}Wait a second!{WAIT_PRESS}\nHero? Me? That's too much!") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I'm not anything special like that?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.#W That is also what you\nsaid the first time we met.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.{WAIT_PRESS} That is also what you\nsaid the first time we met.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You said you were not\nstrong.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -1045,7 +1045,7 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("True courage...?#W\nThat...#W I'm even less confident about that.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("True courage...?{WAIT_PRESS}\nThat...{WAIT_PRESS} I'm even less confident about that.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, @@ -1063,43 +1063,43 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That is how you came to\nbe in this world.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I...#W\nI did that?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I...{WAIT_PRESS}\nI did that?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Your courage has been\nproven.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Without question, you bear\nthe role of saving the world.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And that role...#W\nIt is soon coming to its end.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And that role...{WAIT_PRESS}\nIt is soon coming to its end.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...#WStopping the meteor from\ncrashing into this world...?#W\nThat's my role?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...{WAIT_PRESS}Stopping the meteor from\ncrashing into this world...?{WAIT_PRESS}\nThat's my role?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.#W\nAnd when that is accomplished...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.{WAIT_PRESS}\nAnd when that is accomplished...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You can return to your\nhuman world.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oh...#W\nSo I can go back to being a human...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oh...{WAIT_PRESS}\nSo I can go back to being a human...") }, { 0x2e, 0x15, 0x0000, 0x0000000c, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Wait!#W\nBut that means...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Wait!{WAIT_PRESS}\nBut that means...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.#W It means...#W\nParting ways with $n1.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.{WAIT_PRESS} It means...{WAIT_PRESS}\nParting ways with {NAME_1}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0000, 0x00000005, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("$n1......#W\nI have to leave?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("{NAME_1}......{WAIT_PRESS}\nI have to leave?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n1 feels great\nkinship with you, $n0.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" So, $n0, if you\nwere to leave...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_1} feels great\nkinship with you, {NAME_0}.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" So, {NAME_0}, if you\nwere to leave...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Your friend would be\nheartbroken.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...But there can be nothing\ndone.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Because there are\nencounters, there are also farewells...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...#WI, too, once had\na friend beyond value.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...{WAIT_PRESS}I, too, once had\na friend beyond value.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Truly, I cherished our\nfriendship...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But my friend has gone\naway.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It fills me with sadness\nstill, losing my friend...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ......#W\nBut...#W We will meet again...#W\nThat is what I believe.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ......{WAIT_PRESS}\nBut...{WAIT_PRESS} We will meet again...{WAIT_PRESS}\nThat is what I believe.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(485), @@ -1108,14 +1108,14 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * { 0x27, 0x00, 0x0005, 0x00000018, 0x00ffffff, NULL }, WAIT(30), { 0x2e, 0x15, 0x0000, 0x0000000c, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...!#W W-what was that?!") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...!{WAIT_PRESS} W-what was that?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#WWho was it?#W\nSomeone appears to have been looking\ninto your dream.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Who was it?{WAIT_PRESS}\nSomeone appears to have been looking\ninto your dream.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But it is fine now.\nWhoever it was ran off.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...All that remains in this\ndream is a feeling of sadness.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...That Pokémon...\nI think ran off crying...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#W\nIt will be morning soon.#W\nAu revoir.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nIt will be morning soon.{WAIT_PRESS}\nAu revoir.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a01p02_station.h b/src/data/ground/ground_data_a01p02_station.h index 39598afb..0452f363 100644 --- a/src/data/ground/ground_data_a01p02_station.h +++ b/src/data/ground/ground_data_a01p02_station.h @@ -23,7 +23,7 @@ static const struct ScriptCommand s_gs163_g1_s0_station_sref_script[] = { /* 0x8 { 0x2e, 0x02, 0x0000, 0x00000002, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...Urgggh...#W I feel horrible...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...Urgggh...{WAIT_PRESS} I feel horrible...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), SELECT_ENTITIES(-1, -1), @@ -45,9 +45,9 @@ static const struct ScriptCommand s_gs163_g1_s0_lives0_dlg0[] = { /* 0x8216594 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x02, 0x0000, 0x00000002, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("This is a dream...#W Isn't it...?") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...But why...?#W\nWhy do I feel this terrible...?") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("This is...#W The first time...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("This is a dream...{WAIT_PRESS} Isn't it...?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...But why...?{WAIT_PRESS}\nWhy do I feel this terrible...?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("This is...{WAIT_PRESS} The first time...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -109,136 +109,136 @@ static const struct ScriptCommand s_gs163_g3_s0_lives0_dlg0[] = { /* 0x8216954 * { 0x2d, 0x09, 0x0003, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+If you fail to draw out $n2's\n#+true feelings...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The curse will never be broken.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}If you fail to draw out {NAME_2}'s\n{CENTER_ALIGN}true feelings...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The curse will never be broken.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000046, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gegege!\nHey, $n0!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gegege!\nHey, {NAME_0}!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Don't you dare fool around!\nI'll make you pay for it!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+You have but one chance.#W\n#+$n0,\n#+do your best.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Fine...#W It is time.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+First of all...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}You have but one chance.{WAIT_PRESS}\n{CENTER_ALIGN}{NAME_0},\n{CENTER_ALIGN}do your best.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Fine...{WAIT_PRESS} It is time.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}First of all...") }, LABEL(2), /* = 0x02 */ - ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("#+Why does $n2 wish to\n#+break this curse?")), - CHOICE(/* label */ 4, _("To help $n3.")), + ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("{CENTER_ALIGN}Why does {NAME_2} wish to\n{CENTER_ALIGN}break this curse?")), + CHOICE(/* label */ 4, _("To help {NAME_3}.")), CHOICE(/* label */ 5, _("Just a whim.")), LABEL(5), /* = 0x05 */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+............#WDo you mean that?") }, - ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("#+Do you truly...#W\n#+truly believe that?")), + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}............{WAIT_PRESS}Do you mean that?") }, + ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("{CENTER_ALIGN}Do you truly...{WAIT_PRESS}\n{CENTER_ALIGN}truly believe that?")), CHOICE(/* label */ 7, _("Yes.")), CHOICE(/* label */ 8, _("No.")), LABEL(7), /* = 0x07 */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+............#W\n#+If that is truly how you feel...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+My questions\n#+will end now.") }, - ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("#+You have\n#+no regrets?")), + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}............{WAIT_PRESS}\n{CENTER_ALIGN}If that is truly how you feel...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}My questions\n{CENTER_ALIGN}will end now.") }, + ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("{CENTER_ALIGN}You have\n{CENTER_ALIGN}no regrets?")), CHOICE(/* label */ 10, _("None.")), CHOICE(/* label */ 8, _("I do.")), LABEL(8), /* = 0x08 */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+............#W\n#+Please be serious.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Let me ask you again.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}............{WAIT_PRESS}\n{CENTER_ALIGN}Please be serious.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Let me ask you again.") }, JUMP_LABEL(2), LABEL(4), /* = 0x04 */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+That's a lie, isn't it?") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Didn't $n2 abandon\n#+$n3 long ago?") }, - ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("#+Why would $n2\n#+want to save Gardevoir now?")), + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}That's a lie, isn't it?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Didn't {NAME_2} abandon\n{CENTER_ALIGN}{NAME_3} long ago?") }, + ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("{CENTER_ALIGN}Why would {NAME_2}\n{CENTER_ALIGN}want to save Gardevoir now?")), CHOICE(/* label */ 12, _("For taking the curse.")), - CHOICE(/* label */ 13, _("Came to understand $n3.")), + CHOICE(/* label */ 13, _("Came to understand {NAME_3}.")), LABEL(12), /* = 0x0c */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n3 certainly did protect\n#+$n2 from the curse.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Sacrificing herself to do so.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_3} certainly did protect\n{CENTER_ALIGN}{NAME_2} from the curse.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Sacrificing herself to do so.") }, LABEL(14), /* = 0x0e */ - ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("#+But what did $n2\n#+do then?")), - CHOICE(/* label */ 5, _("Tried to protect $n3.")), + ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("{CENTER_ALIGN}But what did {NAME_2}\n{CENTER_ALIGN}do then?")), + CHOICE(/* label */ 5, _("Tried to protect {NAME_3}.")), CHOICE(/* label */ 15, _("Abandoned Gardevoir and ran.")), LABEL(15), /* = 0x0f */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Yes...#W $n2 abandoned\n#+$n3 and fled.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Yes...{WAIT_PRESS} {NAME_2} abandoned\n{CENTER_ALIGN}{NAME_3} and fled.") }, LABEL(16), /* = 0x10 */ - ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("#+Why did $n2\n#+abandon $n3?")), + ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("{CENTER_ALIGN}Why did {NAME_2}\n{CENTER_ALIGN}abandon {NAME_3}?")), CHOICE(/* label */ 17, _("Gengar only cared about himself.")), CHOICE(/* label */ 5, _("Gengar intended to help later.")), LABEL(17), /* = 0x11 */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+That's right.#W\n#+$n2 didn't want to\n#+be cursed himself...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+And abandoned $n3.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+When $n2 was a human,\n#+$n3 was his partner.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+But to $n2, $n3\n#+was merely a tool.") }, - ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("#+The bond between $n2 and\n#+$n3 was that flimsy...#W\n#+Is that what I am hearing?")), + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}That's right.{WAIT_PRESS}\n{CENTER_ALIGN}{NAME_2} didn't want to\n{CENTER_ALIGN}be cursed himself...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And abandoned {NAME_3}.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}When {NAME_2} was a human,\n{CENTER_ALIGN}{NAME_3} was his partner.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}But to {NAME_2}, {NAME_3}\n{CENTER_ALIGN}was merely a tool.") }, + ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("{CENTER_ALIGN}The bond between {NAME_2} and\n{CENTER_ALIGN}{NAME_3} was that flimsy...{WAIT_PRESS}\n{CENTER_ALIGN}Is that what I am hearing?")), CHOICE(/* label */ 19, _("Yes.")), CHOICE(/* label */ 20, _("No.")), LABEL(20), /* = 0x14 */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The bond between $n2 and\n#+$n3 you claim to be strong?") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+But that makes no sense.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n3 saved $n2 from\n#+the curse. That much is true.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+It was from her depth of\n#+feeling for $n2.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The bond between {NAME_2} and\n{CENTER_ALIGN}{NAME_3} you claim to be strong?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}But that makes no sense.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_3} saved {NAME_2} from\n{CENTER_ALIGN}the curse. That much is true.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}It was from her depth of\n{CENTER_ALIGN}feeling for {NAME_2}.") }, JUMP_LABEL(14), LABEL(19), /* = 0x13 */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+............#W\n#+If that is truly how you feel...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+My questions\n#+will end now.") }, - ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("#+You have\n#+no regrets?")), + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}............{WAIT_PRESS}\n{CENTER_ALIGN}If that is truly how you feel...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}My questions\n{CENTER_ALIGN}will end now.") }, + ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("{CENTER_ALIGN}You have\n{CENTER_ALIGN}no regrets?")), CHOICE(/* label */ 10, _("None.")), CHOICE(/* label */ 22, _("I do.")), LABEL(22), /* = 0x16 */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+You claim that isn't true?") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+But $n2 abandoned\n#+$n3.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}You claim that isn't true?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}But {NAME_2} abandoned\n{CENTER_ALIGN}{NAME_3}.") }, JUMP_LABEL(16), LABEL(13), /* = 0x0d */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Came to understand\n#+$n3's feelings?") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+What is it you claim to understand?") }, - ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("#+What do you claim to be\n#+$n3's feelings?")), - CHOICE(/* label */ 24, _("Caring for $n2.")), - CHOICE(/* label */ 25, _("Hatred for $n2.")), + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Came to understand\n{CENTER_ALIGN}{NAME_3}'s feelings?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}What is it you claim to understand?") }, + ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("{CENTER_ALIGN}What do you claim to be\n{CENTER_ALIGN}{NAME_3}'s feelings?")), + CHOICE(/* label */ 24, _("Caring for {NAME_2}.")), + CHOICE(/* label */ 25, _("Hatred for {NAME_2}.")), LABEL(24), /* = 0x18 */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Caring for $n2.#W\n#+I see...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n3 became a presence\n#+without a physical form because\n#+she bore the curse...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+But even then, Gardevoir never\n#+stopped caring for $n2...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Having learned that, $n2\n#+now wants to save $n3...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+It makes sense...#W However...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Until now, $n2 had\n#+forgotten entirely about\n#+$n3, correct?") }, - ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("#+But now Gengar wants to save\n#+Gardevoir. Isn't that asking a lot?")), + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Caring for {NAME_2}.{WAIT_PRESS}\n{CENTER_ALIGN}I see...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_3} became a presence\n{CENTER_ALIGN}without a physical form because\n{CENTER_ALIGN}she bore the curse...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}But even then, Gardevoir never\n{CENTER_ALIGN}stopped caring for {NAME_2}...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Having learned that, {NAME_2}\n{CENTER_ALIGN}now wants to save {NAME_3}...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}It makes sense...{WAIT_PRESS} However...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Until now, {NAME_2} had\n{CENTER_ALIGN}forgotten entirely about\n{CENTER_ALIGN}{NAME_3}, correct?") }, + ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("{CENTER_ALIGN}But now Gengar wants to save\n{CENTER_ALIGN}Gardevoir. Isn't that asking a lot?")), CHOICE(/* label */ 27, _("Yes.")), CHOICE(/* label */ 28, _("No.")), LABEL(27), /* = 0x1b */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+I see...\n#+You say this because Gengar is\n#+willing to face the consequences?") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Gengar is coming to the help of\n#+Gardevoir because he wants to help...#W\n#+Is that what you claim?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I see...\n{CENTER_ALIGN}You say this because Gengar is\n{CENTER_ALIGN}willing to face the consequences?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gengar is coming to the help of\n{CENTER_ALIGN}Gardevoir because he wants to help...{WAIT_PRESS}\n{CENTER_ALIGN}Is that what you claim?") }, JUMP_LABEL(10), LABEL(28), /* = 0x1c */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+You say that is not so...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+You believe that this is another matter?\n#+And to help is only natural?#W\n#+That is what you believe?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}You say that is not so...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}You believe that this is another matter?\n{CENTER_ALIGN}And to help is only natural?{WAIT_PRESS}\n{CENTER_ALIGN}That is what you believe?") }, JUMP_LABEL(10), LABEL(25), /* = 0x19 */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Hatred for $n2...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n3 felt hatred toward\n#+$n2 for abandonment...#W\n#+That is what you claim?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Hatred for {NAME_2}...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_3} felt hatred toward\n{CENTER_ALIGN}{NAME_2} for abandonment...{WAIT_PRESS}\n{CENTER_ALIGN}That is what you claim?") }, LABEL(29), /* = 0x1d */ - ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("#+In spite of that, $n2\n#+is trying to help Gardevoir...#W\n#+Why should that be so?")), + ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("{CENTER_ALIGN}In spite of that, {NAME_2}\n{CENTER_ALIGN}is trying to help Gardevoir...{WAIT_PRESS}\n{CENTER_ALIGN}Why should that be so?")), CHOICE(/* label */ 30, _("To clear up misunderstandings.")), CHOICE(/* label */ 31, _("To punish Gardevoir.")), LABEL(30), /* = 0x1e */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+I see.\n#+To clear up misunderstandings.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Gengar hopes to help $n3\n#+and clear up misunderstandings...#W\n#+That is what you claim?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I see.\n{CENTER_ALIGN}To clear up misunderstandings.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gengar hopes to help {NAME_3}\n{CENTER_ALIGN}and clear up misunderstandings...{WAIT_PRESS}\n{CENTER_ALIGN}That is what you claim?") }, JUMP_LABEL(10), LABEL(31), /* = 0x1f */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Gengar would go through the trouble\n#+of helping $n3 just so she\n#+could be punished?") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Do you claim that seriously?") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+If that is true...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+My queries will\n#+end now.") }, - ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("#+May I finish now?")), + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gengar would go through the trouble\n{CENTER_ALIGN}of helping {NAME_3} just so she\n{CENTER_ALIGN}could be punished?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Do you claim that seriously?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}If that is true...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}My queries will\n{CENTER_ALIGN}end now.") }, + ASK2(FALSE, /*default*/ -1, /* speaker */ -1, _("{CENTER_ALIGN}May I finish now?")), CHOICE(/* label */ 10, _("Yes.")), CHOICE(/* label */ 33, _("No.")), LABEL(33), /* = 0x21 */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+This isn't the end?") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Is there anything else you wish to say?") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Oh? You are confused?") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+............#W\n#+You must be more serious.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Let me go back to my inquiry.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n3 felt hatred toward\n#+$n2 for abandonment...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}This isn't the end?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Is there anything else you wish to say?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Oh? You are confused?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}............{WAIT_PRESS}\n{CENTER_ALIGN}You must be more serious.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Let me go back to my inquiry.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_3} felt hatred toward\n{CENTER_ALIGN}{NAME_2} for abandonment...") }, JUMP_LABEL(29), LABEL(10), /* = 0x0a */ - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+I understand now...\n#+My questions are finished.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I understand now...\n{CENTER_ALIGN}My questions are finished.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, diff --git a/src/data/ground/ground_data_a02p01_station.h b/src/data/ground/ground_data_a02p01_station.h index 85d7f60c..fb6c2690 100644 --- a/src/data/ground/ground_data_a02p01_station.h +++ b/src/data/ground/ground_data_a02p01_station.h @@ -24,9 +24,9 @@ static const struct ScriptCommand s_gs164_g1_s0_station_sref_script[] = { /* 0x8 { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(164), { 0x2d, 0x09, 0x0000, 0x00000021, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Thus began\n#+$n0's") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+cruel and arduous\n#+journey as a fugitive.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Over forbidding mountains...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Thus began\n{CENTER_ALIGN}{NAME_0}'s") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}cruel and arduous\n{CENTER_ALIGN}journey as a fugitive.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Over forbidding mountains...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a02p02_station.h b/src/data/ground/ground_data_a02p02_station.h index fcb424ce..8372b87a 100644 --- a/src/data/ground/ground_data_a02p02_station.h +++ b/src/data/ground/ground_data_a02p02_station.h @@ -23,7 +23,7 @@ static const struct ScriptCommand s_gs165_g1_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(165), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Across fields of fire...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Across fields of fire...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -33,8 +33,8 @@ static const struct ScriptCommand s_gs165_g1_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0000, 0x00000021, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+But throughout it all,\n#+$n0's team kept\n#+their heads held high.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Without a complaint,\n#+they marched on.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}But throughout it all,\n{CENTER_ALIGN}{NAME_0}'s team kept\n{CENTER_ALIGN}their heads held high.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Without a complaint,\n{CENTER_ALIGN}they marched on.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a02p03_station.h b/src/data/ground/ground_data_a02p03_station.h index a5d4ef1a..3aa8c45f 100644 --- a/src/data/ground/ground_data_a02p03_station.h +++ b/src/data/ground/ground_data_a02p03_station.h @@ -120,7 +120,7 @@ static const struct ScriptCommand s_gs166_g2_s0_lives0_dlg0[] = { /* 0x821915c * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What'll we do,\n$n0?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What'll we do,\n{NAME_0}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Look! There they are!") }, @@ -135,7 +135,7 @@ static const struct ScriptCommand s_gs166_g2_s0_lives0_dlg0[] = { /* 0x821915c * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There's no choice now!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Let's go, $n0!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Let's go, {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x23, 0x00, 0x0028, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a02p04_station.h b/src/data/ground/ground_data_a02p04_station.h index a1f3b93a..194798bb 100644 --- a/src/data/ground/ground_data_a02p04_station.h +++ b/src/data/ground/ground_data_a02p04_station.h @@ -42,14 +42,14 @@ static const struct ScriptCommand s_gs167_g2_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0000, 0x00000021, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And so, $n0's\n#+harrowing journey continued.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Seeking refuge in\n#+even harsher places...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+They fled north.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+They crossed row upon\n#+row of mountains...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Forded fetid swamps...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Scaled frozen cliffs...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Till finally, $n0's tiny team\n#+arrived in a world of snow...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+A frigid wasteland of\n#+driving blizzards.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And so, {NAME_0}'s\n{CENTER_ALIGN}harrowing journey continued.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Seeking refuge in\n{CENTER_ALIGN}even harsher places...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}They fled north.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}They crossed row upon\n{CENTER_ALIGN}row of mountains...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Forded fetid swamps...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Scaled frozen cliffs...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Till finally, {NAME_0}'s tiny team\n{CENTER_ALIGN}arrived in a world of snow...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}A frigid wasteland of\n{CENTER_ALIGN}driving blizzards.") }, BGM_FADEOUT(120), { 0xe0, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -114,8 +114,8 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Oh, hey!\n$n0, you have to see this!")), - VARIANT_DEFAULT(_(" Oh, look!\n$n0, look over there!")), + VARIANT(/* == */ 1, _(" Oh, hey!\n{NAME_0}, you have to see this!")), + VARIANT_DEFAULT(_(" Oh, look!\n{NAME_0}, look over there!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -129,9 +129,9 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ............#WHey, $n0.")), - VARIANT(/* == */ 3, _(" ............#WUm, $n0?")), - VARIANT_DEFAULT(_(" ............#W$n0.")), + VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}Hey, {NAME_0}.")), + VARIANT(/* == */ 3, _(" ............{WAIT_PRESS}Um, {NAME_0}?")), + VARIANT_DEFAULT(_(" ............{WAIT_PRESS}{NAME_0}.")), { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" You remember how tough it\nwas getting over Mt. Blaze, right?")), @@ -163,17 +163,17 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" What?#W There are others?")), + VARIANT(/* == */ 1, _(" What?{WAIT_PRESS} There are others?")), VARIANT(/* == */ 1, _(" Who might they be?")), - VARIANT_DEFAULT(_(" Oh?#W There's someone else?")), + VARIANT_DEFAULT(_(" Oh?{WAIT_PRESS} There's someone else?")), VARIANT_DEFAULT(_(" Well, who do you mean?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...#WOh, right.#W\nAlakazam's still out there.")), + VARIANT(/* == */ 1, _(" ...{WAIT_PRESS}Oh, right.{WAIT_PRESS}\nAlakazam's still out there.")), VARIANT(/* == */ 1, _(" Their team should be able\nto get here...")), - VARIANT_DEFAULT(_(" ...#WOh, I get it.#W\nThere's Alakazam.")), + VARIANT_DEFAULT(_(" ...{WAIT_PRESS}Oh, I get it.{WAIT_PRESS}\nThere's Alakazam.")), VARIANT_DEFAULT(_(" You're right.\nAlakazam's team should be able to get\nhere.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(4), @@ -181,25 +181,25 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), { 0x2e, 0x03, 0x0001, 0x0000000b, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I knew it!\nI knew you'd say that too, $n0!")), - VARIANT_DEFAULT(_(" I thought so!\nYou think so too, $n0, right?!")), + VARIANT(/* == */ 1, _(" I knew it!\nI knew you'd say that too, {NAME_0}!")), + VARIANT_DEFAULT(_(" I thought so!\nYou think so too, {NAME_0}, right?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yeah, you're right.\nThere can't be anyone else.\nHahahahaha.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" All right!\nWe can say good-bye to living like\nfugitives.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We don't have to keep\nrunning away anymore!\nHahahahaha.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hahahaha...#W Haha...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hahahaha...{WAIT_PRESS} Haha...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ..................#W\nThis is no good, $n0.")), + VARIANT(/* == */ 1, _(" ..................{WAIT_PRESS}\nThis is no good, {NAME_0}.")), VARIANT(/* == */ 1, _(" We forgot about some\ntough customers.")), - VARIANT(/* == */ 1, _(" Alakazam.#W\nHis team won't drop the chase ever.")), - VARIANT_DEFAULT(_(" ........................#W\nIt's no good, $n0.")), + VARIANT(/* == */ 1, _(" Alakazam.{WAIT_PRESS}\nHis team won't drop the chase ever.")), + VARIANT_DEFAULT(_(" ........................{WAIT_PRESS}\nIt's no good, {NAME_0}.")), VARIANT_DEFAULT(_(" We've forgotten some\ntough customers.")), - VARIANT_DEFAULT(_(" It's Alakazam's team.#W\nThey'll keep chasing us wherever we go.")), + VARIANT_DEFAULT(_(" It's Alakazam's team.{WAIT_PRESS}\nThey'll keep chasing us wherever we go.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(4), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), @@ -222,34 +222,34 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Huh?#W What's the matter?\nAren't you coming, $n0?")), - VARIANT(/* == */ 3, _(" Oh?#W What's wrong?\nAren't we going, $n0?")), - VARIANT_DEFAULT(_(" Huh?#W What's the matter?\nAren't you coming, $n0?")), + VARIANT(/* == */ 1, _(" Huh?{WAIT_PRESS} What's the matter?\nAren't you coming, {NAME_0}?")), + VARIANT(/* == */ 3, _(" Oh?{WAIT_PRESS} What's wrong?\nAren't we going, {NAME_0}?")), + VARIANT_DEFAULT(_(" Huh?{WAIT_PRESS} What's the matter?\nAren't you coming, {NAME_0}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x0a, 0x000b, 0x00000007, 0x00000000, NULL }, WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...#WWhat?#W\nAren't I tired, you're asking?")), + VARIANT(/* == */ 1, _(" ...{WAIT_PRESS}What?{WAIT_PRESS}\nAren't I tired, you're asking?")), VARIANT(/* == */ 1, _(" We're being chased!\nWe can't rest.")), - VARIANT(/* == */ 1, _(" And...#W\nI told you, didn't I?")), - VARIANT(/* == */ 1, _(" I said I'd go with you,\n$n0.")), - VARIANT(/* == */ 3, _(" ...#WPardon?#W\nAm I tired?")), + VARIANT(/* == */ 1, _(" And...{WAIT_PRESS}\nI told you, didn't I?")), + VARIANT(/* == */ 1, _(" I said I'd go with you,\n{NAME_0}.")), + VARIANT(/* == */ 3, _(" ...{WAIT_PRESS}Pardon?{WAIT_PRESS}\nAm I tired?")), VARIANT(/* == */ 3, _(" They're trying to catch us.\nWe don't have time to rest.")), - VARIANT(/* == */ 3, _(" And...#W\nRemember what I said?")), - VARIANT(/* == */ 3, _(" I said I would go with\nyou, $n0.")), - VARIANT_DEFAULT(_(" ...#WHuh?#W\nAm I tired?")), + VARIANT(/* == */ 3, _(" And...{WAIT_PRESS}\nRemember what I said?")), + VARIANT(/* == */ 3, _(" I said I would go with\nyou, {NAME_0}.")), + VARIANT_DEFAULT(_(" ...{WAIT_PRESS}Huh?{WAIT_PRESS}\nAm I tired?")), VARIANT_DEFAULT(_(" They're chasing us down.\nWe can't afford to rest.\n")), - VARIANT_DEFAULT(_(" And...#W\nI told you already.")), - VARIANT_DEFAULT(_(" I said I would go with\nyou, $n0.")), + VARIANT_DEFAULT(_(" And...{WAIT_PRESS}\nI told you already.")), + VARIANT_DEFAULT(_(" I said I would go with\nyou, {NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...Don't look that way\nat me!\nI'm good. I'm good!")), - VARIANT(/* == */ 1, _(" Let's roll, $n0!\nI'll go with you wherever you go!")), + VARIANT(/* == */ 1, _(" Let's roll, {NAME_0}!\nI'll go with you wherever you go!")), VARIANT(/* == */ 3, _(" ...Oh, please don't look\nlike that.\nHonest, I'm fine.")), - VARIANT(/* == */ 3, _(" Let's go, $n0!\nI'll always stick with you!")), + VARIANT(/* == */ 3, _(" Let's go, {NAME_0}!\nI'll always stick with you!")), VARIANT_DEFAULT(_(" ...Oh, come on.\nNo need for that long face.\nI'm fine.")), - VARIANT_DEFAULT(_(" Let's go, $n0!\nI'll go wherever you go!")), + VARIANT_DEFAULT(_(" Let's go, {NAME_0}!\nI'll go wherever you go!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a03p01_station.h b/src/data/ground/ground_data_a03p01_station.h index d43cf63b..9578b11e 100644 --- a/src/data/ground/ground_data_a03p01_station.h +++ b/src/data/ground/ground_data_a03p01_station.h @@ -56,7 +56,7 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * { 0x3b, 0x36, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Brr... It's cold!#W") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Brr... It's cold!{WAIT_PRESS}") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(8), @@ -71,7 +71,7 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yuck...#W\nMy nose is running, and it's freezing.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yuck...{WAIT_PRESS}\nMy nose is running, and it's freezing.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, @@ -117,14 +117,14 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...#WWhat was that?#W\nIt looked like a Pokémon, but...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...{WAIT_PRESS}What was that?{WAIT_PRESS}\nIt looked like a Pokémon, but...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Was I seeing things?#W\nNo, that can't be right.#W\nI'm sure there was someone there...")), - VARIANT_DEFAULT(_(" Did I imagine that?#W\nNo, I don't think so.#W\nI'm sure there was somebody there.")), + VARIANT(/* == */ 1, _(" Was I seeing things?{WAIT_PRESS}\nNo, that can't be right.{WAIT_PRESS}\nI'm sure there was someone there...")), + VARIANT_DEFAULT(_(" Did I imagine that?{WAIT_PRESS}\nNo, I don't think so.{WAIT_PRESS}\nI'm sure there was somebody there.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -136,8 +136,8 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Well, thinking about it\nisn't going to help.#W\nLet's keep moving.")), - VARIANT_DEFAULT(_(" I guess thinking about it\nwon't help us.#W\nWe should keep moving.")), + VARIANT(/* == */ 1, _(" Well, thinking about it\nisn't going to help.{WAIT_PRESS}\nLet's keep moving.")), + VARIANT_DEFAULT(_(" I guess thinking about it\nwon't help us.{WAIT_PRESS}\nWe should keep moving.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -248,11 +248,11 @@ static const struct ScriptCommand s_gs168_g2_s0_lives0_dlg0[] = { /* 0x821ca1c * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0!\nCheck that out!")), - VARIANT_DEFAULT(_(" $n0! Look!")), + VARIANT(/* == */ 1, _(" {NAME_0}!\nCheck that out!")), + VARIANT_DEFAULT(_(" {NAME_0}! Look!")), { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" See that?#W\nThose trees are frozen!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" See that?{WAIT_PRESS}\nThose trees are frozen!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, diff --git a/src/data/ground/ground_data_a03p02_station.h b/src/data/ground/ground_data_a03p02_station.h index 690d8d58..08307ff6 100644 --- a/src/data/ground/ground_data_a03p02_station.h +++ b/src/data/ground/ground_data_a03p02_station.h @@ -36,9 +36,9 @@ static const struct ScriptCommand s_gs169_g1_s0_lives0_dlg0[] = { /* 0x821cfa4 * WAIT(30), WAIT(90), { 0x2e, 0x02, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wow!#W\nThe snow is like frozen powder!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wow!{WAIT_PRESS}\nThe snow is like frozen powder!") }, { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It looks pretty, but...#W\nIt must be harsh there...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It looks pretty, but...{WAIT_PRESS}\nIt must be harsh there...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a03p03_station.h b/src/data/ground/ground_data_a03p03_station.h index 7ba29dd4..3ffd29db 100644 --- a/src/data/ground/ground_data_a03p03_station.h +++ b/src/data/ground/ground_data_a03p03_station.h @@ -40,7 +40,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * { 0x2e, 0x02, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(This icy mountain path seems to go\non forever...)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(We've walked a long way here...)") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("($n1 looks exhausted, too...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("({NAME_1} looks exhausted, too...)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(We've been running all this time out\nof desperation...)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(What's in store for us ahead?)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Are we really doing the right thing?)") }, @@ -49,24 +49,24 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * { 0x2e, 0x14, 0x0001, 0x00000002, 0x00000000, NULL }, { 0x2f, 0x00, 0x0001, 0x00000000, 0x00000002, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Brr... It's too cold!#W\nThere's only snow around us now.")), + VARIANT(/* == */ 1, _(" Brr... It's too cold!{WAIT_PRESS}\nThere's only snow around us now.")), VARIANT(/* == */ 1, _(" The scenery hasn't changed\nat all for a while now...")), VARIANT(/* == */ 1, _(" Are we even getting\nsomewhere?")), - VARIANT_DEFAULT(_(" Brr... This is too cold!#W\nThere's nothing but snow now.")), + VARIANT_DEFAULT(_(" Brr... This is too cold!{WAIT_PRESS}\nThere's nothing but snow now.")), VARIANT_DEFAULT(_(" The scenery's been\nthe same for a while...")), VARIANT_DEFAULT(_(" I wonder if we're really\nmaking progress...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...Hey, $n0?\nYou know what I'm thinking...?")), + VARIANT(/* == */ 1, _(" ...Hey, {NAME_0}?\nYou know what I'm thinking...?")), VARIANT(/* == */ 1, _(" I think we've finally reached\na place where there's no one else but us.")), VARIANT(/* == */ 1, _(" I also have this feeling\nthere's nothing ahead of us here...")), VARIANT(/* == */ 1, _(" And, I'm feeling pretty\nbeat...")), - VARIANT(/* == */ 3, _(" ...Um, $n0?\nI was thinking...")), + VARIANT(/* == */ 3, _(" ...Um, {NAME_0}?\nI was thinking...")), VARIANT(/* == */ 3, _(" It looks like we've finally\nreached somewhere that's deserted...")), VARIANT(/* == */ 3, _(" I also have a feeling that\nthere isn't anything ahead...")), VARIANT(/* == */ 3, _(" And, I am pretty tired...")), - VARIANT_DEFAULT(_(" ...Hey, $n0?\nI was thinking...")), + VARIANT_DEFAULT(_(" ...Hey, {NAME_0}?\nI was thinking...")), VARIANT_DEFAULT(_(" I think we've come to\na place that's empty except for us...")), VARIANT_DEFAULT(_(" I have this feeling there's\nnothing ahead of here, even if we keep\nmoving...")), VARIANT_DEFAULT(_(" And I'm getting exhausted...")), @@ -88,21 +88,21 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * { 0x2e, 0x0f, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0001, 0x00000000, 0x00000002, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ............#W\nYeah, you're right.")), + VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nYeah, you're right.")), VARIANT(/* == */ 1, _(" We came out here.\nThere's no point wondering about it.")), - VARIANT(/* == */ 1, _(" Sorry, $n0.#W\nI got to feeling sorry for myself.")), - VARIANT(/* == */ 1, _(" $n0, I came out\nhere because I believed in you.")), - VARIANT(/* == */ 1, _(" And that's not changing.\nI'll keep believing in you, $n0...")), - VARIANT(/* == */ 3, _(" ............#W\nYou're right.")), + VARIANT(/* == */ 1, _(" Sorry, {NAME_0}.{WAIT_PRESS}\nI got to feeling sorry for myself.")), + VARIANT(/* == */ 1, _(" {NAME_0}, I came out\nhere because I believed in you.")), + VARIANT(/* == */ 1, _(" And that's not changing.\nI'll keep believing in you, {NAME_0}...")), + VARIANT(/* == */ 3, _(" ............{WAIT_PRESS}\nYou're right.")), VARIANT(/* == */ 3, _(" There isn't any point in\nwondering about what we did.\nNot after all this.")), - VARIANT(/* == */ 3, _(" Sorry, $n0.#W\nI was just getting down on myself.")), - VARIANT(/* == */ 3, _(" $n0, I believed in\nyou, and that's what got me this far.")), - VARIANT(/* == */ 3, _(" And that's not changing.\nI have faith in you, $n0...")), - VARIANT_DEFAULT(_(" ............#W\nSure, that's right.")), + VARIANT(/* == */ 3, _(" Sorry, {NAME_0}.{WAIT_PRESS}\nI was just getting down on myself.")), + VARIANT(/* == */ 3, _(" {NAME_0}, I believed in\nyou, and that's what got me this far.")), + VARIANT(/* == */ 3, _(" And that's not changing.\nI have faith in you, {NAME_0}...")), + VARIANT_DEFAULT(_(" ............{WAIT_PRESS}\nSure, that's right.")), VARIANT_DEFAULT(_(" There isn't any point in\nwondering about what might happen.\nNot after coming this far.")), - VARIANT_DEFAULT(_(" Sorry, $n0.#W\nI was just feeling sorry for myself.")), - VARIANT_DEFAULT(_(" I have faith in you, \n$n0.\nThat's what brought me here.")), - VARIANT_DEFAULT(_(" And that's not changing.\nI still have faith in you, $n0...")), + VARIANT_DEFAULT(_(" Sorry, {NAME_0}.{WAIT_PRESS}\nI was just feeling sorry for myself.")), + VARIANT_DEFAULT(_(" I have faith in you, \n{NAME_0}.\nThat's what brought me here.")), + VARIANT_DEFAULT(_(" And that's not changing.\nI still have faith in you, {NAME_0}...")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, @@ -122,24 +122,24 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * { 0x2e, 0x0f, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0001, 0x00000000, 0x00000002, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" .........#WSorry.#W\nI shouldn't have said that.\nIt doesn't help scaring you like that.")), + VARIANT(/* == */ 1, _(" .........{WAIT_PRESS}Sorry.{WAIT_PRESS}\nI shouldn't have said that.\nIt doesn't help scaring you like that.")), VARIANT(/* == */ 1, _(" We came out here.\nThere's no point wondering about it.")), - VARIANT(/* == */ 1, _(" Even if we don't know\nwhat's ahead...#W\nWe just have to keep going.")), + VARIANT(/* == */ 1, _(" Even if we don't know\nwhat's ahead...{WAIT_PRESS}\nWe just have to keep going.")), VARIANT(/* == */ 1, _(" Don't worry!\nThere's got to be something ahead.")), - VARIANT(/* == */ 1, _(" $n0, I came out\nhere because I believed in you.")), - VARIANT(/* == */ 1, _(" And that's not changing.\nI'll keep believing in you, $n0...")), - VARIANT(/* == */ 3, _(" .........#WI'm sorry.#W\nI shouldn't have said anything to bring\nyou down...")), + VARIANT(/* == */ 1, _(" {NAME_0}, I came out\nhere because I believed in you.")), + VARIANT(/* == */ 1, _(" And that's not changing.\nI'll keep believing in you, {NAME_0}...")), + VARIANT(/* == */ 3, _(" .........{WAIT_PRESS}I'm sorry.{WAIT_PRESS}\nI shouldn't have said anything to bring\nyou down...")), VARIANT(/* == */ 3, _(" There isn't any point in\nwondering about what we did.\nNot after all this.")), - VARIANT(/* == */ 3, _(" Even though we don't know\nwhat's ahead...#W\nWe'll find out if we keep moving!")), + VARIANT(/* == */ 3, _(" Even though we don't know\nwhat's ahead...{WAIT_PRESS}\nWe'll find out if we keep moving!")), VARIANT(/* == */ 3, _(" Don't worry!\nThere's got to be something ahead.")), - VARIANT(/* == */ 3, _(" $n0, I believed in\nyou, and that's what got me this far.")), - VARIANT(/* == */ 3, _(" And that's not changing.\nI have faith in you, $n0...")), - VARIANT_DEFAULT(_(" .........#WI'm sorry.#W\nI said something stupid to frighten you...")), + VARIANT(/* == */ 3, _(" {NAME_0}, I believed in\nyou, and that's what got me this far.")), + VARIANT(/* == */ 3, _(" And that's not changing.\nI have faith in you, {NAME_0}...")), + VARIANT_DEFAULT(_(" .........{WAIT_PRESS}I'm sorry.{WAIT_PRESS}\nI said something stupid to frighten you...")), VARIANT_DEFAULT(_(" There isn't any point in\nwondering about what might happen.\nNot after coming this far.")), - VARIANT_DEFAULT(_(" Even though we don't know\nwhat's ahead...#W\nWe'll only know by pressing on!")), + VARIANT_DEFAULT(_(" Even though we don't know\nwhat's ahead...{WAIT_PRESS}\nWe'll only know by pressing on!")), VARIANT_DEFAULT(_(" Don't worry!\nThere's got to be something ahead.")), - VARIANT_DEFAULT(_(" I have faith in you, \n$n0.\nThat's what brought me here.")), - VARIANT_DEFAULT(_(" And that's not changing.\nI still have faith in you, $n0...")), + VARIANT_DEFAULT(_(" I have faith in you, \n{NAME_0}.\nThat's what brought me here.")), + VARIANT_DEFAULT(_(" And that's not changing.\nI still have faith in you, {NAME_0}...")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, @@ -152,7 +152,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(45), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Yes...)") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("($n1 trusts me without any\ndoubt.)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("({NAME_1} trusts me without any\ndoubt.)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(I can't afford to be indecisive.)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(I have to believe in myself more.)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -169,7 +169,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x15, 0x0000, 0x00000002, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...#WWh-what?#W What was that?)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...{WAIT_PRESS}Wh-what?{WAIT_PRESS} What was that?)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(476), { 0x28, 0x01, 0x0007, 0x00000004, 0x00806040, NULL }, @@ -180,7 +180,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * { 0x27, 0x01, 0x0007, 0x0000000c, 0x00806040, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...D-dizzy?#W Or what?)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...D-dizzy?{WAIT_PRESS} Or what?)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(469), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -188,8 +188,8 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0001, 0x00000000, 0x00000002, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Huh?#W What's the matter?\n$n0?")), - VARIANT_DEFAULT(_(" Huh?#W Is something wrong?\n$n0?")), + VARIANT(/* == */ 1, _(" Huh?{WAIT_PRESS} What's the matter?\n{NAME_0}?")), + VARIANT_DEFAULT(_(" Huh?{WAIT_PRESS} Is something wrong?\n{NAME_0}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(476), { 0x28, 0x01, 0x0007, 0x00000004, 0x00806040, NULL }, @@ -205,9 +205,9 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...Finally, you have arrived...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Someone...#W\nSomeone is talking to me...)") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("($n1...?#W No.\nThis voice isn't $n1...)") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(This voice...#W\nI've heard it somewhere...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Someone...{WAIT_PRESS}\nSomeone is talking to me...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("({NAME_1}...?{WAIT_PRESS} No.\nThis voice isn't {NAME_1}...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(This voice...{WAIT_PRESS}\nI've heard it somewhere...)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(477), @@ -288,11 +288,11 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I am so glad.#W\nFinally, we get to meet.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I am so glad.{WAIT_PRESS}\nFinally, we get to meet.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...You're...#W What...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...You're...{WAIT_PRESS} What...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -300,9 +300,9 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * { 0x2e, 0x0f, 0x0001, 0x00000004, 0x00000000, NULL }, { 0x2f, 0x00, 0x0001, 0x00000000, 0x00000002, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n0.\nWhat's up with you?")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nWhat's up with you?")), VARIANT(/* == */ 1, _(" Talking to yourself like\nthat...")), - VARIANT_DEFAULT(_(" $n0, is something\nthe matter?")), + VARIANT_DEFAULT(_(" {NAME_0}, is something\nthe matter?")), VARIANT_DEFAULT(_(" Why are you talking to\nyourself?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -317,8 +317,8 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(64), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" A little farther ahead...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There is a jagged mountain\nrange topped by #CDMt. Freeze#R.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Inside its peak...#W\nNinetales lives.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There is a jagged mountain\nrange topped by {COLOR YELLOW_D}Mt. Freeze{RESET}.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Inside its peak...{WAIT_PRESS}\nNinetales lives.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0000, 0x0000000c, 0x00000000, NULL }, @@ -341,10 +341,10 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n0!\nCome on, $n0!")), - VARIANT(/* == */ 1, _(" What were you doing?#W\nWhat just happened to you...?")), - VARIANT_DEFAULT(_(" Hey, $n0!\n$n0!")), - VARIANT_DEFAULT(_(" What's the matter?#W\nWhat happened...?")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}!\nCome on, {NAME_0}!")), + VARIANT(/* == */ 1, _(" What were you doing?{WAIT_PRESS}\nWhat just happened to you...?")), + VARIANT_DEFAULT(_(" Hey, {NAME_0}!\n{NAME_0}!")), + VARIANT_DEFAULT(_(" What's the matter?{WAIT_PRESS}\nWhat happened...?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a04p01_station.h b/src/data/ground/ground_data_a04p01_station.h index c210b232..db730952 100644 --- a/src/data/ground/ground_data_a04p01_station.h +++ b/src/data/ground/ground_data_a04p01_station.h @@ -60,7 +60,7 @@ static const struct ScriptCommand s_gs171_g1_s0_lives0_dlg0[] = { /* 0x821fb60 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" From the sky!\nComes a star!") }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" ...It is huge...#W\nA giant of a star!") }, + { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" ...It is huge...{WAIT_PRESS}\nA giant of a star!") }, { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" The star, it falls.\nIt falls straight to us.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -109,7 +109,7 @@ static const struct ScriptCommand s_gs171_g2_s0_lives0_dlg0[] = { /* 0x821fdc4 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x02, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" ...If it keeps coming...\nIt will crash into this world.#W\nIt shall be terrible.") }, + { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" ...If it keeps coming...\nIt will crash into this world.{WAIT_PRESS}\nIt shall be terrible.") }, { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Something must be done...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -162,10 +162,10 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wh-#Wwhat's going on?#W\nWhat is $n3 doing?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wh-{WAIT_PRESS}what's going on?{WAIT_PRESS}\nWhat is {NAME_3} doing?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It is almost ready.#W\nThe #C4Teleport Gem#R...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It is almost ready.{WAIT_PRESS}\nThe {COLOR GREEN}Teleport Gem{RESET}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -185,7 +185,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" .........#WIt is made.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" .........{WAIT_PRESS}It is made.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -193,9 +193,9 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" This...\nThis is the #C4Teleport Gem#R.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" This...\nThis is the {COLOR GREEN}Teleport Gem{RESET}.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" This will deliver you\nto the world of the sky.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Now, $n0.#W\nAccept!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Now, {NAME_0}.{WAIT_PRESS}\nAccept!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x84, 0x00, 0x0100, -0x00000018, -0x00000018, NULL }, @@ -204,7 +204,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY(212), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0's team received\n#+the #C4Teleport Gem#R.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0}'s team received\n{CENTER_ALIGN}the {COLOR GREEN}Teleport Gem{RESET}.") }, { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -213,7 +213,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That was made using\nthe powers of psychics.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" By me, $n2,\nand...#W\nOh?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" By me, {NAME_2},\nand...{WAIT_PRESS}\nOh?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -236,8 +236,8 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Now...#W\nI must ask you this one last time.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This journey will be fraught\nwith considerable danger.#W\nWill you still go?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Now...{WAIT_PRESS}\nI must ask you this one last time.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This journey will be fraught\nwith considerable danger.{WAIT_PRESS}\nWill you still go?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -257,7 +257,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...Yes...#W\nAnd when that wish comes true...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...Yes...{WAIT_PRESS}\nAnd when that wish comes true...)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Gardevoir said...)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -400,15 +400,15 @@ static const struct ScriptCommand s_gs171_g4_s0_lives0_dlg0[] = { /* 0x82213fc * WAIT(30), { 0x2e, 0x03, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(............)") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(This will be my last adventure...#W\nWith $n1...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(This will be my last adventure...{WAIT_PRESS}\nWith {NAME_1}...)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0!\nLet's do this right!")), - VARIANT_DEFAULT(_(" $n0!\nLet's get this done!")), + VARIANT(/* == */ 1, _(" {NAME_0}!\nLet's do this right!")), + VARIANT_DEFAULT(_(" {NAME_0}!\nLet's get this done!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x54, 0x00, 0x002f, 0x00000000, 0x00000000, NULL }, @@ -419,7 +419,7 @@ static const struct ScriptCommand s_gs171_g4_s0_lives0_dlg0[] = { /* 0x82213fc * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, 0x00000000, 0x00000002, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We're counting on you!\n$n1! $n0!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We're counting on you!\n{NAME_1}! {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(500), @@ -609,7 +609,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * { 0x27, 0x01, 0x0005, 0x0000003c, 0x00ffffff, NULL }, WAIT(60), { 0x2e, 0x02, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...#WHuh...?#W This place...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...{WAIT_PRESS}Huh...?{WAIT_PRESS} This place...)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x39, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -630,13 +630,13 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), WAIT(15), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...#WI'm sure of it...)") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(I'm sure... Back there...#W\nGengar saved me...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...{WAIT_PRESS}I'm sure of it...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(I'm sure... Back there...{WAIT_PRESS}\nGengar saved me...)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Maybe...#W\nDid Gengar save $n0 too?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Maybe...{WAIT_PRESS}\nDid Gengar save {NAME_0} too?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), CALL_LABEL(3), @@ -645,7 +645,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0004, 0x00000042, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, -0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Awesome, you're alive!#W\nYou really had all of us worried!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Awesome, you're alive!{WAIT_PRESS}\nYou really had all of us worried!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0c, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -655,17 +655,17 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0006, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Snivel...\nI'm so glad you're safe!#W\nIt's fantastic!") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Snivel...\nI'm so glad you're safe!{WAIT_PRESS}\nIt's fantastic!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Everyone... Thank you.#W\nBut...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Everyone... Thank you.{WAIT_PRESS}\nBut...") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What about the star?!#W\nWhat happened to it?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What about the star?!{WAIT_PRESS}\nWhat happened to it?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(474), @@ -683,7 +683,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Fear not!\nThe star is no more.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Though it will not be\nright away...#W\nThe disasters shall soon be calmed.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Though it will not be\nright away...{WAIT_PRESS}\nThe disasters shall soon be calmed.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), CJUMP_UNK_C6(10), @@ -696,17 +696,17 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * JUMP_LABEL(13), LABEL(12), /* = 0x0c */ { 0x2d, 0x09, 0x0008, 0x0000000a, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What about our team\nmember?\nWhere's $n8?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What about our team\nmember?\nWhere's {NAME_8}?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Be calm.\n$n8 is safe.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Be calm.\n{NAME_8} is safe.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), JUMP_LABEL(10), LABEL(13), /* = 0x0d */ { 0x2d, 0x09, 0x0008, 0x0000000a, 0x00000000, NULL }, { 0x2d, 0x09, 0x0009, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What about our team\nmembers? Where are $n8 and\n$n9?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What about our team\nmembers? Where are {NAME_8} and\n{NAME_9}?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Be calm.\nBoth are unharmed.") }, @@ -727,9 +727,9 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * CALL_LABEL(3), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" We did it, $n0!#W\nWe got it done!")), + VARIANT(/* == */ 1, _(" We did it, {NAME_0}!{WAIT_PRESS}\nWe got it done!")), VARIANT(/* == */ 1, _(" We've won peace!")), - VARIANT_DEFAULT(_(" We did it, $n0!#W\nEverything worked!")), + VARIANT_DEFAULT(_(" We did it, {NAME_0}!{WAIT_PRESS}\nEverything worked!")), VARIANT_DEFAULT(_(" We've won peace!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -1117,7 +1117,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, -0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Whoa, hold on there!\nDon't you point those things at me!#W\nFace the other way! The other way!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Whoa, hold on there!\nDon't you point those things at me!{WAIT_PRESS}\nFace the other way! The other way!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2d, 0x09, 0x0009, 0x00000055, 0x00000000, NULL }, @@ -1147,7 +1147,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0009, 0x00000059, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Oh?#W Not bad!") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Oh?{WAIT_PRESS} Not bad!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_LABEL(2), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -1167,7 +1167,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Ahahahahaha!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" $n0...") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" {NAME_0}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(180), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -1182,26 +1182,26 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * SELECT_LIVES(-1, 1), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(............#W\n$n5...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(............{WAIT_PRESS}\n{NAME_5}...)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_SWITCH(42), { 0x2e, 0x03, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" We owe everything to you,\n$n0, and your friends.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" We owe everything to you,\n{NAME_0}, and your friends.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Peace has returned to\nour world.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Thank you for everything.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" And now...#W\n$n0, your role here has ended.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" And now...{WAIT_PRESS}\n{NAME_0}, your role here has ended.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Soon, you must return to\nyour own world.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" It is time to bid farewell.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(It's finally come...#W\nThis time has finally arrived...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(It's finally come...{WAIT_PRESS}\nThis time has finally arrived...)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(120), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" $n0...#W\nI am so sorry for this...#W\nTo everyone...#W Please bid farewell...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" {NAME_0}...{WAIT_PRESS}\nI am so sorry for this...{WAIT_PRESS}\nTo everyone...{WAIT_PRESS} Please bid farewell...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -1216,7 +1216,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Oh? $n0?") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Oh? {NAME_0}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -1228,12 +1228,12 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0x2e, 0x0f, 0x0001, 0x0000000c, 0x00000000, NULL }, { 0x2f, 0x00, 0x0001, 0x00000000, 0x00000003, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...!#W $n0...!#W\nYour body...#W What's happening?")), - VARIANT_DEFAULT(_(" ...!#W $n0...!#W\nYour body...#W What's happening to you?")), + VARIANT(/* == */ 1, _(" ...!{WAIT_PRESS} {NAME_0}...!{WAIT_PRESS}\nYour body...{WAIT_PRESS} What's happening?")), + VARIANT_DEFAULT(_(" ...!{WAIT_PRESS} {NAME_0}...!{WAIT_PRESS}\nYour body...{WAIT_PRESS} What's happening to you?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x0a, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(30), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("$n1...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("{NAME_1}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x0a, 0x000a, 0x00000005, 0x00000000, NULL }, WAIT(30), @@ -1241,7 +1241,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * WAIT(30), { 0x91, 0x0a, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(30), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("And, everyone...#W I'm sorry.#W\nBut I have to leave.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("And, everyone...{WAIT_PRESS} I'm sorry.{WAIT_PRESS}\nBut I have to leave.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(465), @@ -1260,13 +1260,13 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Wh-what are you saying?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Everyone...#W\nThank you for everything all this time.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Everyone...{WAIT_PRESS}\nThank you for everything all this time.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Huh?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...#WLeave...?#W\nWhat do you mean, leave?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...{WAIT_PRESS}Leave...?{WAIT_PRESS}\nWhat do you mean, leave?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("My role as a Pokémon has ended.") }, @@ -1280,27 +1280,27 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * WAIT(10), { 0x2d, 0x09, 0x0009, 0x0000005a, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0009, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Go back...#W\nTo the human world?!") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Go back...{WAIT_PRESS}\nTo the human world?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? W-why...?#W\nWhy?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? W-why...?{WAIT_PRESS}\nWhy?!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I don't understand!\nWhy do you have to leave?!") }, { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Didn't we...#W\nAren't we friends?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Didn't we...{WAIT_PRESS}\nAren't we friends?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Yes.#W\nYou will always be my friend,\n$n1.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Yes.{WAIT_PRESS}\nYou will always be my friend,\n{NAME_1}.") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I will never forget you.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000008, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Wait, $n0......")), - VARIANT_DEFAULT(_(" Don't go, $n0......")), + VARIANT(/* == */ 1, _(" Wait, {NAME_0}......")), + VARIANT_DEFAULT(_(" Don't go, {NAME_0}......")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -1308,9 +1308,9 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I...\nWhat am I going to do when you're\ngone, $n0?")), - VARIANT(/* == */ 3, _(" I...\nWhat am I going to do when you're\ngone, $n0?")), - VARIANT_DEFAULT(_(" I...\nWhat am I going to do when you're\ngone, $n0?")), + VARIANT(/* == */ 1, _(" I...\nWhat am I going to do when you're\ngone, {NAME_0}?")), + VARIANT(/* == */ 3, _(" I...\nWhat am I going to do when you're\ngone, {NAME_0}?")), + VARIANT_DEFAULT(_(" I...\nWhat am I going to do when you're\ngone, {NAME_0}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I'm so very sorry.\nThis is good-bye...") }, @@ -1325,20 +1325,20 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0x2b, 0x00, 0x0000, 0x0000003c, 0x0000003c, NULL }, { 0x2d, 0x09, 0x0009, 0x0000004e, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0009, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" $n0!") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0009, 0x00000059, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0009, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" $n0!") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0009, 0x0000004f, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0009, 0x00000041, 0x00000000, NULL }, { 0x2f, 0x00, 0x0009, -0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" $n0!") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0006, 0x00000042, 0x00000000, NULL }, { 0x2f, 0x00, 0x0006, -0x00000001, 0x00000002, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" $n0...") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" {NAME_0}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -1346,7 +1346,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2b, 0x00, 0x0000, 0x000000b4, 0x000000b4, NULL }, { 0x2e, 0x03, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0!!! Nooooo!!!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!!! Nooooo!!!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -2121,19 +2121,19 @@ static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 * WAIT(90), { 0x2b, 0x00, 0x0000, -0x00000001, -0x00000001, NULL }, { 0x2e, 0x02, 0x0006, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Snivel... $n0...#W\nWhy...#W I don't understand...") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Snivel... {NAME_0}...{WAIT_PRESS}\nWhy...{WAIT_PRESS} I don't understand...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2d, 0x09, 0x0009, 0x00000059, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0009, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Why?#W\nWhy was it necessary to leave us...?") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Why?{WAIT_PRESS}\nWhy was it necessary to leave us...?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2d, 0x09, 0x0009, 0x00000055, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0009, 0x00000043, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" $n0 saved my\nlife...") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" {NAME_0} saved my\nlife...") }, { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" But I hadn't done anything\nto show my thanks...") }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Left...#W\nBefore I could even say thanks...") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Left...{WAIT_PRESS}\nBefore I could even say thanks...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0e, 0x0004, 0x00000043, 0x00000000, NULL }, @@ -2141,50 +2141,50 @@ static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 * { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You're right...") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Just upped and went like\nthat...") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Why now?\nWhy when the world's been saved?") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Just when things were\ngoing to get better...#W Sob...") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Just when things were\ngoing to get better...{WAIT_PRESS} Sob...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" This was coming...#W\nOur world, it was saved by $n0.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I look back now...#W\nWhen bound for the sky, $n0\nseemed...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" This was coming...{WAIT_PRESS}\nOur world, it was saved by {NAME_0}.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I look back now...{WAIT_PRESS}\nWhen bound for the sky, {NAME_0}\nseemed...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" As if resigned.\nResigned to accept what was to come.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............#W\nI think I know...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nI think I know...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), CALL_LABEL(1), WAIT(60), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I think I understand now...")), - VARIANT(/* == */ 1, _(" $n0 became\na Pokémon to save us...")), - VARIANT(/* == */ 3, _(" $n0 must have...")), - VARIANT(/* == */ 3, _(" $n0 must have\nbecome a Pokémon to save us.")), - VARIANT_DEFAULT(_(" $n0 must have...")), - VARIANT_DEFAULT(_(" $n0 must have\nbecome a Pokémon to save us.")), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And when...#W\nWhen the star was destroyed...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0 knew that\nwould be the time to leave...") }, + VARIANT(/* == */ 1, _(" {NAME_0} became\na Pokémon to save us...")), + VARIANT(/* == */ 3, _(" {NAME_0} must have...")), + VARIANT(/* == */ 3, _(" {NAME_0} must have\nbecome a Pokémon to save us.")), + VARIANT_DEFAULT(_(" {NAME_0} must have...")), + VARIANT_DEFAULT(_(" {NAME_0} must have\nbecome a Pokémon to save us.")), + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And when...{WAIT_PRESS}\nWhen the star was destroyed...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0} knew that\nwould be the time to leave...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000008, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Why...#W\nWhy didn't $n0 tell me earlier...?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If this was coming...#W\nWhy didn't $n0 tell me?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Why...{WAIT_PRESS}\nWhy didn't {NAME_0} tell me earlier...?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If this was coming...{WAIT_PRESS}\nWhy didn't {NAME_0} tell me?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Those words couldn't be\nspoken.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" As much as you are heart-\nbroken now...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n0 must have felt\nthe same pain of leaving.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Try to understand,\n$n1.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_0} must have felt\nthe same pain of leaving.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Try to understand,\n{NAME_1}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sob...#W\n$n0...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sob...{WAIT_PRESS}\n{NAME_0}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a04p04_station.h b/src/data/ground/ground_data_a04p04_station.h index 545f38a0..792f59d1 100644 --- a/src/data/ground/ground_data_a04p04_station.h +++ b/src/data/ground/ground_data_a04p04_station.h @@ -44,9 +44,9 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("........................") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...Is this...\na dream...?") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("........................") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("No...#W\nThis is no dream...") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Yes...#W\nThe star's explosion swallowed me...") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("And I'm now adrift...#W\nas a spirit...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("No...{WAIT_PRESS}\nThis is no dream...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Yes...{WAIT_PRESS}\nThe star's explosion swallowed me...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("And I'm now adrift...{WAIT_PRESS}\nas a spirit...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("..................") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("What's going to happen...?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -57,13 +57,13 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * SELECT_LIVES(-1, 1), { 0x27, 0x01, 0x0005, 0x0000003c, 0x00ffffff, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(............)") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...This shadow...#W\n$n4...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...This shadow...{WAIT_PRESS}\n{NAME_4}...)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Keke! $n0!#W\nDidn't take much to put you down!#W\nServes you right!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Keke! {NAME_0}!{WAIT_PRESS}\nDidn't take much to put you down!{WAIT_PRESS}\nServes you right!") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Kekeke!\nNow, what to do with you?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -82,7 +82,7 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * { 0x2e, 0x02, 0x0000, 0x00000005, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(............)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Gengar is dragging me...)") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...#WGengar said...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...{WAIT_PRESS}Gengar said...)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(He would drag me into the dark\nworld...)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(What is the dark world...?)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Am I going to be abandoned in a world\nI don't know?)") }, @@ -96,7 +96,7 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0034, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ..................#WHunh?") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}Hunh?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -109,14 +109,14 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" This isn't like me...#W\nI can't tell which way is which...") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" This isn't like me...{WAIT_PRESS}\nI can't tell which way is which...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0f, 0x0004, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Keh! To heck with this.#W\nI'll just ditch you here...") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Keh! To heck with this.{WAIT_PRESS}\nI'll just ditch you here...") }, { 0x2e, 0x15, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" That's it. Good-bye to you.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a05p01_station.h b/src/data/ground/ground_data_a05p01_station.h index be8da236..ee4bc686 100644 --- a/src/data/ground/ground_data_a05p01_station.h +++ b/src/data/ground/ground_data_a05p01_station.h @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs175_g1_s0_eff1_script[] = { /* 0x822b0f4 * { 0x2b, 0x00, 0x0000, -0x0000006e, 0x0000003c, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(......!)") }, { 0x2b, 0x00, 0x0000, -0x000000d2, 0x00000032, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Voices...#W\nI hear voices...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Voices...{WAIT_PRESS}\nI hear voices...)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -88,13 +88,13 @@ static const struct ScriptCommand s_gs175_g2_s0_eff1_script[] = { /* 0x822b3d0 * { 0x2b, 0x00, 0x0000, 0x000000be, 0x000000be, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("\n#+I don't want to leave...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("\n{CENTER_ALIGN}I don't want to leave...") }, WAIT(100), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("\n#+I want to stay longer...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("\n{CENTER_ALIGN}I want to stay longer...") }, WAIT(100), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("\n#+With my invaluable...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("\n{CENTER_ALIGN}With my invaluable...") }, WAIT(100), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("\n#+Irreplaceable friend...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("\n{CENTER_ALIGN}Irreplaceable friend...") }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a05p02_station.h b/src/data/ground/ground_data_a05p02_station.h index 62077c02..3982989e 100644 --- a/src/data/ground/ground_data_a05p02_station.h +++ b/src/data/ground/ground_data_a05p02_station.h @@ -98,15 +98,15 @@ static const struct ScriptCommand s_gs176_g1_s0_eff1_script[] = { /* 0x822bb50 * WAIT(90), { 0x2b, 0x00, 0x0000, 0x000000b4, 0x000000b4, NULL }, WAIT(60), - { 0x39, 0x00, 0x005a, 0x00000000, 0x00000000, _("#+Your friend is heartbroken...") }, + { 0x39, 0x00, 0x005a, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Your friend is heartbroken...") }, WAIT(80), - { 0x39, 0x00, 0x005a, 0x00000000, 0x00000000, _("#+A true friend...\n#+A friend for life...") }, + { 0x39, 0x00, 0x005a, 0x00000000, 0x00000000, _("{CENTER_ALIGN}A true friend...\n{CENTER_ALIGN}A friend for life...") }, WAIT(80), - { 0x39, 0x00, 0x005a, 0x00000000, 0x00000000, _("#+You finally realize it now...") }, + { 0x39, 0x00, 0x005a, 0x00000000, 0x00000000, _("{CENTER_ALIGN}You finally realize it now...") }, WAIT(80), - { 0x39, 0x00, 0x005a, 0x00000000, 0x00000000, _("#+If you wish...\n#+And wish very strongly...") }, + { 0x39, 0x00, 0x005a, 0x00000000, 0x00000000, _("{CENTER_ALIGN}If you wish...\n{CENTER_ALIGN}And wish very strongly...") }, WAIT(80), - { 0x39, 0x00, 0x005a, 0x00000000, 0x00000000, _("#+Perhaps you will meet again.") }, + { 0x39, 0x00, 0x005a, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Perhaps you will meet again.") }, { 0x31, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a05p03_station.h b/src/data/ground/ground_data_a05p03_station.h index 47f603a2..a8cea266 100644 --- a/src/data/ground/ground_data_a05p03_station.h +++ b/src/data/ground/ground_data_a05p03_station.h @@ -31,11 +31,11 @@ static const struct ScriptCommand s_gs177_g1_s0_station_sref_script[] = { /* 0x8 { 0x2d, 0x09, 0x0000, 0x00000001, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The story of $n0 and\n#+$n1 ends here.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+But $t isn't done yet!\n#+There are many rescues to be done!") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+A new adventure begins!") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The legendary Pokémon are set\n#+to make their appearance!") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Don't go away!") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The story of {NAME_0} and\n{CENTER_ALIGN}{NAME_1} ends here.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}But {TEAM_NAME} isn't done yet!\n{CENTER_ALIGN}There are many rescues to be done!") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}A new adventure begins!") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The legendary Pokémon are set\n{CENTER_ALIGN}to make their appearance!") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Don't go away!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_b01p01a_station.h b/src/data/ground/ground_data_b01p01a_station.h index bdb2ee2b..a7dd320e 100644 --- a/src/data/ground/ground_data_b01p01a_station.h +++ b/src/data/ground/ground_data_b01p01a_station.h @@ -525,22 +525,22 @@ static const struct ScriptCommand s_gs9_g0_s0_obj0_dlg2[] = { /* 0x819c378 */ { 0x3c, 0x21, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(END_TALK), LABEL(0), /* = 0x00 */ - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+There is a warning tag\n#+on the side of the Mailbox.") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+- Open the Mailbox at the front -") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}There is a warning tag\n{CENTER_ALIGN}on the side of the Mailbox.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}- Open the Mailbox at the front -") }, JUMP_SCRIPT(END_TALK), EXECUTE_FUNCTION(EVENT_S01E02A_L001), JUMP_SCRIPT(END_TALK), LABEL(1), /* = 0x01 */ { 0x3b, 0x08, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 2), - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+\n#+= Extra! =") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Buried Relic Discovered!") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Mystery ruin\n#+found underground!") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Its site had been hidden by the crater\n#+of a meteor strike in ancient times.") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The Buried Relic is thought to date\n#+back beyond recorded history.") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+There are rumors of treasures...") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+And perhaps even Pokémon\n#+that lived in ancient times.") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The Buried Relic is the main\n#+topic in Pokémon Square.") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}\n{CENTER_ALIGN}= Extra! =") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Buried Relic Discovered!") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Mystery ruin\n{CENTER_ALIGN}found underground!") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Its site had been hidden by the crater\n{CENTER_ALIGN}of a meteor strike in ancient times.") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The Buried Relic is thought to date\n{CENTER_ALIGN}back beyond recorded history.") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}There are rumors of treasures...") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And perhaps even Pokémon\n{CENTER_ALIGN}that lived in ancient times.") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The Buried Relic is the main\n{CENTER_ALIGN}topic in Pokémon Square.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SCENARIO_CALC(SCENARIO_SUB7, 49, 2), JUMP_SCRIPT(END_TALK), @@ -1208,9 +1208,9 @@ static const struct ScriptCommand s_gs9_g5_s0_lives0_dlg0[] = { /* 0x819f048 */ WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0.")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}.")), VARIANT(/* == */ 1, _(" We blew it yesterday,\nso let's get it right this time.")), - VARIANT_DEFAULT(_(" Good morning, $n0.")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}.")), VARIANT_DEFAULT(_(" We failed yesterday,\nso let's try harder this time.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -1267,9 +1267,9 @@ static const struct ScriptCommand s_gs9_g6_s1_lives0_dlg0[] = { /* 0x819f3a8 */ { 0x2e, 0x02, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" We did good today.#W\nLet's knock off and call it a night.")), + VARIANT(/* == */ 1, _(" We did good today.{WAIT_PRESS}\nLet's knock off and call it a night.")), VARIANT(/* == */ 1, _(" See you tomorrow!")), - VARIANT_DEFAULT(_(" Didn't we do good today?#W\nLet's call it a night and get some rest.")), + VARIANT_DEFAULT(_(" Didn't we do good today?{WAIT_PRESS}\nLet's call it a night and get some rest.")), VARIANT_DEFAULT(_(" OK, see you tomorrow!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -1328,7 +1328,7 @@ static const struct ScriptCommand s_gs9_g7_s0_lives0_dlg0[] = { /* 0x819f7c4 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Good morning, $n0.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Good morning, {NAME_0}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -1549,9 +1549,9 @@ static const struct ScriptCommand s_gs9_g17_s0_station_sref_script[] = { /* 0x81 { 0x2d, 0x09, 0x0000, 0x00000021, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, WAIT(60), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And that is how") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+$n0 and $n1\n#+began their careers together") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+as a rescue team.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And that is how") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} and {NAME_1}\n{CENTER_ALIGN}began their careers together") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}as a rescue team.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1606,17 +1606,17 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(It might be an instinct thing for\nPokémon...)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Maybe this is what it feels like to want\nto wag your tail...)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(It doesn't matter! I'm happy!)") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Maybe I feel that way because I'm\n$m0!)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Maybe I feel that way because I'm\n{POKEMON_0}!)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Oh? $n0.\nI can tell you're impressed.")), - VARIANT(/* == */ 1, _(" I thought you'd like it.\nI figured you'd find this an easy place\nto live, $n0.")), - VARIANT_DEFAULT(_(" Oh, $n0.\nYou're impressed, aren't you?")), - VARIANT_DEFAULT(_(" I thought so.\nI thought this would make a good place\nfor you to live, $n0.")), + VARIANT(/* == */ 1, _(" Oh? {NAME_0}.\nI can tell you're impressed.")), + VARIANT(/* == */ 1, _(" I thought you'd like it.\nI figured you'd find this an easy place\nto live, {NAME_0}.")), + VARIANT_DEFAULT(_(" Oh, {NAME_0}.\nYou're impressed, aren't you?")), + VARIANT_DEFAULT(_(" I thought so.\nI thought this would make a good place\nfor you to live, {NAME_0}.")), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" In fact, I was sure that\nyou'd like it.")), @@ -1628,40 +1628,40 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" This is your #C5Mailbox#R.#W\nThis is where you'll get mail from\nother Pokémon.")), - VARIANT_DEFAULT(_(" This is your #C5Mailbox#R.#W\nThey deliver mail from Pokémon here.")), + VARIANT(/* == */ 1, _(" This is your {COLOR CYAN}Mailbox{RESET}.{WAIT_PRESS}\nThis is where you'll get mail from\nother Pokémon.")), + VARIANT_DEFAULT(_(" This is your {COLOR CYAN}Mailbox{RESET}.{WAIT_PRESS}\nThey deliver mail from Pokémon here.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" You know that fissure\n$n2 fell into?")), + VARIANT(/* == */ 1, _(" You know that fissure\n{NAME_2} fell into?")), VARIANT(/* == */ 1, _(" There've been other\nnatural disasters like that all of a sudden.")), VARIANT(/* == */ 1, _(" A lot of Pokémon out there\nare hurting from those disasters.")), VARIANT(/* == */ 1, _(" I want to help Pokémon like\nthat.")), VARIANT(/* == */ 1, _(" I want to help make\nthis a safer place for Pokémon.")), - VARIANT(/* == */ 1, _(" And, uh...#W\nI think you're capable after seeing\nhow you did rescuing $n2.")), + VARIANT(/* == */ 1, _(" And, uh...{WAIT_PRESS}\nI think you're capable after seeing\nhow you did rescuing {NAME_2}.")), VARIANT(/* == */ 1, _(" How would you like to form\na rescue team with me?")), - VARIANT(/* == */ 3, _(" Just like the fissure\n$n2 fell into...")), + VARIANT(/* == */ 3, _(" Just like the fissure\n{NAME_2} fell into...")), VARIANT(/* == */ 3, _(" There have been all sorts\nof natural disasters recently.")), VARIANT(/* == */ 3, _(" Many Pokémon are suffering\nfrom these natural disasters.")), VARIANT(/* == */ 3, _(" I want to do good.\nI want to help Pokémon like that.")), VARIANT(/* == */ 3, _(" I want to help make the\nworld a safer place for Pokémon.")), - VARIANT(/* == */ 3, _(" So, um...#W\nWell, I saw how good you were when\nwe rescued $n2...")), + VARIANT(/* == */ 3, _(" So, um...{WAIT_PRESS}\nWell, I saw how good you were when\nwe rescued {NAME_2}...")), VARIANT(/* == */ 3, _(" Would you like to form\na rescue team with me?")), - VARIANT_DEFAULT(_(" You know, just like the\nfissure $n2 fell into...")), + VARIANT_DEFAULT(_(" You know, just like the\nfissure {NAME_2} fell into...")), VARIANT_DEFAULT(_(" For some reason, there have\nbeen many natural disasters lately.")), VARIANT_DEFAULT(_(" Because of those disasters,\nmany Pokémon are suffering.")), VARIANT_DEFAULT(_(" I want to help Pokémon in\nthese tough times.")), VARIANT_DEFAULT(_(" I want to help change things\nso all the Pokémon can live in peace.")), - VARIANT_DEFAULT(_(" So, uh...#W\nWell, I liked how you handled yourself\nwhen we rescued $n2.")), + VARIANT_DEFAULT(_(" So, uh...{WAIT_PRESS}\nWell, I liked how you handled yourself\nwhen we rescued {NAME_2}.")), VARIANT_DEFAULT(_(" Would you like to join me\non a rescue team?")), LABEL(4), /* = 0x04 */ { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" $n0, I think we'd\nmake the world's greatest rescue team.\nHow about it?")), - VARIANT(/* == */ 3, _(" I think we could become\nthe world's number-one rescue team,\n$n0. What do you think?")), - VARIANT_DEFAULT(_(" $n0, with you,\nI think we could even become the world's\nbest rescue team. How about it?")), + VARIANT(/* == */ 1, _(" {NAME_0}, I think we'd\nmake the world's greatest rescue team.\nHow about it?")), + VARIANT(/* == */ 3, _(" I think we could become\nthe world's number-one rescue team,\n{NAME_0}. What do you think?")), + VARIANT_DEFAULT(_(" {NAME_0}, with you,\nI think we could even become the world's\nbest rescue team. How about it?")), CHOICE(/* label */ 6, _("Form a rescue team.")), CHOICE(/* label */ 7, _("Refuse.")), LABEL(7), /* = 0x07 */ @@ -1677,9 +1677,9 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - VARIANT_DEFAULT(_(" Huh?! Oh, but...")), { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0, I'm positive\nwe'd make a first-class rescue team!")), - VARIANT(/* == */ 3, _(" But, $n0!\nI'm sure that we would make a first-class\nrescue team together!")), - VARIANT_DEFAULT(_(" $n0, I'm sure\nthat the two of us would make a\nfirst-class rescue team.")), + VARIANT(/* == */ 1, _(" {NAME_0}, I'm positive\nwe'd make a first-class rescue team!")), + VARIANT(/* == */ 3, _(" But, {NAME_0}!\nI'm sure that we would make a first-class\nrescue team together!")), + VARIANT_DEFAULT(_(" {NAME_0}, I'm sure\nthat the two of us would make a\nfirst-class rescue team.")), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" So come on, I'm begging you.\nLet's form a rescue team, you and me.")), VARIANT(/* == */ 3, _(" Please?\nWill you please form a rescue team\nwith me?")), @@ -1695,21 +1695,21 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" OK! That's done it!")), - VARIANT(/* == */ 1, _(" Starting right now, me and\nyou, $n0, we're partners in\nour rescue team! I'm counting on you!")), + VARIANT(/* == */ 1, _(" Starting right now, me and\nyou, {NAME_0}, we're partners in\nour rescue team! I'm counting on you!")), VARIANT(/* == */ 3, _(" OK! Done deal!")), - VARIANT(/* == */ 3, _(" From now on, $n0,\nwe're partners in our rescue team!\nI'm so glad you joined!")), + VARIANT(/* == */ 3, _(" From now on, {NAME_0},\nwe're partners in our rescue team!\nI'm so glad you joined!")), VARIANT_DEFAULT(_(" Perfect! That's it, then!")), - VARIANT_DEFAULT(_(" We're partners in our\nrescue team from now on, $n0!\nGlad to have you on board!")), + VARIANT_DEFAULT(_(" We're partners in our\nrescue team from now on, {NAME_0}!\nGlad to have you on board!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" The team's name...\nActually, I haven't thought of one yet.")), - VARIANT(/* == */ 1, _(" Hey, $n0.\nWhat do you think would be a good name?")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nWhat do you think would be a good name?")), VARIANT(/* == */ 3, _(" The team's name is...\nI haven't decided on one.")), - VARIANT(/* == */ 3, _(" Listen, $n0.\nWhat would be a good name for us?")), + VARIANT(/* == */ 3, _(" Listen, {NAME_0}.\nWhat would be a good name for us?")), VARIANT_DEFAULT(_(" The team name...\nWell, I don't have one yet.")), - VARIANT_DEFAULT(_(" So, $n0.\nWhat do you think would be a good\nname for us?")), + VARIANT_DEFAULT(_(" So, {NAME_0}.\nWhat do you think would be a good\nname for us?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -1721,12 +1721,12 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" #C5$t#R!#W\nYeah... That's a good name! It suits us!")), - VARIANT_DEFAULT(_(" #C5$t#R!#W\nI like it! It's a good name!\nIt's perfect for us!")), + VARIANT(/* == */ 1, _(" {COLOR CYAN}{TEAM_NAME}{RESET}!{WAIT_PRESS}\nYeah... That's a good name! It suits us!")), + VARIANT_DEFAULT(_(" {COLOR CYAN}{TEAM_NAME}{RESET}!{WAIT_PRESS}\nI like it! It's a good name!\nIt's perfect for us!")), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Rescue Team\n#C5$t#R!#W\nWe begin tomorrow! Let's do it!")), - VARIANT_DEFAULT(_(" Rescue Team\n$t#R!#W\nLet's do good starting tomorrow!")), + VARIANT(/* == */ 1, _(" Rescue Team\n{COLOR CYAN}{TEAM_NAME}{RESET}!{WAIT_PRESS}\nWe begin tomorrow! Let's do it!")), + VARIANT_DEFAULT(_(" Rescue Team\n{TEAM_NAME}{RESET}!{WAIT_PRESS}\nLet's do good starting tomorrow!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x06, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -1869,11 +1869,11 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hahaha, sorry!#W\nI was so excited, I've been waiting out\nhere since dawn...")), + VARIANT(/* == */ 1, _(" Hahaha, sorry!{WAIT_PRESS}\nI was so excited, I've been waiting out\nhere since dawn...")), VARIANT(/* == */ 1, _(" I guess I just fell asleep!")), - VARIANT(/* == */ 3, _(" Ahaha, sorry!#W\nI was so excited about today, I've been\nwaiting here since dawn...")), + VARIANT(/* == */ 3, _(" Ahaha, sorry!{WAIT_PRESS}\nI was so excited about today, I've been\nwaiting here since dawn...")), VARIANT(/* == */ 3, _(" I must have fallen asleep.")), - VARIANT_DEFAULT(_(" Hahaha, sorry!#W\nI was so excited, I came out here at\ndawn to wait for you.")), + VARIANT_DEFAULT(_(" Hahaha, sorry!{WAIT_PRESS}\nI was so excited, I came out here at\ndawn to wait for you.")), VARIANT_DEFAULT(_(" I must have snoozed off.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -1881,8 +1881,8 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Anyway...#W\nOur rescue team officially begins!\nLet's do this right!")), - VARIANT_DEFAULT(_(" Anyway...#W\nToday marks the start of our rescue team!\nLet's always do our best!")), + VARIANT(/* == */ 1, _(" Anyway...{WAIT_PRESS}\nOur rescue team officially begins!\nLet's do this right!")), + VARIANT_DEFAULT(_(" Anyway...{WAIT_PRESS}\nToday marks the start of our rescue team!\nLet's always do our best!")), { 0x2e, 0x15, 0x0001, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ......")), @@ -1904,7 +1904,7 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, yeah!#W\nMaybe there's something in the Mailbox...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, yeah!{WAIT_PRESS}\nMaybe there's something in the Mailbox...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -1914,15 +1914,15 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x3b, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n1 checked the Mailbox.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_1} checked the Mailbox.") }, FANFARE_PLAY(213), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The Mailbox contained\n#+a #C5Rescue Team Starter Set#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The Mailbox contained\n{CENTER_ALIGN}a {COLOR CYAN}Rescue Team Starter Set{RESET}!") }, { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I knew it'd be there!#W\nIt's the #C5Rescue Team Starter Set#R!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I knew it'd be there!{WAIT_PRESS}\nIt's the {COLOR CYAN}Rescue Team Starter Set{RESET}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -1936,15 +1936,15 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n1 opened\n#+the #C5Rescue Team Starter Set#R.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_1} opened\n{CENTER_ALIGN}the {COLOR CYAN}Rescue Team Starter Set{RESET}.") }, FANFARE_PLAY(213), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+There was\n#+a #C5Rescue Team Badge#R inside!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}There was\n{CENTER_ALIGN}a {COLOR CYAN}Rescue Team Badge{RESET} inside!") }, { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY(213), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+There was a #C5Toolbox#R inside!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}There was a {COLOR CYAN}Toolbox{RESET} inside!") }, { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY(213), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+There was also an issue of\n#+#C5Pokémon News#R inside!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}There was also an issue of\n{CENTER_ALIGN}{COLOR CYAN}Pokémon News{RESET} inside!") }, { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -1952,34 +1952,34 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Yeah!#W\nThere's all sorts of good stuff in it!")), - VARIANT_DEFAULT(_(" Yes!#W\nThere are some good things here!")), + VARIANT(/* == */ 1, _(" Yeah!{WAIT_PRESS}\nThere's all sorts of good stuff in it!")), + VARIANT_DEFAULT(_(" Yes!{WAIT_PRESS}\nThere are some good things here!")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" This #C5Rescue Team Badge#R...#W\nIt's proof that you're in a rescue team.")), - VARIANT(/* == */ 1, _(" This #C5Toolbox#R too...#W\nYou can use it for keeping items that you\nfind in dungeons.")), + VARIANT(/* == */ 1, _(" This {COLOR CYAN}Rescue Team Badge{RESET}...{WAIT_PRESS}\nIt's proof that you're in a rescue team.")), + VARIANT(/* == */ 1, _(" This {COLOR CYAN}Toolbox{RESET} too...{WAIT_PRESS}\nYou can use it for keeping items that you\nfind in dungeons.")), VARIANT(/* == */ 1, _(" I'll put the stuff that\nButterfree gave us in here.\nMight as well put it to good use.")), VARIANT(/* == */ 1, _(" But items are really useful.\nLet's use them on our adventures.")), - VARIANT(/* == */ 1, _(" And we have here a copy of\nthe #C5Pokémon News#R.#W\nIt has useful information for rescuers.")), - VARIANT(/* == */ 1, _(" I'll leave the #C5Pokémon News#R\nin the Mailbox.\nYou should read it later.")), - VARIANT_DEFAULT(_(" First off,\nthe #C5Rescue Team Badge#R.#W\nIt shows that we're a rescue team.")), - VARIANT_DEFAULT(_(" This is a #C5Toolbox#R.#W\nYou use it for carrying items you find in\ndungeons.")), + VARIANT(/* == */ 1, _(" And we have here a copy of\nthe {COLOR CYAN}Pokémon News{RESET}.{WAIT_PRESS}\nIt has useful information for rescuers.")), + VARIANT(/* == */ 1, _(" I'll leave the {COLOR CYAN}Pokémon News{RESET}\nin the Mailbox.\nYou should read it later.")), + VARIANT_DEFAULT(_(" First off,\nthe {COLOR CYAN}Rescue Team Badge{RESET}.{WAIT_PRESS}\nIt shows that we're a rescue team.")), + VARIANT_DEFAULT(_(" This is a {COLOR CYAN}Toolbox{RESET}.{WAIT_PRESS}\nYou use it for carrying items you find in\ndungeons.")), VARIANT_DEFAULT(_(" Let's put the stuff\nButterfree gave us in here for now.")), VARIANT_DEFAULT(_(" Items are very useful,\nso let's use them on our adventures.")), - VARIANT_DEFAULT(_(" And finally, a copy of\nthe #C5Pokémon News#R.#W\nIt's useful for rescue teams.")), - VARIANT_DEFAULT(_(" I'll put the #C5Pokémon News#R\nin the Mailbox.\nYou should read it later on.")), + VARIANT_DEFAULT(_(" And finally, a copy of\nthe {COLOR CYAN}Pokémon News{RESET}.{WAIT_PRESS}\nIt's useful for rescue teams.")), + VARIANT_DEFAULT(_(" I'll put the {COLOR CYAN}Pokémon News{RESET}\nin the Mailbox.\nYou should read it later on.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" And, let's see...#W\nIs there any other mail...?#W\nDid we miss anything?")), - VARIANT_DEFAULT(_(" Anything else?#W\nIs there any other mail...?#W\nMaybe not?")), + VARIANT(/* == */ 1, _(" And, let's see...{WAIT_PRESS}\nIs there any other mail...?{WAIT_PRESS}\nDid we miss anything?")), + VARIANT_DEFAULT(_(" Anything else?{WAIT_PRESS}\nIs there any other mail...?{WAIT_PRESS}\nMaybe not?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n1 checked the Mailbox.") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+But the Mailbox was empty.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_1} checked the Mailbox.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}But the Mailbox was empty.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -2172,9 +2172,9 @@ static const struct ScriptCommand s_gs9_g19_s0_lives0_dlg2[] = { /* 0x81a411c */ WAIT(1), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Maybe this is it...")), - VARIANT(/* == */ 1, _(" $n0, how about\nchecking your Mailbox?")), + VARIANT(/* == */ 1, _(" {NAME_0}, how about\nchecking your Mailbox?")), VARIANT_DEFAULT(_(" Could this be...?")), - VARIANT_DEFAULT(_(" $n0, will you\ncheck the Mailbox, please?")), + VARIANT_DEFAULT(_(" {NAME_0}, will you\ncheck the Mailbox, please?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(END_TALK), }; @@ -2186,13 +2186,13 @@ static const struct ScriptCommand s_gs9_g19_s0_obj0_dlg2[] = { /* 0x81a4254 */ WAIT(1), CJUMP_DIR_TO_LINK(0), COND_EQUAL(0, /* to label */ 0), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 checked the Mailbox.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} checked the Mailbox.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, EXECUTE_STATION(-1, 20, 0), HALT, LABEL(0), /* = 0x00 */ - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+There is a warning tag\n#+on the side of the Mailbox.") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+- Open the Mailbox at the front -") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}There is a warning tag\n{CENTER_ALIGN}on the side of the Mailbox.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}- Open the Mailbox at the front -") }, JUMP_SCRIPT(END_TALK), }; @@ -2222,8 +2222,8 @@ static const struct ScriptCommand s_gs9_g19_s1_lives0_dlg0[] = { /* 0x81a43f8 */ WAIT(1), { 0x2e, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n0, aren't\nyou going to check the Mailbox?")), - VARIANT_DEFAULT(_(" $n0, please check\nthe Mailbox.")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}, aren't\nyou going to check the Mailbox?")), + VARIANT_DEFAULT(_(" {NAME_0}, please check\nthe Mailbox.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, RET, @@ -2254,7 +2254,7 @@ static const struct ScriptCommand s_gs9_g19_s1_lives1_dlg2[] = { /* 0x81a4574 */ VARIANT(/* == */ 1, _(" Oh, all right.\nI'll wait here until you're ready.")), VARIANT(/* == */ 1, _(" Give me a shout when you're\nready.\nWe'll get going then.")), VARIANT_DEFAULT(_(" Oh, OK.\nI'll wait until you're all set.")), - VARIANT_DEFAULT(_(" Tell me when you're\nready.#W\nWe'll leave right away then.")), + VARIANT_DEFAULT(_(" Tell me when you're\nready.{WAIT_PRESS}\nWe'll leave right away then.")), JUMP_SCRIPT(END_TALK), LABEL(1), /* = 0x01 */ EXECUTE_FUNCTION(EVENT_M01E07A_L002), @@ -2298,11 +2298,11 @@ static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0001, 0x0000000b, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Maybe it's a rescue job\nrequest?!#W\nCome on, what's it say?")), - VARIANT_DEFAULT(_(" Maybe it's a rescue job\noffer!#W\nWhat does it say?")), + VARIANT(/* == */ 1, _(" Maybe it's a rescue job\nrequest?!{WAIT_PRESS}\nCome on, what's it say?")), + VARIANT_DEFAULT(_(" Maybe it's a rescue job\noffer!{WAIT_PRESS}\nWhat does it say?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x1e, 0x0000, 0x00000022, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 read the letter.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} read the letter.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("“BZZ BZZ BZZ!") }, @@ -2430,11 +2430,11 @@ static const struct ScriptCommand s_gs9_g21_s0_lives0_dlg0[] = { /* 0x81a5378 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Morning, $n0.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Morning, {NAME_0}.") }, { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" We sure loused up on\n$n2's rescue yesterday.")), - VARIANT_DEFAULT(_(" We failed $n2's\nrescue badly yesterday, didn't we?")), + VARIANT(/* == */ 1, _(" We sure loused up on\n{NAME_2}'s rescue yesterday.")), + VARIANT_DEFAULT(_(" We failed {NAME_2}'s\nrescue badly yesterday, didn't we?")), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's get it done right today!")), @@ -2483,15 +2483,15 @@ static const struct ScriptCommand s_gs9_g22_s1_lives0_dlg0[] = { /* 0x81a56b4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0!\nThe dungeon isn't that way.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!\nThe dungeon isn't that way.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" #CDThunderwave Cave#R is\nover this way!")), - VARIANT_DEFAULT(_(" #CDThunderwave Cave#R is \nout this way.")), + VARIANT(/* == */ 1, _(" {COLOR YELLOW_D}Thunderwave Cave{RESET} is\nover this way!")), + VARIANT_DEFAULT(_(" {COLOR YELLOW_D}Thunderwave Cave{RESET} is \nout this way.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -2540,15 +2540,15 @@ static const struct ScriptCommand s_gs9_g22_s2_lives0_dlg0[] = { /* 0x81a5a7c */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0!\nThe dungeon isn't that way.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!\nThe dungeon isn't that way.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" #CDThunderwave Cave#R is\nover this way!")), - VARIANT_DEFAULT(_(" #CDThunderwave Cave#R is \nout this way.")), + VARIANT(/* == */ 1, _(" {COLOR YELLOW_D}Thunderwave Cave{RESET} is\nover this way!")), + VARIANT_DEFAULT(_(" {COLOR YELLOW_D}Thunderwave Cave{RESET} is \nout this way.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -2656,14 +2656,14 @@ static const struct ScriptCommand s_gs9_g24_s0_obj0_dlg2[] = { /* 0x81a6384 */ WAIT(1), CJUMP_DIR_TO_LINK(0), COND_EQUAL(0, /* to label */ 0), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 checked the Mailbox.") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+But there was no mail seeking\n#+help from the rescue team.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} checked the Mailbox.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}But there was no mail seeking\n{CENTER_ALIGN}help from the rescue team.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, EXECUTE_STATION(-1, 25, 0), HALT, LABEL(0), /* = 0x00 */ - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+There is a warning tag\n#+on the side of the Mailbox.") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+- Open the Mailbox at the front -") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}There is a warning tag\n{CENTER_ALIGN}on the side of the Mailbox.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}- Open the Mailbox at the front -") }, JUMP_SCRIPT(END_TALK), }; @@ -2691,7 +2691,7 @@ static const struct ScriptCommand s_gs9_g24_s1_lives0_dlg0[] = { /* 0x81a655c */ DEBUGINFO, { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oops!#W\nI'd better check the Mailbox.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oops!{WAIT_PRESS}\nI'd better check the Mailbox.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, WAIT(30), @@ -2730,8 +2730,8 @@ static const struct ScriptCommand s_gs9_g25_s0_lives0_dlg0[] = { /* 0x81a6700 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0!\nYou're up early.")), - VARIANT_DEFAULT(_(" Good morning, $n0!\nAren't you up early?")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nYou're up early.")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}!\nAren't you up early?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -2772,13 +2772,13 @@ static const struct ScriptCommand s_gs9_g25_s0_lives0_dlg0[] = { /* 0x81a6700 */ { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Well, no point moping.\nLet's go check Pokémon Square.")), - VARIANT(/* == */ 1, _(" I think there will be jobs\nposted at the #C5Pelipper Post Office#R.")), + VARIANT(/* == */ 1, _(" I think there will be jobs\nposted at the {COLOR CYAN}Pelipper Post Office{RESET}.")), VARIANT(/* == */ 1, _(" Pokémon Square's over\nthis way.\nLet's go.")), VARIANT(/* == */ 3, _(" Oh, well.\nWe should go to Pokémon Square.")), - VARIANT(/* == */ 3, _(" We should check the\n#C5Pelipper#R #C5Post Office#R.\nI think they'll have jobs posted.")), + VARIANT(/* == */ 3, _(" We should check the\n{COLOR CYAN}Pelipper{RESET} {COLOR CYAN}Post Office{RESET}.\nI think they'll have jobs posted.")), VARIANT(/* == */ 3, _(" Pokémon Square is over\nhere.\nLet's go.")), VARIANT_DEFAULT(_(" Well, too bad.\nWant to go to Pokémon Square?")), - VARIANT_DEFAULT(_(" I think if we go to the\n#C5Pelipper#R #C5Post Office#R, there'll be jobs\nposted.")), + VARIANT_DEFAULT(_(" I think if we go to the\n{COLOR CYAN}Pelipper{RESET} {COLOR CYAN}Post Office{RESET}, there'll be jobs\nposted.")), VARIANT_DEFAULT(_(" Pokémon Square's over\nthis way.\nLet's go.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(150), @@ -2843,11 +2843,11 @@ static const struct ScriptCommand s_gs9_g26_s0_lives0_dlg0[] = { /* 0x81a7140 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0!")), - VARIANT_DEFAULT(_(" Good morning, $n0!")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}!")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}!")), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ............#WHah?!")), - VARIANT_DEFAULT(_(" ............#WHuh?!")), + VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}Hah?!")), + VARIANT_DEFAULT(_(" ............{WAIT_PRESS}Huh?!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -2864,9 +2864,9 @@ static const struct ScriptCommand s_gs9_g26_s0_lives0_dlg0[] = { /* 0x81a7140 */ { 0x62, 0x00, 0x0100, 0x00000000, -0x00000004, NULL }, WAIT(60), { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Our child, $n3,\nwas kidnapped!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" He was taken to #CDMt. Steel#R's\nsummit!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Please, we need your help!#W\nBye-bye!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Our child, {NAME_3},\nwas kidnapped!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" He was taken to {COLOR YELLOW_D}Mt. Steel{RESET}'s\nsummit!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Please, we need your help!{WAIT_PRESS}\nBye-bye!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -2877,8 +2877,8 @@ static const struct ScriptCommand s_gs9_g26_s0_lives0_dlg0[] = { /* 0x81a7140 */ WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...#WI see...#W\nI guess we'd better go...")), - VARIANT_DEFAULT(_(" ...#WUh, OK...#W\nLet's go...")), + VARIANT(/* == */ 1, _(" ...{WAIT_PRESS}I see...{WAIT_PRESS}\nI guess we'd better go...")), + VARIANT_DEFAULT(_(" ...{WAIT_PRESS}Uh, OK...{WAIT_PRESS}\nLet's go...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -2956,9 +2956,9 @@ static const struct ScriptCommand s_gs9_g27_s0_lives0_dlg0[] = { /* 0x81a7910 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0.")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}.")), VARIANT(/* == */ 1, _(" We blew it yesterday.\nLet's save that little guy today for sure.")), - VARIANT_DEFAULT(_(" Good morning, $n0.")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}.")), VARIANT_DEFAULT(_(" We couldn't do it yesterday,\nso let's be sure to do this rescue today.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -3065,11 +3065,11 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ CALL_SCRIPT(QUESTION_FUNC), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hah? What was that?#W\nWho said that?")), - VARIANT_DEFAULT(_(" Huh? What was that?#W\nAm I hearing voices?")), + VARIANT(/* == */ 1, _(" Hah? What was that?{WAIT_PRESS}\nWho said that?")), + VARIANT_DEFAULT(_(" Huh? What was that?{WAIT_PRESS}\nAm I hearing voices?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...Whoops! You can't see us?#W\nThat's terribly rude of us!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...Whoops! You can't see us?{WAIT_PRESS}\nThat's terribly rude of us!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 1), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -3079,7 +3079,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ CALL_SCRIPT(SHOCK_FUNC), { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Hello. $n4 here.") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Hello. {NAME_4} here.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! Papa!") }, @@ -3088,12 +3088,12 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" $n2!\nYou had us worried!\nYou're not hurt?") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" {NAME_2}!\nYou had us worried!\nYou're not hurt?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Nope!\nIt was scary, but I'm all right.#W\nIt's all thanks to $n0's team.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Nope!\nIt was scary, but I'm all right.{WAIT_PRESS}\nIt's all thanks to {NAME_0}'s team.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -3108,11 +3108,11 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" If you want to thank\nanyone, thank our $n3 friends.")), + VARIANT(/* == */ 1, _(" If you want to thank\nanyone, thank our {NAME_3} friends.")), VARIANT(/* == */ 1, _(" We couldn't have done this\nrescue on our own, right?")), - VARIANT(/* == */ 3, _(" Please thank our\n$n3 friends.")), + VARIANT(/* == */ 3, _(" Please thank our\n{NAME_3} friends.")), VARIANT(/* == */ 3, _(" We couldn't have done this\nrescue by ourselves.")), - VARIANT_DEFAULT(_(" You should be thanking our\n$n3 friends.")), + VARIANT_DEFAULT(_(" You should be thanking our\n{NAME_3} friends.")), VARIANT_DEFAULT(_(" This rescue was impossible\nfor us to do on our own.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -3126,8 +3126,8 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" NO, NO.#W\nIT WAS THE ONLY THING TO DO.#W\nAND...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" HOW BOTH OUR EVOLVED\nFORMS ARE JOINED TRIOS...#W\nI FELT A CERTAIN KINSHIP.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" NO, NO.{WAIT_PRESS}\nIT WAS THE ONLY THING TO DO.{WAIT_PRESS}\nAND...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" HOW BOTH OUR EVOLVED\nFORMS ARE JOINED TRIOS...{WAIT_PRESS}\nI FELT A CERTAIN KINSHIP.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" AFTER ALL, POKéMON MUST\nHELP EACH OTHER.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -3140,13 +3140,13 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0f, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We must be going.\n$n0.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We must be going.\n{NAME_0}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n1.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_1}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -3192,16 +3192,16 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Listen, um...#W\nHow would you like to join us?")), - VARIANT(/* == */ 3, _(" Um...#W\nWould you like to join our team?")), - VARIANT_DEFAULT(_(" Uh...#W\nWould you like to join our team?")), + VARIANT(/* == */ 1, _(" Listen, um...{WAIT_PRESS}\nHow would you like to join us?")), + VARIANT(/* == */ 3, _(" Um...{WAIT_PRESS}\nWould you like to join our team?")), + VARIANT_DEFAULT(_(" Uh...{WAIT_PRESS}\nWould you like to join our team?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" JOIN YOUR TEAM?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yes.#W\nWe couldn't have done the last job\nif you weren't around, $n3.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yes.{WAIT_PRESS}\nWe couldn't have done the last job\nif you weren't around, {NAME_3}.") }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I thought we would need\nmore help for doing rescues in the future.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3211,8 +3211,8 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0001, 0x00000000, 0x00000000, NULL }, ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" Hey, $n0.\nYou think so too, right?")), - VARIANT_DEFAULT(_(" $n0, don't you\nthink so too?")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nYou think so too, right?")), + VARIANT_DEFAULT(_(" {NAME_0}, don't you\nthink so too?")), CHOICE(/* label */ 27, _("Yes! More members needed!")), CHOICE(/* label */ 28, _("We don't need any help.")), LABEL(28), /* = 0x1c */ @@ -3243,22 +3243,22 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But we couldn't have saved\nDiglett by ourselves, right?")), - VARIANT(/* == */ 1, _(" If the $n3 pair\nweren't there to airlift Diglett out,\nwe would've been stuck.")), - VARIANT(/* == */ 1, _(" Or, are you trying to tell\nme that you could've pulled off that\nrescue yourself, $n0?")), + VARIANT(/* == */ 1, _(" If the {NAME_3} pair\nweren't there to airlift Diglett out,\nwe would've been stuck.")), + VARIANT(/* == */ 1, _(" Or, are you trying to tell\nme that you could've pulled off that\nrescue yourself, {NAME_0}?")), VARIANT(/* == */ 3, _(" But we couldn't have\nrescued Diglett on our own.")), - VARIANT(/* == */ 3, _(" If it weren't for the two\n$n3 to fly Diglett out, we\nwould have been stuck.")), - VARIANT(/* == */ 3, _(" Or, $n0, are you\nsaying that you could have done that\nrescue?")), + VARIANT(/* == */ 3, _(" If it weren't for the two\n{NAME_3} to fly Diglett out, we\nwould have been stuck.")), + VARIANT(/* == */ 3, _(" Or, {NAME_0}, are you\nsaying that you could have done that\nrescue?")), VARIANT_DEFAULT(_(" But, you know, we couldn't\nhave rescued Diglett just by ourselves.")), - VARIANT_DEFAULT(_(" If it weren't for the two\n$n3 that flew Diglett out,\nwe would have been helpless.")), - VARIANT_DEFAULT(_(" Or, $n0, you're\nsaying that you could have done that\nrescue by yourself?")), + VARIANT_DEFAULT(_(" If it weren't for the two\n{NAME_3} that flew Diglett out,\nwe would have been helpless.")), + VARIANT_DEFAULT(_(" Or, {NAME_0}, you're\nsaying that you could have done that\nrescue by yourself?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" $n0, do you have\na special ability that'd let you do that?")), - VARIANT(/* == */ 3, _(" Do you have some special\nability that would make you say that,\n$n0?")), - VARIANT_DEFAULT(_(" $n0, do you have\nsome special ability that would let\nyou do that?")), + VARIANT(/* == */ 1, _(" {NAME_0}, do you have\na special ability that'd let you do that?")), + VARIANT(/* == */ 3, _(" Do you have some special\nability that would make you say that,\n{NAME_0}?")), + VARIANT_DEFAULT(_(" {NAME_0}, do you have\nsome special ability that would let\nyou do that?")), CHOICE(/* label */ 32, _("My body stretches.")), CHOICE(/* label */ 32, _("I can fly.")), LABEL(32), /* = 0x20 */ @@ -3267,8 +3267,8 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" Really? You're serious?#W\n...So how about showing me?")), - VARIANT_DEFAULT(_(" Oh, really?!#W\n...Can you show us?")), + VARIANT(/* == */ 1, _(" Really? You're serious?{WAIT_PRESS}\n...So how about showing me?")), + VARIANT_DEFAULT(_(" Oh, really?!{WAIT_PRESS}\n...Can you show us?")), CHOICE(/* label */ 33, _("Sorry, I can't...")), CHOICE(/* label */ 33, _("I just can't...")), LABEL(33), /* = 0x21 */ @@ -3304,7 +3304,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" RESCUE TEAM...#W\nTHAT SOUNDS FUN! BZZ BZZ BZZ!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" RESCUE TEAM...{WAIT_PRESS}\nTHAT SOUNDS FUN! BZZ BZZ BZZ!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -3321,7 +3321,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" OH...\nTHERE ISN'T...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" TOO BAD.#W\nSORRY, BUT WE CAN'T JOIN YOU.#W\nSEE YOU! BZZ BZZ BZZ!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" TOO BAD.{WAIT_PRESS}\nSORRY, BUT WE CAN'T JOIN YOU.{WAIT_PRESS}\nSEE YOU! BZZ BZZ BZZ!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -3344,24 +3344,24 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I know!#W\nLet's go out to #C5Pokémon Square#R\ntomorrow.")), - VARIANT(/* == */ 1, _(" There's this interesting\nshop called the #C5Wigglytuff Club#R.")), - VARIANT(/* == */ 1, _(" It wasn't open the other\nday when we went to the square.#W\nIt might be open tomorrow, though.")), - VARIANT(/* == */ 1, _(" The shop is next to\n#C5Felicity Bank#R.#W\nUsually, #C6Wigglytuff#R is there.")), + VARIANT(/* == */ 1, _(" I know!{WAIT_PRESS}\nLet's go out to {COLOR CYAN}Pokémon Square{RESET}\ntomorrow.")), + VARIANT(/* == */ 1, _(" There's this interesting\nshop called the {COLOR CYAN}Wigglytuff Club{RESET}.")), + VARIANT(/* == */ 1, _(" It wasn't open the other\nday when we went to the square.{WAIT_PRESS}\nIt might be open tomorrow, though.")), + VARIANT(/* == */ 1, _(" The shop is next to\n{COLOR CYAN}Felicity Bank{RESET}.{WAIT_PRESS}\nUsually, {COLOR YELLOW}Wigglytuff{RESET} is there.")), VARIANT(/* == */ 1, _(" We might be able to get\nsome useful information there.")), - VARIANT(/* == */ 1, _(" All right, so that's what\nwe'll do tomorrow.#W\nWe'll go down to Pokémon Square.")), - VARIANT(/* == */ 3, _(" Oh, I know!#W\nWe should go out to #C5Pokémon Square#R\ntomorrow.")), - VARIANT(/* == */ 3, _(" There's an interesting\nshop called the #C5Wigglytuff Club#R.")), - VARIANT(/* == */ 3, _(" There wasn't anyone when\nwe went to the square the other day.#W\nIt might be open tomorrow, though.")), - VARIANT(/* == */ 3, _(" The shop is beside\n#C5Felicity Bank#R.#W\n#C6Wigglytuff#R is usually there.")), + VARIANT(/* == */ 1, _(" All right, so that's what\nwe'll do tomorrow.{WAIT_PRESS}\nWe'll go down to Pokémon Square.")), + VARIANT(/* == */ 3, _(" Oh, I know!{WAIT_PRESS}\nWe should go out to {COLOR CYAN}Pokémon Square{RESET}\ntomorrow.")), + VARIANT(/* == */ 3, _(" There's an interesting\nshop called the {COLOR CYAN}Wigglytuff Club{RESET}.")), + VARIANT(/* == */ 3, _(" There wasn't anyone when\nwe went to the square the other day.{WAIT_PRESS}\nIt might be open tomorrow, though.")), + VARIANT(/* == */ 3, _(" The shop is beside\n{COLOR CYAN}Felicity Bank{RESET}.{WAIT_PRESS}\n{COLOR YELLOW}Wigglytuff{RESET} is usually there.")), VARIANT(/* == */ 3, _(" We might get some useful\ninformation there.")), - VARIANT(/* == */ 3, _(" So that's tomorrow.#W\nWe'll go to Pokémon Square!")), - VARIANT_DEFAULT(_(" I know!#W\nLet's go out to #C5Pokémon Square#R\ntomorrow.")), - VARIANT_DEFAULT(_(" There's an interesting\nplace called the #C5Wigglytuff Club#R.")), - VARIANT_DEFAULT(_(" It wasn't open the other\nday when we went to the square.#W\nIt should be open tomorrow, though.")), - VARIANT_DEFAULT(_(" It's next door to \n#C5Felicity Bank#R.#W\n#C6Wigglytuff#R is usually there every day.")), + VARIANT(/* == */ 3, _(" So that's tomorrow.{WAIT_PRESS}\nWe'll go to Pokémon Square!")), + VARIANT_DEFAULT(_(" I know!{WAIT_PRESS}\nLet's go out to {COLOR CYAN}Pokémon Square{RESET}\ntomorrow.")), + VARIANT_DEFAULT(_(" There's an interesting\nplace called the {COLOR CYAN}Wigglytuff Club{RESET}.")), + VARIANT_DEFAULT(_(" It wasn't open the other\nday when we went to the square.{WAIT_PRESS}\nIt should be open tomorrow, though.")), + VARIANT_DEFAULT(_(" It's next door to \n{COLOR CYAN}Felicity Bank{RESET}.{WAIT_PRESS}\n{COLOR YELLOW}Wigglytuff{RESET} is usually there every day.")), VARIANT_DEFAULT(_(" We may be able to get\nsome information.")), - VARIANT_DEFAULT(_(" OK, that's what we'll do\ntomorrow.#W\nWe'll go to Pokémon Square.")), + VARIANT_DEFAULT(_(" OK, that's what we'll do\ntomorrow.{WAIT_PRESS}\nWe'll go to Pokémon Square.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -3675,7 +3675,7 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ CALL_SCRIPT(LOOK_AROUND_FUNC), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000009, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Morning, $n0!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Morning, {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -3688,35 +3688,35 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...Hah?#W\nYou've been having weird dreams?")), + VARIANT(/* == */ 1, _(" ...Hah?{WAIT_PRESS}\nYou've been having weird dreams?")), VARIANT(/* == */ 1, _(" What sort of weird\ndreams?")), - VARIANT_DEFAULT(_(" ...Oh?#W\nYou've been having strange dreams?")), + VARIANT_DEFAULT(_(" ...Oh?{WAIT_PRESS}\nYou've been having strange dreams?")), VARIANT_DEFAULT(_(" What was strange about\nthem?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(45), { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, WAIT(16), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 told $n1\n#+about the dreams.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} told {NAME_1}\n{CENTER_ALIGN}about the dreams.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(16), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmmm, uh-huh...")), - VARIANT(/* == */ 1, _(" $n0, you said\nyou're really a human, right?")), + VARIANT(/* == */ 1, _(" {NAME_0}, you said\nyou're really a human, right?")), VARIANT(/* == */ 1, _(" So I was thinking...")), VARIANT(/* == */ 1, _(" Maybe those dreams have\nsomething to do with how you became\na Pokémon?")), VARIANT_DEFAULT(_(" Hmmm, OK...")), - VARIANT_DEFAULT(_(" $n0, you said\nyou're actually a human, right?")), + VARIANT_DEFAULT(_(" {NAME_0}, you said\nyou're actually a human, right?")), VARIANT_DEFAULT(_(" So maybe...")), - VARIANT_DEFAULT(_(" Those dreams have some\nconnection to how you became a Pokémon,\n$n0.")), + VARIANT_DEFAULT(_(" Those dreams have some\nconnection to how you became a Pokémon,\n{NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" So let me ask you,\n$n0.\nWhat are you thinking?")), + VARIANT(/* == */ 1, _(" So let me ask you,\n{NAME_0}.\nWhat are you thinking?")), VARIANT(/* == */ 1, _(" Do you want to go back to\nbeing a human?")), - VARIANT_DEFAULT(_(" By the way, $n0.\nWhat do you want to do?")), + VARIANT_DEFAULT(_(" By the way, {NAME_0}.\nWhat do you want to do?")), VARIANT_DEFAULT(_(" Do you want to turn back\ninto a human?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(16), @@ -3741,8 +3741,8 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ VARIANT_DEFAULT(_(" Since you were a human to\nbegin with, it's only natural that you\nwould want to go back to being one.")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" So, tell me.\nWhat sort of a human being were you,\n$n0?")), - VARIANT_DEFAULT(_(" Anyway, when you were\na human, what kind of person were you,\n$n0?")), + VARIANT(/* == */ 1, _(" So, tell me.\nWhat sort of a human being were you,\n{NAME_0}?")), + VARIANT_DEFAULT(_(" Anyway, when you were\na human, what kind of person were you,\n{NAME_0}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0000, 0x00000004, 0x00000000, NULL }, @@ -3752,20 +3752,20 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ CALL_SCRIPT(SWEAT_FUNC), { 0xe2, 0x00, 0x01d6, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0000, 0x00000005, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(............#W\nNope. I can't remember a thing...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(............{WAIT_PRESS}\nNope. I can't remember a thing...)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, wow.\nSo you forgot everything?")), VARIANT(/* == */ 1, _(" Well, that's all right.\nYou can take your time remembering.")), - VARIANT(/* == */ 1, _(" But you know,\n$n0? I'm positive that you\nwere a good human being.")), + VARIANT(/* == */ 1, _(" But you know,\n{NAME_0}? I'm positive that you\nwere a good human being.")), VARIANT(/* == */ 3, _(" Oh, no, you've forgotten?")), VARIANT(/* == */ 3, _(" It's OK.\nThere's no rush to remember.")), - VARIANT(/* == */ 3, _(" But, $n0?\nI can't picture you as anything but\na good human.")), + VARIANT(/* == */ 3, _(" But, {NAME_0}?\nI can't picture you as anything but\na good human.")), VARIANT_DEFAULT(_(" Oh, wow, you've forgotten?")), VARIANT_DEFAULT(_(" That's OK.\nThere's no rush to remember anything.")), - VARIANT_DEFAULT(_(" But this is you,\n$n0. I'm sure you were a good\nhuman being.")), + VARIANT_DEFAULT(_(" But this is you,\n{NAME_0}. I'm sure you were a good\nhuman being.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), JUMP_LABEL(9), @@ -3884,7 +3884,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ VARIANT_DEFAULT(_(" Good morning!\nLet's do good again today!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Is this the place?\nWhere that team named #C5$t#R\nis based?") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Is this the place?\nWhere that team named {COLOR CYAN}{TEAM_NAME}{RESET}\nis based?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(60), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -3920,7 +3920,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0004, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Oh!#W\nOver there. A Mailbox〜♪") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Oh!{WAIT_PRESS}\nOver there. A Mailbox〜♪") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -3962,11 +3962,11 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0001, 0x00000003, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey!#W\nThose rescue jobs were meant for us!")), + VARIANT(/* == */ 1, _(" Hey!{WAIT_PRESS}\nThose rescue jobs were meant for us!")), VARIANT(/* == */ 1, _(" Don't butt in!")), - VARIANT(/* == */ 3, _(" Wait a second!#W\nThose belong to us!")), + VARIANT(/* == */ 3, _(" Wait a second!{WAIT_PRESS}\nThose belong to us!")), VARIANT(/* == */ 3, _(" Don't butt in!")), - VARIANT_DEFAULT(_(" Stop!#W\nThose were meant for us!")), + VARIANT_DEFAULT(_(" Stop!{WAIT_PRESS}\nThose were meant for us!")), VARIANT_DEFAULT(_(" Don't butt in!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -3975,7 +3975,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keh!#W\nIt doesn't matter who does it!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keh!{WAIT_PRESS}\nIt doesn't matter who does it!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000043, 0x00000000, NULL }, @@ -3984,7 +3984,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ WAIT(10), { 0x2e, 0x03, 0x0003, 0x00000042, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...But all we ever get up\nto is no good.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wanna know how it works?#W\nIf we have the cover of a rescue team,\nwe can get away with so much more!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wanna know how it works?{WAIT_PRESS}\nIf we have the cover of a rescue team,\nwe can get away with so much more!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000043, 0x00000000, NULL }, @@ -3993,7 +3993,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wha...#W\nWorld domination?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wha...{WAIT_PRESS}\nWorld domination?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -4002,7 +4002,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nYou heard right!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That's why we're raking in\nthe cash and adding to our gang!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The world will be ours!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The rescue team of evil!\nTeam #C5Meanies#R is who we are!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The rescue team of evil!\nTeam {COLOR CYAN}Meanies{RESET} is who we are!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" See you around!\nKekeh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(60), @@ -4023,9 +4023,9 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...They took off.#W\nWhat a bunch of creeps.")), - VARIANT(/* == */ 3, _(" ...They're gone.#W\nWhat a horrible bunch.")), - VARIANT_DEFAULT(_(" ...They took off.#W\nWhat an unbelievable bunch.")), + VARIANT(/* == */ 1, _(" ...They took off.{WAIT_PRESS}\nWhat a bunch of creeps.")), + VARIANT(/* == */ 3, _(" ...They're gone.{WAIT_PRESS}\nWhat a horrible bunch.")), + VARIANT_DEFAULT(_(" ...They took off.{WAIT_PRESS}\nWhat an unbelievable bunch.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -4334,12 +4334,12 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0!\nLet's keep up our good work today!")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nLet's keep up our good work today!")), VARIANT_DEFAULT(_("")), - VARIANT_DEFAULT(_(" Good morning, $n0!\nLet's do good again today!")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}!\nLet's do good again today!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" $n0!\n$n1!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!\n{NAME_1}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -4362,14 +4362,14 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Oh, if it isn't $n5!\nLong time no see!")), - VARIANT_DEFAULT(_(" Oh, $n5?\nHow have you been?")), + VARIANT(/* == */ 1, _(" Oh, if it isn't {NAME_5}!\nLong time no see!")), + VARIANT_DEFAULT(_(" Oh, {NAME_5}?\nHow have you been?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Please!#W\nPlease help my friend!") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Please!{WAIT_PRESS}\nPlease help my friend!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -4412,9 +4412,9 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000003, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey!\n$n5 came to us for help!")), - VARIANT(/* == */ 3, _(" Wait a second!\n$n5 was asking us to help!")), - VARIANT_DEFAULT(_(" Hold on!\n$n5 came to us for help!")), + VARIANT(/* == */ 1, _(" Hey!\n{NAME_5} came to us for help!")), + VARIANT(/* == */ 3, _(" Wait a second!\n{NAME_5} was asking us to help!")), + VARIANT_DEFAULT(_(" Hold on!\n{NAME_5} came to us for help!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -4435,12 +4435,12 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Listen, $n5.\nHow about we do this?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Listen, {NAME_5}.\nHow about we do this?") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" How about you give the\nreward to the team that brings back your\nchum first?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0f, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" But I...#W\nI don't have any money...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" But I...{WAIT_PRESS}\nI don't have any money...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -4451,16 +4451,16 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, yeah.#W\nYou can even join our team.\nThere's an offer you can't refuse.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, yeah.{WAIT_PRESS}\nYou can even join our team.\nThere's an offer you can't refuse.") }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" When you join us, \n$n5, we'll let you be a big wheel\nin Team #C5Meanies#R, kekekeke!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" When you join us, \n{NAME_5}, we'll let you be a big wheel\nin Team {COLOR CYAN}Meanies{RESET}, kekekeke!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That's the deal,\n$n1.\nThe first to rescue wins!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That's the deal,\n{NAME_1}.\nThe first to rescue wins!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -4497,8 +4497,8 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0!#W\nLet's roll, and quick!")), - VARIANT_DEFAULT(_(" $n0!#W\nLet's get going!")), + VARIANT(/* == */ 1, _(" {NAME_0}!{WAIT_PRESS}\nLet's roll, and quick!")), + VARIANT_DEFAULT(_(" {NAME_0}!{WAIT_PRESS}\nLet's get going!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -4680,9 +4680,9 @@ static const struct ScriptCommand s_gs9_g32_s0_lives0_dlg2[] = { /* 0x81b0818 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...What should I do?#W\nI don't have any money, and...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I don't want to join those\n#C5Meanies#R...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Please, $n0,\nhelp us...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...What should I do?{WAIT_PRESS}\nI don't have any money, and...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I don't want to join those\n{COLOR CYAN}Meanies{RESET}...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Please, {NAME_0},\nhelp us...") }, JUMP_SCRIPT(END_TALK), }; @@ -4711,9 +4711,9 @@ static const struct ScriptCommand s_gs9_g33_s0_lives0_dlg0[] = { /* 0x81b0a00 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0.")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}.")), VARIANT(/* == */ 1, _(" We bungled it yesterday.\nWe've got to get it right today.")), - VARIANT_DEFAULT(_(" Good morning, $n0.")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}.")), VARIANT_DEFAULT(_(" We came up short\nyesterday, so let's be sure to do things\nright today.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -4756,20 +4756,20 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0002, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This is great!\nWelcome back, $n3!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This is great!\nWelcome back, {NAME_3}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Thank you, $n2!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Thank you, {NAME_2}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(16), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And thank you,\n$n1 and $n0!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And thank you,\n{NAME_1} and {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -4791,12 +4791,12 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" It's just great to see\nthat $n3 is back safe and sound.")), - VARIANT_DEFAULT(_(" We're happy to see that\n$n3 is back safe and sound.")), + VARIANT(/* == */ 1, _(" It's just great to see\nthat {NAME_3} is back safe and sound.")), + VARIANT_DEFAULT(_(" We're happy to see that\n{NAME_3} is back safe and sound.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#W\nCool...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nCool...") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You're even more cool\nthan I thought!") }, @@ -4818,11 +4818,11 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0, how about we\ndo something right here?")), + VARIANT(/* == */ 1, _(" {NAME_0}, how about we\ndo something right here?")), VARIANT(/* == */ 1, _(" Why don't we make\na properly impressive rescue team base?")), - VARIANT(/* == */ 3, _(" $n0, why don't\nwe do something right here??")), + VARIANT(/* == */ 3, _(" {NAME_0}, why don't\nwe do something right here??")), VARIANT(/* == */ 3, _(" We should make a proper\nrescue team base here.\nSomething impressive.")), - VARIANT_DEFAULT(_(" $n0, we should\ndo something with this place.")), + VARIANT_DEFAULT(_(" {NAME_0}, we should\ndo something with this place.")), VARIANT_DEFAULT(_(" We should make a proper\nrescue team base here.\nSomething impressive.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), @@ -4876,7 +4876,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" $n0 and\n$n1, thank you again!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_0} and\n{NAME_1}, thank you again!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000009, 0x00000000, NULL }, @@ -4910,7 +4910,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I'm just beat today.\nLet's keep up our good work tomorrow!\nSee you!")), - VARIANT_DEFAULT(_(" That was a tiring day.#W\nLet's do some more good tomorrow!\nSee you!")), + VARIANT_DEFAULT(_(" That was a tiring day.{WAIT_PRESS}\nLet's do some more good tomorrow!\nSee you!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -5073,8 +5073,8 @@ static const struct ScriptCommand s_gs9_g35_s0_lives0_dlg0[] = { /* 0x81b2540 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0, morning!\nLet's keep up our good work today!")), - VARIANT_DEFAULT(_(" $n0, good morning!\nLet's do good again today!")), + VARIANT(/* == */ 1, _(" {NAME_0}, morning!\nLet's keep up our good work today!")), + VARIANT_DEFAULT(_(" {NAME_0}, good morning!\nLet's do good again today!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Umm... Hello?") }, @@ -5091,10 +5091,10 @@ static const struct ScriptCommand s_gs9_g35_s0_lives0_dlg0[] = { /* 0x81b2540 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Umm... Is rescue team\n#C5$t#R here?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Umm... Is rescue team\n{COLOR CYAN}{TEAM_NAME}{RESET} here?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That's right...#W Huh?#W\nWait, aren't you...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That's right...{WAIT_PRESS} Huh?{WAIT_PRESS}\nWait, aren't you...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -5165,16 +5165,16 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I remember now!#W\nYou're the $n2 in Pokémon\nSquare.")), - VARIANT(/* == */ 1, _(" We saw $n3's\nteam accepting your rescue job.")), - VARIANT(/* == */ 3, _(" I remember!#W\nYou're the $n2 in Pokémon\nSquare.")), - VARIANT(/* == */ 3, _(" We saw $n3\nagreeing to do your rescue job.")), - VARIANT_DEFAULT(_(" I remember now!#W\n$n2, we saw you in Pokémon\nSquare.")), - VARIANT_DEFAULT(_(" We watched $n3\nagreeing to take on your rescue job.")), + VARIANT(/* == */ 1, _(" I remember now!{WAIT_PRESS}\nYou're the {NAME_2} in Pokémon\nSquare.")), + VARIANT(/* == */ 1, _(" We saw {NAME_3}'s\nteam accepting your rescue job.")), + VARIANT(/* == */ 3, _(" I remember!{WAIT_PRESS}\nYou're the {NAME_2} in Pokémon\nSquare.")), + VARIANT(/* == */ 3, _(" We saw {NAME_3}\nagreeing to do your rescue job.")), + VARIANT_DEFAULT(_(" I remember now!{WAIT_PRESS}\n{NAME_2}, we saw you in Pokémon\nSquare.")), + VARIANT_DEFAULT(_(" We watched {NAME_3}\nagreeing to take on your rescue job.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.#W\nBut, $n3...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.{WAIT_PRESS}\nBut, {NAME_3}...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" He hasn't come back yet\nfrom the rescue mission.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(455), @@ -5186,8 +5186,8 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Are you serious?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Our friend $n2 got\nwedged between some rocks.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We $n2 can go\nanywhere if we can catch a wind, but...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Our friend {NAME_2} got\nwedged between some rocks.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We {NAME_2} can go\nanywhere if we can catch a wind, but...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Even though the skies are\nfilled with thunderclouds, for some\nodd reason, the winds haven't blown.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -5195,19 +5195,19 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Not even a breeze?#W\nThat is strange...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Not even a breeze?{WAIT_PRESS}\nThat is strange...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n3's leafy fans\ncan whip up powerful winds.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We thought $n3's\nwind would be able to dislodge our friend,\nbut...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_3}'s leafy fans\ncan whip up powerful winds.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We thought {NAME_3}'s\nwind would be able to dislodge our friend,\nbut...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But $n3 hasn't\ncome back...")), - VARIANT(/* == */ 1, _(" It doesn't sound like that\ntough of a rescue...#W\nThat is weird...")), - VARIANT_DEFAULT(_(" But $n3 hasn't\nreturned...?")), - VARIANT_DEFAULT(_(" It doesn't sound like all\nthat challenging of a rescue mission...#W\nIt is strange...")), + VARIANT(/* == */ 1, _(" But {NAME_3} hasn't\ncome back...")), + VARIANT(/* == */ 1, _(" It doesn't sound like that\ntough of a rescue...{WAIT_PRESS}\nThat is weird...")), + VARIANT_DEFAULT(_(" But {NAME_3} hasn't\nreturned...?")), + VARIANT_DEFAULT(_(" It doesn't sound like all\nthat challenging of a rescue mission...{WAIT_PRESS}\nIt is strange...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(120), WAIT(150), @@ -5218,8 +5218,8 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ WAIT(40), { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Oh?#W\nThat's the spirit, $n0.#W\nYour look says you won't need to be asked.")), - VARIANT_DEFAULT(_(" Oh?#W That's the spirit,\n$n0.#W\nYour expression tells me you're ready.")), + VARIANT(/* == */ 1, _(" Oh?{WAIT_PRESS}\nThat's the spirit, {NAME_0}.{WAIT_PRESS}\nYour look says you won't need to be asked.")), + VARIANT_DEFAULT(_(" Oh?{WAIT_PRESS} That's the spirit,\n{NAME_0}.{WAIT_PRESS}\nYour expression tells me you're ready.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -5246,8 +5246,8 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Let's get to it,\n$n0!")), - VARIANT_DEFAULT(_(" Let's go, $n0!")), + VARIANT(/* == */ 1, _(" Let's get to it,\n{NAME_0}!")), + VARIANT_DEFAULT(_(" Let's go, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -5324,7 +5324,7 @@ static const struct ScriptCommand s_gs9_g37_s0_lives0_dlg2[] = { /* 0x81b390c */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" My friend is stuck in\na place called #CDSilent Chasm#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" My friend is stuck in\na place called {COLOR YELLOW_D}Silent Chasm{RESET}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I hate to burden you,\nbut you're our only hope...") }, JUMP_SCRIPT(END_TALK), }; @@ -5355,8 +5355,8 @@ static const struct ScriptCommand s_gs9_g38_s0_lives0_dlg0[] = { /* 0x81b3acc */ WAIT(30), { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning!#W\nLet's try to get things right today!")), - VARIANT_DEFAULT(_(" Good morning!#W\nLet's do our best like always!")), + VARIANT(/* == */ 1, _(" Morning!{WAIT_PRESS}\nLet's try to get things right today!")), + VARIANT_DEFAULT(_(" Good morning!{WAIT_PRESS}\nLet's do our best like always!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -5437,8 +5437,8 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ WAIT(20), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" That monster...#W\nIt said it was Zapdos or something.")), - VARIANT_DEFAULT(_(" That monster...#W\nIt said it was Zapdos...")), + VARIANT(/* == */ 1, _(" That monster...{WAIT_PRESS}\nIt said it was Zapdos or something.")), + VARIANT_DEFAULT(_(" That monster...{WAIT_PRESS}\nIt said it was Zapdos...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_FADEOUT(30), @@ -5455,7 +5455,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n4!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_4}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -5467,7 +5467,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, BGM_SWITCH(114), { 0x2e, 0x10, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Zapdos...#W\nIt's one of the legendary bird Pokémon.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Zapdos...{WAIT_PRESS}\nIt's one of the legendary bird Pokémon.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I heard it had been\nsleeping for a long time...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -5476,7 +5476,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" No.#W\nShiftry's winds were only the trigger.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" No.{WAIT_PRESS}\nShiftry's winds were only the trigger.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" To begin with, the absence\nof winds there was unnatural.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" It must have been caused\nby the rash of natural disasters recently.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Zapdos is enraged from\nhaving been awoken from its sleep.") }, @@ -5486,12 +5486,12 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" But Zapdos won't be easy.#W\nIts electric attacks are wicked nasty.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" But Zapdos won't be easy.{WAIT_PRESS}\nIts electric attacks are wicked nasty.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0b, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I know that.#W\nWe will need to be cautious.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I know that.{WAIT_PRESS}\nWe will need to be cautious.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -5507,8 +5507,8 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x10, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" What?!#W\nThat is dangerous!") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Zapdos is powerful.#W\nIt will be too much for your skill level.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" What?!{WAIT_PRESS}\nThat is dangerous!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Zapdos is powerful.{WAIT_PRESS}\nIt will be too much for your skill level.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -5525,8 +5525,8 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" And we're not afraid of no\nZapdos!#W\nIsn't that right, $n0?!")), - VARIANT_DEFAULT(_(" Besides, Zapdos doesn't\nscare us.#W\nRight, $n0?")), + VARIANT(/* == */ 1, _(" And we're not afraid of no\nZapdos!{WAIT_PRESS}\nIsn't that right, {NAME_0}?!")), + VARIANT_DEFAULT(_(" Besides, Zapdos doesn't\nscare us.{WAIT_PRESS}\nRight, {NAME_0}?")), CHOICE(/* label */ 15, _("Yup! I'm not scared!")), CHOICE(/* label */ 16, _("Owowow... My stomach!")), LABEL(15), /* = 0x0f */ @@ -5579,11 +5579,11 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" No problem!#W\nMy partner always puts on this act.")), + VARIANT(/* == */ 1, _(" No problem!{WAIT_PRESS}\nMy partner always puts on this act.")), VARIANT(/* == */ 1, _(" Always faking these\nstomachaches...\nIt's a big headache, I tell you!")), - VARIANT(/* == */ 3, _(" No problem!#W\n$n0 always puts on this act.")), + VARIANT(/* == */ 3, _(" No problem!{WAIT_PRESS}\n{NAME_0} always puts on this act.")), VARIANT(/* == */ 3, _(" Always faking a\nstomachache...\nIt gets to be annoying.")), - VARIANT_DEFAULT(_(" No problem!#W\n$n0 always does this act.")), + VARIANT_DEFAULT(_(" No problem!{WAIT_PRESS}\n{NAME_0} always does this act.")), VARIANT_DEFAULT(_(" It's always a fake\nstomachache.\nIt bugs me a little.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(470), @@ -5604,7 +5604,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ WAIT(120), { 0x2e, 0x10, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ......") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Fine.#W\nI see that you have courage.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Fine.{WAIT_PRESS}\nI see that you have courage.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(455), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -5614,10 +5614,10 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x10, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Our two teams should make\nour ways separately through #CDMt. Thunder#R.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Our two teams should make\nour ways separately through {COLOR YELLOW_D}Mt. Thunder{RESET}.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We will go when we have\ngeared up for battle.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Knowing how strong our\nopponent is, we have no choice but to\nbe cautious.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You should make way for\n#CDMt. Thunder#R only when you are fully\nprepared.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You should make way for\n{COLOR YELLOW_D}Mt. Thunder{RESET} only when you are fully\nprepared.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Our objective is to rescue\nShiftry!\nLet us find success!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -5633,9 +5633,9 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0!\nLet's give it our best, partner!")), - VARIANT(/* == */ 3, _(" $n0!\nLet's do good!")), - VARIANT_DEFAULT(_(" $n0!\nLet's do our best!")), + VARIANT(/* == */ 1, _(" {NAME_0}!\nLet's give it our best, partner!")), + VARIANT(/* == */ 3, _(" {NAME_0}!\nLet's do good!")), + VARIANT_DEFAULT(_(" {NAME_0}!\nLet's do our best!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -5845,17 +5845,17 @@ static const struct ScriptCommand s_gs9_g40_s0_lives0_dlg0[] = { /* 0x81b603c */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0!\nGet a good night's sleep?")), - VARIANT_DEFAULT(_(" Good morning, $n0!\nDid you sleep well?")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nGet a good night's sleep?")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}!\nDid you sleep well?")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" So now...#W\nWe're supposed to be rescuing Shiftry at\n#CDMt. Thunder#R, right?")), + VARIANT(/* == */ 1, _(" So now...{WAIT_PRESS}\nWe're supposed to be rescuing Shiftry at\n{COLOR YELLOW_D}Mt. Thunder{RESET}, right?")), VARIANT(/* == */ 1, _(" But Alakazam said we should\nbe prepared before going...")), - VARIANT(/* == */ 1, _(" What do you think?#W\nWe can go off to #CDMt. Thunder#R right away,\nor we can put it off. It's your choice.")), + VARIANT(/* == */ 1, _(" What do you think?{WAIT_PRESS}\nWe can go off to {COLOR YELLOW_D}Mt. Thunder{RESET} right away,\nor we can put it off. It's your choice.")), VARIANT(/* == */ 1, _(" But whatever we do today,\nlet's give it our best like always!")), - VARIANT_DEFAULT(_(" OK...#W\nWe should be heading to #CDMt. Thunder#R to\ndo the Shiftry rescue, right?")), + VARIANT_DEFAULT(_(" OK...{WAIT_PRESS}\nWe should be heading to {COLOR YELLOW_D}Mt. Thunder{RESET} to\ndo the Shiftry rescue, right?")), VARIANT_DEFAULT(_(" But Alakazam said that we\nshould be properly prepared before we\ntry...")), - VARIANT_DEFAULT(_(" What should we do?#W\nWe can go to #CDMt. Thunder#R right now\nor later. It's up to you.")), + VARIANT_DEFAULT(_(" What should we do?{WAIT_PRESS}\nWe can go to {COLOR YELLOW_D}Mt. Thunder{RESET} right now\nor later. It's up to you.")), VARIANT_DEFAULT(_(" But anyway, let's do our\nbest like always!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -5910,8 +5910,8 @@ static const struct ScriptCommand s_gs9_g42_s0_lives0_dlg0[] = { /* 0x81b6630 */ WAIT(30), { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning!#W\nLet's keep giving it our best!")), - VARIANT_DEFAULT(_(" Good morning!#W\nLet's do our best like always!")), + VARIANT(/* == */ 1, _(" Morning!{WAIT_PRESS}\nLet's keep giving it our best!")), + VARIANT_DEFAULT(_(" Good morning!{WAIT_PRESS}\nLet's do our best like always!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -5967,14 +5967,14 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ CALL_SCRIPT(LOOK_AROUND_FUNC), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0, morning!")), + VARIANT(/* == */ 1, _(" {NAME_0}, morning!")), VARIANT(/* == */ 1, _(" I did a little checking\naround yesterday.")), - VARIANT(/* == */ 1, _(" The #C5Hill of the Ancients#R\nis in the #CDGreat Canyon#R.")), - VARIANT(/* == */ 1, _(" So let's roll!\nOff we go to the #CDGreat Canyon#R!")), - VARIANT_DEFAULT(_(" $n0, good morning!")), + VARIANT(/* == */ 1, _(" The {COLOR CYAN}Hill of the Ancients{RESET}\nis in the {COLOR YELLOW_D}Great Canyon{RESET}.")), + VARIANT(/* == */ 1, _(" So let's roll!\nOff we go to the {COLOR YELLOW_D}Great Canyon{RESET}!")), + VARIANT_DEFAULT(_(" {NAME_0}, good morning!")), VARIANT_DEFAULT(_(" Yesterday, I did some\nchecking around.")), - VARIANT_DEFAULT(_(" It turns out that the\n#C5Hill of the Ancients#R is apparently in\nthe #CDGreat Canyon#R.")), - VARIANT_DEFAULT(_(" We should go there right\naway!\nOff to the #CDGreat Canyon#R!")), + VARIANT_DEFAULT(_(" It turns out that the\n{COLOR CYAN}Hill of the Ancients{RESET} is apparently in\nthe {COLOR YELLOW_D}Great Canyon{RESET}.")), + VARIANT_DEFAULT(_(" We should go there right\naway!\nOff to the {COLOR YELLOW_D}Great Canyon{RESET}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -5985,7 +5985,7 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" Huh? What's up with you?")), VARIANT_DEFAULT(_(" Huh? What's the matter?")), - CHOICE(/* label */ 1, _("Listen, $n1.")), + CHOICE(/* label */ 1, _("Listen, {NAME_1}.")), CHOICE(/* label */ 2, _("It's OK, it's nothing.")), LABEL(1), /* = 0x01 */ { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -6020,8 +6020,8 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ LABEL(4), /* = 0x04 */ { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 3, _(" Why...?#W\nYou need to ask me that?")), - VARIANT_DEFAULT(_(" Why...?#W\nWhat, you need to ask?")), + VARIANT(/* == */ 3, _(" Why...?{WAIT_PRESS}\nYou need to ask me that?")), + VARIANT_DEFAULT(_(" Why...?{WAIT_PRESS}\nWhat, you need to ask?")), CHOICE(/* label */ 6, _("It's not for you...")), CHOICE(/* label */ 7, _("It's for someone else...")), LABEL(6), /* = 0x06 */ @@ -6029,36 +6029,36 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Well, sure.")), VARIANT(/* == */ 1, _(" It lets me try harder to do\nmy best because it's not about me.")), - VARIANT(/* == */ 1, _(" You and me--we're friends,\nright, $n0?")), + VARIANT(/* == */ 1, _(" You and me--we're friends,\nright, {NAME_0}?")), VARIANT(/* == */ 3, _(" That's why.")), VARIANT(/* == */ 3, _(" Because it's not about me,\nI can try that much harder to do my best.")), - VARIANT(/* == */ 3, _(" We're friends, aren't we,\n$n0?")), + VARIANT(/* == */ 3, _(" We're friends, aren't we,\n{NAME_0}?")), VARIANT_DEFAULT(_(" You said it.")), VARIANT_DEFAULT(_(" It lets me try harder to do\nmy best because it's not about me.")), - VARIANT_DEFAULT(_(" We're friends, aren't we,\n$n0?")), + VARIANT_DEFAULT(_(" We're friends, aren't we,\n{NAME_0}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I want to do my best\nbecause it's for you, $n0.")), - VARIANT(/* == */ 3, _(" I want to do my best\nbecause it's for you, $n0.")), - VARIANT_DEFAULT(_(" I want to do my best\nbecause it's for you, $n0.")), + VARIANT(/* == */ 1, _(" I want to do my best\nbecause it's for you, {NAME_0}.")), + VARIANT(/* == */ 3, _(" I want to do my best\nbecause it's for you, {NAME_0}.")), + VARIANT_DEFAULT(_(" I want to do my best\nbecause it's for you, {NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(8), LABEL(7), /* = 0x07 */ { 0x2e, 0x02, 0x0001, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" For someone else?\nNow that's cold.")), - VARIANT(/* == */ 1, _(" You and me--we're friends,\nright, $n0?")), + VARIANT(/* == */ 1, _(" You and me--we're friends,\nright, {NAME_0}?")), VARIANT(/* == */ 3, _(" For someone else?\nNow isn't that cold?")), - VARIANT(/* == */ 3, _(" We're friends, aren't we,\n$n0?")), + VARIANT(/* == */ 3, _(" We're friends, aren't we,\n{NAME_0}?")), VARIANT_DEFAULT(_(" Someone else?\nCome on, what do you think I am?")), - VARIANT_DEFAULT(_(" We're friends, aren't we,\n$n0?")), + VARIANT_DEFAULT(_(" We're friends, aren't we,\n{NAME_0}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I want to do my best\nbecause it's for you, $n0.")), - VARIANT(/* == */ 3, _(" I want to do my best\nbecause it's for you, $n0.")), - VARIANT_DEFAULT(_(" I want to do my best\nbecause it's for you, $n0.")), + VARIANT(/* == */ 1, _(" I want to do my best\nbecause it's for you, {NAME_0}.")), + VARIANT(/* == */ 3, _(" I want to do my best\nbecause it's for you, {NAME_0}.")), + VARIANT_DEFAULT(_(" I want to do my best\nbecause it's for you, {NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(8), LABEL(8), /* = 0x08 */ @@ -6128,9 +6128,9 @@ static const struct ScriptCommand s_gs9_g44_s0_lives0_dlg0[] = { /* 0x81b78c0 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0!")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}!")), VARIANT(/* == */ 1, _(" Like always, let's give\nit our best!")), - VARIANT_DEFAULT(_(" Good morning, $n0!")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}!")), VARIANT_DEFAULT(_(" Let's do our best like we\nalways do!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -6177,15 +6177,15 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ CALL_SCRIPT(LOOK_AROUND_FUNC), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0!")), - VARIANT(/* == */ 1, _(" Let's keep doing our best...#W\nActually, I need to ask you something.")), - VARIANT_DEFAULT(_(" Good morning, $n0!")), - VARIANT_DEFAULT(_(" Let's keep on doing good...#W\nActually, I want to ask you something.")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}!")), + VARIANT(/* == */ 1, _(" Let's keep doing our best...{WAIT_PRESS}\nActually, I need to ask you something.")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}!")), + VARIANT_DEFAULT(_(" Let's keep on doing good...{WAIT_PRESS}\nActually, I want to ask you something.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" Remember what\n$n3 said yesterday?#W\nDoes it bother you?")), - VARIANT_DEFAULT(_(" What do you think about\nwhat $n3 said yesterday?#W\nDoes it bother you?")), + VARIANT(/* == */ 1, _(" Remember what\n{NAME_3} said yesterday?{WAIT_PRESS}\nDoes it bother you?")), + VARIANT_DEFAULT(_(" What do you think about\nwhat {NAME_3} said yesterday?{WAIT_PRESS}\nDoes it bother you?")), CHOICE(/* label */ 0, _("Yes.")), CHOICE(/* label */ 1, _("No.")), LABEL(0), /* = 0x00 */ @@ -6195,11 +6195,11 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Yeah, I guess so.\nIt would bother you too, $n0.")), + VARIANT(/* == */ 1, _(" Yeah, I guess so.\nIt would bother you too, {NAME_0}.")), VARIANT(/* == */ 1, _(" He said that there is a link\nbetween the world's balance being upset\nand how you became a Pokémon...")), VARIANT(/* == */ 1, _(" And how the upset balance\nis causing natural disasters...")), VARIANT(/* == */ 1, _(" And, worst of all, he said\nhow our world will be ruined if the\nbalance isn't restored.")), - VARIANT_DEFAULT(_(" Yes, I guess you would be\nconcerned too, $n0.")), + VARIANT_DEFAULT(_(" Yes, I guess you would be\nconcerned too, {NAME_0}.")), VARIANT_DEFAULT(_(" There's supposed to be\na link between the world's balance being\nupset and how you became a Pokémon...")), VARIANT_DEFAULT(_(" And because of the world's\nupset balance, natural disasters have been\noccurring...")), VARIANT_DEFAULT(_(" And more than anything,\nhe said that the world will be ruined\nif the balance isn't restored...")), @@ -6213,47 +6213,47 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah?!\nIt doesn't have anything to do with you?!")), - VARIANT(/* == */ 1, _(" $n0!\nThat's not funny!")), + VARIANT(/* == */ 1, _(" {NAME_0}!\nThat's not funny!")), VARIANT(/* == */ 1, _(" The world might be\ndestroyed!")), - VARIANT(/* == */ 1, _(" And how you became a\nPokémon, $n0...\nThat's all supposed to be related!")), + VARIANT(/* == */ 1, _(" And how you became a\nPokémon, {NAME_0}...\nThat's all supposed to be related!")), VARIANT_DEFAULT(_(" Huh?!\nIt doesn't concern you?!")), - VARIANT_DEFAULT(_(" $n0!\nDon't joke around--it's not funny!")), + VARIANT_DEFAULT(_(" {NAME_0}!\nDon't joke around--it's not funny!")), VARIANT_DEFAULT(_(" The world might be\ndestroyed!")), - VARIANT_DEFAULT(_(" And how you became a\nPokémon, $n0...\nThat's all supposed to be related!")), + VARIANT_DEFAULT(_(" And how you became a\nPokémon, {NAME_0}...\nThat's all supposed to be related!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh!\n...I get it.")), - VARIANT(/* == */ 1, _(" On second thought, you must\nbe more worried than I am,\n$n0...")), + VARIANT(/* == */ 1, _(" On second thought, you must\nbe more worried than I am,\n{NAME_0}...")), VARIANT(/* == */ 1, _(" You're in the middle of this.\nOf course you're worried...")), - VARIANT(/* == */ 1, _(" Sorry, $n0.\nI wasn't thinking.")), + VARIANT(/* == */ 1, _(" Sorry, {NAME_0}.\nI wasn't thinking.")), VARIANT(/* == */ 3, _(" Oh!\n...I understand now.")), - VARIANT(/* == */ 3, _(" How stupid of me...\nOf course you would be more worried\nthan I am, $n0...")), + VARIANT(/* == */ 3, _(" How stupid of me...\nOf course you would be more worried\nthan I am, {NAME_0}...")), VARIANT(/* == */ 3, _(" You're involved in all of\nthis.\nIt's only natural you'd be worried...")), - VARIANT(/* == */ 3, _(" Sorry, $n0.\nIt was inconsiderate of me.")), + VARIANT(/* == */ 3, _(" Sorry, {NAME_0}.\nIt was inconsiderate of me.")), VARIANT_DEFAULT(_(" Oh!\n...I get it.")), - VARIANT_DEFAULT(_(" I wasn't thinking.\nYou should be more worried than I am,\n$n0...")), + VARIANT_DEFAULT(_(" I wasn't thinking.\nYou should be more worried than I am,\n{NAME_0}...")), VARIANT_DEFAULT(_(" You're in the middle of this.\nOf course you're worried...")), - VARIANT_DEFAULT(_(" I'm sorry, $n0.\nI should have realized...")), + VARIANT_DEFAULT(_(" I'm sorry, {NAME_0}.\nI should have realized...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x02, 0x0001, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n3 said the world\nwill be destroyed if nothing's done...")), - VARIANT_DEFAULT(_(" $n3 said that the\nworld will be ruined if nothing is done...")), + VARIANT(/* == */ 1, _(" {NAME_3} said the world\nwill be destroyed if nothing's done...")), + VARIANT_DEFAULT(_(" {NAME_3} said that the\nworld will be ruined if nothing is done...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(2), LABEL(2), /* = 0x02 */ { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I want to do something...#W\nBut I don't really get it...")), - VARIANT(/* == */ 1, _(" Tell me.\nThe world's balance...#W\nWhat is that?")), - VARIANT_DEFAULT(_(" I want to do something...#W\nBut there's something I don't understand.")), - VARIANT_DEFAULT(_(" So, uh...\nThe world's balance...#W\nWhat is it?")), + VARIANT(/* == */ 1, _(" I want to do something...{WAIT_PRESS}\nBut I don't really get it...")), + VARIANT(/* == */ 1, _(" Tell me.\nThe world's balance...{WAIT_PRESS}\nWhat is that?")), + VARIANT_DEFAULT(_(" I want to do something...{WAIT_PRESS}\nBut there's something I don't understand.")), + VARIANT_DEFAULT(_(" So, uh...\nThe world's balance...{WAIT_PRESS}\nWhat is it?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" $n0, do you know?\nWhat the world's balance is?")), + ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" {NAME_0}, do you know?\nWhat the world's balance is?")), CHOICE(/* label */ 3, _("Of course.")), CHOICE(/* label */ 4, _("Don't know.")), CLEAR_ARRAY(EVENT_LOCAL), @@ -6265,8 +6265,8 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Oh, really?!#W\n$n0, you know?!")), - VARIANT_DEFAULT(_(" Oh, really?!#W\n$n0, you know?!")), + VARIANT(/* == */ 1, _(" Oh, really?!{WAIT_PRESS}\n{NAME_0}, you know?!")), + VARIANT_DEFAULT(_(" Oh, really?!{WAIT_PRESS}\n{NAME_0}, you know?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CLEAR_ARRAY(EVENT_LOCAL), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), @@ -6282,7 +6282,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, WAIT(100), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" In space...?#W\nLike where the stars and the moon are?\nThat space?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" In space...?{WAIT_PRESS}\nLike where the stars and the moon are?\nThat space?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -6302,8 +6302,8 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hah?!#W\nGo out to space?!")), - VARIANT_DEFAULT(_(" Huh?!#W\nGo out to space?!")), + VARIANT(/* == */ 1, _(" Hah?!{WAIT_PRESS}\nGo out to space?!")), + VARIANT_DEFAULT(_(" Huh?!{WAIT_PRESS}\nGo out to space?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CLEAR_ARRAY(EVENT_LOCAL), { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, @@ -6337,12 +6337,12 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey! $n2!")), - VARIANT(/* == */ 1, _(" You came at the right time!#W\nWe want you to carry us out to space...")), - VARIANT(/* == */ 3, _(" Oh! $n2!")), - VARIANT(/* == */ 3, _(" You came at the right time!#W\nI was wondering if you could carry us\nout to space...")), - VARIANT_DEFAULT(_(" Oh! $n2!")), - VARIANT_DEFAULT(_(" Just who we need!#W\nYou see, we're wondering if you could\ncarry us to space...")), + VARIANT(/* == */ 1, _(" Hey! {NAME_2}!")), + VARIANT(/* == */ 1, _(" You came at the right time!{WAIT_PRESS}\nWe want you to carry us out to space...")), + VARIANT(/* == */ 3, _(" Oh! {NAME_2}!")), + VARIANT(/* == */ 3, _(" You came at the right time!{WAIT_PRESS}\nI was wondering if you could carry us\nout to space...")), + VARIANT_DEFAULT(_(" Oh! {NAME_2}!")), + VARIANT_DEFAULT(_(" Just who we need!{WAIT_PRESS}\nYou see, we're wondering if you could\ncarry us to space...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -6376,8 +6376,8 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" So, you don't know anything\nat all, $n0...")), - VARIANT_DEFAULT(_(" So, you don't know either,\n$n0...")), + VARIANT(/* == */ 1, _(" So, you don't know anything\nat all, {NAME_0}...")), + VARIANT_DEFAULT(_(" So, you don't know either,\n{NAME_0}...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(11), LABEL(9), /* = 0x09 */ @@ -6399,8 +6399,8 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" So, you don't know anything\nat all, $n0...")), - VARIANT_DEFAULT(_(" So, you don't know either,\n$n0...")), + VARIANT(/* == */ 1, _(" So, you don't know anything\nat all, {NAME_0}...")), + VARIANT_DEFAULT(_(" So, you don't know either,\n{NAME_0}...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(11), LABEL(6), /* = 0x06 */ @@ -6429,8 +6429,8 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...OK.#W\nYeah, I guess so.\nIt'd be impossible to know.")), - VARIANT_DEFAULT(_(" ...OK.#W\nI guess so. You wouldn't know.")), + VARIANT(/* == */ 1, _(" ...OK.{WAIT_PRESS}\nYeah, I guess so.\nIt'd be impossible to know.")), + VARIANT_DEFAULT(_(" ...OK.{WAIT_PRESS}\nI guess so. You wouldn't know.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(11), /* = 0x0b */ { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, @@ -6621,9 +6621,9 @@ static const struct ScriptCommand s_gs9_g46_s0_lives0_dlg0[] = { /* 0x81ba664 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0001, 0x00000007, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0!\nSorry!")), - VARIANT(/* == */ 3, _(" $n0!\nSorry!")), - VARIANT_DEFAULT(_(" $n0!\nSorry!")), + VARIANT(/* == */ 1, _(" {NAME_0}!\nSorry!")), + VARIANT(/* == */ 3, _(" {NAME_0}!\nSorry!")), + VARIANT_DEFAULT(_(" {NAME_0}!\nSorry!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(465), @@ -6632,28 +6632,28 @@ static const struct ScriptCommand s_gs9_g46_s0_lives0_dlg0[] = { /* 0x81ba664 */ WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I started doubting you\na little, $n0...")), - VARIANT(/* == */ 3, _(" I started doubting you\na little, $n0...")), - VARIANT_DEFAULT(_(" I started doubting you\na little, $n0...")), + VARIANT(/* == */ 1, _(" I started doubting you\na little, {NAME_0}...")), + VARIANT(/* == */ 3, _(" I started doubting you\na little, {NAME_0}...")), + VARIANT_DEFAULT(_(" I started doubting you\na little, {NAME_0}...")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But I've made up my mind.")), - VARIANT(/* == */ 1, _(" I'm going to believe in you,\n$n0.")), - VARIANT(/* == */ 1, _(" Because you're my friend,\n$n0.\nAn important friend.")), - VARIANT(/* == */ 1, _(" Yes, a really important...#W\nfriend...")), + VARIANT(/* == */ 1, _(" I'm going to believe in you,\n{NAME_0}.")), + VARIANT(/* == */ 1, _(" Because you're my friend,\n{NAME_0}.\nAn important friend.")), + VARIANT(/* == */ 1, _(" Yes, a really important...{WAIT_PRESS}\nfriend...")), VARIANT(/* == */ 3, _(" I'm not going to worry\nanymore.")), - VARIANT(/* == */ 3, _(" I believe in you,\n$n0.")), - VARIANT(/* == */ 3, _(" Because...\nYou're a friend like no other,\n$n0.")), - VARIANT(/* == */ 3, _(" You're an invaluable...#W\nfriend...")), + VARIANT(/* == */ 3, _(" I believe in you,\n{NAME_0}.")), + VARIANT(/* == */ 3, _(" Because...\nYou're a friend like no other,\n{NAME_0}.")), + VARIANT(/* == */ 3, _(" You're an invaluable...{WAIT_PRESS}\nfriend...")), VARIANT_DEFAULT(_(" But I'm not going to worry\nanymore.")), - VARIANT_DEFAULT(_(" I believe in you,\n$n0.")), - VARIANT_DEFAULT(_(" Because you're a friend\nlike no other, $n0.")), - VARIANT_DEFAULT(_(" You're a friend...#W\nLike I'd never get again...")), + VARIANT_DEFAULT(_(" I believe in you,\n{NAME_0}.")), + VARIANT_DEFAULT(_(" Because you're a friend\nlike no other, {NAME_0}.")), + VARIANT_DEFAULT(_(" You're a friend...{WAIT_PRESS}\nLike I'd never get again...")), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" All right, $n0!\nLet's get back to doing our best tomorrow!")), - VARIANT(/* == */ 3, _(" OK, $n0!\nLet's try our best to do well tomorrow!")), - VARIANT_DEFAULT(_(" OK, $n0!\nLet's do our best tomorrow like always!")), + VARIANT(/* == */ 1, _(" All right, {NAME_0}!\nLet's get back to doing our best tomorrow!")), + VARIANT(/* == */ 3, _(" OK, {NAME_0}!\nLet's try our best to do well tomorrow!")), + VARIANT_DEFAULT(_(" OK, {NAME_0}!\nLet's do our best tomorrow like always!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -6714,12 +6714,12 @@ static const struct ScriptCommand s_gs9_g47_s0_lives0_dlg0[] = { /* 0x81bb154 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000009, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Morning, $n0!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Morning, {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...Huh?#W\nYou look pale.\nWhat's up with you?")), - VARIANT_DEFAULT(_(" ...Oh?#W\nYou look pale.\nIs something the matter?")), + VARIANT(/* == */ 1, _(" ...Huh?{WAIT_PRESS}\nYou look pale.\nWhat's up with you?")), + VARIANT_DEFAULT(_(" ...Oh?{WAIT_PRESS}\nYou look pale.\nIs something the matter?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -6799,7 +6799,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(150), { 0x2e, 0x14, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Gasp, gasp...#W\nWow, that was a real shock!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Gasp, gasp...{WAIT_PRESS}\nWow, that was a real shock!") }, { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x93, 0x05, 0x0002, 0x00000022, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, @@ -6809,8 +6809,8 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But, hey, $n0.")), - VARIANT_DEFAULT(_(" But listen, $n0.")), + VARIANT(/* == */ 1, _(" But, hey, {NAME_0}.")), + VARIANT_DEFAULT(_(" But listen, {NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000003, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -6820,10 +6820,10 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ VARIANT_DEFAULT(_(" Why didn't you argue that\nit's not you?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" Why didn't you say you're\nnot the human that appears in the legend\nof $n6?")), - VARIANT_DEFAULT(_(" You should have said you're\nnot the human that appears in the legend\nof $n6!")), - CHOICE(/* label */ 1, _("...Listen, $n1.")), - CHOICE(/* label */ 1, _("...Hey, $n1.")), + VARIANT(/* == */ 1, _(" Why didn't you say you're\nnot the human that appears in the legend\nof {NAME_6}?")), + VARIANT_DEFAULT(_(" You should have said you're\nnot the human that appears in the legend\nof {NAME_6}!")), + CHOICE(/* label */ 1, _("...Listen, {NAME_1}.")), + CHOICE(/* label */ 1, _("...Hey, {NAME_1}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), LABEL(1), /* = 0x01 */ @@ -6841,10 +6841,10 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wh-what's the matter now?\nWhat are you saying all of a sudden?")), - VARIANT(/* == */ 1, _(" Give up our rescue team?#W\nThat doesn't sound like you, $n0.")), + VARIANT(/* == */ 1, _(" Give up our rescue team?{WAIT_PRESS}\nThat doesn't sound like you, {NAME_0}.")), VARIANT(/* == */ 1, _(" What's up with that?")), VARIANT_DEFAULT(_(" Wh-what's the matter?\nWhat makes you say that all of a sudden?")), - VARIANT_DEFAULT(_(" Give up on our rescue\nteam?#W\nIt's not like you to say that, $n0.")), + VARIANT_DEFAULT(_(" Give up on our rescue\nteam?{WAIT_PRESS}\nIt's not like you to say that, {NAME_0}.")), VARIANT_DEFAULT(_(" Is something the matter?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(4), @@ -6863,12 +6863,12 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...Hah?#W\nYou're saying you don't deserve to be on\nour rescue team?!")), - VARIANT(/* == */ 1, _(" What's wrong with you?!#W\nWhy are you saying that?!")), - VARIANT(/* == */ 1, _(" It's not like you at all,\n$n0!#W\nWhat happened to you?!")), - VARIANT_DEFAULT(_(" ...Huh?!#W\nYou don't think you deserve to be on our\nrescue team?!")), - VARIANT_DEFAULT(_(" What's wrong?!#W\nWhat makes you say that?!")), - VARIANT_DEFAULT(_(" That doesn't sound like you\nat all, $n0.#W\nTell me, what's the matter?")), + VARIANT(/* == */ 1, _(" ...Hah?{WAIT_PRESS}\nYou're saying you don't deserve to be on\nour rescue team?!")), + VARIANT(/* == */ 1, _(" What's wrong with you?!{WAIT_PRESS}\nWhy are you saying that?!")), + VARIANT(/* == */ 1, _(" It's not like you at all,\n{NAME_0}!{WAIT_PRESS}\nWhat happened to you?!")), + VARIANT_DEFAULT(_(" ...Huh?!{WAIT_PRESS}\nYou don't think you deserve to be on our\nrescue team?!")), + VARIANT_DEFAULT(_(" What's wrong?!{WAIT_PRESS}\nWhat makes you say that?!")), + VARIANT_DEFAULT(_(" That doesn't sound like you\nat all, {NAME_0}.{WAIT_PRESS}\nTell me, what's the matter?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(4), LABEL(4), /* = 0x04 */ @@ -6879,10 +6879,10 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............#WHuh?\nYou had a dream?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Huh?\nYou had a dream?") }, FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And $n7 appeared\nin it?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And {NAME_7} appeared\nin it?") }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...And that made you think\nthat maybe you were that human after\nall...") }, { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, @@ -6892,24 +6892,24 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000003, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n0!")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}!")), VARIANT(/* == */ 1, _(" That doesn't mean you\nremembered what you were like as\na human, does it?")), VARIANT(/* == */ 1, _(" So you don't know what\nactually happened!")), - VARIANT(/* == */ 3, _(" Listen, $n0!")), + VARIANT(/* == */ 3, _(" Listen, {NAME_0}!")), VARIANT(/* == */ 3, _(" You didn't remember\nwhat you were like as a human being,\ndid you?")), VARIANT(/* == */ 3, _(" So you don't know what\nreally happened.")), - VARIANT_DEFAULT(_(" Listen, $n0.")), + VARIANT_DEFAULT(_(" Listen, {NAME_0}.")), VARIANT_DEFAULT(_(" Did your dream make\nyou remember what you were like as a\nhuman being?")), VARIANT_DEFAULT(_(" Since it didn't, you don't\nknow what really happened.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I...#W\nYou know that I believe in you,\n$n0, right?")), + VARIANT(/* == */ 1, _(" I...{WAIT_PRESS}\nYou know that I believe in you,\n{NAME_0}, right?")), VARIANT(/* == */ 1, _(" So...")), - VARIANT(/* == */ 3, _(" I...#W\nI believe in you, $n0.\nYou know that, right?")), + VARIANT(/* == */ 3, _(" I...{WAIT_PRESS}\nI believe in you, {NAME_0}.\nYou know that, right?")), VARIANT(/* == */ 3, _(" So...")), - VARIANT_DEFAULT(_(" I...#W\nI have faith in you, $n0.\nYou know that?")), + VARIANT_DEFAULT(_(" I...{WAIT_PRESS}\nI have faith in you, {NAME_0}.\nYou know that?")), VARIANT_DEFAULT(_(" So...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 1), @@ -6925,9 +6925,9 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0xe5, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" After that scene in\nPokémon Square...#W\nWe held a town meeting...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" After that scene in\nPokémon Square...{WAIT_PRESS}\nWe held a town meeting...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" On what we must do to\nsave the world...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And we arrived at a\nconsensus.#W\nWe must get rid of you.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And we arrived at a\nconsensus.{WAIT_PRESS}\nWe must get rid of you.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(9), WAIT(10), @@ -6939,7 +6939,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I was incredulous too...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I had hoped it would not\ncome to this, but...#W\nIt is unfortunate.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I had hoped it would not\ncome to this, but...{WAIT_PRESS}\nIt is unfortunate.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We will...\nDefeat you with all our might!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -6984,22 +6984,22 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Anyone that goes with\n$n0 will be considered an enemy.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Anyone that goes with\n{NAME_0} will be considered an enemy.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The trackers will attack\nwithout mercy.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That goes for us too.\nWe will join the hunt to be rid of you.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Against all odds, you must\nrun.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Run, run...#W\nAnd survive.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Run, run...{WAIT_PRESS}\nAnd survive.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You must run till you\nuncover the truth.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000008, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n2...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_2}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There will be no mercy\nthe next time we meet.#W\nFarewell.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There will be no mercy\nthe next time we meet.{WAIT_PRESS}\nFarewell.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -7016,35 +7016,35 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0x93, 0x0a, 0x000a, 0x00000022, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0...")), - VARIANT(/* == */ 1, _(" In their own way,\n$n2's team believes in you too.")), + VARIANT(/* == */ 1, _(" {NAME_0}...")), + VARIANT(/* == */ 1, _(" In their own way,\n{NAME_2}'s team believes in you too.")), VARIANT(/* == */ 1, _(" Didn't I say this before?")), VARIANT(/* == */ 1, _(" I'm not going to doubt you\nanymore.")), - VARIANT(/* == */ 1, _(" Whatever happens, I'll\nalways believe in you, $n0.")), + VARIANT(/* == */ 1, _(" Whatever happens, I'll\nalways believe in you, {NAME_0}.")), VARIANT(/* == */ 1, _(" I won't be scared, even if\nother rescue teams attack us.")), - VARIANT(/* == */ 3, _(" $n0...")), - VARIANT(/* == */ 3, _(" Did you see?\n$n2's team has faith in you too.")), + VARIANT(/* == */ 3, _(" {NAME_0}...")), + VARIANT(/* == */ 3, _(" Did you see?\n{NAME_2}'s team has faith in you too.")), VARIANT(/* == */ 3, _(" I said this before, didn't I?")), VARIANT(/* == */ 3, _(" I'm not going to worry\nanymore.")), - VARIANT(/* == */ 3, _(" Whatever happens, I have\nfaith in you, $n0.")), + VARIANT(/* == */ 3, _(" Whatever happens, I have\nfaith in you, {NAME_0}.")), VARIANT(/* == */ 3, _(" Even if other rescue teams\nstalk us, I won't be scared.")), - VARIANT_DEFAULT(_(" $n0...")), - VARIANT_DEFAULT(_(" In their own way,\n$n2's team has faith in you too.")), + VARIANT_DEFAULT(_(" {NAME_0}...")), + VARIANT_DEFAULT(_(" In their own way,\n{NAME_2}'s team has faith in you too.")), VARIANT_DEFAULT(_(" Didn't I say this before?")), VARIANT_DEFAULT(_(" I'm not going to worry\nanymore.")), - VARIANT_DEFAULT(_(" Whatever happens, I'll\nalways have faith in you, $n0.")), + VARIANT_DEFAULT(_(" Whatever happens, I'll\nalways have faith in you, {NAME_0}.")), VARIANT_DEFAULT(_(" Even if we're attacked\nby other rescue teams, I won't be\nscared.")), { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" So what's all this about\nnot believing in yourself, $n0?")), - VARIANT(/* == */ 3, _(" So what are we supposed to\ndo if you don't have faith in yourself,\n$n0?")), - VARIANT_DEFAULT(_(" What good will it do if\nyou don't believe in yourself,\n$n0?")), + VARIANT(/* == */ 1, _(" So what's all this about\nnot believing in yourself, {NAME_0}?")), + VARIANT(/* == */ 3, _(" So what are we supposed to\ndo if you don't have faith in yourself,\n{NAME_0}?")), + VARIANT_DEFAULT(_(" What good will it do if\nyou don't believe in yourself,\n{NAME_0}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 2), WAIT(1), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" $n0.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" {NAME_0}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -7053,24 +7053,24 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0x93, 0x0a, 0x000a, 0x00000036, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0e, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n5...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_5}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" $n0...\nI made a promise, remember?") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" {NAME_0}...\nI made a promise, remember?") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" That we would make a\nrescue team base here.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" That I would join your\nrescue team when I grew up.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" $n0...\nDon't give up.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" You're a hero to me,\n$n0.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I believe in you too,\n$n0.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" {NAME_0}...\nDon't give up.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" You're a hero to me,\n{NAME_0}.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I believe in you too,\n{NAME_0}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0001, 0x00000000, 0x00000000, NULL }, - ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" So, what do you say,\n$n0?")), + ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" So, what do you say,\n{NAME_0}?")), CHOICE(/* label */ 18, _("OK! I won't give up!")), CHOICE(/* label */ 18, _("I'm over it! No giving up!")), LABEL(18), /* = 0x12 */ @@ -7085,11 +7085,11 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's right!\nThat's the spirit!\nThat's what I wanted to hear!")), - VARIANT(/* == */ 1, _(" That's the $n0 we\nall know!")), + VARIANT(/* == */ 1, _(" That's the {NAME_0} we\nall know!")), VARIANT(/* == */ 3, _(" Exactly!\nThat's the spirit!\nThat's more like it!")), - VARIANT(/* == */ 3, _(" That's what we expect from\nour $n0!")), + VARIANT(/* == */ 3, _(" That's what we expect from\nour {NAME_0}!")), VARIANT_DEFAULT(_(" Yeah!\nThat's right!\nThat's more like it!")), - VARIANT_DEFAULT(_(" That's what we expect from\nour $n0!")), + VARIANT_DEFAULT(_(" That's what we expect from\nour {NAME_0}!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -7331,7 +7331,7 @@ static const struct ScriptCommand s_gs9_g49_s0_station_sref_script[] = { /* 0x81 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(9), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next dawn...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next dawn...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -7357,8 +7357,8 @@ static const struct ScriptCommand s_gs9_g49_s0_lives0_dlg0[] = { /* 0x81bea68 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0!\nIt's early, but I guessed you would be up!")), - VARIANT_DEFAULT(_(" Morning, $n0!#W\nIt's early, but of course you'd be up by\nnow!")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nIt's early, but I guessed you would be up!")), + VARIANT_DEFAULT(_(" Morning, {NAME_0}!{WAIT_PRESS}\nIt's early, but of course you'd be up by\nnow!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), @@ -7370,9 +7370,9 @@ static const struct ScriptCommand s_gs9_g49_s0_lives0_dlg0[] = { /* 0x81bea68 */ { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" All right, I'll wait while\nyou get ready.")), - VARIANT(/* == */ 1, _(" Tell me when you're set.#W\nWe'll roll out then.")), + VARIANT(/* == */ 1, _(" Tell me when you're set.{WAIT_PRESS}\nWe'll roll out then.")), VARIANT_DEFAULT(_(" Oh, OK.\nI'll wait while you get ready.")), - VARIANT_DEFAULT(_(" Tell me when you're\nready.#W\nLet's leave then.")), + VARIANT_DEFAULT(_(" Tell me when you're\nready.{WAIT_PRESS}\nLet's leave then.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -7425,9 +7425,9 @@ static const struct ScriptCommand s_gs9_g50_s0_lives0_dlg2[] = { /* 0x81beef8 */ { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" All right. I'll wait while\nyou get ready.")), - VARIANT(/* == */ 1, _(" Tell me when you're set.#W\nWe'll roll out then.")), + VARIANT(/* == */ 1, _(" Tell me when you're set.{WAIT_PRESS}\nWe'll roll out then.")), VARIANT_DEFAULT(_(" Oh, OK.\nI'll wait while you get ready.")), - VARIANT_DEFAULT(_(" Tell me when you're\nready.#W\nLet's leave then.")), + VARIANT_DEFAULT(_(" Tell me when you're\nready.{WAIT_PRESS}\nLet's leave then.")), JUMP_SCRIPT(END_TALK), LABEL(1), /* = 0x01 */ EXECUTE_FUNCTION(EVENT_M01E07A_L002), @@ -7501,9 +7501,9 @@ static const struct ScriptCommand s_gs9_g50_s2_lives1_dlg2[] = { /* 0x81bf4bc */ LABEL(2), /* = 0x02 */ MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" All right, I'll wait while\nyou get ready.")), - VARIANT(/* == */ 1, _(" Tell me when you're set.#W\nWe'll roll out then.")), + VARIANT(/* == */ 1, _(" Tell me when you're set.{WAIT_PRESS}\nWe'll roll out then.")), VARIANT_DEFAULT(_(" Oh, OK.\nI'll wait while you get ready.")), - VARIANT_DEFAULT(_(" Tell me when you're\nready.#W\nLet's leave then.")), + VARIANT_DEFAULT(_(" Tell me when you're\nready.{WAIT_PRESS}\nLet's leave then.")), JUMP_SCRIPT(END_TALK), LABEL(1), /* = 0x01 */ EXECUTE_FUNCTION(EVENT_M01E07A_L002), @@ -7574,13 +7574,13 @@ static const struct ScriptCommand s_gs9_g51_s0_lives0_dlg0[] = { /* 0x81bf7d4 */ MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is going to be one\nrough trip...")), VARIANT(/* == */ 1, _(" I want to keep our team\nmembers out of all this...")), - VARIANT(/* == */ 1, _(" Let's not tell our friends...#W\nAnd we'll go, just you and me.")), + VARIANT(/* == */ 1, _(" Let's not tell our friends...{WAIT_PRESS}\nAnd we'll go, just you and me.")), VARIANT(/* == */ 3, _(" I'm sure that this will be a\ndangerous journey...")), VARIANT(/* == */ 3, _(" I don't want to get our team\nmembers involved in this...")), - VARIANT(/* == */ 3, _(" Let's not tell them...#W\nWe should go by ourselves.")), + VARIANT(/* == */ 3, _(" Let's not tell them...{WAIT_PRESS}\nWe should go by ourselves.")), VARIANT_DEFAULT(_(" This is going to be a\ndangerous trip...")), VARIANT_DEFAULT(_(" I don't want to get our team\nmembers involved...")), - VARIANT_DEFAULT(_(" Let's not tell them...#W\nWe'll just leave by ourselves.")), + VARIANT_DEFAULT(_(" Let's not tell them...{WAIT_PRESS}\nWe'll just leave by ourselves.")), LABEL(1), /* = 0x01 */ MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" You know what we have\nto do, right?")), @@ -7594,7 +7594,7 @@ static const struct ScriptCommand s_gs9_g51_s0_lives0_dlg0[] = { /* 0x81bf7d4 */ BGM_SWITCH(24), { 0x2e, 0x03, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...Yes. We have to escape.)") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Like $n2 said that time...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Like {NAME_2} said that time...)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x5f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -7633,7 +7633,7 @@ static const struct ScriptCommand s_gs9_g52_s0_lives0_dlg0[] = { /* 0x81bff70 */ WAIT(30), { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Against all odds, you must\nrun.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Run, run...#W\nAnd survive.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Run, run...{WAIT_PRESS}\nAnd survive.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You must run till you\nuncover the truth.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -7723,7 +7723,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ VARIANT_DEFAULT(_(" OK!\nLet's get going!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" $n0!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -7761,7 +7761,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" We wanted to see you off,\n$n0.") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" We wanted to see you off,\n{NAME_0}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" M-me too!") }, @@ -7817,7 +7817,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's a letter.\n$n0, can you read it?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's a letter.\n{NAME_0}, can you read it?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -7830,7 +7830,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ { 0x86, 0x00, 0x0100, 0x00000039, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, WAIT(30), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 began reading the letter.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} began reading the letter.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("“Take care!\n It's farewell, but only for now.") }, { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Until the day I can deliver mail\n to you again...") }, @@ -7859,7 +7859,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0!\nLet's go! Hit the road!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!\nLet's go! Hit the road!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -8208,8 +8208,8 @@ static const struct ScriptCommand s_gs9_g55_s0_lives0_dlg0[] = { /* 0x81c23c0 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0.\nGet a good night's sleep?")), - VARIANT_DEFAULT(_(" Good morning, $n0.\nDid you sleep well?")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}.\nGet a good night's sleep?")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}.\nDid you sleep well?")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" OK, we're back in the\nrescue team business!")), @@ -8235,12 +8235,12 @@ static const struct ScriptCommand s_gs9_g55_s0_lives0_dlg0[] = { /* 0x81c23c0 */ { 0x93, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n2's brought us\nmail already, too.")), - VARIANT_DEFAULT(_(" And look, $n2 is\nbringing us mail already.")), + VARIANT(/* == */ 1, _(" {NAME_2}'s brought us\nmail already, too.")), + VARIANT_DEFAULT(_(" And look, {NAME_2} is\nbringing us mail already.")), { 0x2e, 0x15, 0x0001, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Let's give it our best like\nwe always used to, $n0!")), - VARIANT_DEFAULT(_(" Let's try to do our best like\nwe always did, $n0!")), + VARIANT(/* == */ 1, _(" Let's give it our best like\nwe always used to, {NAME_0}!")), + VARIANT_DEFAULT(_(" Let's try to do our best like\nwe always did, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -8337,7 +8337,7 @@ static const struct ScriptCommand s_gs9_g57_s0_lives0_dlg0[] = { /* 0x81c2c50 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Good morning, $n0!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Good morning, {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -8352,22 +8352,22 @@ static const struct ScriptCommand s_gs9_g57_s0_lives0_dlg0[] = { /* 0x81c2c50 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Oh, right!#W\nThat earthquake earlier!")), - VARIANT(/* == */ 1, _(" $n0, you're\nworried the same way I am.\nI should've known, $n0.")), + VARIANT(/* == */ 1, _(" Oh, right!{WAIT_PRESS}\nThat earthquake earlier!")), + VARIANT(/* == */ 1, _(" {NAME_0}, you're\nworried the same way I am.\nI should've known, {NAME_0}.")), VARIANT(/* == */ 1, _(" Alakazam's team hasn't come\nback yet...")), VARIANT(/* == */ 1, _(" And they say Groudon is\nwickedly strong, so yeah, it is a bit\nworrying...")), VARIANT(/* == */ 1, _(" But, then again, Alakazam's\nbunch is tough, too.\nThey should be OK...")), VARIANT(/* == */ 1, _(" Well, we did leave Groudon\nup to Alakazam...")), VARIANT(/* == */ 1, _(" So we can't do much of\nanything but wait for them to come back.")), - VARIANT(/* == */ 3, _(" Oh, right!#W\nThat earthquake earlier!")), - VARIANT(/* == */ 3, _(" $n0, you're\nworried about the same thing I am.\nI should have guessed, $n0.")), + VARIANT(/* == */ 3, _(" Oh, right!{WAIT_PRESS}\nThat earthquake earlier!")), + VARIANT(/* == */ 3, _(" {NAME_0}, you're\nworried about the same thing I am.\nI should have guessed, {NAME_0}.")), VARIANT(/* == */ 3, _(" Alakazam's team still hasn't\ncome back...")), VARIANT(/* == */ 3, _(" People say that Groudon is\nvery powerful, so I am a little worried...")), VARIANT(/* == */ 3, _(" But Alakazam's team is also\nvery strong.\nThey must be OK.")), VARIANT(/* == */ 3, _(" Anyway, we agreed to let\nAlakazam handle Groudon.")), VARIANT(/* == */ 3, _(" So we'll just have to wait\nfor them to come back.")), - VARIANT_DEFAULT(_(" Oh, I get it!#W\nThat earthquake earlier!")), - VARIANT_DEFAULT(_(" $n0, you're\nworried about the same thing I am.\nI should've guessed, $n0.")), + VARIANT_DEFAULT(_(" Oh, I get it!{WAIT_PRESS}\nThat earthquake earlier!")), + VARIANT_DEFAULT(_(" {NAME_0}, you're\nworried about the same thing I am.\nI should've guessed, {NAME_0}.")), VARIANT_DEFAULT(_(" Alakazam's team hasn't come\nback yet...")), VARIANT_DEFAULT(_(" They say that Groudon is\npowerful.\nThat has me a little worried.")), VARIANT_DEFAULT(_(" But Alakazam's team is\ntough too.\nThey should be fine.")), @@ -8438,10 +8438,10 @@ static const struct ScriptCommand s_gs9_g58_s0_lives0_dlg0[] = { /* 0x81c37c8 */ WAIT(30), { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Oh, already awake,\n$n0?")), + VARIANT(/* == */ 1, _(" Oh, already awake,\n{NAME_0}?")), VARIANT(/* == */ 1, _(" There was another\nearthquake earlier, right?")), VARIANT(/* == */ 1, _(" There've been so many...\nI can't get a decent night's sleep.")), - VARIANT_DEFAULT(_(" Oh, hi!\nYou're up early, $n0.")), + VARIANT_DEFAULT(_(" Oh, hi!\nYou're up early, {NAME_0}.")), VARIANT_DEFAULT(_(" Did you notice the\nearthquake earlier?")), VARIANT_DEFAULT(_(" It's hard to get decent sleep\nwhen there are so many earthquakes.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -8465,8 +8465,8 @@ static const struct ScriptCommand s_gs9_g58_s0_lives0_dlg0[] = { /* 0x81c37c8 */ WAIT(30), { 0x2e, 0x0e, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n2.#W\nWhat's up?")), - VARIANT_DEFAULT(_(" Oh, $n2.#W\nWhat's the matter?")), + VARIANT(/* == */ 1, _(" Hey, {NAME_2}.{WAIT_PRESS}\nWhat's up?")), + VARIANT_DEFAULT(_(" Oh, {NAME_2}.{WAIT_PRESS}\nWhat's the matter?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -8483,7 +8483,7 @@ static const struct ScriptCommand s_gs9_g58_s0_lives0_dlg0[] = { /* 0x81c37c8 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0, let's go!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, let's go!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(5), @@ -8571,13 +8571,13 @@ static const struct ScriptCommand s_gs9_g59_s0_lives0_dlg0[] = { /* 0x81c4100 */ WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I wish we could've gone too,\nbut that's just too bad.")), - VARIANT(/* == */ 1, _(" We'll let $n2's\nteam take care of things underground.")), + VARIANT(/* == */ 1, _(" We'll let {NAME_2}'s\nteam take care of things underground.")), VARIANT(/* == */ 1, _(" We'll keep giving it our\nbest in our rescue work.")), VARIANT(/* == */ 3, _(" I wish we could have gone\ntoo, but that can't be helped.")), - VARIANT(/* == */ 3, _(" $n2's team can\ntake care of things underground.")), + VARIANT(/* == */ 3, _(" {NAME_2}'s team can\ntake care of things underground.")), VARIANT(/* == */ 3, _(" And we'll keep doing the best\nwe can in our rescue work.")), VARIANT_DEFAULT(_(" I wish we could have gone\ntoo, but there's nothing we can do about\nthat.")), - VARIANT_DEFAULT(_(" $n2's team can\ntake care of things underground.")), + VARIANT_DEFAULT(_(" {NAME_2}'s team can\ntake care of things underground.")), VARIANT_DEFAULT(_(" We'll keep doing the best we\ncan in our rescue work.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -8631,12 +8631,12 @@ static const struct ScriptCommand s_gs9_g60_s0_lives0_dlg0[] = { /* 0x81c45d8 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" We got held up by the\ntrouble we had with $n2.")), + VARIANT(/* == */ 1, _(" We got held up by the\ntrouble we had with {NAME_2}.")), VARIANT(/* == */ 1, _(" But now, we're finally\ngoing off to the underground dungeon.")), VARIANT(/* == */ 1, _(" I know we're not leaving\ntill tomorrow, but I'm, like, buzzing with\nexcitement.")), VARIANT(/* == */ 1, _(" We should spend today\ngetting ready.")), VARIANT(/* == */ 1, _(" Let me know when you're\nready to roll.")), - VARIANT_DEFAULT(_(" We were held up by that\ntrouble with $n2...")), + VARIANT_DEFAULT(_(" We were held up by that\ntrouble with {NAME_2}...")), VARIANT_DEFAULT(_(" But now, we're getting the\nchance to go to the underground dungeon.")), VARIANT_DEFAULT(_(" We're not leaving until\ntomorrow, but I'm jumpy with anticipation.")), VARIANT_DEFAULT(_(" Let's spend today getting\nready for the dungeon.")), @@ -8784,12 +8784,12 @@ static const struct ScriptCommand s_gs9_g62_s0_lives0_dlg0[] = { /* 0x81c5060 */ WAIT(30), { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0!\nGet a good night's sleep?")), - VARIANT_DEFAULT(_(" Good morning, $n0!\nDid you sleep well?")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nGet a good night's sleep?")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}!\nDid you sleep well?")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" This is it!#W\nLet's give it our best and rescue\n$n2!")), - VARIANT_DEFAULT(_(" OK, this is it!#W\nLet's do our best and save $n2's\nteam!")), + VARIANT(/* == */ 1, _(" This is it!{WAIT_PRESS}\nLet's give it our best and rescue\n{NAME_2}!")), + VARIANT_DEFAULT(_(" OK, this is it!{WAIT_PRESS}\nLet's do our best and save {NAME_2}'s\nteam!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), BGM_FADEOUT(150), @@ -8870,8 +8870,8 @@ static const struct ScriptCommand s_gs9_g63_s0_lives0_dlg0[] = { /* 0x81c56b4 */ WAIT(30), { 0x2e, 0x02, 0x0001, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ............#W\nWe didn't do well, did we?")), - VARIANT_DEFAULT(_(" ............#W\nWe didn't do very well, did we?")), + VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nWe didn't do well, did we?")), + VARIANT_DEFAULT(_(" ............{WAIT_PRESS}\nWe didn't do very well, did we?")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But we knew that it would\nbe a tough dungeon.\nWe don't need to get down on ourselves.")), @@ -8955,9 +8955,9 @@ static const struct ScriptCommand s_gs9_g65_s0_lives0_dlg0[] = { /* 0x81c5cd4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning!\nGet a good night's sleep?")), - VARIANT(/* == */ 1, _(" This is it!#W\nLet's roll, $n0!\nTo the sky we go!")), + VARIANT(/* == */ 1, _(" This is it!{WAIT_PRESS}\nLet's roll, {NAME_0}!\nTo the sky we go!")), VARIANT_DEFAULT(_(" Good morning!\nDid you sleep well?")), - VARIANT_DEFAULT(_(" This is it!#W\nLet's go, $n0!\nWe're off to the sky!")), + VARIANT_DEFAULT(_(" This is it!{WAIT_PRESS}\nLet's go, {NAME_0}!\nWe're off to the sky!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -9014,19 +9014,19 @@ static const struct ScriptCommand s_gs9_g67_s0_lives0_dlg0[] = { /* 0x81c605c */ MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning!")), VARIANT(/* == */ 1, _(" Even while we do this,\nthat falling star is coming closer and\ncloser...")), - VARIANT(/* == */ 1, _(" The #CDSky Tower#R is one harsh\nplace...")), + VARIANT(/* == */ 1, _(" The {COLOR YELLOW_D}Sky Tower{RESET} is one harsh\nplace...")), VARIANT(/* == */ 1, _(" But I'm not giving up!")), - VARIANT(/* == */ 1, _(" Let's give it our best,\n$n0!")), + VARIANT(/* == */ 1, _(" Let's give it our best,\n{NAME_0}!")), VARIANT(/* == */ 3, _(" Good morning!")), VARIANT(/* == */ 3, _(" Even now, that falling star\nis getting closer and closer...")), - VARIANT(/* == */ 3, _(" The #CDSky Tower#R is incredibly\nharsh too...")), + VARIANT(/* == */ 3, _(" The {COLOR YELLOW_D}Sky Tower{RESET} is incredibly\nharsh too...")), VARIANT(/* == */ 3, _(" But I'm not giving up!")), - VARIANT(/* == */ 3, _(" Let's keep doing our best,\n$n0!")), + VARIANT(/* == */ 3, _(" Let's keep doing our best,\n{NAME_0}!")), VARIANT_DEFAULT(_(" Good morning!")), VARIANT_DEFAULT(_(" That falling star is coming\ncloser and closer even now...")), - VARIANT_DEFAULT(_(" The #CDSky Tower#R is also very\nchallenging...")), + VARIANT_DEFAULT(_(" The {COLOR YELLOW_D}Sky Tower{RESET} is also very\nchallenging...")), VARIANT_DEFAULT(_(" But I'm not giving up!")), - VARIANT_DEFAULT(_(" Let's keep doing our best,\n$n0!")), + VARIANT_DEFAULT(_(" Let's keep doing our best,\n{NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -9580,7 +9580,7 @@ static const struct ScriptCommand s_gs9_g69_s0_lives0_dlg0[] = { /* 0x81c817c */ { 0x89, 0x15, 0x0080, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n0!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x89, 0x18, 0x0080, 0x00000000, 0x00000000, NULL }, @@ -9590,18 +9590,18 @@ static const struct ScriptCommand s_gs9_g69_s0_lives0_dlg0[] = { /* 0x81c817c */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0f, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, hi, $n2 and\n$n3.#W\nWhat's the matter?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, hi, {NAME_2} and\n{NAME_3}.{WAIT_PRESS}\nWhat's the matter?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's Snubbull!#W\nThere's something weird going on!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's Snubbull!{WAIT_PRESS}\nThere's something weird going on!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Snubbull is weird...?#W\nWeird, how?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Snubbull is weird...?{WAIT_PRESS}\nWeird, how?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -9612,7 +9612,7 @@ static const struct ScriptCommand s_gs9_g69_s0_lives0_dlg0[] = { /* 0x81c817c */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0!\nLet's go to the square!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!\nLet's go to the square!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -9724,11 +9724,11 @@ static const struct ScriptCommand s_gs9_g71_s0_lives0_dlg0[] = { /* 0x81c899c */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Oh, yeah, $n0!\nHang on a second!")), + VARIANT(/* == */ 1, _(" Oh, yeah, {NAME_0}!\nHang on a second!")), VARIANT(/* == */ 1, _(" There's something I wanted\nto bounce off you before we go to any\ndungeon.")), - VARIANT(/* == */ 3, _(" Oh, yeah, $n0!\nHold on a second!")), + VARIANT(/* == */ 3, _(" Oh, yeah, {NAME_0}!\nHold on a second!")), VARIANT(/* == */ 3, _(" There's something I wanted\nto discuss before we go to a dungeon.")), - VARIANT_DEFAULT(_(" Oh, yeah, $n0!\nWait a second!")), + VARIANT_DEFAULT(_(" Oh, yeah, {NAME_0}!\nWait a second!")), VARIANT_DEFAULT(_(" There's something I wanted\nto talk over with you before we go to\na dungeon.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -9774,7 +9774,7 @@ static const struct ScriptCommand s_gs9_g72_s0_lives0_dlg0[] = { /* 0x81c8d90 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" You know how we always\nwent into dungeons, me and you,\n$n0?")), + VARIANT(/* == */ 1, _(" You know how we always\nwent into dungeons, me and you,\n{NAME_0}?")), VARIANT(/* == */ 1, _(" But I think we're going to\nbe facing even more different types of\ndungeons from now on.")), VARIANT(/* == */ 1, _(" With just us two, I think\nwe might have some tough times.")), VARIANT(/* == */ 1, _(" So, this is what I was\nthinking...")), @@ -9782,7 +9782,7 @@ static const struct ScriptCommand s_gs9_g72_s0_lives0_dlg0[] = { /* 0x81c8d90 */ VARIANT(/* == */ 1, _(" For instance, how about\npicking different rescue team leaders\nand members to go to dungeons?")), VARIANT(/* == */ 1, _(" Depending on the dungeon,\nwe might not even get to go anymore...")), VARIANT(/* == */ 1, _(" But that way, we could have\ndifferent types of Pokémon go in.\nI think that'd be good for us.")), - VARIANT(/* == */ 3, _(" You know how we always\ngo to dungeons together, $n0?")), + VARIANT(/* == */ 3, _(" You know how we always\ngo to dungeons together, {NAME_0}?")), VARIANT(/* == */ 3, _(" But from now on, I expect\nto be seeing different types of dungeons.")), VARIANT(/* == */ 3, _(" With just us, I think there\nwill be times when we find it tough going.")), VARIANT(/* == */ 3, _(" So, this is my idea.")), @@ -9790,7 +9790,7 @@ static const struct ScriptCommand s_gs9_g72_s0_lives0_dlg0[] = { /* 0x81c8d90 */ VARIANT(/* == */ 3, _(" How about we make it\npossible to pick different leaders and\nmembers for rescue teams?")), VARIANT(/* == */ 3, _(" I think there will even be\ntimes we don't go on rescues, depending\non the dungeon.")), VARIANT(/* == */ 3, _(" But I think that will let us\nmount rescues with Pokémon of different\ntypes. It will make the team better.")), - VARIANT_DEFAULT(_(" You know how we always\ngo to dungeons together, $n0?")), + VARIANT_DEFAULT(_(" You know how we always\ngo to dungeons together, {NAME_0}?")), VARIANT_DEFAULT(_(" But I think we'll be seeing\nall sorts of different dungeons from\nnow on...")), VARIANT_DEFAULT(_(" I think some of them will\nbe tough even for us.")), VARIANT_DEFAULT(_(" So, I have an idea.")), @@ -9799,11 +9799,11 @@ static const struct ScriptCommand s_gs9_g72_s0_lives0_dlg0[] = { /* 0x81c8d90 */ VARIANT_DEFAULT(_(" That might mean we won't\nbe going on rescues to certain dungeons...")), VARIANT_DEFAULT(_(" But that will let us handle\nrescues better by having more Pokémon\ntypes available.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" What do you say?#W\n$n0, do you think it would be\ngood if we could make anyone the leader?")), + ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" What do you say?{WAIT_PRESS}\n{NAME_0}, do you think it would be\ngood if we could make anyone the leader?")), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" What do you say?#W\n$n0, do you think it would be\ngood if we could make anyone the leader?")), - VARIANT(/* == */ 3, _(" Do you like the idea?#W\n$n0, do you think it'd be good\nto be able to freely choose leaders?")), - VARIANT_DEFAULT(_(" Do you like the idea?#W\n$n0, do you think it'd be good to\nbe able to freely choose leaders?")), + VARIANT(/* == */ 1, _(" What do you say?{WAIT_PRESS}\n{NAME_0}, do you think it would be\ngood if we could make anyone the leader?")), + VARIANT(/* == */ 3, _(" Do you like the idea?{WAIT_PRESS}\n{NAME_0}, do you think it'd be good\nto be able to freely choose leaders?")), + VARIANT_DEFAULT(_(" Do you like the idea?{WAIT_PRESS}\n{NAME_0}, do you think it'd be good to\nbe able to freely choose leaders?")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), LABEL(3), /* = 0x03 */ @@ -9824,11 +9824,11 @@ static const struct ScriptCommand s_gs9_g72_s0_lives0_dlg0[] = { /* 0x81c8d90 */ VARIANT_DEFAULT(_(" Don't you think it would be\nbetter if different types of Pokémon\nwent in instead of us?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Right, $n0?#W\nIt's better to be able to change leaders\nand members in any way, agreed?")), + ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Right, {NAME_0}?{WAIT_PRESS}\nIt's better to be able to change leaders\nand members in any way, agreed?")), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" Right, $n0?#W\nIt's better to be able to change leaders\nand members in any way, agreed?")), - VARIANT(/* == */ 3, _(" Right, $n0?#W\nYou agree that it'd be better if we could\nfreely choose team leaders and members?")), - VARIANT_DEFAULT(_(" Right, $n0?#W\nYou agree that it'd be better if we could\nfreely choose team leaders and members?")), + VARIANT(/* == */ 1, _(" Right, {NAME_0}?{WAIT_PRESS}\nIt's better to be able to change leaders\nand members in any way, agreed?")), + VARIANT(/* == */ 3, _(" Right, {NAME_0}?{WAIT_PRESS}\nYou agree that it'd be better if we could\nfreely choose team leaders and members?")), + VARIANT_DEFAULT(_(" Right, {NAME_0}?{WAIT_PRESS}\nYou agree that it'd be better if we could\nfreely choose team leaders and members?")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), LABEL(2), /* = 0x02 */ @@ -9838,27 +9838,27 @@ static const struct ScriptCommand s_gs9_g72_s0_lives0_dlg0[] = { /* 0x81c8d90 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Yeah, that's right!#W\nYou think so too, $n0!")), - VARIANT(/* == */ 1, _(" OK! That's settled!#W\nWe'll make it so we can choose the\nPokémon going into dungeons from now on.")), - VARIANT_DEFAULT(_(" Yup, that's right!#W\nI thought you'd agree, $n0!")), - VARIANT_DEFAULT(_(" OK! New rule!#W\nWe can now freely pick the Pokémon that\nare going into dungeons.")), + VARIANT(/* == */ 1, _(" Yeah, that's right!{WAIT_PRESS}\nYou think so too, {NAME_0}!")), + VARIANT(/* == */ 1, _(" OK! That's settled!{WAIT_PRESS}\nWe'll make it so we can choose the\nPokémon going into dungeons from now on.")), + VARIANT_DEFAULT(_(" Yup, that's right!{WAIT_PRESS}\nI thought you'd agree, {NAME_0}!")), + VARIANT_DEFAULT(_(" OK! New rule!{WAIT_PRESS}\nWe can now freely pick the Pokémon that\nare going into dungeons.")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is how we should\npick a rescue team's leader.")), VARIANT_DEFAULT(_(" I think this is how we\nshould pick the leader of a team going\ninto a dungeon.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" In its Friend Area, face the\nteam member you want to make the leader,\nthen select #C6Make Leader#R on the menu.")), + VARIANT(/* == */ 1, _(" In its Friend Area, face the\nteam member you want to make the leader,\nthen select {COLOR YELLOW}Make Leader{RESET} on the menu.")), VARIANT(/* == */ 1, _(" That Pokémon will be the\nteam leader from then on.\nWe should do that before dungeons.")), VARIANT(/* == */ 1, _(" Oh, there's one more thing.")), VARIANT(/* == */ 1, _(" Let's also make it so\nthe leader can go to dungeons alone\nif it wants.")), - VARIANT(/* == */ 1, _(" Don't forget!#W To pick a\nleader,#W go to them in their Friend Area...#W\nand select #C6Make Leader#R.")), + VARIANT(/* == */ 1, _(" Don't forget!{WAIT_PRESS} To pick a\nleader,{WAIT_PRESS} go to them in their Friend Area...{WAIT_PRESS}\nand select {COLOR YELLOW}Make Leader{RESET}.")), VARIANT(/* == */ 1, _(" Let's get in the habit of\ngoing out to Friend Areas and picking\na leader before leaving for a dungeon.")), - VARIANT_DEFAULT(_(" In its Friend Area, face the\nteam member you want as the leader,\nthen select #C6Make Leader#R on the menu.")), + VARIANT_DEFAULT(_(" In its Friend Area, face the\nteam member you want as the leader,\nthen select {COLOR YELLOW}Make Leader{RESET} on the menu.")), VARIANT_DEFAULT(_(" That will make the Pokémon\nthe team leader.\nWe should do that before every dungeon.")), VARIANT_DEFAULT(_(" One more thing.")), VARIANT_DEFAULT(_(" We should make it so\na team leader can go into a dungeon\nalone if it wants.")), - VARIANT_DEFAULT(_(" Anyway...#W To choose the\nleader of a dungeon-bound team...#W\nIn a Friend Area, use...#W #C6Make Leader#R.")), + VARIANT_DEFAULT(_(" Anyway...{WAIT_PRESS} To choose the\nleader of a dungeon-bound team...{WAIT_PRESS}\nIn a Friend Area, use...{WAIT_PRESS} {COLOR YELLOW}Make Leader{RESET}.")), VARIANT_DEFAULT(_(" We should always choose\nthe team leader in its Friend Area\nbefore sending the team to any dungeon.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -9941,7 +9941,7 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ { 0x2e, 0x0e, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Uh...#W Um...") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Uh...{WAIT_PRESS} Um...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), @@ -9957,7 +9957,7 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Um...#W\nI'm Wynaut, and this is...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Um...{WAIT_PRESS}\nI'm Wynaut, and this is...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -9998,14 +9998,14 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!!!#W") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!!!{WAIT_PRESS}") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Please help me.#W\nI have to go now.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Please help me.{WAIT_PRESS}\nI have to go now.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -10025,17 +10025,17 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What was that?\nWhat just happened?")), - VARIANT(/* == */ 1, _(" That little Pokémon...#W\nWhat was the boy called? Wynaut?")), + VARIANT(/* == */ 1, _(" That little Pokémon...{WAIT_PRESS}\nWhat was the boy called? Wynaut?")), VARIANT(/* == */ 1, _(" He wanted us to check the\nBulletin Board at the Pelipper Post Office.")), VARIANT(/* == */ 1, _(" Maybe those two have a\nproblem or something...")), VARIANT(/* == */ 1, _(" And they put up a rescue\njob notice on the Bulletin Board.")), - VARIANT(/* == */ 1, _(" There's only one way to\nfind out.#W Let's go to the Pelipper Post\nOffice and check the Bulletin Board.")), + VARIANT(/* == */ 1, _(" There's only one way to\nfind out.{WAIT_PRESS} Let's go to the Pelipper Post\nOffice and check the Bulletin Board.")), VARIANT_DEFAULT(_(" What was that?\nWhat was that all about?")), - VARIANT_DEFAULT(_(" That little Pokémon...#W\nDid the boy say he was Wynaut?")), + VARIANT_DEFAULT(_(" That little Pokémon...{WAIT_PRESS}\nDid the boy say he was Wynaut?")), VARIANT_DEFAULT(_(" I think he wanted us to look\nat the Bulletin Board at the Pelipper Post\nOffice.")), VARIANT_DEFAULT(_(" Maybe Wynaut and his\nfriend have a problem on their hands...")), VARIANT_DEFAULT(_(" So, they may have a help-\nwanted notice on the Bulletin Board.")), - VARIANT_DEFAULT(_(" Only one thing to do.#W\nLet's go check the Pelipper Post Office's\nBulletin Board.")), + VARIANT_DEFAULT(_(" Only one thing to do.{WAIT_PRESS}\nLet's go check the Pelipper Post Office's\nBulletin Board.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -10194,9 +10194,9 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Just like we promised,\nwe punished that gang of $n4.")), + VARIANT(/* == */ 1, _(" Just like we promised,\nwe punished that gang of {NAME_4}.")), VARIANT(/* == */ 1, _(" I'm hoping that they'll\nsmarten up and settle down.")), - VARIANT_DEFAULT(_(" Like we promised, we\nshowed the $n4 gang they\nshouldn't monkey around.")), + VARIANT_DEFAULT(_(" Like we promised, we\nshowed the {NAME_4} gang they\nshouldn't monkey around.")), VARIANT_DEFAULT(_(" That should teach them not\nto be so wild.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -10218,7 +10218,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY(203), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0's team received\n#+a peeled #C4Chestnut#R as their reward.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0}'s team received\n{CENTER_ALIGN}a peeled {COLOR GREEN}Chestnut{RESET} as their reward.") }, { 0xe1, 0x00, 0x00cb, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -10226,10 +10226,10 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ..................#W\nThis...#W\nA peeled Chestnut?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}\nThis...{WAIT_PRESS}\nA peeled Chestnut?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes. It's a peeled Chestnut.#W\nYou see, we...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes. It's a peeled Chestnut.{WAIT_PRESS}\nYou see, we...") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Don't have any money.") }, @@ -10241,16 +10241,16 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" So we can only give you\na Chestnut as our reward.#W\nAre you unhappy?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" So we can only give you\na Chestnut as our reward.{WAIT_PRESS}\nAre you unhappy?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Uh... No, no...#W\nWe're OK with this.")), + VARIANT(/* == */ 1, _(" Uh... No, no...{WAIT_PRESS}\nWe're OK with this.")), VARIANT(/* == */ 1, _(" Peeled Chestnuts are\ndelicious...")), - VARIANT(/* == */ 3, _(" Uh... No, no...#W\nWe're not upset.")), + VARIANT(/* == */ 3, _(" Uh... No, no...{WAIT_PRESS}\nWe're not upset.")), VARIANT(/* == */ 3, _(" I mean, peeled Chestnuts\nare tasty...")), - VARIANT_DEFAULT(_(" Um... No. No...#W\nWe're fine with this.")), + VARIANT_DEFAULT(_(" Um... No. No...{WAIT_PRESS}\nWe're fine with this.")), VARIANT_DEFAULT(_(" Peeled Chestnuts are\ndelicious...")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000009, 0x00000000, NULL }, @@ -10281,7 +10281,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ WAIT(15), { 0x2e, 0x0f, 0x0001, 0x0000000c, 0x00000000, NULL }, { 0x2f, 0x00, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Aww, no, the $n4\ngang!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Aww, no, the {NAME_4}\ngang!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -10292,7 +10292,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Did those goons...")), VARIANT(/* == */ 1, _(" Did they follow us here\nfor revenge?")), - VARIANT_DEFAULT(_(" That $n4 gang...")), + VARIANT_DEFAULT(_(" That {NAME_4} gang...")), VARIANT_DEFAULT(_(" Did they chase us here to\nget us back?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(10), @@ -10374,7 +10374,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They look like...#W\nThey're having a discussion.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They look like...{WAIT_PRESS}\nThey're having a discussion.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -10394,12 +10394,12 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ...Uh, listen.#W\nYou got something we want...") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" That peeled Chestnut you\nhave...#W\nCan we have it?") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ...Uh, listen.{WAIT_PRESS}\nYou got something we want...") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" That peeled Chestnut you\nhave...{WAIT_PRESS}\nCan we have it?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We, uh...#W\nLove peeled Chestnuts!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We, uh...{WAIT_PRESS}\nLove peeled Chestnuts!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -10412,16 +10412,16 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ VARIANT_DEFAULT(_(" Can't you just get Chestnuts\nby yourselves?")), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You know how Chestnuts\nhave that spiky shell?") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Trying to peel that spiky\nshell... It hurts.#W\nAnd we end up losing our tempers!") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" That's why we're asking.\nGive us that peeled Chestnut.#W\nWe'll do whatever you want.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Trying to peel that spiky\nshell... It hurts.{WAIT_PRESS}\nAnd we end up losing our tempers!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" That's why we're asking.\nGive us that peeled Chestnut.{WAIT_PRESS}\nWe'll do whatever you want.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hmmm...\n$n0, what do you think?") }, - ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Should we give our peeled\nChestnut to the $n4 gang?")), + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hmmm...\n{NAME_0}, what do you think?") }, + ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Should we give our peeled\nChestnut to the {NAME_4} gang?")), CHOICE(/* label */ 15, _("Yes.")), CHOICE(/* label */ 16, _("No.")), LABEL(16), /* = 0x10 */ @@ -10463,9 +10463,9 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+$n0 was suddenly attacked\n#+by the $n4 gang!") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+However...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The $n4 gang was weak.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} was suddenly attacked\n{CENTER_ALIGN}by the {NAME_4} gang!") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}However...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {NAME_4} gang was weak.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10521,10 +10521,10 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, { 0x2f, 0x00, 0x0001, -0x00000001, -0x00000004, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hmmm...\n$n0, what do you think?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The $n4 are saying\nthey'll do anything we want.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hmmm...\n{NAME_0}, what do you think?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The {NAME_4} are saying\nthey'll do anything we want.") }, WAIT(10), - ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Should we give our peeled\nChestnut to the $n4 gang?")), + ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Should we give our peeled\nChestnut to the {NAME_4} gang?")), CHOICE(/* label */ 15, _("Yes.")), CHOICE(/* label */ 16, _("No.")), LABEL(15), /* = 0x0f */ @@ -10545,15 +10545,15 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I know!#W\nHey, $n4 gang, how are you guys\nwith physical labor?")), - VARIANT_DEFAULT(_(" I know!#W\nListen, $n4 gang, how are you\nwith physical labor?")), + VARIANT(/* == */ 1, _(" I know!{WAIT_PRESS}\nHey, {NAME_4} gang, how are you guys\nwith physical labor?")), + VARIANT_DEFAULT(_(" I know!{WAIT_PRESS}\nListen, {NAME_4} gang, how are you\nwith physical labor?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Physical labor?\nYou mean muscle work?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We have muscles...#W\nBut we don't like work.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We have muscles...{WAIT_PRESS}\nBut we don't like work.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -10574,10 +10574,10 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" You got it!#W\nOur rescue team base!")), + VARIANT(/* == */ 1, _(" You got it!{WAIT_PRESS}\nOur rescue team base!")), VARIANT(/* == */ 1, _(" If you'd help us build our\nrescue team base, we could give you this\npeeled Chestnut!")), VARIANT(/* == */ 1, _(" What do you say?")), - VARIANT_DEFAULT(_(" That's right!#W\nOur rescue team base!")), + VARIANT_DEFAULT(_(" That's right!{WAIT_PRESS}\nOur rescue team base!")), VARIANT_DEFAULT(_(" If you would help us with\nthe building of our rescue team base,\nwe could give you this peeled Chestnut!")), VARIANT_DEFAULT(_(" How does that sound?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10603,7 +10603,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Really?#W\nYou'll help us?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Really?{WAIT_PRESS}\nYou'll help us?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Yeah.\nLeave it to us!") }, @@ -10614,7 +10614,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ...In return...#W\nHand over that peeled Chestnut.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ...In return...{WAIT_PRESS}\nHand over that peeled Chestnut.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, @@ -10665,7 +10665,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sniff...\nThanks, everyone!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" OK!#W\nLet's get a move on!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" OK!{WAIT_PRESS}\nLet's get a move on!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, @@ -11171,10 +11171,10 @@ static const struct ScriptCommand s_gs9_g76_s0_station_sref_script[] = { /* 0x81 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(9), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And so...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Construction work began on\n#+the rescue team base of") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+$n0's team\n#+$t.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Several days later...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And so...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Construction work began on\n{CENTER_ALIGN}the rescue team base of") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0}'s team\n{CENTER_ALIGN}{TEAM_NAME}.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Several days later...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -11223,7 +11223,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Whew...#W\nOur base is coming along quickly.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Whew...{WAIT_PRESS}\nOur base is coming along quickly.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -11267,8 +11267,8 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Yeah...#W But we're getting\nclose, right, $n4 gang?#W\n...#WHah?")), - VARIANT_DEFAULT(_(" That's true.#W But we're\ngetting close, right, $n4 gang?#W\n...#WHuh?")), + VARIANT(/* == */ 1, _(" Yeah...{WAIT_PRESS} But we're getting\nclose, right, {NAME_4} gang?{WAIT_PRESS}\n...{WAIT_PRESS}Hah?")), + VARIANT_DEFAULT(_(" That's true.{WAIT_PRESS} But we're\ngetting close, right, {NAME_4} gang?{WAIT_PRESS}\n...{WAIT_PRESS}Huh?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -11325,7 +11325,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" This work's too boring!#W\nHow do you expect us to keep going?") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" This work's too boring!{WAIT_PRESS}\nHow do you expect us to keep going?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0c, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -11347,12 +11347,12 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Problem, $n0.")), - VARIANT(/* == */ 1, _(" It looks like the\n$n4 gang won't work unless\nwe get them another peeled Chestnut.")), - VARIANT(/* == */ 1, _(" I guess we have to find\nmore peeled Chestnuts and give them to\nthe $n4 gang.")), - VARIANT_DEFAULT(_(" We have a problem,\n$n0.")), - VARIANT_DEFAULT(_(" I don't think the\n$n4 gang will work unless\nwe get them another peeled Chestnut.")), - VARIANT_DEFAULT(_(" I guess we'll have to give\nthe $n4 gang any peeled\nChestnuts that we find.")), + VARIANT(/* == */ 1, _(" Problem, {NAME_0}.")), + VARIANT(/* == */ 1, _(" It looks like the\n{NAME_4} gang won't work unless\nwe get them another peeled Chestnut.")), + VARIANT(/* == */ 1, _(" I guess we have to find\nmore peeled Chestnuts and give them to\nthe {NAME_4} gang.")), + VARIANT_DEFAULT(_(" We have a problem,\n{NAME_0}.")), + VARIANT_DEFAULT(_(" I don't think the\n{NAME_4} gang will work unless\nwe get them another peeled Chestnut.")), + VARIANT_DEFAULT(_(" I guess we'll have to give\nthe {NAME_4} gang any peeled\nChestnuts that we find.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -11570,7 +11570,7 @@ static const struct ScriptCommand s_gs9_g77_s0_lives0_dlg2[] = { /* 0x81d1bf4 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What?!\nYou don't have any?!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Then we can't work!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you want us to renovate\nyour rescue team base, bring us \na Chestnut. A peeled one!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We see peeled #CIChestnuts#R\nsometimes in #CDUproar Forest#R.\nWe want them out of the shell.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We see peeled {COLOR GREEN_I}Chestnuts{RESET}\nsometimes in {COLOR YELLOW_D}Uproar Forest{RESET}.\nWe want them out of the shell.") }, JUMP_SCRIPT(END_TALK), LABEL(0), /* = 0x00 */ EXECUTE_STATION(-1, -1, 1), @@ -11594,7 +11594,7 @@ static const struct ScriptCommand s_gs9_g77_s0_lives1_dlg2[] = { /* 0x81d1e24 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What?!\nYou don't have any?!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Then we can't work!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you want us to renovate\nyour rescue team base, bring us \na Chestnut. A peeled one!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We see #CIChestnuts#R\nsometimes in #CDUproar Forest#R.\nWe want them out of the shell.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We see {COLOR GREEN_I}Chestnuts{RESET}\nsometimes in {COLOR YELLOW_D}Uproar Forest{RESET}.\nWe want them out of the shell.") }, JUMP_SCRIPT(END_TALK), LABEL(0), /* = 0x00 */ EXECUTE_STATION(-1, -1, 1), @@ -11618,7 +11618,7 @@ static const struct ScriptCommand s_gs9_g77_s0_lives2_dlg2[] = { /* 0x81d1f8c */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What?!\nYou don't have any?!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Then we can't work!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you want us to renovate\nyour rescue team base, bring us \na Chestnut. A peeled one!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We see #CIChestnuts#R\nsometimes in #CDUproar Forest#R.\nWe want them out of the shell.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We see {COLOR GREEN_I}Chestnuts{RESET}\nsometimes in {COLOR YELLOW_D}Uproar Forest{RESET}.\nWe want them out of the shell.") }, JUMP_SCRIPT(END_TALK), LABEL(0), /* = 0x00 */ EXECUTE_STATION(-1, -1, 1), @@ -11746,9 +11746,9 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ BGM_FADEOUT(60), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+$n0 was suddenly attacked\n#+by the $n2 gang!") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+However...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The $n2 gang was weak.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} was suddenly attacked\n{CENTER_ALIGN}by the {NAME_2} gang!") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}However...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {NAME_2} gang was weak.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -11774,7 +11774,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ LABEL(3), /* = 0x03 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 peeled the spiny shell\n#+and handed the peeled Chestnut over.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} peeled the spiny shell\n{CENTER_ALIGN}and handed the peeled Chestnut over.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), SELECT_ENTITIES(-1, 3), @@ -11814,7 +11814,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ WAIT(10), { 0x2e, 0x0b, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We'll carry in the materials\nand get the place built. Double-quick!#W\nYou just wait!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We'll carry in the materials\nand get the place built. Double-quick!{WAIT_PRESS}\nYou just wait!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SCENARIO_ADVANCE(SCENARIO_SUB1, /*unused*/ 30), REMOVE_ITEMSTACK(ITEM_CHESTNUT), @@ -11825,11 +11825,11 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And so...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Supplied with another peeled Chestnut,\n#+the $n2 gang got motivated...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And returned to work on\n#+the rescue team base's renovation.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+As a result...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The rescue team base's completion\n#+moved a little closer.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And so...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Supplied with another peeled Chestnut,\n{CENTER_ALIGN}the {NAME_2} gang got motivated...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And returned to work on\n{CENTER_ALIGN}the rescue team base's renovation.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}As a result...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The rescue team base's completion\n{CENTER_ALIGN}moved a little closer.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12000,11 +12000,11 @@ static const struct ScriptCommand s_gs9_g78_s0_station_sref_script[] = { /* 0x81 { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(9), { 0x2d, 0x09, 0x0000, 0x0000006f, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And so...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Supplied with another peeled Chestnut,\n#+the $n0 gang got motivated...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And returned to work on\n#+the rescue team base's renovation.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And finally...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The rescue team base was completed!") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And so...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Supplied with another peeled Chestnut,\n{CENTER_ALIGN}the {NAME_0} gang got motivated...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And returned to work on\n{CENTER_ALIGN}the rescue team base's renovation.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And finally...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The rescue team base was completed!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12016,12 +12016,12 @@ static const struct ScriptCommand s_gs9_g78_s0_station_sref_script[] = { /* 0x81 { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2d, 0x09, 0x0000, 0x0000006f, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+As a result of everyone's desperate\n#+efforts to stop the $n0 gang...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The rescue team base was saved.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+As for the $n4 gang, they\n#+promised to keep from rampaging...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+In return for more peeled Chestnuts,\n#+they returned to their forest.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And that is how...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The chaotic renovation of\n#+the rescue team base came to an end.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}As a result of everyone's desperate\n{CENTER_ALIGN}efforts to stop the {NAME_0} gang...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The rescue team base was saved.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}As for the {NAME_4} gang, they\n{CENTER_ALIGN}promised to keep from rampaging...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}In return for more peeled Chestnuts,\n{CENTER_ALIGN}they returned to their forest.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And that is how...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The chaotic renovation of\n{CENTER_ALIGN}the rescue team base came to an end.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CANCEL_ENTITIES(-1, 0), WAIT(1), @@ -12075,8 +12075,8 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Sniff...#W\nFinally...#W\nThis day has finally come...")), - VARIANT_DEFAULT(_(" Sniff...#W\nFinally...#W\nThis day has finally arrived...")), + VARIANT(/* == */ 1, _(" Sniff...{WAIT_PRESS}\nFinally...{WAIT_PRESS}\nThis day has finally come...")), + VARIANT_DEFAULT(_(" Sniff...{WAIT_PRESS}\nFinally...{WAIT_PRESS}\nThis day has finally arrived...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -12084,12 +12084,12 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0!\nIt's finally finished!")), - VARIANT(/* == */ 1, _(" Our... #C5$t#R's\nrescue team base!")), - VARIANT(/* == */ 3, _(" $n0!\nIt's finally ready!")), - VARIANT(/* == */ 3, _(" Our... #C5$t#R's\nrescue team base!")), - VARIANT_DEFAULT(_(" $n0!\nIt's ready! Finally!")), - VARIANT_DEFAULT(_(" Our... #C5$t#R's\nrescue team base!")), + VARIANT(/* == */ 1, _(" {NAME_0}!\nIt's finally finished!")), + VARIANT(/* == */ 1, _(" Our... {COLOR CYAN}{TEAM_NAME}{RESET}'s\nrescue team base!")), + VARIANT(/* == */ 3, _(" {NAME_0}!\nIt's finally ready!")), + VARIANT(/* == */ 3, _(" Our... {COLOR CYAN}{TEAM_NAME}{RESET}'s\nrescue team base!")), + VARIANT_DEFAULT(_(" {NAME_0}!\nIt's ready! Finally!")), + VARIANT_DEFAULT(_(" Our... {COLOR CYAN}{TEAM_NAME}{RESET}'s\nrescue team base!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x08, 0x0002, 0x00000004, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -12097,8 +12097,8 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Sniff... This is so cool.#W\nI can stare at it forever! Our rescue team\nbase is so cool.")), - VARIANT_DEFAULT(_(" Sniff... It's so cool.#W\nEvery time I take a look at our rescue\nteam base, I only see coolness.")), + VARIANT(/* == */ 1, _(" Sniff... This is so cool.{WAIT_PRESS}\nI can stare at it forever! Our rescue team\nbase is so cool.")), + VARIANT_DEFAULT(_(" Sniff... It's so cool.{WAIT_PRESS}\nEvery time I take a look at our rescue\nteam base, I only see coolness.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -12106,8 +12106,8 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" The way it looks like you\nis a nice touch, $n0!")), - VARIANT_DEFAULT(_(" Its resemblance to you\nis a nice touch, $n0!")), + VARIANT(/* == */ 1, _(" The way it looks like you\nis a nice touch, {NAME_0}!")), + VARIANT_DEFAULT(_(" Its resemblance to you\nis a nice touch, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -12140,7 +12140,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0x91, 0x0a, 0x0002, 0x00000001, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x15, 0x0001, 0x0000000a, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sniff... Everyone...#W\nThank you!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sniff... Everyone...{WAIT_PRESS}\nThank you!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -12149,7 +12149,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0b, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, -0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Say, there.#W\nThere's something I want to ask...") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Say, there.{WAIT_PRESS}\nThere's something I want to ask...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -12158,7 +12158,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" If this rescue team base is\nfinished...") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Does that maybe mean...#W\nYou won't bring us peeled Chestnuts\nanymore?") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Does that maybe mean...{WAIT_PRESS}\nYou won't bring us peeled Chestnuts\nanymore?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -12166,10 +12166,10 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hahaha!\nWell, what do you think?")), VARIANT(/* == */ 1, _(" We don't need to keep\nworking on the base anymore.")), - VARIANT(/* == */ 1, _(" To our $n4 gang!#W\nThanks for everything!")), + VARIANT(/* == */ 1, _(" To our {NAME_4} gang!{WAIT_PRESS}\nThanks for everything!")), VARIANT_DEFAULT(_(" Hahaha!\nOf course!")), VARIANT_DEFAULT(_(" We're finished with work\non our rescue team base.")), - VARIANT_DEFAULT(_(" To our $n4 gang!#W\nSincerely, thank you for everything!")), + VARIANT_DEFAULT(_(" To our {NAME_4} gang!{WAIT_PRESS}\nSincerely, thank you for everything!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(120), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -12551,9 +12551,9 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" That's cool, $n2.#W\nBut why'd you run away?")), + VARIANT(/* == */ 1, _(" That's cool, {NAME_2}.{WAIT_PRESS}\nBut why'd you run away?")), VARIANT(/* == */ 1, _(" Your letter said something\nabout not wanting to be a grown-up, but...")), - VARIANT_DEFAULT(_(" No problem, $n2.#W\nBut what made you run away in the first\nplace?")), + VARIANT_DEFAULT(_(" No problem, {NAME_2}.{WAIT_PRESS}\nBut what made you run away in the first\nplace?")), VARIANT_DEFAULT(_(" Your letter said something\nabout not wanting to become an adult...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -12588,18 +12588,18 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, { 0x2f, 0x00, 0x0001, -0x00000001, -0x00000004, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" More $n2?#W\nTwo of them, even...")), - VARIANT_DEFAULT(_(" More $n2?#W\nTwo of them...")), + VARIANT(/* == */ 1, _(" More {NAME_2}?{WAIT_PRESS}\nTwo of them, even...")), + VARIANT_DEFAULT(_(" More {NAME_2}?{WAIT_PRESS}\nTwo of them...")), WAIT(20), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n2.#W\nWho are those guys?")), - VARIANT_DEFAULT(_(" Hey, $n2.#W\nWhat do they want?")), + VARIANT(/* == */ 1, _(" Hey, {NAME_2}.{WAIT_PRESS}\nWho are those guys?")), + VARIANT_DEFAULT(_(" Hey, {NAME_2}.{WAIT_PRESS}\nWhat do they want?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They're...#W\nMy friends.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They're...{WAIT_PRESS}\nMy friends.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -12608,7 +12608,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Now, come with us.#W\nThe grown-up ritual is ready for you.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Now, come with us.{WAIT_PRESS}\nThe grown-up ritual is ready for you.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -12624,21 +12624,21 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If I have to get that\npaw print on my back...#W\nI'd rather not become a grown-up!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If I have to get that\npaw print on my back...{WAIT_PRESS}\nI'd rather not become a grown-up!") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" What is that?#W\nThis grown-up ritual?")), - VARIANT_DEFAULT(_(" What was that?#W\nWhat grown-up ritual?")), + VARIANT(/* == */ 1, _(" What is that?{WAIT_PRESS}\nThis grown-up ritual?")), + VARIANT_DEFAULT(_(" What was that?{WAIT_PRESS}\nWhat grown-up ritual?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It is a custom among us $m2.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It is a custom among us {POKEMON_2}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -12651,7 +12651,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" They do that by taking the\nfront paw...#W\nand pushing doooooowwnn on the back...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" They do that by taking the\nfront paw...{WAIT_PRESS}\nand pushing doooooowwnn on the back...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -12668,8 +12668,8 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...I know!#W\nI have decided!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I shall join $n0's\nrescue team!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...I know!{WAIT_PRESS}\nI have decided!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I shall join {NAME_0}'s\nrescue team!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -12684,7 +12684,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" So...\nI won't return to the pack!#W\nThis is where I will dedicate myself!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" So...\nI won't return to the pack!{WAIT_PRESS}\nThis is where I will dedicate myself!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -12727,8 +12727,8 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Welcome to the team!#W\nWe expect your best, $n2!")), - VARIANT_DEFAULT(_(" You're on the team now!#W\nWe expect your best, $n2!")), + VARIANT(/* == */ 1, _(" Welcome to the team!{WAIT_PRESS}\nWe expect your best, {NAME_2}!")), + VARIANT_DEFAULT(_(" You're on the team now!{WAIT_PRESS}\nWe expect your best, {NAME_2}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -12737,7 +12737,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" One thing I am good at is\ndrawing and painting.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" For example...#W\nLet me see...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" For example...{WAIT_PRESS}\nLet me see...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -12763,12 +12763,12 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0x3b, 0x1d, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(1, /* to label */ 16), FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n2 joined the rescue team!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2} joined the rescue team!") }, { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x3b, 0x1e, 0x0000, 0x00000000, 0x00000000, NULL }, - ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to $n2?")), + ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to {NAME_2}?")), CHOICE(/* label */ 17, _("*Yes")), CHOICE(/* label */ 18, _("No")), LABEL(17), /* = 0x11 */ @@ -12777,15 +12777,15 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0x3b, 0x1f, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SCENARIO_CALC(SCENARIO_SUB1, 32, 3), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I will find my own place\nin the #C4Sky Blue Plains#R.\nUntil then...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I will find my own place\nin the {COLOR GREEN}Sky Blue Plains{RESET}.\nUntil then...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, LABEL(16), /* = 0x10 */ SCENARIO_CALC(SCENARIO_SUB1, 32, 2), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...But wait! I see that\nmy Friend Area is full...#W\nThis is most unfortunate.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I could join your rescue\nteam if there were room for me in the\n#C4Sky Blue Plains#R...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...But wait! I see that\nmy Friend Area is full...{WAIT_PRESS}\nThis is most unfortunate.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I could join your rescue\nteam if there were room for me in the\n{COLOR GREEN}Sky Blue Plains{RESET}...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Please speak with me\nagain then.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -13084,7 +13084,7 @@ static const struct ScriptCommand s_gs9_g81_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(9), { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -13106,7 +13106,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hi, $n2, long time!#W\nYou're here to visit us?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hi, {NAME_2}, long time!{WAIT_PRESS}\nYou're here to visit us?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -13116,9 +13116,9 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n2, you must be\ninterested in our adventures!\nHahahaha!")), - VARIANT(/* == */ 3, _(" $n2, you must be\ninterested in our achievements!\nHahahaha!")), - VARIANT_DEFAULT(_(" $n2, you must be\nintrigued by our achievements!\nHahahaha!")), + VARIANT(/* == */ 1, _(" {NAME_2}, you must be\ninterested in our adventures!\nHahahaha!")), + VARIANT(/* == */ 3, _(" {NAME_2}, you must be\ninterested in our achievements!\nHahahaha!")), + VARIANT_DEFAULT(_(" {NAME_2}, you must be\nintrigued by our achievements!\nHahahaha!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -13144,7 +13144,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh...\nIs that all...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Hey, $n2!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Hey, {NAME_2}!") }, FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -13159,18 +13159,18 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ WAIT(30), { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh, hey!\nThere you are!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Didn't know you'd be here.\nYou had me looking, $n2.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Didn't know you'd be here.\nYou had me looking, {NAME_2}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What is it?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Well, to the northeast of\n#CDMt. Thunder#R...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Well, to the northeast of\n{COLOR YELLOW_D}Mt. Thunder{RESET}...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" There's a gigantic cave!") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" There wasn't anything like\nthat there before, hey?") }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" So, I figured $n2\nwould know something...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" So, I figured {NAME_2}\nwould know something...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), WAIT(60), @@ -13187,11 +13187,11 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ WAIT(60), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I shall call it...#W\nThe #CDMeteor Cave#R.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I shall call it...{WAIT_PRESS}\nThe {COLOR YELLOW_D}Meteor Cave{RESET}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x00, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" #CDMeteor Cave#R?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {COLOR YELLOW_D}Meteor Cave{RESET}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It was when Rayquaza\ndestroyed the falling star...") }, @@ -13203,17 +13203,17 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Say, $n3.")), - VARIANT_DEFAULT(_(" Um, $n3.")), + VARIANT(/* == */ 1, _(" Say, {NAME_3}.")), + VARIANT_DEFAULT(_(" Um, {NAME_3}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Did you explore inside the\n#CDMeteor Cave#R?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Did you explore inside the\n{COLOR YELLOW_D}Meteor Cave{RESET}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Uh, yeah...#W\nJust a little...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Uh, yeah...{WAIT_PRESS}\nJust a little...") }, { 0x2e, 0x0d, 0x0003, 0x00000003, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But the place was crawling\nwith these weird things...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It freaked me out.\nI couldn't stay there long...") }, @@ -13222,15 +13222,15 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000a, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Ahaha!\nWho would've thought it?\n$n3's kind of cowardly!")), - VARIANT_DEFAULT(_(" Hahaha!\nSurprise, surprise!\n$n3's kind of cowardly!")), + VARIANT(/* == */ 1, _(" Ahaha!\nWho would've thought it?\n{NAME_3}'s kind of cowardly!")), + VARIANT_DEFAULT(_(" Hahaha!\nSurprise, surprise!\n{NAME_3}'s kind of cowardly!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000002, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" What's that?!") }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Hey, you, $n1.#W\nIf you were to see that dungeon, you'd be\nintimidated too!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Hey, you, {NAME_1}.{WAIT_PRESS}\nIf you were to see that dungeon, you'd be\nintimidated too!") }, { 0x2e, 0x15, 0x0003, 0x00000003, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I've never seen anything\nlike it before...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" There were downright\nbizarre things in there that I'm not\nsure were even Pokémon.") }, @@ -13243,18 +13243,18 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" $n2, do you have\nany idea what are in that place?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_2}, do you have\nany idea what are in that place?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...I draw a blank.#W\nI do not know...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...I draw a blank.{WAIT_PRESS}\nI do not know...") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" However...#W\nThat cavern. The collision that caused \nit had to be enormous.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nThat cavern. The collision that caused \nit had to be enormous.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If there were things that\nsurvived the crash...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Perhaps...\nOf this world they may not be.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" You mean...#W\nThey came from that falling star?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" You mean...{WAIT_PRESS}\nThey came from that falling star?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -13267,8 +13267,8 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0.\nWe should go investigate.#W\nThe #CDMeteor Cave#R.")), - VARIANT_DEFAULT(_(" $n0.\nWant to go investigate?#W\nThe #CDMeteor Cave#R.")), + VARIANT(/* == */ 1, _(" {NAME_0}.\nWe should go investigate.{WAIT_PRESS}\nThe {COLOR YELLOW_D}Meteor Cave{RESET}.")), + VARIANT_DEFAULT(_(" {NAME_0}.\nWant to go investigate?{WAIT_PRESS}\nThe {COLOR YELLOW_D}Meteor Cave{RESET}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -13276,7 +13276,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The rescue team gained\n#+access to the #CDMeteor Cave#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The rescue team gained\n{CENTER_ALIGN}access to the {COLOR YELLOW_D}Meteor Cave{RESET}!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -13491,14 +13491,14 @@ static const struct ScriptCommand s_gs9_g83_s0_lives0_dlg0[] = { /* 0x81da3bc */ FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), { 0x2e, 0x07, 0x0000, 0x00000004, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Wh-what was that...?#W\nWhat just happened?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Wh-what was that...?{WAIT_PRESS}\nWhat just happened?") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Something huge flew by at an incredible\nspeed...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("It seemed to be going...\nToward the mountain range in the north?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............#W\nYawwwwwn...\nStill sleepy...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}\nYawwwwwn...\nStill sleepy...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("It's still early.\nI'll catch a little more sleep...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -13547,23 +13547,23 @@ static const struct ScriptCommand s_gs9_g84_s0_lives0_dlg0[] = { /* 0x81da9c8 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0003, 0x00000002, 0x00000000, NULL }, { 0x2f, 0x00, 0x0003, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" $n2!#W\nYou're safe! Yesssss!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_2}!{WAIT_PRESS}\nYou're safe! Yesssss!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0e, 0x0002, 0x00000006, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm so sorry, $n3.#W\nThat dungeon--it was too much for me.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm so sorry, {NAME_3}.{WAIT_PRESS}\nThat dungeon--it was too much for me.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Thank you for saving me.#W\nI appreciate it〜♪") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Thank you for saving me.{WAIT_PRESS}\nI appreciate it〜♪") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x15, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ow, ow, ow...#W\nMy body--it hurts all over even now...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ow, ow, ow...{WAIT_PRESS}\nMy body--it hurts all over even now...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -13587,7 +13587,7 @@ static const struct ScriptCommand s_gs9_g84_s0_lives0_dlg0[] = { /* 0x81da9c8 */ { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" At first, I made an SOS Call\nbecause I did not want to lose this...") }, { 0x2e, 0x15, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But I will give it to you.#W\nHere! Your reward for my rescue〜♪") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But I will give it to you.{WAIT_PRESS}\nHere! Your reward for my rescue〜♪") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -13600,13 +13600,13 @@ static const struct ScriptCommand s_gs9_g84_s0_lives0_dlg0[] = { /* 0x81da9c8 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They say if you take that\nstone to the #CDWish Cave#R...\nTo its very depths...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They say if you take that\nstone to the {COLOR YELLOW_D}Wish Cave{RESET}...\nTo its very depths...") }, { 0x2e, 0x15, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wonder of wonders!#W\nA wish--it comes true!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wonder of wonders!{WAIT_PRESS}\nA wish--it comes true!") }, { 0x2e, 0x15, 0x0002, 0x00000001, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You see〜♪\nA rich reward, won't you agree?") }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" However...#W\nIf you lose that #CIWish Stone#R on\nthe way, the wish cannot come true.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nIf you lose that {COLOR GREEN_I}Wish Stone{RESET} on\nthe way, the wish cannot come true.") }, { 0x2e, 0x15, 0x0002, 0x00000001, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" For me, it was impossible.\nBut you must try〜♪") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -13657,9 +13657,9 @@ static const struct ScriptCommand s_gs9_g84_s0_lives1_dlg2[] = { /* 0x81db3d8 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" They say if you take that\nWish Stone to the Wish Cave...\nTo its very depths...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wonder of wonders!#W\nA wish--it comes true!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wonder of wonders!{WAIT_PRESS}\nA wish--it comes true!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You see〜♪\nA rich reward, won't you agree?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" However...#W\nIf you lose that #CIWish Stone#R on\nthe way, the wish cannot come true.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nIf you lose that {COLOR GREEN_I}Wish Stone{RESET} on\nthe way, the wish cannot come true.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" For me, it was impossible.\nBut you must try〜♪") }, JUMP_SCRIPT(END_TALK), }; @@ -13718,27 +13718,27 @@ static const struct ScriptCommand s_gs9_g85_s0_lives0_dlg0[] = { /* 0x81db740 */ WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n2 is our newest\nfriend!#W\nGlad to have you with us!")), - VARIANT_DEFAULT(_(" From now on, $n2\nis our friend!#W\nGlad to meet you!")), + VARIANT(/* == */ 1, _(" {NAME_2} is our newest\nfriend!{WAIT_PRESS}\nGlad to have you with us!")), + VARIANT_DEFAULT(_(" From now on, {NAME_2}\nis our friend!{WAIT_PRESS}\nGlad to meet you!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The latest recruit to\n#+Team #C5$t#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The latest recruit to\n{CENTER_ALIGN}Team {COLOR CYAN}{TEAM_NAME}{RESET}!") }, FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n2 joined\n#+the rescue team!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2} joined\n{CENTER_ALIGN}the rescue team!") }, { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x2a, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 2), COND_EQUAL(1, /* to label */ 2), WAIT(10), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+And more!") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The Friend Area\n#+#CH$h#R was obtained!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And more!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The Friend Area\n{CENTER_ALIGN}{COLOR GREEN_H}{FRIEND_AREA}{RESET} was obtained!") }, FANFARE_PLAY(212), { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, { 0x31, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(2), /* = 0x02 */ { 0x3b, 0x2b, 0x0000, 0x00000000, 0x00000000, NULL }, - ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to $n2?")), + ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to {NAME_2}?")), CHOICE(/* label */ 3, _("*Yes.")), CHOICE(/* label */ 4, _("No.")), LABEL(3), /* = 0x03 */ @@ -13794,16 +13794,16 @@ static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nLate riser!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Like always, slow to rise,\naren't you, Team #C5$t#R! Kekeke!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Like always, slow to rise,\naren't you, Team {COLOR CYAN}{TEAM_NAME}{RESET}! Kekeke!") }, { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Tchah!#W\nBut that's not what I came here to say.\nNot today.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It irks me to say this, but...#W\nI need your help.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Can you take me up\n#CDMt. Freeze#R?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I tried going up over and\nover, but...#W Keh...\nIt's steep and harsh...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ninetales is up on\n#CDMt. Freeze#R.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Tchah!{WAIT_PRESS}\nBut that's not what I came here to say.\nNot today.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It irks me to say this, but...{WAIT_PRESS}\nI need your help.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Can you take me up\n{COLOR YELLOW_D}Mt. Freeze{RESET}?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I tried going up over and\nover, but...{WAIT_PRESS} Keh...\nIt's steep and harsh...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ninetales is up on\n{COLOR YELLOW_D}Mt. Freeze{RESET}.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I've got to see Ninetales.\nI'm prepared to do whatever it takes.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" That's why I'm asking you.#W\nTake me up #CDMt. Freeze#R.")), + ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" That's why I'm asking you.{WAIT_PRESS}\nTake me up {COLOR YELLOW_D}Mt. Freeze{RESET}.")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), LABEL(2), /* = 0x02 */ @@ -13826,24 +13826,24 @@ static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#W\nI'd like to say that, but I need your help.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nI'd like to say that, but I need your help.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I've got to see Ninetales.\nI'm prepared to do whatever it takes.") }, - ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" That's why I'm asking you.#W\nTake me up #CDMt. Freeze#R!")), + ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" That's why I'm asking you.{WAIT_PRESS}\nTake me up {COLOR YELLOW_D}Mt. Freeze{RESET}!")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), LABEL(4), /* = 0x04 */ WAIT(10), BGM_STOP, FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n2 can now tag\n#+along with the rescue team!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2} can now tag\n{CENTER_ALIGN}along with the rescue team!") }, { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(1), WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The only place I want to go\nis #CDMt. Freeze#R.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The only place I want to go\nis {COLOR YELLOW_D}Mt. Freeze{RESET}.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm not about to tag along\nif you're going to other dungeons.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'll only tag along when you\ngo off to #CDMt. Freeze#R. Keke!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'll only tag along when you\ngo off to {COLOR YELLOW_D}Mt. Freeze{RESET}. Keke!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -13893,9 +13893,9 @@ static const struct ScriptCommand s_gs9_g87_s0_lives0_dlg2[] = { /* 0x81dc588 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The only place I want to go\nis #CDMt. Freeze#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The only place I want to go\nis {COLOR YELLOW_D}Mt. Freeze{RESET}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm not about to tag along\nif you're going to other dungeons.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll only tag along when you\ngo off to #CDMt. Freeze#R. Keke!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll only tag along when you\ngo off to {COLOR YELLOW_D}Mt. Freeze{RESET}. Keke!") }, JUMP_SCRIPT(END_TALK), }; @@ -13922,7 +13922,7 @@ static const struct ScriptCommand s_gs9_g88_s0_lives0_dlg0[] = { /* 0x81dc6c4 */ WAIT(30), { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keke!\nYou did good today.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Next, we go to that\n#CDMurky Cave#R place...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Next, we go to that\n{COLOR YELLOW_D}Murky Cave{RESET} place...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That sounds like another\nchallenging place, so I'll need your\nhelp still! Keke!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -13943,9 +13943,9 @@ static const struct ScriptCommand s_gs9_g88_s0_lives1_dlg2[] = { /* 0x81dc878 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" They say, if you take that\nWish Stone to the Wish Cave...\nTo its very depths...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wonder of wonders!#W\nA wish--it comes true!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wonder of wonders!{WAIT_PRESS}\nA wish--it comes true!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You see〜♪\nA rich reward, won't you agree?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" However...#W\nIf you lose that #CIWish Stone#R on\nthe way, the wish cannot come true.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nIf you lose that {COLOR GREEN_I}Wish Stone{RESET} on\nthe way, the wish cannot come true.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" For me, it was impossible.\nBut you must try〜♪") }, JUMP_SCRIPT(END_TALK), }; @@ -13977,7 +13977,7 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nLate riser!") }, - ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" It's the #CDMurky Cave#R next.#W\nI'll need your help for that.")), + ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" It's the {COLOR YELLOW_D}Murky Cave{RESET} next.{WAIT_PRESS}\nI'll need your help for that.")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), LABEL(2), /* = 0x02 */ @@ -13985,7 +13985,7 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 1), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keke! Then, we'll go!\nTo the #CDMurky Cave#R!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keke! Then, we'll go!\nTo the {COLOR YELLOW_D}Murky Cave{RESET}!") }, { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gardevoir's physical form...\nThat's where it is.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" For my sake, Gardevoir...") }, @@ -13995,8 +13995,8 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Nah, that's not important.#W\nI just feel like going! Keke!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...OK, go there for me!\nTo the #CDMurky Cave#R!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Nah, that's not important.{WAIT_PRESS}\nI just feel like going! Keke!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...OK, go there for me!\nTo the {COLOR YELLOW_D}Murky Cave{RESET}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(4), LABEL(3), /* = 0x03 */ @@ -14007,26 +14007,26 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ SELECT_ENTITIES(-1, 2), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#W\nI thought that, but I need your help.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I have to go to the\n#CDMurky Cave#R.\nI'm prepared to do whatever it takes.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nI thought that, but I need your help.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I have to go to the\n{COLOR YELLOW_D}Murky Cave{RESET}.\nI'm prepared to do whatever it takes.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" When I get there, I...") }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" It doesn't matter.\nI just need your help.#W\nTake me to the #CDMurky Cave#R!")), + ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" It doesn't matter.\nI just need your help.{WAIT_PRESS}\nTake me to the {COLOR YELLOW_D}Murky Cave{RESET}!")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), LABEL(4), /* = 0x04 */ WAIT(10), BGM_STOP, FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n2 can now tag\n#+along with the rescue team!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2} can now tag\n{CENTER_ALIGN}along with the rescue team!") }, { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(1), WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The only place I want to go\nis the #CDMurky Cave#R.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The only place I want to go\nis the {COLOR YELLOW_D}Murky Cave{RESET}.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm not about to tag along\nif you're going to other dungeons.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'll only tag along when you\ngo off to the #CDMurky Cave#R. Keke!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'll only tag along when you\ngo off to the {COLOR YELLOW_D}Murky Cave{RESET}. Keke!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -14081,9 +14081,9 @@ static const struct ScriptCommand s_gs9_g90_s0_lives0_dlg2[] = { /* 0x81dd2d4 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The only place I want to go\nis the #CDMurky Cave#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The only place I want to go\nis the {COLOR YELLOW_D}Murky Cave{RESET}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm not about to tag along\nif you're going to other dungeons.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll only tag along when you\ngo off to the #CDMurky Cave#R. Keke!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll only tag along when you\ngo off to the {COLOR YELLOW_D}Murky Cave{RESET}. Keke!") }, JUMP_SCRIPT(END_TALK), }; @@ -14109,20 +14109,20 @@ static const struct ScriptCommand s_gs9_g91_s0_lives0_dlg0[] = { /* 0x81dd410 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0e, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Thank you so much...#W\nMy curse has been lifted.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" You did this for me, even\nthough I had never met you before...#W\nI have no idea how to thank you...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Thank you so much...{WAIT_PRESS}\nMy curse has been lifted.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" You did this for me, even\nthough I had never met you before...{WAIT_PRESS}\nI have no idea how to thank you...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" From the bottom of my\nheart...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Thank you so very much for\nsaving me.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0002, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#W\nGood for you, $n3.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nGood for you, {NAME_3}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hey, $n0.\nThanks for getting me through this.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hey, {NAME_0}.\nThanks for getting me through this.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This is my thanks.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -14147,16 +14147,16 @@ static const struct ScriptCommand s_gs9_g91_s0_lives0_dlg0[] = { /* 0x81dd410 */ { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What is it now?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Your name...#W\nPlease, what is your name?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Your name...{WAIT_PRESS}\nPlease, what is your name?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keh!") }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The name's $n2.#W\nGlad to meet you.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The name's {NAME_2}.{WAIT_PRESS}\nGlad to meet you.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" My name is $n3.#W\nI am also glad to meet you.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" My name is {NAME_3}.{WAIT_PRESS}\nI am also glad to meet you.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_b01p02a_station.h b/src/data/ground/ground_data_b01p02a_station.h index 030a12b4..ab707ec2 100644 --- a/src/data/ground/ground_data_b01p02a_station.h +++ b/src/data/ground/ground_data_b01p02a_station.h @@ -255,7 +255,7 @@ static const struct ScriptCommand s_gs12_g3_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(12), { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -334,7 +334,7 @@ static const struct ScriptCommand s_gs12_g6_s0_station_sref_script[] = { /* 0x81 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -469,11 +469,11 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" It's $n0's house.")), + VARIANT(/* == */ 1, _(" It's {NAME_0}'s house.")), VARIANT(/* == */ 1, _(" It also happens to be our\nrescue team's base.")), - VARIANT(/* == */ 3, _(" It's $n0's house.")), + VARIANT(/* == */ 3, _(" It's {NAME_0}'s house.")), VARIANT(/* == */ 3, _(" It's also our rescue team's\nbase.")), - VARIANT_DEFAULT(_(" It's $n0's house.")), + VARIANT_DEFAULT(_(" It's {NAME_0}'s house.")), VARIANT_DEFAULT(_(" It's also our rescue team's\nbase.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -492,9 +492,9 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ { 0x2e, 0x03, 0x0001, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hahaha, don't worry about it.\nNo need for thanks.")), - VARIANT(/* == */ 1, _(" But forget that...#W\nWhat happened to you?")), + VARIANT(/* == */ 1, _(" But forget that...{WAIT_PRESS}\nWhat happened to you?")), VARIANT_DEFAULT(_(" Hahaha, it's OK.\nThere's no need for thanks.")), - VARIANT_DEFAULT(_(" Rather than that...#W\nWhat happened?")), + VARIANT_DEFAULT(_(" Rather than that...{WAIT_PRESS}\nWhat happened?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -519,10 +519,10 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes! That!#W\nIsn't it exciting?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes! That!{WAIT_PRESS}\nIsn't it exciting?") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ever since then, I've been\ntraveling all over in hopes of seeing\nthe mirage Pokémon...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But I've had no luck...#W\nFinally, I became dizzy from fatigue...#W\nAnd I must have passed out.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But I've had no luck...{WAIT_PRESS}\nFinally, I became dizzy from fatigue...{WAIT_PRESS}\nAnd I must have passed out.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -531,7 +531,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I...#W\nI'm giving up on my quest...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I...{WAIT_PRESS}\nI'm giving up on my quest...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm simply worn out...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -539,13 +539,13 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hold up a second!#W\nAre you sure you want to give up that\neasily?")), - VARIANT_DEFAULT(_(" Wait a second!#W\nAre you sure you won't regret giving up\nthat easily?")), + VARIANT(/* == */ 1, _(" Hold up a second!{WAIT_PRESS}\nAre you sure you want to give up that\neasily?")), + VARIANT_DEFAULT(_(" Wait a second!{WAIT_PRESS}\nAre you sure you won't regret giving up\nthat easily?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But I...#W\nI've reached my physical limit...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But I...{WAIT_PRESS}\nI've reached my physical limit...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If I push myself any\nfurther, I will collapse again.\nIt's not good for my health...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -557,7 +557,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ WAIT(10), BGM_STOP, FANFARE_PLAY(212), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n1 received something\n#+from $n2.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_1} received something\n{CENTER_ALIGN}from {NAME_2}.") }, { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -575,14 +575,14 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's a...#W\n#CIClear Wing#R...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's a...{WAIT_PRESS}\n{COLOR GREEN_I}Clear Wing{RESET}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Clear Wing?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.#W\nI found it on my travels.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's a wing of some sort.\nIt's transparent, but...#W\nIf you hold it up like this...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.{WAIT_PRESS}\nI found it on my travels.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's a wing of some sort.\nIt's transparent, but...{WAIT_PRESS}\nIf you hold it up like this...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), CANCEL_EFFECTS(9, 1), @@ -615,14 +615,14 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, are you OK?#W\nYou still look wobbly on your feet.")), - VARIANT_DEFAULT(_(" Wait, are you OK?#W\nYou're still unsteady on your feet.")), + VARIANT(/* == */ 1, _(" Hey, are you OK?{WAIT_PRESS}\nYou still look wobbly on your feet.")), + VARIANT_DEFAULT(_(" Wait, are you OK?{WAIT_PRESS}\nYou're still unsteady on your feet.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, no.\nWhen I walk, I always totter.#W\nBye.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, no.\nWhen I walk, I always totter.{WAIT_PRESS}\nBye.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -632,7 +632,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" #C4Clear Wing#R, huh...#W\nI don't have a clue what this is all about...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {COLOR GREEN}Clear Wing{RESET}, huh...{WAIT_PRESS}\nI don't have a clue what this is all about...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -641,12 +641,12 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But you are interested in\nthe mirage Pokémon, right?")), VARIANT(/* == */ 1, _(" For something like this,\nXatu'd be the one to ask.")), - VARIANT(/* == */ 1, _(" Xatu should be at the peak\nof the #CDGreat Canyon#R.")), - VARIANT(/* == */ 1, _(" We should go out there.\nTo the #CDGreat Canyon#R!")), + VARIANT(/* == */ 1, _(" Xatu should be at the peak\nof the {COLOR YELLOW_D}Great Canyon{RESET}.")), + VARIANT(/* == */ 1, _(" We should go out there.\nTo the {COLOR YELLOW_D}Great Canyon{RESET}!")), VARIANT_DEFAULT(_(" But the mirage Pokémon\ndoes interest you, right?")), VARIANT_DEFAULT(_(" I think Xatu is the one to\nask for something like this.")), - VARIANT_DEFAULT(_(" Xatu should be at the peak\nof the #CDGreat Canyon#R.")), - VARIANT_DEFAULT(_(" We should go!\nTo the #CDGreat Canyon#R!")), + VARIANT_DEFAULT(_(" Xatu should be at the peak\nof the {COLOR YELLOW_D}Great Canyon{RESET}.")), + VARIANT_DEFAULT(_(" We should go!\nTo the {COLOR YELLOW_D}Great Canyon{RESET}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -858,9 +858,9 @@ static const struct ScriptCommand s_gs12_g10_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+No...\n#+Morning, but only by time...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+A time so early in the morning\n#+that everyone is still in bed...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}No...\n{CENTER_ALIGN}Morning, but only by time...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}A time so early in the morning\n{CENTER_ALIGN}that everyone is still in bed...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -894,8 +894,8 @@ static const struct ScriptCommand s_gs12_g10_s0_lives0_dlg0[] = { /* 0x81e507c * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0000, 0x0000000c, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Wha...#W What is it?!") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("What...#W\nWhat's happening outside?!") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Wha...{WAIT_PRESS} What is it?!") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("What...{WAIT_PRESS}\nWhat's happening outside?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x6a, 0x00, 0x0200, 0x00000000, 0x00000020, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -911,7 +911,7 @@ static const struct ScriptCommand s_gs12_g11_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Several hours later...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Several hours later...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -920,12 +920,12 @@ static const struct ScriptCommand s_gs12_g11_s0_station_sref_script[] = { /* 0x8 { 0x2e, 0x00, 0x0000, -0x00000002, 0x00000000, NULL }, { 0x2e, 0x00, 0x0001, -0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ............#W\nHey...")), - VARIANT(/* == */ 1, _(" Hey, $n0.")), - VARIANT(/* == */ 1, _(" ...$n0, wake up!\nGet up already!")), - VARIANT_DEFAULT(_(" ............#W\nHey...")), - VARIANT_DEFAULT(_(" Hey, $n0.")), - VARIANT_DEFAULT(_(" $n0, wake up!\nCome on, wake up!")), + VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nHey...")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}.")), + VARIANT(/* == */ 1, _(" ...{NAME_0}, wake up!\nGet up already!")), + VARIANT_DEFAULT(_(" ............{WAIT_PRESS}\nHey...")), + VARIANT_DEFAULT(_(" Hey, {NAME_0}.")), + VARIANT_DEFAULT(_(" {NAME_0}, wake up!\nCome on, wake up!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), @@ -947,10 +947,10 @@ static const struct ScriptCommand s_gs12_g11_s0_lives0_dlg0[] = { /* 0x81e5528 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" You're finally awake,\n$n0?")), + VARIANT(/* == */ 1, _(" You're finally awake,\n{NAME_0}?")), VARIANT(/* == */ 1, _(" Sounds like there's a big\nruckus going on at the square.")), VARIANT(/* == */ 1, _(" Let's go check it out!")), - VARIANT_DEFAULT(_(" $n0, are you\nawake?")), + VARIANT_DEFAULT(_(" {NAME_0}, are you\nawake?")), VARIANT_DEFAULT(_(" There's some sort of a\ncommotion down at the square.")), VARIANT_DEFAULT(_(" Let's take a look!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -976,7 +976,7 @@ static const struct ScriptCommand s_gs12_g12_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1004,15 +1004,15 @@ static const struct ScriptCommand s_gs12_g12_s0_lives0_dlg0[] = { /* 0x81e5884 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n0!\nGreat news!")), - VARIANT(/* == */ 1, _(" $n2 wants to\njoin us!")), - VARIANT_DEFAULT(_(" Listen, $n0!\nI've got great news!")), - VARIANT_DEFAULT(_(" $n2 wants to\njoin us!")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}!\nGreat news!")), + VARIANT(/* == */ 1, _(" {NAME_2} wants to\njoin us!")), + VARIANT_DEFAULT(_(" Listen, {NAME_0}!\nI've got great news!")), + VARIANT_DEFAULT(_(" {NAME_2} wants to\njoin us!")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I saw $n2 outside\nlooking dazed, so I went and said hello.")), + VARIANT(/* == */ 1, _(" I saw {NAME_2} outside\nlooking dazed, so I went and said hello.")), VARIANT(/* == */ 1, _(" It turns out that it was\nsuddenly blown here by gusting winds!")), - VARIANT_DEFAULT(_(" I saw $n2 outside\nlooking stunned, so I introduced myself.")), + VARIANT_DEFAULT(_(" I saw {NAME_2} outside\nlooking stunned, so I introduced myself.")), VARIANT_DEFAULT(_(" It says it was blown here\nby a sudden gust of wind!")), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -1023,8 +1023,8 @@ static const struct ScriptCommand s_gs12_g12_s0_lives0_dlg0[] = { /* 0x81e5884 * VARIANT(/* == */ 1, _(" ...But since it's here, it\nfigures it must be for a good reason,\nso it wants to join us!")), VARIANT_DEFAULT(_(" ...But since it's here, it\ndecided that it must be for a good reason.\nAnd so it wants to join us!")), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" What do you think?\nShould we let $n2 join?")), - VARIANT_DEFAULT(_(" What should we do?\nShould we let $n2 join?")), + VARIANT(/* == */ 1, _(" What do you think?\nShould we let {NAME_2} join?")), + VARIANT_DEFAULT(_(" What should we do?\nShould we let {NAME_2} join?")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), LABEL(2), /* = 0x02 */ @@ -1051,12 +1051,12 @@ static const struct ScriptCommand s_gs12_g12_s0_lives0_dlg0[] = { /* 0x81e5884 * VARIANT_DEFAULT(_(" Huh?! You're sure of that?\nThat Pokémon volunteered to join...")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Let me ask you again.#W\nBut this is the last time.")), - VARIANT_DEFAULT(_(" Let me make sure.#W\nAnd I won't ask you again.")), + VARIANT(/* == */ 1, _(" Let me ask you again.{WAIT_PRESS}\nBut this is the last time.")), + VARIANT_DEFAULT(_(" Let me make sure.{WAIT_PRESS}\nAnd I won't ask you again.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" What do you think?\nShould we let $n2 join?")), - VARIANT_DEFAULT(_(" What should we do?\nShould we let $n2 join?")), + VARIANT(/* == */ 1, _(" What do you think?\nShould we let {NAME_2} join?")), + VARIANT_DEFAULT(_(" What should we do?\nShould we let {NAME_2} join?")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 5, _("No.")), LABEL(5), /* = 0x05 */ @@ -1067,8 +1067,8 @@ static const struct ScriptCommand s_gs12_g12_s0_lives0_dlg0[] = { /* 0x81e5884 * VARIANT_DEFAULT(_(" OK...\nIt's disappointing, but it can't be helped.")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I'll go tell $n2 no.")), - VARIANT_DEFAULT(_(" I'll let $n2 know\nhe hasn't been accepted.")), + VARIANT(/* == */ 1, _(" I'll go tell {NAME_2} no.")), + VARIANT_DEFAULT(_(" I'll let {NAME_2} know\nhe hasn't been accepted.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -1120,7 +1120,7 @@ static const struct ScriptCommand s_gs12_g13_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1147,10 +1147,10 @@ static const struct ScriptCommand s_gs12_g13_s0_lives0_dlg0[] = { /* 0x81e6580 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n0!\nGreat news!")), - VARIANT(/* == */ 1, _(" Team #C5$t#R's\nrescue rank went up!")), - VARIANT_DEFAULT(_(" Listen, $n0!\nI've got great news!")), - VARIANT_DEFAULT(_(" Team #C5$t#R's\nrescue rank went up!")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}!\nGreat news!")), + VARIANT(/* == */ 1, _(" Team {COLOR CYAN}{TEAM_NAME}{RESET}'s\nrescue rank went up!")), + VARIANT_DEFAULT(_(" Listen, {NAME_0}!\nI've got great news!")), + VARIANT_DEFAULT(_(" Team {COLOR CYAN}{TEAM_NAME}{RESET}'s\nrescue rank went up!")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I saw Pelipper outside\nlooking dazed, so I went and said hello.")), @@ -1170,9 +1170,9 @@ static const struct ScriptCommand s_gs12_g13_s0_lives0_dlg0[] = { /* 0x81e6580 * { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But since he ended up here,\nhe figures it must be for a good reason.\nWe're getting the rescue rank crest!")), - VARIANT(/* == */ 1, _(" Isn't that awesome?!#W\nIt's kind of unfair, but...#W\nWell, so what?")), + VARIANT(/* == */ 1, _(" Isn't that awesome?!{WAIT_PRESS}\nIt's kind of unfair, but...{WAIT_PRESS}\nWell, so what?")), VARIANT_DEFAULT(_(" But since he ended up here,\nhe thinks it must be for a good reason.\nWe're getting that new rescue rank crest!")), - VARIANT_DEFAULT(_(" It's awesome!#W\nI guess it's kind of unfair, but...#W\nWell, anyway!")), + VARIANT_DEFAULT(_(" It's awesome!{WAIT_PRESS}\nI guess it's kind of unfair, but...{WAIT_PRESS}\nWell, anyway!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -1180,7 +1180,7 @@ static const struct ScriptCommand s_gs12_g13_s0_lives0_dlg0[] = { /* 0x81e6580 * VARIANT_DEFAULT(_(" If it's a gift, we have\nto accept!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Team #C5$t#R's\n#+rescue rank went up!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Team {COLOR CYAN}{TEAM_NAME}{RESET}'s\n{CENTER_ALIGN}rescue rank went up!") }, FANFARE_PLAY(201), { 0xe1, 0x00, 0x00c9, 0x00000000, 0x00000000, NULL }, { 0x31, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1220,7 +1220,7 @@ static const struct ScriptCommand s_gs12_g14_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1247,11 +1247,11 @@ static const struct ScriptCommand s_gs12_g14_s0_lives0_dlg0[] = { /* 0x81e6fcc * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n0!\nGreat news!")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}!\nGreat news!")), VARIANT(/* == */ 1, _(" The Rescue Organization\nsent us a cash reward!")), VARIANT(/* == */ 1, _(" I don't have a clue why\nthey'd send us this, but...")), VARIANT(/* == */ 1, _(" Who am I to complain?")), - VARIANT_DEFAULT(_(" Listen, $n0!\nI've got great news!")), + VARIANT_DEFAULT(_(" Listen, {NAME_0}!\nI've got great news!")), VARIANT_DEFAULT(_(" The Rescue Organization\nsent us some reward money!")), VARIANT_DEFAULT(_(" I don't have the foggiest\nnotion why they'd send it...")), VARIANT_DEFAULT(_(" But why worry about it?")), @@ -1299,7 +1299,7 @@ static const struct ScriptCommand s_gs12_g15_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), @@ -1322,15 +1322,15 @@ static const struct ScriptCommand s_gs12_g15_s0_lives0_dlg0[] = { /* 0x81e7560 - CALL_SCRIPT(LOOK_AROUND_FUNC), { 0x2e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...I'm still the same.") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("The way I look...\nI'm still $m0.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("The way I look...\nI'm still {POKEMON_0}.") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("But why would I be transformed\ninto a Pokémon?") }, FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), { 0x2e, 0x00, 0x0000, 0x00000004, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............#W\nHmm... I don't understand this at all...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}\nHmm... I don't understand this at all...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("........................") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............#W\nI feel groggy and sleepy...") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Not feeling well...#W\nI need more sleep...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}\nI feel groggy and sleepy...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Not feeling well...{WAIT_PRESS}\nI need more sleep...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -1436,12 +1436,12 @@ static const struct ScriptCommand s_gs12_g17_s0_lives0_dlg0[] = { /* 0x81e7be8 * CALL_SCRIPT(LOOK_AROUND_FUNC), { 0x2e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("..................") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oof...#W\nI'm feeling refreshed!") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oof...{WAIT_PRESS}\nI'm feeling refreshed!") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I still look like a Pokémon, but...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("..................") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oh, that's right.#W That Pokémon...#W\nI think it was $n1?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oh, that's right.{WAIT_PRESS} That Pokémon...{WAIT_PRESS}\nI think it was {NAME_1}?") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("We made a promise to form a rescue\nteam together...") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I wonder what $n1 is doing?#W\nI should go out.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I wonder what {NAME_1} is doing?{WAIT_PRESS}\nI should go out.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -1459,7 +1459,7 @@ static const struct ScriptCommand s_gs12_g18_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), @@ -1532,7 +1532,7 @@ static const struct ScriptCommand s_gs12_g20_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(12), { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -1570,7 +1570,7 @@ static const struct ScriptCommand s_gs12_g20_s0_lives0_dlg0[] = { /* 0x81e8394 * FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), WAIT(15), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Hello? Uhh...\nYou are $n0...#W Aren't you?") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Hello? Uhh...\nYou are {NAME_0}...{WAIT_PRESS} Aren't you?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(468), @@ -1584,7 +1584,7 @@ static const struct ScriptCommand s_gs12_g20_s0_lives0_dlg0[] = { /* 0x81e8394 * WAIT(15), { 0x92, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...Oh! You can't see us, of course!#W\nHow very rude of us!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...Oh! You can't see us, of course!{WAIT_PRESS}\nHow very rude of us!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), SELECT_ENTITIES(-1, 1), @@ -1593,17 +1593,17 @@ static const struct ScriptCommand s_gs12_g20_s0_lives0_dlg0[] = { /* 0x81e8394 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), BGM_FADEIN(60, 1), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" We're pleased to meet you.\nWe are $n2.") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" We're pleased to meet you.\nWe are {NAME_2}.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Last night, during the\nearthquake...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Our child $n3 was\nattacked...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Our child {NAME_3} was\nattacked...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" He was whisked away to\nthe peak of a tall mountain.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We couldn't possibly climb\nsomewhere so high up...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That is why we must call\nupon you for your help, $n0.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n3 was abducted\nby a Pokémon named $n4.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That is why we must call\nupon you for your help, {NAME_0}.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_3} was abducted\nby a Pokémon named {NAME_4}.") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's a vilely vicious ruffian!\nPlease do be careful.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Please, we need your help!#W\nWe must go!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Please, we need your help!{WAIT_PRESS}\nWe must go!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -1660,7 +1660,7 @@ static const struct ScriptCommand s_gs12_g21_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), @@ -1695,7 +1695,7 @@ static const struct ScriptCommand s_gs12_g22_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(12), { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1731,7 +1731,7 @@ static const struct ScriptCommand s_gs12_g23_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(12), { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1767,7 +1767,7 @@ static const struct ScriptCommand s_gs12_g24_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1831,7 +1831,7 @@ static const struct ScriptCommand s_gs12_g26_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1895,7 +1895,7 @@ static const struct ScriptCommand s_gs12_g28_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1959,7 +1959,7 @@ static const struct ScriptCommand s_gs12_g30_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2023,7 +2023,7 @@ static const struct ScriptCommand s_gs12_g32_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2054,7 +2054,7 @@ static const struct ScriptCommand s_gs12_g33_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2079,14 +2079,14 @@ static const struct ScriptCommand s_gs12_g33_s0_lives0_dlg0[] = { /* 0x81ea094 * WAIT(15), CALL_SCRIPT(LOOK_AROUND_DOWN_FUNC), WAIT(45), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............#W\nWhat a strange dream...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}\nWhat a strange dream...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("It's the dream I always have, but it was\nclearer than it was before...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I think I finally learned who that\nPokémon was...") }, FANFARE_PLAY2(464), CALL_SCRIPT(NOTICE_FUNC), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("That's it!#W\n$n2!") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("It was $n2!") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Yesterday, $n3 said...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("That's it!{WAIT_PRESS}\n{NAME_2}!") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("It was {NAME_2}!") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Yesterday, {NAME_3} said...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -2122,9 +2122,9 @@ static const struct ScriptCommand s_gs12_g34_s0_lives0_dlg0[] = { /* 0x81ea3c4 * WAIT(30), WAIT(30), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("..................") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Maybe...#W\nMaybe, I...") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Maybe I was the human who was\n$n2's partner...") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Maybe I was the one that abandoned\n$n2 when she was cursed...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Maybe...{WAIT_PRESS}\nMaybe, I...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Maybe I was the human who was\n{NAME_2}'s partner...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Maybe I was the one that abandoned\n{NAME_2} when she was cursed...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Maybe that's why I turned into\na Pokémon...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -2145,7 +2145,7 @@ static const struct ScriptCommand s_gs12_g35_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2176,7 +2176,7 @@ static const struct ScriptCommand s_gs12_g36_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2197,14 +2197,14 @@ static const struct ScriptCommand s_gs12_g36_s0_lives0_dlg0[] = { /* 0x81ea85c * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(30), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............#W\nThere was an earthquake...#W\nWasn't there...?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}\nThere was an earthquake...{WAIT_PRESS}\nWasn't there...?") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I think I had that dream again...") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I think I spoke with Gardevoir...#W\nShe said something important...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I think I spoke with Gardevoir...{WAIT_PRESS}\nShe said something important...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(464), CALL_SCRIPT(NOTICE_FUNC), WAIT(30), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("That's it!#W\nShe did say something!") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("That's it!{WAIT_PRESS}\nShe did say something!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -2239,9 +2239,9 @@ static const struct ScriptCommand s_gs12_g37_s0_lives0_dlg0[] = { /* 0x81eab48 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(466), - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("$n2 knows!#W\nShe knows why I became a Pokémon.") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("{NAME_2} knows!{WAIT_PRESS}\nShe knows why I became a Pokémon.") }, { 0x2e, 0x02, 0x0000, 0x00000004, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("She also said something about a role...#W\nWhat did she mean by that?") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("She also said something about a role...{WAIT_PRESS}\nWhat did she mean by that?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -2260,7 +2260,7 @@ static const struct ScriptCommand s_gs12_g38_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2294,7 +2294,7 @@ static const struct ScriptCommand s_gs12_g38_s0_lives0_dlg0[] = { /* 0x81eaddc * WAIT(60), CALL_SCRIPT(LOOK_AROUND_FUNC), { 0x2e, 0x15, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............#W\nI guess it settled down...") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}\nI guess it settled down...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _(".......There've been a lot of earthquakes\nlately...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(1), @@ -2310,7 +2310,7 @@ static const struct ScriptCommand s_gs12_g39_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2354,7 +2354,7 @@ static const struct ScriptCommand s_gs12_g39_s0_lives0_dlg0[] = { /* 0x81eb100 * FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0!\nThere's a commotion down at the square!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!\nThere's a commotion down at the square!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" A lot of Pokémon have\nalready gathered there.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Let's go to the square right\nnow!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2393,7 +2393,7 @@ static const struct ScriptCommand s_gs12_g40_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2428,7 +2428,7 @@ static const struct ScriptCommand s_gs12_g41_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2474,9 +2474,9 @@ static const struct ScriptCommand s_gs12_g42_s0_lives0_dlg0[] = { /* 0x81eb95c * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" How do you like Dream\nEater?#W\nHorrible, isn't it? Keke!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" How do you like Dream\nEater?{WAIT_PRESS}\nHorrible, isn't it? Keke!") }, { 0x2e, 0x02, 0x0001, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But who would've thought\nyou were also human before...#W\nDidn't expect that.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But who would've thought\nyou were also human before...{WAIT_PRESS}\nDidn't expect that.") }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But who cares?\nSomeone like that's sure to be some\nlowlife. Keke!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll expose you yet!") }, @@ -2487,14 +2487,14 @@ static const struct ScriptCommand s_gs12_g42_s0_lives0_dlg0[] = { /* 0x81eb95c * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hm?!#W\nSomething's coming!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hm?!{WAIT_PRESS}\nSomething's coming!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(484), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What? What is that light?#W\nIt's coming closer?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What? What is that light?{WAIT_PRESS}\nIt's coming closer?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(90), @@ -2554,7 +2554,7 @@ static const struct ScriptCommand s_gs12_g43_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The next morning...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The next morning...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2622,14 +2622,14 @@ static const struct ScriptCommand s_gs12_g45_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(12), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Due to $n0 and\n#+$n1's heroic actions...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+the falling star was destroyed...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+and peace returned to\n#+the world of Pokémon.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+But that did not put an end\n#+to the natural calamities.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Natural disasters still occurred,\n#+but much less often.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Needless to say,\n#+$t's rescue activities") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+continued as if nothing had changed.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Several mornings later...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Due to {NAME_0} and\n{CENTER_ALIGN}{NAME_1}'s heroic actions...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}the falling star was destroyed...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}and peace returned to\n{CENTER_ALIGN}the world of Pokémon.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}But that did not put an end\n{CENTER_ALIGN}to the natural calamities.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Natural disasters still occurred,\n{CENTER_ALIGN}but much less often.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Needless to say,\n{CENTER_ALIGN}{TEAM_NAME}'s rescue activities") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}continued as if nothing had changed.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Several mornings later...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2656,16 +2656,16 @@ static const struct ScriptCommand s_gs12_g45_s0_lives0_dlg0[] = { /* 0x81ec59c * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0!\nDid you just get up?")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nDid you just get up?")), VARIANT(/* == */ 1, _(" I just went by the Pelipper\nPost Office.")), VARIANT(/* == */ 1, _(" There were still rescue jobs\nposted on the Bulletin Board.")), VARIANT(/* == */ 1, _(" Even though it's peaceful\nagain, lots of Pokémon still need helping.")), - VARIANT(/* == */ 1, _(" $n0!#W\nLet's keep on giving it our best like\nalways!")), - VARIANT_DEFAULT(_(" Good morning, $n0!\nDid you just wake up?")), + VARIANT(/* == */ 1, _(" {NAME_0}!{WAIT_PRESS}\nLet's keep on giving it our best like\nalways!")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}!\nDid you just wake up?")), VARIANT_DEFAULT(_(" I went by the Pelipper Post\nOffice earlier.")), VARIANT_DEFAULT(_(" The Bulletin Board was still\ncovered with rescue jobs.")), VARIANT_DEFAULT(_(" Even though it's peaceful\nagain, many Pokémon still need our help.")), - VARIANT_DEFAULT(_(" $n0!#W\nLet's keep on doing our best as always!")), + VARIANT_DEFAULT(_(" {NAME_0}!{WAIT_PRESS}\nLet's keep on doing our best as always!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -2745,9 +2745,9 @@ static const struct ScriptCommand s_gs12_g46_s1_lives0_dlg0[] = { /* 0x81ecc04 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Morning, $n0!")), + VARIANT(/* == */ 1, _(" Morning, {NAME_0}!")), VARIANT(/* == */ 1, _(" Let's keep on giving it our\nbest for our rescue team!")), - VARIANT_DEFAULT(_(" Good morning, $n0!")), + VARIANT_DEFAULT(_(" Good morning, {NAME_0}!")), VARIANT_DEFAULT(_(" Let's keep doing our best\nfor our rescue team!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d01p01_station.h b/src/data/ground/ground_data_d01p01_station.h index 567f47fa..d02eb732 100644 --- a/src/data/ground/ground_data_d01p01_station.h +++ b/src/data/ground/ground_data_d01p01_station.h @@ -41,11 +41,11 @@ static const struct ScriptCommand s_gs178_g1_s0_station_sref_script[] = { /* 0x8 { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(178), WAIT(100), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Where am I?") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Am I dreaming this?") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+I feel a pleasant breeze.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+...I hear a voice from somewhere...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+I wonder who it is?") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Where am I?") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Am I dreaming this?") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I feel a pleasant breeze.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}...I hear a voice from somewhere...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I wonder who it is?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -54,9 +54,9 @@ static const struct ScriptCommand s_gs178_g1_s0_station_sref_script[] = { /* 0x8 { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ............") }, MSG_VAR(2, PARTNER_TALK_KIND, -1), VARIANT(/* == */ 1, _(" ...Hey.")), - VARIANT(/* == */ 1, _(" ...Hey, wake up.#W\nWake up already.")), + VARIANT(/* == */ 1, _(" ...Hey, wake up.{WAIT_PRESS}\nWake up already.")), VARIANT_DEFAULT(_(" ...Excuse me.")), - VARIANT_DEFAULT(_(" ...Please, wake up.#W\nCome on, wake up.")), + VARIANT_DEFAULT(_(" ...Please, wake up.{WAIT_PRESS}\nCome on, wake up.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), BGM_FADEIN(60, 101), @@ -106,16 +106,16 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I'm $n1.\nGlad to meet you!")), - VARIANT(/* == */ 3, _(" I'm $n1.\nHappy to meet you!")), - VARIANT_DEFAULT(_(" I'm $n1.\nGlad to meet you!")), + VARIANT(/* == */ 1, _(" I'm {NAME_1}.\nGlad to meet you!")), + VARIANT(/* == */ 3, _(" I'm {NAME_1}.\nHappy to meet you!")), + VARIANT_DEFAULT(_(" I'm {NAME_1}.\nGlad to meet you!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...So, who might you be?#W\nI don't think I've seen your face around\nhere.")), - VARIANT(/* == */ 3, _(" ...And, you are?#W\nI don't think I've seen you around before.")), - VARIANT_DEFAULT(_(" ...And, you are?#W\nI've never seen you around before.")), + VARIANT(/* == */ 1, _(" ...So, who might you be?{WAIT_PRESS}\nI don't think I've seen your face around\nhere.")), + VARIANT(/* == */ 3, _(" ...And, you are?{WAIT_PRESS}\nI don't think I've seen you around before.")), + VARIANT_DEFAULT(_(" ...And, you are?{WAIT_PRESS}\nI've never seen you around before.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -126,12 +126,12 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hah?#W\nYou say you're a human?")), - VARIANT(/* == */ 1, _(" But any which way I look\nat you, you're a normal $m0.")), - VARIANT(/* == */ 3, _(" Huh?#W\nDid you say human?")), - VARIANT(/* == */ 3, _(" But you look like a normal\n$m0 from every angle?")), - VARIANT_DEFAULT(_(" Huh?#W\nYou're a human?")), - VARIANT_DEFAULT(_(" But you look like a normal\n$m0 in every way.")), + VARIANT(/* == */ 1, _(" Hah?{WAIT_PRESS}\nYou say you're a human?")), + VARIANT(/* == */ 1, _(" But any which way I look\nat you, you're a normal {POKEMON_0}.")), + VARIANT(/* == */ 3, _(" Huh?{WAIT_PRESS}\nDid you say human?")), + VARIANT(/* == */ 3, _(" But you look like a normal\n{POKEMON_0} from every angle?")), + VARIANT_DEFAULT(_(" Huh?{WAIT_PRESS}\nYou're a human?")), + VARIANT_DEFAULT(_(" But you look like a normal\n{POKEMON_0} in every way.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(469), @@ -144,7 +144,7 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - { 0xe2, 0x00, 0x01e2, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0000, 0x0000000c, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(It... It's true...)") }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(I have turned into\na $m0!)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(I have turned into\na {POKEMON_0}!)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x15, 0x0000, 0x00000004, 0x00000000, NULL }, @@ -154,14 +154,14 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" You're...#W\nSome kind of weird...")), + VARIANT(/* == */ 1, _(" You're...{WAIT_PRESS}\nSome kind of weird...")), VARIANT(/* == */ 1, _(" So, what's your name?\nWhat do you call yourself?")), - VARIANT_DEFAULT(_(" Um...#W\nYou're kind of weird...")), - VARIANT_DEFAULT(_(" Your name?#W\nWhat's your name?")), + VARIANT_DEFAULT(_(" Um...{WAIT_PRESS}\nYou're kind of weird...")), + VARIANT_DEFAULT(_(" Your name?{WAIT_PRESS}\nWhat's your name?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(My name...?#W\nThat's right, my name is...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(My name...?{WAIT_PRESS}\nThat's right, my name is...)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x3b, 0x16, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -170,9 +170,9 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Uh-huh... $n0.#W\nThat's...")), - VARIANT(/* == */ 3, _(" OK.\nYou're named $n0?#W\nWell...")), - VARIANT_DEFAULT(_(" Oh.\n$n0's your name?#W\nWell...")), + VARIANT(/* == */ 1, _(" Uh-huh... {NAME_0}.{WAIT_PRESS}\nThat's...")), + VARIANT(/* == */ 3, _(" OK.\nYou're named {NAME_0}?{WAIT_PRESS}\nWell...")), + VARIANT_DEFAULT(_(" Oh.\n{NAME_0}'s your name?{WAIT_PRESS}\nWell...")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000a, 0x00000000, NULL }, @@ -218,7 +218,7 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's horrible!\nMy $n3 fell into a cavern!\nMy poor baby!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's horrible!\nMy {NAME_3} fell into a cavern!\nMy poor baby!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -227,16 +227,16 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(12), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" A huge fissure opened in\nthe ground, and my $n3 fell in!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" A huge fissure opened in\nthe ground, and my {NAME_3} fell in!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" He's too young to crawl out\nby himself!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" When I went to get my\nbaby, Pokémon suddenly attacked me!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? You were attacked?#W\nBy other Pokémon?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? You were attacked?{WAIT_PRESS}\nBy other Pokémon?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They must be enraged by\nthe fissure...and out of control!\nThat's what I think.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm not strong enough to\nfend off those wild Pokémon...#W\nWhat will become of my baby?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm not strong enough to\nfend off those wild Pokémon...{WAIT_PRESS}\nWhat will become of my baby?") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! What am I to do?!\nOh dear, oh dear...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -363,7 +363,7 @@ static const struct ScriptCommand s_gs178_g2_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(178), { 0x2d, 0x09, 0x0000, 0x00000035, 0x00000000, NULL }, { 0x2e, 0x0b, 0x0000, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" ...Hello?#W\nHello!") }, + { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" ...Hello?{WAIT_PRESS}\nHello!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -412,7 +412,7 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" In the forest.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You two ran off to rescue\nmy poor $n3, but...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You two ran off to rescue\nmy poor {NAME_3}, but...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -428,7 +428,7 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ohh!\nIs my poor $n3 safe?!\nOh dear, oh dear...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ohh!\nIs my poor {NAME_3} safe?!\nOh dear, oh dear...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -441,8 +441,8 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Let's roll, $n0!")), - VARIANT_DEFAULT(_(" $n0! Let's go!")), + VARIANT(/* == */ 1, _(" Let's roll, {NAME_0}!")), + VARIANT_DEFAULT(_(" {NAME_0}! Let's go!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(1), @@ -540,14 +540,14 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My baby's safe...#W\nI'm sorry, I don't know how I could ever\nthank you properly...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My baby's safe...{WAIT_PRESS}\nI'm sorry, I don't know how I could ever\nthank you properly...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Aww, don't worry, lady.#W\nThere have been a lot of quakes and\nfissures lately. It's dangerous.")), + VARIANT(/* == */ 1, _(" Aww, don't worry, lady.{WAIT_PRESS}\nThere have been a lot of quakes and\nfissures lately. It's dangerous.")), VARIANT(/* == */ 1, _(" I'm glad your little guy's\nnot hurt, honestly.")), - VARIANT_DEFAULT(_(" Oh, that's OK!#W\nIt has been dangerous lately with sudden\nquakes and fissures like that one.")), + VARIANT_DEFAULT(_(" Oh, that's OK!{WAIT_PRESS}\nIt has been dangerous lately with sudden\nquakes and fissures like that one.")), VARIANT_DEFAULT(_(" It was great to find your\nlittle boy unharmed.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -556,18 +556,18 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I'm $n1.")), - VARIANT(/* == */ 3, _(" I'm $n1.")), - VARIANT_DEFAULT(_(" I'm $n1.")), + VARIANT(/* == */ 1, _(" I'm {NAME_1}.")), + VARIANT(/* == */ 3, _(" I'm {NAME_1}.")), + VARIANT_DEFAULT(_(" I'm {NAME_1}.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And this is $n0.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And this is {NAME_0}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ............#W\nCool...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nCool...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -579,7 +579,7 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - WAIT(30), FANFARE_STOP2(470), { 0x2e, 0x15, 0x0000, 0x00000004, 0x00000000, NULL }, - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(He's, uh...#W Staring at me adoringly...)") }, + { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(He's, uh...{WAIT_PRESS} Staring at me adoringly...)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Those sparkly eyes...\nIt's a little embarrassing...)") }, { 0x2e, 0x15, 0x0000, 0x00000001, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(But, this doesn't feel bad, either.\nIt's like I'm a hero.)") }, @@ -588,7 +588,7 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - WAIT(30), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Thank you!\n$n1 and $n0!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Thank you!\n{NAME_1} and {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I know it isn't really\nenough, but this is a token of our\nthanks. Please accept it.") }, @@ -636,8 +636,8 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...#WSay, $n0.#W\nIf you don't have anywhere to stay,\nwhy don't you come with me?")), - VARIANT_DEFAULT(_(" ...#WListen, $n0.#W\nIf you don't have a place to stay, you\nshould come with me.")), + VARIANT(/* == */ 1, _(" ...{WAIT_PRESS}Say, {NAME_0}.{WAIT_PRESS}\nIf you don't have anywhere to stay,\nwhy don't you come with me?")), + VARIANT_DEFAULT(_(" ...{WAIT_PRESS}Listen, {NAME_0}.{WAIT_PRESS}\nIf you don't have a place to stay, you\nshould come with me.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d02p01_station.h b/src/data/ground/ground_data_d02p01_station.h index 0cadb808..49d766f7 100644 --- a/src/data/ground/ground_data_d02p01_station.h +++ b/src/data/ground/ground_data_d02p01_station.h @@ -60,7 +60,7 @@ static const struct ScriptCommand s_gs180_g1_s0_lives0_dlg0[] = { /* 0x823047c * { 0x2e, 0x0e, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" OH, YOU ARE HERE.\nBZBZBZZ!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" MY FRIENDS ARE IN THIS\nCAVERN. BZBZBZZ.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" MY FRIENDS SHOULD BE\nON B$d0F. PLEASE HELP THEM!\nBZBZBZZZT!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" MY FRIENDS SHOULD BE\nON B{VALUE_0}F. PLEASE HELP THEM!\nBZBZBZZZT!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, @@ -173,13 +173,13 @@ static const struct ScriptCommand s_gs180_g2_s0_lives0_dlg0[] = { /* 0x8230ae4 * { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The $n2 are in\nthere somewhere.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The {NAME_2} are in\nthere somewhere.") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Let's give it our best\nand rescue them $n0!")), - VARIANT_DEFAULT(_(" Let's do our best to rescue\nthem, $n0!")), + VARIANT(/* == */ 1, _(" Let's give it our best\nand rescue them {NAME_0}!")), + VARIANT_DEFAULT(_(" Let's do our best to rescue\nthem, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d03p01_station.h b/src/data/ground/ground_data_d03p01_station.h index e3ca1a42..cda17c5e 100644 --- a/src/data/ground/ground_data_d03p01_station.h +++ b/src/data/ground/ground_data_d03p01_station.h @@ -43,10 +43,10 @@ static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 * WAIT(15), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" So, this is it...\n#CDMt. Steel#R...")), - VARIANT(/* == */ 1, _(" $n3's been taken\nto the peak here...")), - VARIANT_DEFAULT(_(" Here we are...\n#CDMt. Steel#R...")), - VARIANT_DEFAULT(_(" So, $n3 was\nwhisked to its peak...")), + VARIANT(/* == */ 1, _(" So, this is it...\n{COLOR YELLOW_D}Mt. Steel{RESET}...")), + VARIANT(/* == */ 1, _(" {NAME_3}'s been taken\nto the peak here...")), + VARIANT_DEFAULT(_(" Here we are...\n{COLOR YELLOW_D}Mt. Steel{RESET}...")), + VARIANT_DEFAULT(_(" So, {NAME_3} was\nwhisked to its peak...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" That's right!") }, @@ -59,7 +59,7 @@ static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 * WAIT(60), { 0x2d, 0x0a, 0x0000, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The peak is $d0F!\nThank you for helping! Farewell!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The peak is {VALUE_0}F!\nThank you for helping! Farewell!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -74,8 +74,8 @@ static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 * WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ......#W\nWell, I guess we go...")), - VARIANT_DEFAULT(_(" ......#W\nUh... Let's go.")), + VARIANT(/* == */ 1, _(" ......{WAIT_PRESS}\nWell, I guess we go...")), + VARIANT_DEFAULT(_(" ......{WAIT_PRESS}\nUh... Let's go.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, @@ -162,10 +162,10 @@ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" We'll take another shot at\n#CDMt. Steel#R.")), - VARIANT(/* == */ 1, _(" We'll rescue $n3\nno matter what it takes!")), - VARIANT_DEFAULT(_(" We have to make another\nattempt at #CDMt. Steel#R.")), - VARIANT_DEFAULT(_(" Whatever it takes,\nlet's rescue $n3!")), + VARIANT(/* == */ 1, _(" We'll take another shot at\n{COLOR YELLOW_D}Mt. Steel{RESET}.")), + VARIANT(/* == */ 1, _(" We'll rescue {NAME_3}\nno matter what it takes!")), + VARIANT_DEFAULT(_(" We have to make another\nattempt at {COLOR YELLOW_D}Mt. Steel{RESET}.")), + VARIANT_DEFAULT(_(" Whatever it takes,\nlet's rescue {NAME_3}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" That's the spirit!") }, @@ -178,7 +178,7 @@ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 * WAIT(60), { 0x2d, 0x0a, 0x0000, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The peak is $d0F!\nThank you for helping! Farewell!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The peak is {VALUE_0}F!\nThank you for helping! Farewell!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -193,8 +193,8 @@ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 * WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ......#W\nWell, here we go...")), - VARIANT_DEFAULT(_(" ......#W\nUh... Let's go.")), + VARIANT(/* == */ 1, _(" ......{WAIT_PRESS}\nWell, here we go...")), + VARIANT_DEFAULT(_(" ......{WAIT_PRESS}\nUh... Let's go.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d03p02_station.h b/src/data/ground/ground_data_d03p02_station.h index d22f473b..e0c9f622 100644 --- a/src/data/ground/ground_data_d03p02_station.h +++ b/src/data/ground/ground_data_d03p02_station.h @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0f, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Grr... I can't keep up!#W\nI'll flee for now!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Grr... I can't keep up!{WAIT_PRESS}\nI'll flee for now!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -64,9 +64,9 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey!\nWe sent $n3 packing!")), + VARIANT(/* == */ 1, _(" Hey!\nWe sent {NAME_3} packing!")), VARIANT(/* == */ 1, _(" You're safe now.\nCome on down!")), - VARIANT_DEFAULT(_(" Hey there!\nWe chased $n3 off!")), + VARIANT_DEFAULT(_(" Hey there!\nWe chased {NAME_3} off!")), VARIANT_DEFAULT(_(" It's OK now.\nCome down over here.")), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -77,8 +77,8 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" OK, no sweat.#W\nWe'll go to you. Just wait.")), - VARIANT_DEFAULT(_(" OK, no problem.#W\nWe'll come to you. Just wait.")), + VARIANT(/* == */ 1, _(" OK, no sweat.{WAIT_PRESS}\nWe'll go to you. Just wait.")), + VARIANT_DEFAULT(_(" OK, no problem.{WAIT_PRESS}\nWe'll come to you. Just wait.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -93,7 +93,7 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0, what'll\nwe do?\nWe can't get across this.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, what'll\nwe do?\nWe can't get across this.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 1), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -104,12 +104,12 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey! It's those $n4\nfrom that rescue!")), - VARIANT_DEFAULT(_(" Oh, hi!\nYou're the $n4 we saved!")), + VARIANT(/* == */ 1, _(" Hey! It's those {NAME_4}\nfrom that rescue!")), + VARIANT_DEFAULT(_(" Oh, hi!\nYou're the {NAME_4} we saved!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" WE GOT WORD OF THIS.#W\nWE CAN RESCUE DIGLETT FROM THE\nSKY. BZBZBZZ!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" WE GOT WORD OF THIS.{WAIT_PRESS}\nWE CAN RESCUE DIGLETT FROM THE\nSKY. BZBZBZZ!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d04p01_station.h b/src/data/ground/ground_data_d04p01_station.h index 006cfe18..16d0e7a6 100644 --- a/src/data/ground/ground_data_d04p01_station.h +++ b/src/data/ground/ground_data_d04p01_station.h @@ -43,14 +43,14 @@ static const struct ScriptCommand s_gs184_g1_s0_lives0_dlg0[] = { /* 0x82343f8 * WAIT(20), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" This is it.\n$n2 is lost in these woods.")), - VARIANT(/* == */ 1, _(" $n3's crew\nshould have a head start on us.")), + VARIANT(/* == */ 1, _(" This is it.\n{NAME_2} is lost in these woods.")), + VARIANT(/* == */ 1, _(" {NAME_3}'s crew\nshould have a head start on us.")), VARIANT(/* == */ 1, _(" We'd better hurry.")), - VARIANT(/* == */ 3, _(" This is it.\n$n2 is lost somewhere in these\nwoods.")), - VARIANT(/* == */ 3, _(" $n3's gang should\nalready be here.")), + VARIANT(/* == */ 3, _(" This is it.\n{NAME_2} is lost somewhere in these\nwoods.")), + VARIANT(/* == */ 3, _(" {NAME_3}'s gang should\nalready be here.")), VARIANT(/* == */ 3, _(" We ought to hurry.")), - VARIANT_DEFAULT(_(" This must be it.\n$n2 is lost somewhere in these\nwoods.")), - VARIANT_DEFAULT(_(" $n3's gang should\nbe in there already.")), + VARIANT_DEFAULT(_(" This must be it.\n{NAME_2} is lost somewhere in these\nwoods.")), + VARIANT_DEFAULT(_(" {NAME_3}'s gang should\nbe in there already.")), VARIANT_DEFAULT(_(" We need to hurry.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -96,14 +96,14 @@ static const struct ScriptCommand s_gs184_g2_s0_lives0_dlg0[] = { /* 0x8234830 * WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Let's move it, $n0!")), - VARIANT(/* == */ 1, _(" Even while we're dawdling\nhere, $n2's team...")), + VARIANT(/* == */ 1, _(" Let's move it, {NAME_0}!")), + VARIANT(/* == */ 1, _(" Even while we're dawdling\nhere, {NAME_2}'s team...")), VARIANT(/* == */ 1, _(" Hurry! Chop, chop!")), - VARIANT(/* == */ 3, _(" Let's hurry, $n0!")), - VARIANT(/* == */ 3, _(" While we're stuck\nback here, $n2's gang will be...")), + VARIANT(/* == */ 3, _(" Let's hurry, {NAME_0}!")), + VARIANT(/* == */ 3, _(" While we're stuck\nback here, {NAME_2}'s gang will be...")), VARIANT(/* == */ 3, _(" We have to hurry!")), - VARIANT_DEFAULT(_(" Let's hustle, $n0!")), - VARIANT_DEFAULT(_(" We're still stuck back here\nwhile $n2's gang is...")), + VARIANT_DEFAULT(_(" Let's hustle, {NAME_0}!")), + VARIANT_DEFAULT(_(" We're still stuck back here\nwhile {NAME_2}'s gang is...")), VARIANT_DEFAULT(_(" Come on, hurry!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d04p02_station.h b/src/data/ground/ground_data_d04p02_station.h index 04534fe5..e7535dd8 100644 --- a/src/data/ground/ground_data_d04p02_station.h +++ b/src/data/ground/ground_data_d04p02_station.h @@ -42,7 +42,7 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0003, 0x00000043, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Owowowow...#W\nYou'll pay for this!\nDon't you forget it!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Owowowow...{WAIT_PRESS}\nYou'll pay for this!\nDon't you forget it!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(16), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -60,8 +60,8 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Well, those pests are gone.\nLet's find $n2.")), - VARIANT_DEFAULT(_(" No one should hold us back\nnow. Let's find $n2.")), + VARIANT(/* == */ 1, _(" Well, those pests are gone.\nLet's find {NAME_2}.")), + VARIANT_DEFAULT(_(" No one should hold us back\nnow. Let's find {NAME_2}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(16), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Um, excuse me...") }, @@ -83,7 +83,7 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You must be $n2.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You must be {NAME_2}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Let's get you home.\nCaterpie was worried about you.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(16), diff --git a/src/data/ground/ground_data_d05p01_station.h b/src/data/ground/ground_data_d05p01_station.h index ddc7d492..e14f8b65 100644 --- a/src/data/ground/ground_data_d05p01_station.h +++ b/src/data/ground/ground_data_d05p01_station.h @@ -64,8 +64,8 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" So your friend $n2\nis somewhere deep in this canyon?")), - VARIANT_DEFAULT(_(" Your friend $n2\nis lost deep in this canyon?")), + VARIANT(/* == */ 1, _(" So your friend {NAME_2}\nis somewhere deep in this canyon?")), + VARIANT_DEFAULT(_(" Your friend {NAME_2}\nis lost deep in this canyon?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0d, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -78,8 +78,8 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Let's roll, $n0!")), - VARIANT_DEFAULT(_(" Let's go, $n0!")), + VARIANT(/* == */ 1, _(" Let's roll, {NAME_0}!")), + VARIANT_DEFAULT(_(" Let's go, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -100,19 +100,19 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * WAIT(10), { 0x2e, 0x0d, 0x0002, 0x00000041, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There's something I forgot\nto mention...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This canyon is known as\nthe #CDSilent Chasm#R, but...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This canyon is known as\nthe {COLOR YELLOW_D}Silent Chasm{RESET}, but...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's rumored that an amazing\nmonster sleeps here.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(473), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(NOTICE_FUNC), { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" M...#Wmonster?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" M...{WAIT_PRESS}monster?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes, but!#W\nIt's only folklore!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes, but!{WAIT_PRESS}\nIt's only folklore!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's also true that\nShiftry hasn't returned...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I just thought I should\nlet you know...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -126,7 +126,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh!#W\nWhat's wrong?!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh!{WAIT_PRESS}\nWhat's wrong?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -141,12 +141,12 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n0, you too,\nright?")), - VARIANT_DEFAULT(_(" Say, $n0, you're\nfeeling sick too, aren't you?")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}, you too,\nright?")), + VARIANT_DEFAULT(_(" Say, {NAME_0}, you're\nfeeling sick too, aren't you?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" $n0, you have\na stomachache too, don't you?")), - VARIANT_DEFAULT(_(" $n0, your stomach\nhurts too, doesn't it?")), + VARIANT(/* == */ 1, _(" {NAME_0}, you have\na stomachache too, don't you?")), + VARIANT_DEFAULT(_(" {NAME_0}, your stomach\nhurts too, doesn't it?")), CHOICE(/* label */ 12, _("It's true! It's tearing me up!")), CHOICE(/* label */ 13, _("Huh? I'm perfectly fine.")), LABEL(12), /* = 0x0c */ @@ -162,9 +162,9 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" See...\n$n0 is in pain too.")), + VARIANT(/* == */ 1, _(" See...\n{NAME_0} is in pain too.")), VARIANT(/* == */ 1, _(" Sorry, but we can't handle\nthis rescue...")), - VARIANT_DEFAULT(_(" See...\n$n0 is hurting too.")), + VARIANT_DEFAULT(_(" See...\n{NAME_0} is hurting too.")), VARIANT_DEFAULT(_(" I'm sorry, but we won't\nbe able to handle this rescue...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -172,7 +172,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Is that so?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But $n0...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But {NAME_0}...") }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hasn't had anything to\neat yet this morning.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -185,7 +185,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Owowow...#W\nI guess the cramping settled down...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Owowow...{WAIT_PRESS}\nI guess the cramping settled down...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -208,13 +208,13 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000003, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" What's wrong with you,\n$n0?!\nBack me up here!")), + VARIANT(/* == */ 1, _(" What's wrong with you,\n{NAME_0}?!\nBack me up here!")), VARIANT(/* == */ 1, _(" You're my partner!\nYou have to catch my drift better!")), - VARIANT_DEFAULT(_(" What's the matter,\n$n0?!\nI need you to back me!")), + VARIANT_DEFAULT(_(" What's the matter,\n{NAME_0}?!\nI need you to back me!")), VARIANT_DEFAULT(_(" If you're my partner, you\nneed to read my cues better!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wh-why this sudden\noutburst, $n1?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wh-why this sudden\noutburst, {NAME_1}?") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Don't you have a\nstomachache?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -227,9 +227,9 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Uh, yeah...")), - VARIANT(/* == */ 1, _(" Owowow...#W\nI guess the cramping settled down...")), + VARIANT(/* == */ 1, _(" Owowow...{WAIT_PRESS}\nI guess the cramping settled down...")), VARIANT_DEFAULT(_(" Uh, yes...")), - VARIANT_DEFAULT(_(" Owowow...#W\nI guess the cramping settled down...")), + VARIANT_DEFAULT(_(" Owowow...{WAIT_PRESS}\nI guess the cramping settled down...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -258,15 +258,15 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" All right...#W\nThere's nothing we can do about that.")), + VARIANT(/* == */ 1, _(" All right...{WAIT_PRESS}\nThere's nothing we can do about that.")), VARIANT(/* == */ 1, _(" We'll just have to hope the\nmonster doesn't really exist.")), - VARIANT_DEFAULT(_(" OK...#W\nWell, it can't be helped.")), + VARIANT_DEFAULT(_(" OK...{WAIT_PRESS}\nWell, it can't be helped.")), VARIANT_DEFAULT(_(" Let's just hope that monster\ndoesn't exist.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2d, 0x0a, 0x0000, 0x00000006, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My friend Jumpluff should\nbe around B$d0F.#W\nPlease take care!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My friend Jumpluff should\nbe around B{VALUE_0}F.{WAIT_PRESS}\nPlease take care!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -277,8 +277,8 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Let's roll, $n0!")), - VARIANT_DEFAULT(_(" Let's get going,\n$n0!")), + VARIANT(/* == */ 1, _(" Let's roll, {NAME_0}!")), + VARIANT_DEFAULT(_(" Let's get going,\n{NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d05p02_station.h b/src/data/ground/ground_data_d05p02_station.h index 670e9f6e..e65f35ff 100644 --- a/src/data/ground/ground_data_d05p02_station.h +++ b/src/data/ground/ground_data_d05p02_station.h @@ -51,8 +51,8 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * WAIT(32), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n2's friend is\nsupposed to be around here, right?")), - VARIANT_DEFAULT(_(" Isn't this the place?\nWhere $n2's friend is supposed\nto be?")), + VARIANT(/* == */ 1, _(" {NAME_2}'s friend is\nsupposed to be around here, right?")), + VARIANT_DEFAULT(_(" Isn't this the place?\nWhere {NAME_2}'s friend is supposed\nto be?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -77,11 +77,11 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Great!\nYour friend is waiting for you.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n3 is in the\nback...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_3} is in the\nback...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? $n3?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? {NAME_3}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, WAIT(5), @@ -112,7 +112,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Get away from here!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Get...#W\nGet away?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Get...{WAIT_PRESS}\nGet away?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_STOP, FANFARE_PLAY2(502), @@ -166,22 +166,22 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * WAIT(8), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(30), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Shi-$n3's gone!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Shi-{NAME_3}'s gone!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, WAIT(15), BGM_SWITCH(9), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I am $n6!\nThe embodiment of lightning!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I am {NAME_6}!\nThe embodiment of lightning!") }, { 0x2e, 0x0e, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" If you wish to save\n$n3, then scale #CDMt. Thunder#R!") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" If you wish to save\n{NAME_3}, then scale {COLOR YELLOW_D}Mt. Thunder{RESET}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n6...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_6}...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" So that's the legendary\nmonster...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), diff --git a/src/data/ground/ground_data_d06p01_station.h b/src/data/ground/ground_data_d06p01_station.h index 051b6470..f2cf5341 100644 --- a/src/data/ground/ground_data_d06p01_station.h +++ b/src/data/ground/ground_data_d06p01_station.h @@ -52,15 +52,15 @@ static const struct ScriptCommand s_gs188_g1_s0_lives0_dlg0[] = { /* 0x82392cc * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" This must be the foot of\n#CDMt. Thunder#R...")), - VARIANT(/* == */ 1, _(" I wonder if $n3's\nteam is already on the way...")), - VARIANT_DEFAULT(_(" This is the foot of\n#CDMt. Thunder#R.")), - VARIANT_DEFAULT(_(" I wonder...\nIs $n3's team already on\ntheir way?")), + VARIANT(/* == */ 1, _(" This must be the foot of\n{COLOR YELLOW_D}Mt. Thunder{RESET}...")), + VARIANT(/* == */ 1, _(" I wonder if {NAME_3}'s\nteam is already on the way...")), + VARIANT_DEFAULT(_(" This is the foot of\n{COLOR YELLOW_D}Mt. Thunder{RESET}.")), + VARIANT_DEFAULT(_(" I wonder...\nIs {NAME_3}'s team already on\ntheir way?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n2, huh...#W\nIt sounds really tough.")), - VARIANT_DEFAULT(_(" $n2...#W\nIt sounds very tough...")), + VARIANT(/* == */ 1, _(" {NAME_2}, huh...{WAIT_PRESS}\nIt sounds really tough.")), + VARIANT_DEFAULT(_(" {NAME_2}...{WAIT_PRESS}\nIt sounds very tough...")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Brr... I'm shaking...") }, @@ -71,14 +71,14 @@ static const struct ScriptCommand s_gs188_g1_s0_lives0_dlg0[] = { /* 0x82392cc * { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But I can't be spooked\nby this.")), - VARIANT(/* == */ 1, _(" Our mission is to rescue\n$n4.")), - VARIANT(/* == */ 1, _(" $n0, let's give it\nour best!")), + VARIANT(/* == */ 1, _(" Our mission is to rescue\n{NAME_4}.")), + VARIANT(/* == */ 1, _(" {NAME_0}, let's give it\nour best!")), VARIANT(/* == */ 3, _(" I shouldn't get all scared\nnow!")), - VARIANT(/* == */ 3, _(" Our objective is to rescue\n$n4.")), - VARIANT(/* == */ 3, _(" $n0, let's do our\nbest!")), + VARIANT(/* == */ 3, _(" Our objective is to rescue\n{NAME_4}.")), + VARIANT(/* == */ 3, _(" {NAME_0}, let's do our\nbest!")), VARIANT_DEFAULT(_(" I can't be scared now.")), - VARIANT_DEFAULT(_(" Our objective is simple.\nWe're rescuing $n4.")), - VARIANT_DEFAULT(_(" $n0, let's try\nour best!")), + VARIANT_DEFAULT(_(" Our objective is simple.\nWe're rescuing {NAME_4}.")), + VARIANT_DEFAULT(_(" {NAME_0}, let's try\nour best!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x23, 0x00, 0x003c, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -146,9 +146,9 @@ static const struct ScriptCommand s_gs188_g2_s0_lives0_dlg0[] = { /* 0x8239a30 * WAIT(20), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0!\nThis time, we're gonna rescue\n$n2!")), + VARIANT(/* == */ 1, _(" {NAME_0}!\nThis time, we're gonna rescue\n{NAME_2}!")), VARIANT(/* == */ 1, _(" Let's give it our best!")), - VARIANT_DEFAULT(_(" $n0!\nWe'll rescue $n2 this time for\nsure!")), + VARIANT_DEFAULT(_(" {NAME_0}!\nWe'll rescue {NAME_2} this time for\nsure!")), VARIANT_DEFAULT(_(" Let's work hard at it!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x23, 0x00, 0x003c, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d06p02_station.h b/src/data/ground/ground_data_d06p02_station.h index 7595288c..213c9577 100644 --- a/src/data/ground/ground_data_d06p02_station.h +++ b/src/data/ground/ground_data_d06p02_station.h @@ -153,12 +153,12 @@ static const struct ScriptCommand s_gs189_g1_s0_lives0_dlg0[] = { /* 0x823a4d8 * WAIT(10), { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hmm...#W\nThings didn't go right for us...")), - VARIANT_DEFAULT(_(" Hmm...#W\nThings didn't turn out in our favor...")), + VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nThings didn't go right for us...")), + VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThings didn't turn out in our favor...")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But we should be getting\nclose.#W\nLet's keep going hard at it!")), - VARIANT_DEFAULT(_(" But we shouldn't be far.#W\nLet's keep doing our best!")), + VARIANT(/* == */ 1, _(" But we should be getting\nclose.{WAIT_PRESS}\nLet's keep going hard at it!")), + VARIANT_DEFAULT(_(" But we shouldn't be far.{WAIT_PRESS}\nLet's keep doing our best!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d06p03_station.h b/src/data/ground/ground_data_d06p03_station.h index bed74bcd..03a6daca 100644 --- a/src/data/ground/ground_data_d06p03_station.h +++ b/src/data/ground/ground_data_d06p03_station.h @@ -73,7 +73,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wh-what is going on...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Urrggh!#W\nUwoah!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Urrggh!{WAIT_PRESS}\nUwoah!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -101,14 +101,14 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Enough!#W\nThat's enough fighting.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I've calmed down.\nTake $n6 back.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Enough!{WAIT_PRESS}\nThat's enough fighting.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I've calmed down.\nTake {NAME_6} back.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You kids...\nYou've impressed me.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But...#W\nThings won't be this easy next time.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But...{WAIT_PRESS}\nThings won't be this easy next time.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I will go all out next time,\nso you'd best be prepared!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Until then, you'd better\nhone your skills!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -133,7 +133,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(NOTICE_FUNC), { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Look!\nThere's $n6!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Look!\nThere's {NAME_6}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -149,7 +149,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Ungh... Uh, yeah...#W\nSomehow, I am...") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Ungh... Uh, yeah...{WAIT_PRESS}\nSomehow, I am...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -160,7 +160,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" But that was an eye-opener.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Driving off that\n$n2.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Driving off that\n{NAME_2}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -168,7 +168,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I agree.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You're awfully strong for\na plain $m0.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You're awfully strong for\na plain {POKEMON_0}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(32), { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, @@ -176,7 +176,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ......") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I sensed it when we first\nmet...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Perhaps...#W\nYou aren't a Pokémon, are you?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Perhaps...{WAIT_PRESS}\nYou aren't a Pokémon, are you?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -184,8 +184,8 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wow!\nHow can you tell that?!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But you're right.\n$n0 isn't a Pokémon.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0 is a human.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But you're right.\n{NAME_0} isn't a Pokémon.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0} is a human.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(473), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -202,11 +202,11 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0 doesn't really\nknow what happened, either.")), - VARIANT(/* == */ 1, _(" $n0 just woke up\none morning here as a Pokémon...")), + VARIANT(/* == */ 1, _(" {NAME_0} doesn't really\nknow what happened, either.")), + VARIANT(/* == */ 1, _(" {NAME_0} just woke up\none morning here as a Pokémon...")), VARIANT(/* == */ 1, _(" ...And doesn't remember\na thing about being a human.")), - VARIANT_DEFAULT(_(" $n0 doesn't\nunderstand very much, either.")), - VARIANT_DEFAULT(_(" $n0 woke up\none morning here as a Pokémon...")), + VARIANT_DEFAULT(_(" {NAME_0} doesn't\nunderstand very much, either.")), + VARIANT_DEFAULT(_(" {NAME_0} woke up\none morning here as a Pokémon...")), VARIANT_DEFAULT(_(" ...And doesn't remember\nanything about being a human.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), @@ -214,35 +214,35 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Oh, that's right!#W\nLombre was saying something in the\nsquare.")), - VARIANT(/* == */ 1, _(" He said $n3\nknows everything.")), - VARIANT(/* == */ 1, _(" $n3, do you know\nwhy $n0 became a Pokémon?")), - VARIANT_DEFAULT(_(" Oh, wait!#W\nLombre said something in the square!")), - VARIANT_DEFAULT(_(" He said $n3 knows\neverything!")), - VARIANT_DEFAULT(_(" $n3, could you\nfigure out why $n0 became a\nPokémon?")), + VARIANT(/* == */ 1, _(" Oh, that's right!{WAIT_PRESS}\nLombre was saying something in the\nsquare.")), + VARIANT(/* == */ 1, _(" He said {NAME_3}\nknows everything.")), + VARIANT(/* == */ 1, _(" {NAME_3}, do you know\nwhy {NAME_0} became a Pokémon?")), + VARIANT_DEFAULT(_(" Oh, wait!{WAIT_PRESS}\nLombre said something in the square!")), + VARIANT_DEFAULT(_(" He said {NAME_3} knows\neverything!")), + VARIANT_DEFAULT(_(" {NAME_3}, could you\nfigure out why {NAME_0} became a\nPokémon?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ......") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" No...#W\nI can't determine that.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" No...{WAIT_PRESS}\nI can't determine that.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0001, 0x00000005, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh...\nI thought you would know...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" However...#W\nThere is a way for unveiling the truth.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nThere is a way for unveiling the truth.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0001, 0x0000000b, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, really? How?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Make way to the\n#C5Hill of the Ancients#R.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Make way to the\n{COLOR CYAN}Hill of the Ancients{RESET}.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" There, you will find a\nPokémon that stares into the sun all day...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" A Pokémon who is said to\nsee into the future.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Xatu is his name.#W\nHe should shed light on your puzzling\nfriend.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Xatu is his name.{WAIT_PRESS}\nHe should shed light on your puzzling\nfriend.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -254,20 +254,20 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0, let's roll!\nWe're going to the #C5Hill of the Ancients#R!")), + VARIANT(/* == */ 1, _(" {NAME_0}, let's roll!\nWe're going to the {COLOR CYAN}Hill of the Ancients{RESET}!")), VARIANT(/* == */ 1, _(" There's no time to lose!\nWe'd better go back quick!")), - VARIANT_DEFAULT(_(" $n0, let's go!\nOff to the #C5Hill of the Ancients#R!")), + VARIANT_DEFAULT(_(" {NAME_0}, let's go!\nOff to the {COLOR CYAN}Hill of the Ancients{RESET}!")), VARIANT_DEFAULT(_(" We can't waste any time!\nLet's go back quick!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Shiftry, you too.#W\nLet's hurry back.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Shiftry, you too.{WAIT_PRESS}\nLet's hurry back.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Uh... Yeah...#W\nI guess we should...") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Uh... Yeah...{WAIT_PRESS}\nI guess we should...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, @@ -280,8 +280,8 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0!")), - VARIANT_DEFAULT(_(" $n0!")), + VARIANT(/* == */ 1, _(" {NAME_0}!")), + VARIANT_DEFAULT(_(" {NAME_0}!")), { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(464), CALL_SCRIPT(NOTICE_FUNC), @@ -306,13 +306,13 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x0e, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Alakazam.#W\nI know you.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Alakazam.{WAIT_PRESS}\nI know you.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I don't think you're \ncompletely ignorant about this.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ......#W\nYou know something, don't you?") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ......{WAIT_PRESS}\nYou know something, don't you?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0f, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" There is something that\nconcerns me.#W\nBut it should go unspoken for now.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" There is something that\nconcerns me.{WAIT_PRESS}\nBut it should go unspoken for now.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...For their sake...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), diff --git a/src/data/ground/ground_data_d07p01_station.h b/src/data/ground/ground_data_d07p01_station.h index ed439292..6433a31e 100644 --- a/src/data/ground/ground_data_d07p01_station.h +++ b/src/data/ground/ground_data_d07p01_station.h @@ -44,20 +44,20 @@ static const struct ScriptCommand s_gs191_g1_s0_lives0_dlg0[] = { /* 0x823d8e0 * { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This is the #CDGreat Canyon#R...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This is the {COLOR YELLOW_D}Great Canyon{RESET}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The peak is called the\n#C5Hill of the Ancients#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The peak is called the\n{COLOR CYAN}Hill of the Ancients{RESET}.") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, { 0x2d, 0x0a, 0x0000, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n2 said that\nthe #C5Hill of the Ancients#R is on $d0F.")), - VARIANT(/* == */ 1, _(" That's where we'll find\n$n3.#W\n$n0, let's give it our best!")), - VARIANT_DEFAULT(_(" According to $n2,\nthe #C5Hill of the Ancients#R is on $d0F.")), - VARIANT_DEFAULT(_(" $n3 should be\nthere.#W\n$n0, let's do our best!")), + VARIANT(/* == */ 1, _(" {NAME_2} said that\nthe {COLOR CYAN}Hill of the Ancients{RESET} is on {VALUE_0}F.")), + VARIANT(/* == */ 1, _(" That's where we'll find\n{NAME_3}.{WAIT_PRESS}\n{NAME_0}, let's give it our best!")), + VARIANT_DEFAULT(_(" According to {NAME_2},\nthe {COLOR CYAN}Hill of the Ancients{RESET} is on {VALUE_0}F.")), + VARIANT_DEFAULT(_(" {NAME_3} should be\nthere.{WAIT_PRESS}\n{NAME_0}, let's do our best!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x23, 0x00, 0x0028, 0x00000000, 0x00000000, NULL }, @@ -113,11 +113,11 @@ static const struct ScriptCommand s_gs191_g2_s0_lives0_dlg0[] = { /* 0x823ddac * { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0!\nThis time we'll make it to the peak,\nall right?")), - VARIANT(/* == */ 1, _(" We'll meet $n3\nand ask about you, $n0.")), + VARIANT(/* == */ 1, _(" {NAME_0}!\nThis time we'll make it to the peak,\nall right?")), + VARIANT(/* == */ 1, _(" We'll meet {NAME_3}\nand ask about you, {NAME_0}.")), VARIANT(/* == */ 1, _(" Let's give it our best!")), - VARIANT_DEFAULT(_(" $n0!\nLet's make it to the peak this time!")), - VARIANT_DEFAULT(_(" We have to meet\n$n3 and get some information\non you, $n0.")), + VARIANT_DEFAULT(_(" {NAME_0}!\nLet's make it to the peak this time!")), + VARIANT_DEFAULT(_(" We have to meet\n{NAME_3} and get some information\non you, {NAME_0}.")), VARIANT_DEFAULT(_(" Let's do our best!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d07p02_station.h b/src/data/ground/ground_data_d07p02_station.h index 873f72ff..1684c454 100644 --- a/src/data/ground/ground_data_d07p02_station.h +++ b/src/data/ground/ground_data_d07p02_station.h @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#W\nWhat is it?#W\nHave you reason to see me?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nWhat is it?{WAIT_PRESS}\nHave you reason to see me?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, @@ -65,19 +65,19 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * WAIT(45), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hm! This...#W\nThis is a #CIClear Wing#R...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...#WI see.#W\nAbout the mirage Pokémon...#W\nThat is what you wish to know?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hm! This...{WAIT_PRESS}\nThis is a {COLOR GREEN_I}Clear Wing{RESET}...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...{WAIT_PRESS}I see.{WAIT_PRESS}\nAbout the mirage Pokémon...{WAIT_PRESS}\nThat is what you wish to know?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _(" #C6#RKwaaaaah!") }, + { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _(" {COLOR YELLOW}{RESET}Kwaaaaah!") }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(60), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" .......#W\nThe mirage Pokémon...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I know...#W\nLittle about it...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" .......{WAIT_PRESS}\nThe mirage Pokémon...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I know...{WAIT_PRESS}\nLittle about it...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............") }, @@ -94,7 +94,7 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * CALL_SCRIPT(NOTICE_FUNC), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" However!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There are Pokémon that\nlive, breathe, and prosper with\nthe very land.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They...#W\nrage with the eruptions of volcanoes...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They...{WAIT_PRESS}\nrage with the eruptions of volcanoes...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Roar as one with thunder...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And race with the north\nwind.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -106,19 +106,19 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" An island known as the\n“Three Fields.”") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There is one such field.\nThe #CDFiery Field#R!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There is one such field.\nThe {COLOR YELLOW_D}Fiery Field{RESET}!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" One of the Pokémon...\nA shadow of the mirage...is there.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Go.\nYou must go to the #CDFiery Field#R.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Go.\nYou must go to the {COLOR YELLOW_D}Fiery Field{RESET}.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The answers you seek...\nPerhaps they await you there.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Gained access to\n#+the #CDFiery Field#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Fiery Field{RESET}!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -194,16 +194,16 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Yes! We finally made it to\nthe top, $n0!")), - VARIANT_DEFAULT(_(" Yes! We've finally made it\nto the top, $n0!")), + VARIANT(/* == */ 1, _(" Yes! We finally made it to\nthe top, {NAME_0}!")), + VARIANT_DEFAULT(_(" Yes! We've finally made it\nto the top, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x08, 0x0002, 0x00000004, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" So this is the #C5Hill of\nthe Ancients#R...")), - VARIANT_DEFAULT(_(" This is the #C5Hill of the\nAncients#R...")), + VARIANT(/* == */ 1, _(" So this is the {COLOR CYAN}Hill of\nthe Ancients{RESET}...")), + VARIANT_DEFAULT(_(" This is the {COLOR CYAN}Hill of the\nAncients{RESET}...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -217,7 +217,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0!#W\nIs that $n2 over there?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!{WAIT_PRESS}\nIs that {NAME_2} over there?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -226,7 +226,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0x7a, 0x00, 0x003c, 0x00000002, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, WAIT(20), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Excuse me?#W\nAre you maybe $n2?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Excuse me?{WAIT_PRESS}\nAre you maybe {NAME_2}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ......") }, @@ -266,7 +266,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Maybe he's sleeping while\non his feet?") }, { 0x2e, 0x15, 0x0001, -0x00000002, 0x00000000, NULL }, ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT_DEFAULT(_(" $n0, what should\nwe do?")), + VARIANT_DEFAULT(_(" {NAME_0}, what should\nwe do?")), CHOICE(/* label */ 2, _("Tickle him.")), CHOICE(/* label */ 3, _("Attack him.")), LABEL(2), /* = 0x02 */ @@ -275,8 +275,8 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hah? Tickle him?#W\n...OK. I'll try it.")), - VARIANT_DEFAULT(_(" Huh? Tickle him?#W\n...OK. It's worth a try.")), + VARIANT(/* == */ 1, _(" Hah? Tickle him?{WAIT_PRESS}\n...OK. I'll try it.")), + VARIANT_DEFAULT(_(" Huh? Tickle him?{WAIT_PRESS}\n...OK. It's worth a try.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, @@ -329,8 +329,8 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" It's useless, $n0.\nI'm not getting any response.")), - VARIANT_DEFAULT(_(" It's no good, $n0.\nHe's not responding.")), + VARIANT(/* == */ 1, _(" It's useless, {NAME_0}.\nI'm not getting any response.")), + VARIANT_DEFAULT(_(" It's no good, {NAME_0}.\nHe's not responding.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(90), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -344,7 +344,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Snort...#W Giggle...") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Snort...{WAIT_PRESS} Giggle...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -358,9 +358,9 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" He finally started laughing...")), - VARIANT(/* == */ 1, _(" Maybe...#W\nIs he just dense?")), + VARIANT(/* == */ 1, _(" Maybe...{WAIT_PRESS}\nIs he just dense?")), VARIANT_DEFAULT(_(" He's finally laughing now...")), - VARIANT_DEFAULT(_(" Is he...#W\njust dense?")), + VARIANT_DEFAULT(_(" Is he...{WAIT_PRESS}\njust dense?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(90), BGM_STOP, @@ -401,8 +401,8 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * WAIT(60), { 0x2e, 0x03, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...#WOh, all right. \nYou really want me to do this.")), - VARIANT_DEFAULT(_(" ...#WFine, then.\nI'll do it, OK?")), + VARIANT(/* == */ 1, _(" ...{WAIT_PRESS}Oh, all right. \nYou really want me to do this.")), + VARIANT_DEFAULT(_(" ...{WAIT_PRESS}Fine, then.\nI'll do it, OK?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -420,8 +420,8 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0x2b, 0x00, 0x0000, 0x0000002d, 0x0000003c, NULL }, { 0x2e, 0x03, 0x0001, 0x00000003, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" All right. Counting down.#W\nThree...#W Two...#W One...#W Now...!")), - VARIANT_DEFAULT(_(" OK. Counting down.#W\nThree...#W Two...#W One...#W Now...!")), + VARIANT(/* == */ 1, _(" All right. Counting down.{WAIT_PRESS}\nThree...{WAIT_PRESS} Two...{WAIT_PRESS} One...{WAIT_PRESS} Now...!")), + VARIANT_DEFAULT(_(" OK. Counting down.{WAIT_PRESS}\nThree...{WAIT_PRESS} Two...{WAIT_PRESS} One...{WAIT_PRESS} Now...!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2b, 0x00, 0x0000, -0x00000001, -0x00000001, NULL }, @@ -449,8 +449,8 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Indeed.") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I am $n2.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You discerned my true\nidentity...#W\nYou are not an ordinary sort...") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I am {NAME_2}.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You discerned my true\nidentity...{WAIT_PRESS}\nYou are not an ordinary sort...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -466,7 +466,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You there.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You are no ordinary\nPokémon.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You are...#W\nhuman, yes?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You are...{WAIT_PRESS}\nhuman, yes?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -494,17 +494,17 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Then, you've got to tell us,\n$n2!")), - VARIANT_DEFAULT(_(" If you know, please tell us,\n$n2!")), + VARIANT(/* == */ 1, _(" Then, you've got to tell us,\n{NAME_2}!")), + VARIANT_DEFAULT(_(" If you know, please tell us,\n{NAME_2}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" This is my friend\n$n0...")), + VARIANT(/* == */ 1, _(" This is my friend\n{NAME_0}...")), VARIANT(/* == */ 1, _(" My friend woke up one\nmorning as a Pokémon.")), VARIANT(/* == */ 1, _(" Without remembering\nanything as a human being, too.")), - VARIANT_DEFAULT(_(" Next to me is my friend\n$n0...")), + VARIANT_DEFAULT(_(" Next to me is my friend\n{NAME_0}...")), VARIANT_DEFAULT(_(" My friend woke up one\nmorning as a Pokémon.")), VARIANT_DEFAULT(_(" And, without any memory as\na human.")), WAIT(30), @@ -512,8 +512,8 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n2, you can tell,\ncan't you?#W\nCan't you tell us?")), - VARIANT_DEFAULT(_(" $n2, you can tell,\ncan't you?#W\nPlease tell us.")), + VARIANT(/* == */ 1, _(" {NAME_2}, you can tell,\ncan't you?{WAIT_PRESS}\nCan't you tell us?")), + VARIANT_DEFAULT(_(" {NAME_2}, you can tell,\ncan't you?{WAIT_PRESS}\nPlease tell us.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................") }, @@ -526,10 +526,10 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wait. $n0\nbecoming a Pokémon and...#Wthe natural\ndisasters...#Ware related?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wait. {NAME_0}\nbecoming a Pokémon and...{WAIT_PRESS}the natural\ndisasters...{WAIT_PRESS}are related?!") }, { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What do you mean?!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What does $n0\nhave to do with the natural disasters\nwe've been seeing?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What does {NAME_0}\nhave to do with the natural disasters\nwe've been seeing?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ........................") }, @@ -546,7 +546,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There are bigger concerns...#W\nI am afraid...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There are bigger concerns...{WAIT_PRESS}\nI am afraid...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The world's balance...\nIt must be restored.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Or the unthinkable shall\nbefall our world.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -556,10 +556,10 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Wh-#Wwhat did you say?")), - VARIANT(/* == */ 1, _(" The world...#W\nThe unthinkable is going to happen?")), - VARIANT_DEFAULT(_(" Huh...?#W\nYou're serious?!")), - VARIANT_DEFAULT(_(" The world...#W\nThe unthinkable is coming?")), + VARIANT(/* == */ 1, _(" Wh-{WAIT_PRESS}what did you say?")), + VARIANT(/* == */ 1, _(" The world...{WAIT_PRESS}\nThe unthinkable is going to happen?")), + VARIANT_DEFAULT(_(" Huh...?{WAIT_PRESS}\nYou're serious?!")), + VARIANT_DEFAULT(_(" The world...{WAIT_PRESS}\nThe unthinkable is coming?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Every day I see it.\nThe same future every day...") }, @@ -568,10 +568,10 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Xa-$n2...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Xa-{NAME_2}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I fear it...#W\nThe world's destruction.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I fear it...{WAIT_PRESS}\nThe world's destruction.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), SELECT_LIVES(-1, 1), @@ -583,7 +583,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Kekeh!\nIsn't that a surprise!") }, { 0x2e, 0x02, 0x0003, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That $n0...\nwas human...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That {NAME_0}...\nwas human...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d08p01_station.h b/src/data/ground/ground_data_d08p01_station.h index d91e5e3f..e4647ca4 100644 --- a/src/data/ground/ground_data_d08p01_station.h +++ b/src/data/ground/ground_data_d08p01_station.h @@ -181,7 +181,7 @@ static const struct ScriptCommand s_gs193_g1_s0_lives0_dlg0[] = { /* 0x824313c * WAIT(20), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I think they went this way.") }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" They can't get away.\nNot from all of us.") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" We have to get rid of $n0\nquickly...") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" We have to get rid of {NAME_0}\nquickly...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(455), @@ -190,9 +190,9 @@ static const struct ScriptCommand s_gs193_g1_s0_lives0_dlg0[] = { /* 0x824313c * { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Whoa!\nThey're catching up to us already?")), - VARIANT(/* == */ 1, _(" $n0, we have to\nroll.")), + VARIANT(/* == */ 1, _(" {NAME_0}, we have to\nroll.")), VARIANT_DEFAULT(_(" Aww, no!\nAre they catching up to us?")), - VARIANT_DEFAULT(_(" $n0, we'd better\ngo.")), + VARIANT_DEFAULT(_(" {NAME_0}, we'd better\ngo.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, @@ -256,18 +256,18 @@ static const struct ScriptCommand s_gs193_g2_s0_lives0_dlg0[] = { /* 0x8243ab8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Urrggh...#W\nWe couldn't get through...")), - VARIANT_DEFAULT(_(" Ouch...#W\nWe couldn't break through...")), + VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), + VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" I think we got cocky and\ncareless, $n0.")), + VARIANT(/* == */ 1, _(" I think we got cocky and\ncareless, {NAME_0}.")), VARIANT(/* == */ 1, _(" Wonder what happened to\nthe Pokémon chasing us?\nAre they in the dungeon?")), VARIANT(/* == */ 1, _(" Well, running into them\nwould be bad trouble.\nLet's get through this...and fast.")), - VARIANT_DEFAULT(_(" I guess we got a little\ncareless, $n0.")), + VARIANT_DEFAULT(_(" I guess we got a little\ncareless, {NAME_0}.")), VARIANT_DEFAULT(_(" I wonder what became of\nthe Pokémon chasing us?\nAre they in the dungeon?")), VARIANT_DEFAULT(_(" We sure don't want to run\ninto them.\nLet's get through this quickly.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -339,8 +339,8 @@ static const struct ScriptCommand s_gs193_g3_s1_lives0_dlg0[] = { /* 0x8244078 * WAIT(1), { 0x8e, 0x01, 0x0000, 0x00000022, 0x00000000, NULL }, ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" Hey, $n0.\nAre you all ready?")), - VARIANT_DEFAULT(_(" Hi, $n0.\nAre you ready?")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nAre you all ready?")), + VARIANT_DEFAULT(_(" Hi, {NAME_0}.\nAre you ready?")), CHOICE(/* label */ 0, _("All set!")), CHOICE(/* label */ 1, _("Not yet.")), LABEL(1), /* = 0x01 */ @@ -459,7 +459,7 @@ static const struct ScriptCommand s_gs193_g4_s0_lives0_dlg0[] = { /* 0x8244804 * CALL_SCRIPT(NOTICE_FUNC), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What the...?#W\nIsn't this where we started from?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What the...?{WAIT_PRESS}\nIsn't this where we started from?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -469,12 +469,12 @@ static const struct ScriptCommand s_gs193_g4_s0_lives0_dlg0[] = { /* 0x8244804 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ............#W\nI guess that path just loops back to the\nstart.")), - VARIANT(/* == */ 1, _(" If we want to move on,\nI think our only choice is the #CDLapis Cave#R.")), - VARIANT(/* == */ 1, _(" $n0, let's give it\nour best!")), - VARIANT_DEFAULT(_(" ............#W\nI guess that path we took just loops back\nto where it started.")), - VARIANT_DEFAULT(_(" It looks like we have to go\nthrough the #CDLapis Cave#R to move on.")), - VARIANT_DEFAULT(_(" $n0, let's do our\nbest!")), + VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nI guess that path just loops back to the\nstart.")), + VARIANT(/* == */ 1, _(" If we want to move on,\nI think our only choice is the {COLOR YELLOW_D}Lapis Cave{RESET}.")), + VARIANT(/* == */ 1, _(" {NAME_0}, let's give it\nour best!")), + VARIANT_DEFAULT(_(" ............{WAIT_PRESS}\nI guess that path we took just loops back\nto where it started.")), + VARIANT_DEFAULT(_(" It looks like we have to go\nthrough the {COLOR YELLOW_D}Lapis Cave{RESET} to move on.")), + VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -524,8 +524,8 @@ static const struct ScriptCommand s_gs193_g5_s0_lives0_dlg0[] = { /* 0x8244d30 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Urrggh...#W\nWe couldn't get through...")), - VARIANT_DEFAULT(_(" Ouch...#W\nWe couldn't break through...")), + VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), + VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -533,9 +533,9 @@ static const struct ScriptCommand s_gs193_g5_s0_lives0_dlg0[] = { /* 0x8244d30 * { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We have to get through this\nfast, or they'll catch up to us.")), - VARIANT(/* == */ 1, _(" $n0, let's give it\nour best!")), + VARIANT(/* == */ 1, _(" {NAME_0}, let's give it\nour best!")), VARIANT_DEFAULT(_(" If we don't get through here\nfast, they'll catch up to us.")), - VARIANT_DEFAULT(_(" $n0, let's do our\nbest!")), + VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d08p02_station.h b/src/data/ground/ground_data_d08p02_station.h index dc97d2dd..44060f7e 100644 --- a/src/data/ground/ground_data_d08p02_station.h +++ b/src/data/ground/ground_data_d08p02_station.h @@ -68,7 +68,7 @@ static const struct ScriptCommand s_gs194_g1_s0_lives0_dlg0[] = { /* 0x8245734 * FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(NOTICE_FUNC), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Catch $n0!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Catch {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d09p01_station.h b/src/data/ground/ground_data_d09p01_station.h index 5c68a803..0fae1d1c 100644 --- a/src/data/ground/ground_data_d09p01_station.h +++ b/src/data/ground/ground_data_d09p01_station.h @@ -159,7 +159,7 @@ static const struct ScriptCommand s_gs195_g1_s0_station_sref_script[] = { /* 0x8 WAIT(60), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ........................") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...I think...#W\nThey're gone.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...I think...{WAIT_PRESS}\nThey're gone.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(25), { 0x3b, 0x3a, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -210,8 +210,8 @@ static const struct ScriptCommand s_gs195_g1_s0_lives0_dlg0[] = { /* 0x8246544 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But...#W\nThere's no point hiding out here.")), - VARIANT_DEFAULT(_(" But...#W\nThere isn't any point hiding here.")), + VARIANT(/* == */ 1, _(" But...{WAIT_PRESS}\nThere's no point hiding out here.")), + VARIANT_DEFAULT(_(" But...{WAIT_PRESS}\nThere isn't any point hiding here.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, @@ -222,8 +222,8 @@ static const struct ScriptCommand s_gs195_g1_s0_lives0_dlg0[] = { /* 0x8246544 * WAIT(10), { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0, we need to\nroll as soon as we're ready.")), - VARIANT_DEFAULT(_(" Let's go as soon as we're\nready, $n0.")), + VARIANT(/* == */ 1, _(" {NAME_0}, we need to\nroll as soon as we're ready.")), + VARIANT_DEFAULT(_(" Let's go as soon as we're\nready, {NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -295,8 +295,8 @@ static const struct ScriptCommand s_gs195_g2_s1_lives0_dlg0[] = { /* 0x8246bd0 * WAIT(1), { 0x8e, 0x01, 0x0000, 0x00000022, 0x00000000, NULL }, ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" $n0, are you ready\nto roll?")), - VARIANT_DEFAULT(_(" $n0, are you\nready?")), + VARIANT(/* == */ 1, _(" {NAME_0}, are you ready\nto roll?")), + VARIANT_DEFAULT(_(" {NAME_0}, are you\nready?")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("*Not yet.")), LABEL(3), /* = 0x03 */ @@ -425,8 +425,8 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Urrggh...#W\nWe couldn't get through...")), - VARIANT_DEFAULT(_(" Ouch...#W\nWe couldn't break through...")), + VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), + VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(463), @@ -434,19 +434,19 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x08, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ssh!#W\nSomeone's coming.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ssh!{WAIT_PRESS}\nSomeone's coming.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x86, 0x00, 0x0200, 0x00000007, 0x00000000, NULL }, { 0x6b, 0x00, 0x0200, 0x00000008, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Where are they?\n$n0 and that sidekick.") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Where are they?\n{NAME_0} and that sidekick.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Do you think they tried getting over\nMt. Blaze?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" No, that's impossible.#W\nNobody could ever get past it.") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" No, that's impossible.{WAIT_PRESS}\nNobody could ever get past it.") }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" They should be around here still.\nKeep looking!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), @@ -541,7 +541,7 @@ static const struct ScriptCommand s_gs195_g4_s0_lives0_dlg0[] = { /* 0x8247d30 * CALL_SCRIPT(NOTICE_FUNC), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What the...?#W\nIsn't this where we started from?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What the...?{WAIT_PRESS}\nIsn't this where we started from?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -551,12 +551,12 @@ static const struct ScriptCommand s_gs195_g4_s0_lives0_dlg0[] = { /* 0x8247d30 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ............#W\nI guess that path just loops back to the\nstart.")), - VARIANT(/* == */ 1, _(" If we want to move on,\nI think our only choice is #CDMt. Blaze#R.")), - VARIANT(/* == */ 1, _(" $n0, let's give it\nour best!")), - VARIANT_DEFAULT(_(" ............#W\nI guess that path we took just loops back\nto where it started.")), - VARIANT_DEFAULT(_(" It looks like we have to go\nover #CDMt. Blaze#R to move on.")), - VARIANT_DEFAULT(_(" $n0, let's do our\nbest!")), + VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nI guess that path just loops back to the\nstart.")), + VARIANT(/* == */ 1, _(" If we want to move on,\nI think our only choice is {COLOR YELLOW_D}Mt. Blaze{RESET}.")), + VARIANT(/* == */ 1, _(" {NAME_0}, let's give it\nour best!")), + VARIANT_DEFAULT(_(" ............{WAIT_PRESS}\nI guess that path we took just loops back\nto where it started.")), + VARIANT_DEFAULT(_(" It looks like we have to go\nover {COLOR YELLOW_D}Mt. Blaze{RESET} to move on.")), + VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -605,8 +605,8 @@ static const struct ScriptCommand s_gs195_g5_s0_lives0_dlg0[] = { /* 0x8248230 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Urrggh...#W\nWe couldn't get through...")), - VARIANT_DEFAULT(_(" Ouch...#W\nWe couldn't break through...")), + VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), + VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -614,9 +614,9 @@ static const struct ScriptCommand s_gs195_g5_s0_lives0_dlg0[] = { /* 0x8248230 * { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We have to get through this\nfast, or they'll catch up to us.")), - VARIANT(/* == */ 1, _(" $n0, let's give it\nour best!")), + VARIANT(/* == */ 1, _(" {NAME_0}, let's give it\nour best!")), VARIANT_DEFAULT(_(" If we don't get through here\nfast, they'll catch up to us.")), - VARIANT_DEFAULT(_(" $n0, let's do our\nbest!")), + VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d09p02_station.h b/src/data/ground/ground_data_d09p02_station.h index 84209f55..10b190b9 100644 --- a/src/data/ground/ground_data_d09p02_station.h +++ b/src/data/ground/ground_data_d09p02_station.h @@ -168,12 +168,12 @@ static const struct ScriptCommand s_gs196_g1_s0_lives0_dlg0[] = { /* 0x82491e4 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hmm...#W\nWell, that didn't go well.")), - VARIANT_DEFAULT(_(" Hmm...#W\nThat didn't work out...")), + VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nWell, that didn't go well.")), + VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThat didn't work out...")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But we almost made it.#W\nLet's give it our best again!")), - VARIANT_DEFAULT(_(" But we came close.#W\nLet's keep doing our best!")), + VARIANT(/* == */ 1, _(" But we almost made it.{WAIT_PRESS}\nLet's give it our best again!")), + VARIANT_DEFAULT(_(" But we came close.{WAIT_PRESS}\nLet's keep doing our best!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d09p03_station.h b/src/data/ground/ground_data_d09p03_station.h index e5ad59b5..b260897d 100644 --- a/src/data/ground/ground_data_d09p03_station.h +++ b/src/data/ground/ground_data_d09p03_station.h @@ -89,17 +89,17 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * WAIT(15), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................#W\nDo you say that sincerely?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}\nDo you say that sincerely?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I'm not lying to you.\nBelieve me.")), - VARIANT(/* == */ 1, _(" If you think I'm lying...#W\nLook at my eyes!")), + VARIANT(/* == */ 1, _(" If you think I'm lying...{WAIT_PRESS}\nLook at my eyes!")), VARIANT(/* == */ 3, _(" It's true!\nPlease believe me!")), - VARIANT(/* == */ 3, _(" If you think I'm lying...#W\nPlease, look at my eyes!")), + VARIANT(/* == */ 3, _(" If you think I'm lying...{WAIT_PRESS}\nPlease, look at my eyes!")), VARIANT_DEFAULT(_(" It's true!\nPlease believe me!")), - VARIANT_DEFAULT(_(" If you think I'm lying...#W\nLook at my eyes!")), + VARIANT_DEFAULT(_(" If you think I'm lying...{WAIT_PRESS}\nLook at my eyes!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ......") }, @@ -137,7 +137,7 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(SPREE_END_FUNC), WAIT(15), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#WFine.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Fine.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I trust that you aren't lying.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -157,7 +157,7 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * WAIT(15), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You may pass.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Get through Mt. Blaze.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And...#W\nPromise me this.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And...{WAIT_PRESS}\nPromise me this.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Promise me that you will\nfind the cause of the calamities that\nwrack our world...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And stop the disasters\nfrom sowing more destruction and\nsuffering.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -195,20 +195,20 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We're fugitives, so we can't\nget to it right away...")), VARIANT(/* == */ 1, _(" But we're a rescue team.")), - VARIANT(/* == */ 1, _(" We'll get to the bottom of\nwhat's causing the natural disasters.#W\nI promise.")), + VARIANT(/* == */ 1, _(" We'll get to the bottom of\nwhat's causing the natural disasters.{WAIT_PRESS}\nI promise.")), VARIANT(/* == */ 3, _(" We're being chased, so we\ncan't get on it right away...")), VARIANT(/* == */ 3, _(" But we're a rescue team.")), - VARIANT(/* == */ 3, _(" We'll get to the bottom of\nwhat's causing the natural calamities.#W\nI promise.")), + VARIANT(/* == */ 3, _(" We'll get to the bottom of\nwhat's causing the natural calamities.{WAIT_PRESS}\nI promise.")), VARIANT_DEFAULT(_(" We're being hunted, so we\ncan't get to it right away...")), VARIANT_DEFAULT(_(" But we're a rescue team.")), - VARIANT_DEFAULT(_(" We'll investigate what's\nbehind the natural calamities.#W\nI promise.")), + VARIANT_DEFAULT(_(" We'll investigate what's\nbehind the natural calamities.{WAIT_PRESS}\nI promise.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#W\nI will hold you to that promise.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nI will hold you to that promise.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You've made me believe that\nyou will honor that promise.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If you do not forget...#W\nthe courage you showed in facing me.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If you do not forget...{WAIT_PRESS}\nthe courage you showed in facing me.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -266,12 +266,12 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But I'm glad $n2\nunderstood us. Really.")), - VARIANT(/* == */ 1, _(" So, anyway...#W\nWe should get off Mt. Blaze ourselves.")), - VARIANT(/* == */ 3, _(" But it's really great that\n$n2 understood us.")), - VARIANT(/* == */ 3, _(" Anyway...#W\nWe should get off Mt. Blaze, too.")), - VARIANT_DEFAULT(_(" But I'm glad $n2\nunderstood us. That was key.")), - VARIANT_DEFAULT(_(" Anyway...#W\nLet's get off Mt. Blaze ourselves.")), + VARIANT(/* == */ 1, _(" But I'm glad {NAME_2}\nunderstood us. Really.")), + VARIANT(/* == */ 1, _(" So, anyway...{WAIT_PRESS}\nWe should get off Mt. Blaze ourselves.")), + VARIANT(/* == */ 3, _(" But it's really great that\n{NAME_2} understood us.")), + VARIANT(/* == */ 3, _(" Anyway...{WAIT_PRESS}\nWe should get off Mt. Blaze, too.")), + VARIANT_DEFAULT(_(" But I'm glad {NAME_2}\nunderstood us. That was key.")), + VARIANT_DEFAULT(_(" Anyway...{WAIT_PRESS}\nLet's get off Mt. Blaze ourselves.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), BGM_FADEOUT(150), diff --git a/src/data/ground/ground_data_d10p01_station.h b/src/data/ground/ground_data_d10p01_station.h index 28afa0af..a86f6108 100644 --- a/src/data/ground/ground_data_d10p01_station.h +++ b/src/data/ground/ground_data_d10p01_station.h @@ -172,9 +172,9 @@ static const struct ScriptCommand s_gs198_g1_s0_lives0_dlg0[] = { /* 0x824c290 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But there's no point in us\nsticking around here forever...")), - VARIANT(/* == */ 1, _(" We can only go forward!#W\nWe'll just have to go for it and get\nthrough this, $n0!")), + VARIANT(/* == */ 1, _(" We can only go forward!{WAIT_PRESS}\nWe'll just have to go for it and get\nthrough this, {NAME_0}!")), VARIANT_DEFAULT(_(" But hiding out in this area\nisn't the answer either...")), - VARIANT_DEFAULT(_(" We can only go forward.#W\nWe'll just have to keep our spirits up\nand keep going, $n0!")), + VARIANT_DEFAULT(_(" We can only go forward.{WAIT_PRESS}\nWe'll just have to keep our spirits up\nand keep going, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, WAIT(10), @@ -232,8 +232,8 @@ static const struct ScriptCommand s_gs198_g2_s1_lives0_dlg0[] = { /* 0x824c7d4 * WAIT(1), { 0x8e, 0x01, 0x0000, 0x00000022, 0x00000000, NULL }, ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" $n0, are you ready\nto roll?")), - VARIANT_DEFAULT(_(" $n0, are you\nready?")), + VARIANT(/* == */ 1, _(" {NAME_0}, are you ready\nto roll?")), + VARIANT_DEFAULT(_(" {NAME_0}, are you\nready?")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("*Not yet.")), LABEL(3), /* = 0x03 */ @@ -363,8 +363,8 @@ static const struct ScriptCommand s_gs198_g3_s0_lives0_dlg0[] = { /* 0x824d0c0 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Urrggh...#W\nWe couldn't get through...")), - VARIANT_DEFAULT(_(" Ouch...#W\nWe couldn't break through...")), + VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), + VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -372,8 +372,8 @@ static const struct ScriptCommand s_gs198_g3_s0_lives0_dlg0[] = { /* 0x824d0c0 * VARIANT_DEFAULT(_(" This is as tough as we\nexpected...")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But let's give it our best\nand get through this, $n0!")), - VARIANT_DEFAULT(_(" But let's keep trying our\nbest and get through this, $n0!")), + VARIANT(/* == */ 1, _(" But let's give it our best\nand get through this, {NAME_0}!")), + VARIANT_DEFAULT(_(" But let's keep trying our\nbest and get through this, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -426,17 +426,17 @@ static const struct ScriptCommand s_gs198_g4_s0_lives0_dlg0[] = { /* 0x824d500 * { 0x2d, 0x09, 0x0002, 0x00000066, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hmmm...#W\nWell, that didn't go well.")), - VARIANT_DEFAULT(_(" Hmm...#W\nWe didn't do well at all...")), + VARIANT(/* == */ 1, _(" Hmmm...{WAIT_PRESS}\nWell, that didn't go well.")), + VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nWe didn't do well at all...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" That $n2...\nHe's one tough customer.")), + VARIANT(/* == */ 1, _(" That {NAME_2}...\nHe's one tough customer.")), VARIANT(/* == */ 1, _(" But why aren't we allowed\nto go into this forest?")), - VARIANT(/* == */ 1, _(" ...It doesn't matter anyway.\nLet's give it our best, $n0!")), - VARIANT_DEFAULT(_(" That Pokémon,\n$n2, is pretty tough.")), + VARIANT(/* == */ 1, _(" ...It doesn't matter anyway.\nLet's give it our best, {NAME_0}!")), + VARIANT_DEFAULT(_(" That Pokémon,\n{NAME_2}, is pretty tough.")), VARIANT_DEFAULT(_(" But why are we forbidden\nfrom entering this forest?")), - VARIANT_DEFAULT(_(" It makes no difference.\n$n0, let's try our best!")), + VARIANT_DEFAULT(_(" It makes no difference.\n{NAME_0}, let's try our best!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -484,7 +484,7 @@ static const struct ScriptCommand s_gs198_g5_s0_lives0_dlg0[] = { /* 0x824d980 * CALL_SCRIPT(NOTICE_FUNC), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What the...?#W\nIsn't this where we started from?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What the...?{WAIT_PRESS}\nIsn't this where we started from?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -494,12 +494,12 @@ static const struct ScriptCommand s_gs198_g5_s0_lives0_dlg0[] = { /* 0x824d980 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ............#W\nI guess that path just loops back to the\nstart.")), - VARIANT(/* == */ 1, _(" If we want to move on,\nI think our only choice is the #CDFrosty\nForest#R.")), - VARIANT(/* == */ 1, _(" $n0, let's give it\nour best!")), - VARIANT_DEFAULT(_(" ............#W\nI guess that path we took just loops back\nto where it started.")), - VARIANT_DEFAULT(_(" It looks like we have to get\nthrough the #CDFrosty Forest#R to move on.")), - VARIANT_DEFAULT(_(" $n0, let's do our\nbest!")), + VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nI guess that path just loops back to the\nstart.")), + VARIANT(/* == */ 1, _(" If we want to move on,\nI think our only choice is the {COLOR YELLOW_D}Frosty\nForest{RESET}.")), + VARIANT(/* == */ 1, _(" {NAME_0}, let's give it\nour best!")), + VARIANT_DEFAULT(_(" ............{WAIT_PRESS}\nI guess that path we took just loops back\nto where it started.")), + VARIANT_DEFAULT(_(" It looks like we have to get\nthrough the {COLOR YELLOW_D}Frosty Forest{RESET} to move on.")), + VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -553,16 +553,16 @@ static const struct ScriptCommand s_gs198_g6_s0_lives0_dlg0[] = { /* 0x824ded4 * { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Urrggh...#W\nWe couldn't get through...")), - VARIANT_DEFAULT(_(" Ouch...#W\nWe couldn't break through...")), + VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), + VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" This is one harsh place,\nbut let's bear down and get through,\n$n0!")), - VARIANT_DEFAULT(_(" This is a harsh place,\nso let's do our best to get through,\n$n0!")), + VARIANT(/* == */ 1, _(" This is one harsh place,\nbut let's bear down and get through,\n{NAME_0}!")), + VARIANT_DEFAULT(_(" This is a harsh place,\nso let's do our best to get through,\n{NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d10p02_station.h b/src/data/ground/ground_data_d10p02_station.h index 0f57572c..0315f90a 100644 --- a/src/data/ground/ground_data_d10p02_station.h +++ b/src/data/ground/ground_data_d10p02_station.h @@ -169,8 +169,8 @@ static const struct ScriptCommand s_gs199_g1_s0_lives0_dlg0[] = { /* 0x824eea4 * { 0x2d, 0x09, 0x0002, 0x00000066, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hmm...#W\nWell, that didn't go well.")), - VARIANT_DEFAULT(_(" Hmm...#W\nThat didn't work out...")), + VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nWell, that didn't go well.")), + VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThat didn't work out...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, @@ -180,8 +180,8 @@ static const struct ScriptCommand s_gs199_g1_s0_lives0_dlg0[] = { /* 0x824eea4 * VARIANT_DEFAULT(_(" This is as tough as we\nexpected...")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But let's give it our best\nand get through this, $n0!")), - VARIANT_DEFAULT(_(" But let's keep trying our\nbest and get through this, $n0!")), + VARIANT(/* == */ 1, _(" But let's give it our best\nand get through this, {NAME_0}!")), + VARIANT_DEFAULT(_(" But let's keep trying our\nbest and get through this, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -237,19 +237,19 @@ static const struct ScriptCommand s_gs199_g2_s0_lives0_dlg0[] = { /* 0x824f33c * { 0x2d, 0x09, 0x0002, 0x00000066, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hmmm...#W\nWell, that didn't go well.")), - VARIANT_DEFAULT(_(" Hmm...#W\nWe didn't do well at all...")), + VARIANT(/* == */ 1, _(" Hmmm...{WAIT_PRESS}\nWell, that didn't go well.")), + VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nWe didn't do well at all...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" That $n2...\nHe's one tough customer.")), + VARIANT(/* == */ 1, _(" That {NAME_2}...\nHe's one tough customer.")), VARIANT(/* == */ 1, _(" But why aren't we allowed\nto go into this forest?")), - VARIANT(/* == */ 1, _(" It doesn't matter anyway.\nLet's give it our best, $n0!")), - VARIANT_DEFAULT(_(" That Pokémon,\n$n2, is pretty tough.")), + VARIANT(/* == */ 1, _(" It doesn't matter anyway.\nLet's give it our best, {NAME_0}!")), + VARIANT_DEFAULT(_(" That Pokémon,\n{NAME_2}, is pretty tough.")), VARIANT_DEFAULT(_(" But why are we forbidden\nfrom entering this forest?")), - VARIANT_DEFAULT(_(" It makes no difference.\n$n0, let's try our best!")), + VARIANT_DEFAULT(_(" It makes no difference.\n{NAME_0}, let's try our best!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d10p03_station.h b/src/data/ground/ground_data_d10p03_station.h index 8a9cbadd..b7092faf 100644 --- a/src/data/ground/ground_data_d10p03_station.h +++ b/src/data/ground/ground_data_d10p03_station.h @@ -27,11 +27,11 @@ static const struct ScriptCommand s_gs200_g1_s0_station_sref_script[] = { /* 0x8 BGM_FADEOUT(60), { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And so...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+After getting through the Frosty\n#+Forest, $n0's team...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Headed further north...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The more they advanced...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The harsher the conditions became...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And so...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}After getting through the Frosty\n{CENTER_ALIGN}Forest, {NAME_0}'s team...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Headed further north...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The more they advanced...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The harsher the conditions became...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -51,13 +51,13 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Please, $n2!")), + VARIANT(/* == */ 1, _(" Please, {NAME_2}!")), VARIANT(/* == */ 1, _(" We have to keep moving.\nWe have to get through this.")), VARIANT(/* == */ 1, _(" Please, let us pass!")), - VARIANT(/* == */ 3, _(" Please, $n2!")), + VARIANT(/* == */ 3, _(" Please, {NAME_2}!")), VARIANT(/* == */ 3, _(" We have to get through,\nno matter what.")), VARIANT(/* == */ 3, _(" Please, let us pass!")), - VARIANT_DEFAULT(_(" Please, $n2!")), + VARIANT_DEFAULT(_(" Please, {NAME_2}!")), VARIANT_DEFAULT(_(" We have to get through.\nNo matter what it takes.")), VARIANT_DEFAULT(_(" Please, let us pass!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -70,8 +70,8 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Why?#W\nWhy can't we pass?")), - VARIANT_DEFAULT(_(" Why?#W\nWhy can't we pass?")), + VARIANT(/* == */ 1, _(" Why?{WAIT_PRESS}\nWhy can't we pass?")), + VARIANT_DEFAULT(_(" Why?{WAIT_PRESS}\nWhy can't we pass?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -86,7 +86,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * VARIANT_DEFAULT(_(" W-warmed up?\n(I'm still freezing, but...)")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The flow of frigid air has\nbeen disturbed in the forest.#W\nSnow has started to melt.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The flow of frigid air has\nbeen disturbed in the forest.{WAIT_PRESS}\nSnow has started to melt.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Snow is melting.\nSnow that has never melted before.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This has never happened,\neven once.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Then you appeared in the\nforest.") }, @@ -105,21 +105,21 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * VARIANT_DEFAULT(_(" W-we don't have anything\nto do with that!\nIt's a coincidence!")), { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n2.\nYou have to listen.")), + VARIANT(/* == */ 1, _(" Hey, {NAME_2}.\nYou have to listen.")), VARIANT(/* == */ 1, _(" It's not our fault that the\nsnow is melting here.")), - VARIANT(/* == */ 1, _(" It's not just here.#W\nNatural disasters are happening all\nover the place.")), + VARIANT(/* == */ 1, _(" It's not just here.{WAIT_PRESS}\nNatural disasters are happening all\nover the place.")), VARIANT(/* == */ 1, _(" Even if we hadn't come, the\nfrigid air here would have been disturbed.")), - VARIANT(/* == */ 3, _(" Please, $n2.\nListen to me.")), + VARIANT(/* == */ 3, _(" Please, {NAME_2}.\nListen to me.")), VARIANT(/* == */ 3, _(" It's not our fault that the\nsnow is melting.")), - VARIANT(/* == */ 3, _(" It's not just here.#W\nRight now, natural calamities are occurring\neverywhere.")), + VARIANT(/* == */ 3, _(" It's not just here.{WAIT_PRESS}\nRight now, natural calamities are occurring\neverywhere.")), VARIANT(/* == */ 3, _(" The forest's frigid airflow\nwould have been disturbed even if we\nhadn't come.")), - VARIANT_DEFAULT(_(" Please, $n2.\nHear me out.")), + VARIANT_DEFAULT(_(" Please, {NAME_2}.\nHear me out.")), VARIANT_DEFAULT(_(" It isn't our fault that the\nsnow started melting here.")), - VARIANT_DEFAULT(_(" It's not just here.#W\nNatural calamities are taking place\neverywhere right now.")), + VARIANT_DEFAULT(_(" It's not just here.{WAIT_PRESS}\nNatural calamities are taking place\neverywhere right now.")), VARIANT_DEFAULT(_(" The forest's frigid airflow\nwould have been disturbed even if we\nhadn't come.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Is that all?#W\nYou expect me to believe that?!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Is that all?{WAIT_PRESS}\nYou expect me to believe that?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(685), @@ -135,7 +135,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waaaaaaaah!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Enough of your foolish talk!#W\nPrepare for your end!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Enough of your foolish talk!{WAIT_PRESS}\nPrepare for your end!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -186,17 +186,17 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The calamities taking place\nnow are of a special nature.\nI've never experienced such before.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#W\nSo, there are calamities besides this...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nSo, there are calamities besides this...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................#WFine.#W\nI will choose to believe you.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}Fine.{WAIT_PRESS}\nI will choose to believe you.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You may pass.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n2!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_2}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -215,7 +215,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yup! We promise,\n$n2!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yup! We promise,\n{NAME_2}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -230,7 +230,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you.#W\nYou saved us.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you.{WAIT_PRESS}\nYou saved us.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, @@ -238,7 +238,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0x2e, 0x0e, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ..................") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Rather than saying thanks,\nfocus on stopping the calamities before\nthey worsen.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" If they are left unchecked,\nworse will befall us...#W\nMy instinct warns me so.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" If they are left unchecked,\nworse will befall us...{WAIT_PRESS}\nMy instinct warns me so.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, @@ -252,7 +252,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ............#W\nI think it would be best if we combined\nforces...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nI think it would be best if we combined\nforces...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -266,7 +266,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * CALL_SCRIPT(JUMP_HAPPY_FUNC), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?#W\nYou will? Really?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?{WAIT_PRESS}\nYou will? Really?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -278,16 +278,16 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sniffle...\nThank you, $n3.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sniffle...\nThank you, {NAME_3}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), BGM_STOP, FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n3 joined the team!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_3} joined the team!") }, { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x1a, 0x0000, 0x00000000, 0x00000000, NULL }, - ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to $n3?")), + ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to {NAME_3}?")), CHOICE(/* label */ 29, _("*Yes.")), CHOICE(/* label */ 30, _("No.")), LABEL(29), /* = 0x1d */ diff --git a/src/data/ground/ground_data_d11p01_station.h b/src/data/ground/ground_data_d11p01_station.h index 59519989..b3234823 100644 --- a/src/data/ground/ground_data_d11p01_station.h +++ b/src/data/ground/ground_data_d11p01_station.h @@ -154,39 +154,39 @@ static const struct ScriptCommand s_gs201_g1_s0_lives0_dlg0[] = { /* 0x8252548 * { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...OK.\nSo that's what happened...")), - VARIANT(/* == */ 1, _(" $n2 appeared to\nyou...")), + VARIANT(/* == */ 1, _(" {NAME_2} appeared to\nyou...")), VARIANT(/* == */ 1, _(" So that's why you were\nlooking so stunned.")), VARIANT_DEFAULT(_(" ...Oh.\nSo something like that happened.")), - VARIANT_DEFAULT(_(" $n2 appeared to\nyou...")), + VARIANT_DEFAULT(_(" {NAME_2} appeared to\nyou...")), VARIANT_DEFAULT(_(" That's why you were\nlooking so stunned earlier.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But, wow...\n$n3 isn't just a legend.\nIt really exists...")), - VARIANT_DEFAULT(_(" I'm amazed, though...\n$n3 isn't just a legend.\nIt really exists...")), + VARIANT(/* == */ 1, _(" But, wow...\n{NAME_3} isn't just a legend.\nIt really exists...")), + VARIANT_DEFAULT(_(" I'm amazed, though...\n{NAME_3} isn't just a legend.\nIt really exists...")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" And that $n3 is\nat the peak way up there.")), - VARIANT_DEFAULT(_(" And that $n3 is up\nat the peak...")), + VARIANT(/* == */ 1, _(" And that {NAME_3} is\nat the peak way up there.")), + VARIANT_DEFAULT(_(" And that {NAME_3} is up\nat the peak...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000008, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Sniffle...#W\n$n0!")), + VARIANT(/* == */ 1, _(" Sniffle...{WAIT_PRESS}\n{NAME_0}!")), VARIANT(/* == */ 1, _(" All the effort we put into\ngetting here...\nIt's finally going to pay off!")), - VARIANT(/* == */ 1, _(" We'll meet $n3\nand get the truth!")), - VARIANT_DEFAULT(_(" Sniffle...#W\n$n0!")), + VARIANT(/* == */ 1, _(" We'll meet {NAME_3}\nand get the truth!")), + VARIANT_DEFAULT(_(" Sniffle...{WAIT_PRESS}\n{NAME_0}!")), VARIANT_DEFAULT(_(" All the effort we put into\ngetting here...\nIt's finally going to bear fruit!")), - VARIANT_DEFAULT(_(" We'll meet $n3\nand get the truth!")), + VARIANT_DEFAULT(_(" We'll meet {NAME_3}\nand get the truth!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" We'll finally clear your\nreputation, $n0!#W\nThat'll be great!")), - VARIANT_DEFAULT(_(" We'll finally get rid of the\nsuspicions others have about you,\n$n0!#W Awesome!")), + VARIANT(/* == */ 1, _(" We'll finally clear your\nreputation, {NAME_0}!{WAIT_PRESS}\nThat'll be great!")), + VARIANT_DEFAULT(_(" We'll finally get rid of the\nsuspicions others have about you,\n{NAME_0}!{WAIT_PRESS} Awesome!")), CHOICE(/* label */ 2, _("........................")), CHOICE(/* label */ 2, _("........................")), LABEL(2), /* = 0x02 */ @@ -194,15 +194,15 @@ static const struct ScriptCommand s_gs201_g1_s0_lives0_dlg0[] = { /* 0x8252548 * WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n0...")), - VARIANT(/* == */ 1, _(" You don't need to look so\nworried.#W\nIt'll be OK.")), - VARIANT(/* == */ 1, _(" $n0, I can\nunderstand how it'd be scary for you to\nmeet $n3.")), - VARIANT(/* == */ 1, _(" The heartless human who\nabandoned $n2...#W\nHow that might be you...")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}...")), + VARIANT(/* == */ 1, _(" You don't need to look so\nworried.{WAIT_PRESS}\nIt'll be OK.")), + VARIANT(/* == */ 1, _(" {NAME_0}, I can\nunderstand how it'd be scary for you to\nmeet {NAME_3}.")), + VARIANT(/* == */ 1, _(" The heartless human who\nabandoned {NAME_2}...{WAIT_PRESS}\nHow that might be you...")), VARIANT(/* == */ 1, _(" I bet you're scared,\nthinking that.")), - VARIANT_DEFAULT(_(" Listen, $n0...")), - VARIANT_DEFAULT(_(" ...Don't be so worried.#W\nIt will be all right.")), - VARIANT_DEFAULT(_(" It's only natural that you\nwould be scared of meeting $n3,\n$n0.")), - VARIANT_DEFAULT(_(" The heartless human who\nabandoned $n2...#W\nIt may be you...")), + VARIANT_DEFAULT(_(" Listen, {NAME_0}...")), + VARIANT_DEFAULT(_(" ...Don't be so worried.{WAIT_PRESS}\nIt will be all right.")), + VARIANT_DEFAULT(_(" It's only natural that you\nwould be scared of meeting {NAME_3},\n{NAME_0}.")), + VARIANT_DEFAULT(_(" The heartless human who\nabandoned {NAME_2}...{WAIT_PRESS}\nIt may be you...")), VARIANT_DEFAULT(_(" I can understand how\nyou could think that.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -211,33 +211,33 @@ static const struct ScriptCommand s_gs201_g1_s0_lives0_dlg0[] = { /* 0x8252548 * CHOICE(/* label */ 4, _("You believe so much in me?")), LABEL(4), /* = 0x04 */ { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hmm...?#W Well, there was\na time when I had some doubts...#W\nBut now...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hmm...?{WAIT_PRESS} Well, there was\na time when I had some doubts...{WAIT_PRESS}\nBut now...") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...I wonder why?#W\nI really don't know why.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...I wonder why?{WAIT_PRESS}\nI really don't know why.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But it doesn't matter now.#W\n$n0, you're a really good sort.")), + VARIANT(/* == */ 1, _(" But it doesn't matter now.{WAIT_PRESS}\n{NAME_0}, you're a really good sort.")), VARIANT(/* == */ 1, _(" You know, before...")), VARIANT(/* == */ 1, _(" When I first got the idea\nto start this rescue team...")), - VARIANT(/* == */ 1, _(" I met you in the Tiny\nWoods, $n0.")), + VARIANT(/* == */ 1, _(" I met you in the Tiny\nWoods, {NAME_0}.")), VARIANT(/* == */ 1, _(" Now that I think about it,\nthere was something different about you.\nJust a feeling.")), - VARIANT(/* == */ 3, _(" But it doesn't matter.\nI know you're a good sort, $n0...")), + VARIANT(/* == */ 3, _(" But it doesn't matter.\nI know you're a good sort, {NAME_0}...")), VARIANT(/* == */ 3, _(" Do you remember...?")), VARIANT(/* == */ 3, _(" When I first got the idea to\nstart a rescue team...")), - VARIANT(/* == */ 3, _(" I met you in the Tiny\nWoods, $n0...")), + VARIANT(/* == */ 3, _(" I met you in the Tiny\nWoods, {NAME_0}...")), VARIANT(/* == */ 3, _(" Even back then, I sensed\nthere was something different about you.")), - VARIANT_DEFAULT(_(" But it's all right.#W\n$n0, you're a really good sort.")), + VARIANT_DEFAULT(_(" But it's all right.{WAIT_PRESS}\n{NAME_0}, you're a really good sort.")), VARIANT_DEFAULT(_(" You know, before...")), VARIANT_DEFAULT(_(" When I first got the idea\nto start a rescue team...")), - VARIANT_DEFAULT(_(" I met you in the Tiny\nWoods, $n0.")), + VARIANT_DEFAULT(_(" I met you in the Tiny\nWoods, {NAME_0}.")), VARIANT_DEFAULT(_(" Now that I think about it,\nthere was something different about you.")), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" This is kind of weird,\nisn't it?#W\nBut I believe in you, $n0.")), - VARIANT(/* == */ 3, _(" It is weird, isn't it?#W\nBut I believe in you, $n0.")), - VARIANT_DEFAULT(_(" It is strange, isn't it?#W\nBut, $n0, I believe in you.")), + VARIANT(/* == */ 1, _(" This is kind of weird,\nisn't it?{WAIT_PRESS}\nBut I believe in you, {NAME_0}.")), + VARIANT(/* == */ 3, _(" It is weird, isn't it?{WAIT_PRESS}\nBut I believe in you, {NAME_0}.")), + VARIANT_DEFAULT(_(" It is strange, isn't it?{WAIT_PRESS}\nBut, {NAME_0}, I believe in you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -247,8 +247,8 @@ static const struct ScriptCommand s_gs201_g1_s0_lives0_dlg0[] = { /* 0x8252548 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0, let's give it\nour best!")), - VARIANT_DEFAULT(_(" $n0, let's do our\nbest!")), + VARIANT(/* == */ 1, _(" {NAME_0}, let's give it\nour best!")), + VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -328,8 +328,8 @@ static const struct ScriptCommand s_gs201_g2_s1_lives0_dlg0[] = { /* 0x8253910 * WAIT(1), { 0x8e, 0x01, 0x0000, 0x00000022, 0x00000000, NULL }, ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" Hey, $n0.\nAre you all ready?")), - VARIANT_DEFAULT(_(" Hi, $n0.\nAre you ready?")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nAre you all ready?")), + VARIANT_DEFAULT(_(" Hi, {NAME_0}.\nAre you ready?")), CHOICE(/* label */ 2, _("All set!")), CHOICE(/* label */ 3, _("Not yet.")), LABEL(3), /* = 0x03 */ @@ -462,16 +462,16 @@ static const struct ScriptCommand s_gs201_g3_s0_lives0_dlg0[] = { /* 0x82541ac * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Darn...#W\nThat didn't go well.")), - VARIANT_DEFAULT(_(" Ouch...#W\nThat turned out badly.")), + VARIANT(/* == */ 1, _(" Darn...{WAIT_PRESS}\nThat didn't go well.")), + VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nThat turned out badly.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is one seriously\nrough neighborhood...")), - VARIANT(/* == */ 1, _(" But let's storm our way\nto the peak, $n0!")), + VARIANT(/* == */ 1, _(" But let's storm our way\nto the peak, {NAME_0}!")), VARIANT_DEFAULT(_(" This is a seriously tough\nchallenge, but...")), - VARIANT_DEFAULT(_(" Let's be sure to reach the\npeak, $n0!")), + VARIANT_DEFAULT(_(" Let's be sure to reach the\npeak, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -526,7 +526,7 @@ static const struct ScriptCommand s_gs201_g4_s0_lives0_dlg0[] = { /* 0x82545ec * CALL_SCRIPT(NOTICE_FUNC), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What the...?#W\nIsn't this where we started from?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What the...?{WAIT_PRESS}\nIsn't this where we started from?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -536,12 +536,12 @@ static const struct ScriptCommand s_gs201_g4_s0_lives0_dlg0[] = { /* 0x82545ec * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ............#W\nI guess that path just loops back to the\nstart.")), - VARIANT(/* == */ 1, _(" If we want to move on,\nI think our only choice is #CDMt. Freeze#R.")), - VARIANT(/* == */ 1, _(" $n0, let's give it\nour best!")), - VARIANT_DEFAULT(_(" ............#W\nI guess that path we took just loops back\nto where it started.")), - VARIANT_DEFAULT(_(" It looks like we have to get\nover #CDMt. Freeze#R to move on.")), - VARIANT_DEFAULT(_(" $n0, let's do our\nbest!")), + VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nI guess that path just loops back to the\nstart.")), + VARIANT(/* == */ 1, _(" If we want to move on,\nI think our only choice is {COLOR YELLOW_D}Mt. Freeze{RESET}.")), + VARIANT(/* == */ 1, _(" {NAME_0}, let's give it\nour best!")), + VARIANT_DEFAULT(_(" ............{WAIT_PRESS}\nI guess that path we took just loops back\nto where it started.")), + VARIANT_DEFAULT(_(" It looks like we have to get\nover {COLOR YELLOW_D}Mt. Freeze{RESET} to move on.")), + VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -595,16 +595,16 @@ static const struct ScriptCommand s_gs201_g5_s0_lives0_dlg0[] = { /* 0x8254af8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Urrggh...#W\nWe couldn't get through...")), - VARIANT_DEFAULT(_(" Ouch...#W\nWe couldn't break through...")), + VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), + VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" This is one harsh place,\nbut let's bear down and get through,\n$n0!")), - VARIANT_DEFAULT(_(" This is a harsh place,\nso let's do our best to get through,\n$n0!")), + VARIANT(/* == */ 1, _(" This is one harsh place,\nbut let's bear down and get through,\n{NAME_0}!")), + VARIANT_DEFAULT(_(" This is a harsh place,\nso let's do our best to get through,\n{NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -659,7 +659,7 @@ static const struct ScriptCommand s_gs201_g6_s0_lives0_dlg0[] = { /* 0x8254f30 * { 0x89, 0x40, 0x0080, 0x00000003, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You're going to #CDMt. Freeze#R?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You're going to {COLOR YELLOW_D}Mt. Freeze{RESET}?") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Don't forget to take me,\nkekeh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d11p02_station.h b/src/data/ground/ground_data_d11p02_station.h index f54c0a4b..30fb4040 100644 --- a/src/data/ground/ground_data_d11p02_station.h +++ b/src/data/ground/ground_data_d11p02_station.h @@ -181,16 +181,16 @@ static const struct ScriptCommand s_gs202_g1_s0_lives0_dlg0[] = { /* 0x8255f00 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hmm...#W\nWell, that didn't go well.")), - VARIANT_DEFAULT(_(" Hmm...#W\nThat didn't work out...")), + VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nWell, that didn't go well.")), + VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThat didn't work out...")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But we didn't have far to\ngo!")), - VARIANT(/* == */ 1, _(" Let's storm our way to the\ntop this time, $n0!")), + VARIANT(/* == */ 1, _(" Let's storm our way to the\ntop this time, {NAME_0}!")), VARIANT_DEFAULT(_(" But we were very close!")), - VARIANT_DEFAULT(_(" Let's be sure to reach the\npeak this time, $n0!")), + VARIANT_DEFAULT(_(" Let's be sure to reach the\npeak this time, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d11p03_station.h b/src/data/ground/ground_data_d11p03_station.h index 39c4a429..2037f257 100644 --- a/src/data/ground/ground_data_d11p03_station.h +++ b/src/data/ground/ground_data_d11p03_station.h @@ -74,7 +74,7 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hey, Ninetales!#W\nWhere are you?! Come out!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hey, Ninetales!{WAIT_PRESS}\nWhere are you?! Come out!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), FANFARE_PLAY2(506), @@ -94,7 +94,7 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ............#WWhat do you want?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}What do you want?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(455), @@ -108,9 +108,9 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It is not my fault.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It all arose because you\nfled, isn't that so?") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" You fled from yourself as\na human...#W\nAnd you fled from Gardevoir.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" You fled from yourself as\na human...{WAIT_PRESS}\nAnd you fled from Gardevoir.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It was I who cast the curse.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But you became\n$m2 because you\nabandoned Gardevoir.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But you became\n{POKEMON_2} because you\nabandoned Gardevoir.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It was Gardevoir that bore\nmy curse, not you.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -119,18 +119,18 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Anyway...#W\nAbout that curse...#W\nHow about lifting it already?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Anyway...{WAIT_PRESS}\nAbout that curse...{WAIT_PRESS}\nHow about lifting it already?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(464), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" You...#W\nYou have the nerve to ask that?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" You...{WAIT_PRESS}\nYou have the nerve to ask that?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keh! That's right!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Imagine! Me asking anyone\nfor a favor!#W\nI'm breaking out in hives at the thought!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Imagine! Me asking anyone\nfor a favor!{WAIT_PRESS}\nI'm breaking out in hives at the thought!") }, { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Turn me down, and I'll\nKO you!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -152,7 +152,7 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Humph. I regret to inform...#W\nEven if you could defeat me, the curse\nwould remain.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Humph. I regret to inform...{WAIT_PRESS}\nEven if you could defeat me, the curse\nwould remain.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I don't have the power to\nlift curses.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -162,10 +162,10 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gegeh!\nWhat are you saying?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We $m3 are known\nto be vengeful in the extreme.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We {POKEMON_3} are known\nto be vengeful in the extreme.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Once we cast a curse,\nit is final...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Our curse is so powerful,\neven we cannot lift it...#W\nThere may be a way, however...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I became enraged at your\ntreacherous heart...#W\nAnd on it, I laid my curse.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Our curse is so powerful,\neven we cannot lift it...{WAIT_PRESS}\nThere may be a way, however...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I became enraged at your\ntreacherous heart...{WAIT_PRESS}\nAnd on it, I laid my curse.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" For that reason, depending\non your heart now, the curse may be\nlifted.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Take this with you.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -174,14 +174,14 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY(212), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n2 received the\n#+#CI9-Tail Crest#R from $n3.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2} received the\n{CENTER_ALIGN}{COLOR GREEN_I}9-Tail Crest{RESET} from {NAME_3}.") }, { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Gardevoir's physical form\nis sealed within the #CDMurky Cave#R.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The seal can be broken\nby that stone.#W\nThe #CI9-Tail Crest#R.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Gardevoir's physical form\nis sealed within the {COLOR YELLOW_D}Murky Cave{RESET}.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The seal can be broken\nby that stone.{WAIT_PRESS}\nThe {COLOR GREEN_I}9-Tail Crest{RESET}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(465), @@ -189,11 +189,11 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gotcha!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We just go to this\n#CDMurky Cave#R and plunk down that rock...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We just go to this\n{COLOR YELLOW_D}Murky Cave{RESET} and plunk down that rock...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And that breaks the seal,\nso good-bye to the curse!") }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nHow do you like that?\nIt's ridiculously simple!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There was a way to lift\nthe curse after all!#W\nYou had me scared! Kekeke!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There was a way to lift\nthe curse after all!{WAIT_PRESS}\nYou had me scared! Kekeke!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -212,9 +212,9 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That oaf...#W\nHe has changed in many ways...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But he is wavering...#W\nHis old and new emotions are clashing\nwithin his heart...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" If he would only realize that\nupon reaching the #CDMurky Cave#R...#W\nIf he does not...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That oaf...{WAIT_PRESS}\nHe has changed in many ways...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But he is wavering...{WAIT_PRESS}\nHis old and new emotions are clashing\nwithin his heart...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" If he would only realize that\nupon reaching the {COLOR YELLOW_D}Murky Cave{RESET}...{WAIT_PRESS}\nIf he does not...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -338,15 +338,15 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * { 0x2e, 0x0f, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We finally made it.")), - VARIANT(/* == */ 1, _(" This is the peak.#W\n...Right?")), - VARIANT(/* == */ 1, _(" Where could $n5\nbe?")), + VARIANT(/* == */ 1, _(" This is the peak.{WAIT_PRESS}\n...Right?")), + VARIANT(/* == */ 1, _(" Where could {NAME_5}\nbe?")), VARIANT_DEFAULT(_(" We've finally arrived.")), - VARIANT_DEFAULT(_(" This is the summit.#W\n...Isn't it?")), - VARIANT_DEFAULT(_(" I wonder where\n$n5 is?")), + VARIANT_DEFAULT(_(" This is the summit.{WAIT_PRESS}\n...Isn't it?")), + VARIANT_DEFAULT(_(" I wonder where\n{NAME_5} is?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" There they are!#W\nI've spotted $n0!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" There they are!{WAIT_PRESS}\nI've spotted {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" All right!\nI see them!") }, @@ -359,7 +359,7 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(10), { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" A-$n2!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" A-{NAME_2}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -368,7 +368,7 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Pipe down, $n4.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Pipe down, {NAME_4}.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We can finally settle\nthings here.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I can barely contain myself.\nI'm itching for a fight.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -377,7 +377,7 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" $n1.#W\nDon't think badly of me.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_1}.{WAIT_PRESS}\nDon't think badly of me.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I don't know how to show\nmercy.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -385,10 +385,10 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n0...#W\nI didn't wish for this conclusion...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_0}...{WAIT_PRESS}\nI didn't wish for this conclusion...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But this, too, is fate.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The role of a rescue team\nis to help bring peace.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We will...#W\ncrush you with every shred of our power!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We will...{WAIT_PRESS}\ncrush you with every shred of our power!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Get them!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -650,11 +650,11 @@ static const struct ScriptCommand s_gs203_g3_s0_station_sref_script[] = { /* 0x8 { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000058, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000067, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And thus...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Alakazam's team made their\n#+way underground to quell\n#+the awakened $n3.") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Meanwhile, cleared of all\n#+suspicion, $n0's team...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Put an end to their long\n#+and arduous journey...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And returned to their\n#+welcoming rescue team base.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And thus...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Alakazam's team made their\n{CENTER_ALIGN}way underground to quell\n{CENTER_ALIGN}the awakened {NAME_3}.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Meanwhile, cleared of all\n{CENTER_ALIGN}suspicion, {NAME_0}'s team...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Put an end to their long\n{CENTER_ALIGN}and arduous journey...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And returned to their\n{CENTER_ALIGN}welcoming rescue team base.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -692,7 +692,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...!#W\n$n5!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...!{WAIT_PRESS}\n{NAME_5}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -702,11 +702,11 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0x2e, 0x0c, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" W-what?!#W\n$n5?!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" W-what?!{WAIT_PRESS}\n{NAME_5}?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Th-that's $n5...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Th-that's {NAME_5}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0d, 0x0004, 0x00000041, 0x00000000, NULL }, @@ -718,33 +718,33 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 0x2e, 0x02, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0005, 0x00000001, -0x00000001, NULL }, BGM_SWITCH(6), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Cease fighting at once,\n$n2.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Cease fighting at once,\n{NAME_2}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" They are...#W\nmy guests.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" They are...{WAIT_PRESS}\nmy guests.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Tell us, $n5!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Tell us, {NAME_5}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Who was the human that\nappeared in your legend?") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" No, even before that, was\nthe legend itself a true event?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Depending on your reply...#W\nI may have no choice but to eliminate\nthem!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Depending on your reply...{WAIT_PRESS}\nI may have no choice but to eliminate\nthem!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Whether they consider my\ncurse to be a legend or not...") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I care not.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" However...#W\nIt did happen.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nIt did happen.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Many years ago, I tried to\nlay a curse on a human.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" It was then, however, that\n$n6, the human's partner, dashed\nin...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" It was then, however, that\n{NAME_6}, the human's partner, dashed\nin...") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" It selflessly bore the full\nbrunt of the curse meant for the human.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Then, the human did a\nselfish and cowardly thing.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" They abandoned\n$n6 and fled.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" They abandoned\n{NAME_6} and fled.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" The human eventually\nbecame a Pokémon.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Transformed into a\nPokémon, the human...#W\nThe human lives on.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Transformed into a\nPokémon, the human...{WAIT_PRESS}\nThe human lives on.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -755,7 +755,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" $n0...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" {NAME_0}...") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" You may relax.\nIt is not you.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(24), @@ -763,25 +763,25 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............#WJust now...#W\n...What did you just say?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Just now...{WAIT_PRESS}\n...What did you just say?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" $n0 is not the\nhuman that appears in the legend.\nThat is what I said.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" {NAME_0} is not the\nhuman that appears in the legend.\nThat is what I said.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Wh-#Wwhat...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Wh-{WAIT_PRESS}what...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000008, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ............#W\nWhat's wrong with me?#W\nI'm too tensed up to move...")), - VARIANT(/* == */ 3, _(" ............#W\nThere's something wrong...#W\nI'm too tensed up to move...")), - VARIANT_DEFAULT(_(" ............#W\nWhat's happening to me...?#W\nI'm too tensed up to move...")), + VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nWhat's wrong with me?{WAIT_PRESS}\nI'm too tensed up to move...")), + VARIANT(/* == */ 3, _(" ............{WAIT_PRESS}\nThere's something wrong...{WAIT_PRESS}\nI'm too tensed up to move...")), + VARIANT_DEFAULT(_(" ............{WAIT_PRESS}\nWhat's happening to me...?{WAIT_PRESS}\nI'm too tensed up to move...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -795,9 +795,9 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Deep breaths...\nIn... Out... In... Out... In... Out...")), - VARIANT(/* == */ 1, _(" ..................#WWhew...")), + VARIANT(/* == */ 1, _(" ..................{WAIT_PRESS}Whew...")), VARIANT_DEFAULT(_(" Deep breaths...\nIn... Out... In... Out... In... Out...")), - VARIANT_DEFAULT(_(" ..................#WWhew...")), + VARIANT_DEFAULT(_(" ..................{WAIT_PRESS}Whew...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -821,29 +821,29 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000a, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" That's great!#W\nI knew $n0 wasn't the one!")), - VARIANT(/* == */ 1, _(" It's just as I thought!#W\n$n0 wouldn't do anything like\nthat!")), - VARIANT(/* == */ 3, _(" That's great!#W\nI knew $n0 couldn't be the one!")), - VARIANT(/* == */ 3, _(" I knew it!#W\n$n0 couldn't possibly be\nanyone that terrible!")), - VARIANT_DEFAULT(_(" That's great!#W\nI knew that $n0 wasn't involved!")), - VARIANT_DEFAULT(_(" I knew it!#W\nThere's no way that $n0 would\ndo those terrible things!")), + VARIANT(/* == */ 1, _(" That's great!{WAIT_PRESS}\nI knew {NAME_0} wasn't the one!")), + VARIANT(/* == */ 1, _(" It's just as I thought!{WAIT_PRESS}\n{NAME_0} wouldn't do anything like\nthat!")), + VARIANT(/* == */ 3, _(" That's great!{WAIT_PRESS}\nI knew {NAME_0} couldn't be the one!")), + VARIANT(/* == */ 3, _(" I knew it!{WAIT_PRESS}\n{NAME_0} couldn't possibly be\nanyone that terrible!")), + VARIANT_DEFAULT(_(" That's great!{WAIT_PRESS}\nI knew that {NAME_0} wasn't involved!")), + VARIANT_DEFAULT(_(" I knew it!{WAIT_PRESS}\nThere's no way that {NAME_0} would\ndo those terrible things!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I have another thing to say.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" It is true that I foretold\nof the world's balance becoming unstable...") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" However, that human\nbecoming a Pokémon and the world's\nbalance are not linked in any way.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" The cause of the natural\ncalamities...#W\nIt exists elsewhere.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" The cause of the natural\ncalamities...{WAIT_PRESS}\nIt exists elsewhere.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000003, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey! You lot!#W\nYou were wrong!")), - VARIANT(/* == */ 1, _(" You doubted and hounded\n$n0!")), - VARIANT_DEFAULT(_(" Hey, you!#W\nYou were wrong!")), - VARIANT_DEFAULT(_(" You were wrong to hound\nand harass $n0!")), + VARIANT(/* == */ 1, _(" Hey! You lot!{WAIT_PRESS}\nYou were wrong!")), + VARIANT(/* == */ 1, _(" You doubted and hounded\n{NAME_0}!")), + VARIANT_DEFAULT(_(" Hey, you!{WAIT_PRESS}\nYou were wrong!")), + VARIANT_DEFAULT(_(" You were wrong to hound\nand harass {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, @@ -852,7 +852,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Uh...er...#W\nWe...uh...apologize.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Uh...er...{WAIT_PRESS}\nWe...uh...apologize.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -860,8 +860,8 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0003, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" No.#W\nI suspected Gengar right from the start.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" $n0 just doesn't\nlook like the treacherous type!#W\nHahahahaha...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" No.{WAIT_PRESS}\nI suspected Gengar right from the start.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_0} just doesn't\nlook like the treacherous type!{WAIT_PRESS}\nHahahahaha...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -873,7 +873,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But I must say...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You are to be commended\nfor prevailing through this cruel\njourney and discovering the truth.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Impressive, $n0.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Impressive, {NAME_0}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -891,18 +891,18 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...Hah?#W\nBut wait a second.")), - VARIANT_DEFAULT(_(" ...Huh?#W\nOh, but wait...")), + VARIANT(/* == */ 1, _(" ...Hah?{WAIT_PRESS}\nBut wait a second.")), + VARIANT_DEFAULT(_(" ...Huh?{WAIT_PRESS}\nOh, but wait...")), BGM_FADEOUT(150), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Why did $n0\nbecome a Pokémon?")), - VARIANT(/* == */ 1, _(" I understand that\n$n0 isn't the human that\nappeared in the legend...")), - VARIANT(/* == */ 1, _(" Then, why would\n$n0 become a Pokémon?")), - VARIANT(/* == */ 1, _(" $n0...#W\nWho are you?!")), - VARIANT_DEFAULT(_(" Then why did $n0\nturn into a Pokémon?")), - VARIANT_DEFAULT(_(" I understand that\n$n0 isn't the human from that\nlegend...")), - VARIANT_DEFAULT(_(" Then, how do you explain\n$n0 becoming a Pokémon?")), - VARIANT_DEFAULT(_(" $n0...#W\nWho are you?")), + VARIANT(/* == */ 1, _(" Why did {NAME_0}\nbecome a Pokémon?")), + VARIANT(/* == */ 1, _(" I understand that\n{NAME_0} isn't the human that\nappeared in the legend...")), + VARIANT(/* == */ 1, _(" Then, why would\n{NAME_0} become a Pokémon?")), + VARIANT(/* == */ 1, _(" {NAME_0}...{WAIT_PRESS}\nWho are you?!")), + VARIANT_DEFAULT(_(" Then why did {NAME_0}\nturn into a Pokémon?")), + VARIANT_DEFAULT(_(" I understand that\n{NAME_0} isn't the human from that\nlegend...")), + VARIANT_DEFAULT(_(" Then, how do you explain\n{NAME_0} becoming a Pokémon?")), + VARIANT_DEFAULT(_(" {NAME_0}...{WAIT_PRESS}\nWho are you?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(453), @@ -930,7 +930,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * BGM_FADEIN(60, 9), { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" The world's crust is\nshifting.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" The natural calamities are\nworsening.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" And...#W\nThe shifting of the ground...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" And...{WAIT_PRESS}\nThe shifting of the ground...") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" It will awaken the beast\nthat embodies the ground...\nThe beast that slept deep underground...") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Groudon will be awakened!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -954,7 +954,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What is that?#W\nWhat's a Groudon?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What is that?{WAIT_PRESS}\nWhat's a Groudon?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d12p01_station.h b/src/data/ground/ground_data_d12p01_station.h index 461244d1..9e1d3a56 100644 --- a/src/data/ground/ground_data_d12p01_station.h +++ b/src/data/ground/ground_data_d12p01_station.h @@ -110,10 +110,10 @@ static const struct ScriptCommand s_gs204_g1_s0_lives0_dlg0[] = { /* 0x825d228 * CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" So this is it...#W\nThe underground cavern where\n$n2 is...")), + VARIANT(/* == */ 1, _(" So this is it...{WAIT_PRESS}\nThe underground cavern where\n{NAME_2} is...")), VARIANT(/* == */ 1, _(" Look at the flowing\nstreams of lava...")), VARIANT(/* == */ 1, _(" It wouldn't surprise me if\nthe dungeon is scorching hot...")), - VARIANT_DEFAULT(_(" This must be it...#W\n$n2 is in this underground\ncavern.")), + VARIANT_DEFAULT(_(" This must be it...{WAIT_PRESS}\n{NAME_2} is in this underground\ncavern.")), VARIANT_DEFAULT(_(" Whew...\nLook at the streams of lava.")), VARIANT_DEFAULT(_(" It's going to be scorching\nhot in the dungeon, I think.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -175,8 +175,8 @@ static const struct ScriptCommand s_gs204_g2_s0_lives0_dlg0[] = { /* 0x825d818 * { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, WAIT(15), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" This time, we'll rescue\n$n2's team!\nLet's get it done!")), - VARIANT_DEFAULT(_(" This time, we have to\nrescue $n2's team!\nLet's not blow it!")), + VARIANT(/* == */ 1, _(" This time, we'll rescue\n{NAME_2}'s team!\nLet's get it done!")), + VARIANT_DEFAULT(_(" This time, we have to\nrescue {NAME_2}'s team!\nLet's not blow it!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d12p02_station.h b/src/data/ground/ground_data_d12p02_station.h index 37d5b708..c502cb63 100644 --- a/src/data/ground/ground_data_d12p02_station.h +++ b/src/data/ground/ground_data_d12p02_station.h @@ -152,12 +152,12 @@ static const struct ScriptCommand s_gs205_g1_s0_lives0_dlg0[] = { /* 0x825e344 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hmm...#W\nWell, that didn't go well.")), - VARIANT_DEFAULT(_(" Hmm...#W\nThat didn't work out...")), + VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nWell, that didn't go well.")), + VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThat didn't work out...")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But we didn't have far to\ngo!#W\nLet's give it our best!")), - VARIANT_DEFAULT(_(" But we were very close!#W\nLet's keep trying our best!")), + VARIANT(/* == */ 1, _(" But we didn't have far to\ngo!{WAIT_PRESS}\nLet's give it our best!")), + VARIANT_DEFAULT(_(" But we were very close!{WAIT_PRESS}\nLet's keep trying our best!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d12p04_station.h b/src/data/ground/ground_data_d12p04_station.h index 366a8b01..f9e5e780 100644 --- a/src/data/ground/ground_data_d12p04_station.h +++ b/src/data/ground/ground_data_d12p04_station.h @@ -32,8 +32,8 @@ static const struct ScriptCommand s_gs206_g1_s0_station_sref_script[] = { /* 0x8 { 0x2d, 0x09, 0x0000, 0x00000001, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000058, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000067, 0x00000000, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Having calmed $n2,\n#+$n0's team left the dungeon...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And returned to Pokémon Square\n#+together with $n1's team.") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Having calmed {NAME_2},\n{CENTER_ALIGN}{NAME_0}'s team left the dungeon...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And returned to Pokémon Square\n{CENTER_ALIGN}together with {NAME_1}'s team.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -85,7 +85,7 @@ static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Look! It's $n3!#W\n$n4 and $n5 too!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Look! It's {NAME_3}!{WAIT_PRESS}\n{NAME_4} and {NAME_5} too!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -102,7 +102,7 @@ static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 * { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0c, 0x0004, 0x00000043, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Did you do it?\n$n2?") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Did you do it?\n{NAME_2}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -121,7 +121,7 @@ static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0005, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What about $n2?#W\nWill it be OK?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What about {NAME_2}?{WAIT_PRESS}\nWill it be OK?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Your concern is unneeded.\nIt will awaken soon enough.") }, @@ -137,7 +137,7 @@ static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 * { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0005, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waah...#W\nAnother quake!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waah...{WAIT_PRESS}\nAnother quake!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Out! Quickly!") }, diff --git a/src/data/ground/ground_data_d13p01_station.h b/src/data/ground/ground_data_d13p01_station.h index 3d35f5f2..b40b6107 100644 --- a/src/data/ground/ground_data_d13p01_station.h +++ b/src/data/ground/ground_data_d13p01_station.h @@ -54,8 +54,8 @@ static const struct ScriptCommand s_gs207_g1_s0_lives0_dlg0[] = { /* 0x826008c * WAIT(60), { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Ouch...#W\nWhere are we?")), - VARIANT_DEFAULT(_(" Owowow...#W\nWhere are we?")), + VARIANT(/* == */ 1, _(" Ouch...{WAIT_PRESS}\nWhere are we?")), + VARIANT_DEFAULT(_(" Owowow...{WAIT_PRESS}\nWhere are we?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -64,7 +64,7 @@ static const struct ScriptCommand s_gs207_g1_s0_lives0_dlg0[] = { /* 0x826008c * CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wah!\n$n0, this is cool!#W\nWe're on clouds!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wah!\n{NAME_0}, this is cool!{WAIT_PRESS}\nWe're on clouds!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -77,7 +77,7 @@ static const struct ScriptCommand s_gs207_g1_s0_lives0_dlg0[] = { /* 0x826008c * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0, look up there!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, look up there!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -184,16 +184,16 @@ static const struct ScriptCommand s_gs207_g2_s0_lives0_dlg0[] = { /* 0x8260934 * WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" It must be at the very top...")), - VARIANT(/* == */ 1, _(" That must be where\n$n2 is...")), + VARIANT(/* == */ 1, _(" That must be where\n{NAME_2} is...")), VARIANT_DEFAULT(_(" It's at the top of this\ntower...")), - VARIANT_DEFAULT(_(" That's where $n2\nis...")), + VARIANT_DEFAULT(_(" That's where {NAME_2}\nis...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0!\nLet's give it our best!")), - VARIANT_DEFAULT(_(" $n0!\nLet's do our best on the climb!")), + VARIANT(/* == */ 1, _(" {NAME_0}!\nLet's give it our best!")), + VARIANT_DEFAULT(_(" {NAME_0}!\nLet's do our best on the climb!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d13p02_station.h b/src/data/ground/ground_data_d13p02_station.h index 3c2ab32e..8e7748cd 100644 --- a/src/data/ground/ground_data_d13p02_station.h +++ b/src/data/ground/ground_data_d13p02_station.h @@ -153,12 +153,12 @@ static const struct ScriptCommand s_gs208_g1_s0_lives0_dlg0[] = { /* 0x8261b84 * WAIT(10), { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hmm...#W\nWell, that didn't go well.")), - VARIANT_DEFAULT(_(" Hmm...#W\nThat didn't work out...")), + VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nWell, that didn't go well.")), + VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThat didn't work out...")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But we didn't have far to\ngo!#W\nLet's give it our best!")), - VARIANT_DEFAULT(_(" But we were very close!#W\nLet's keep trying our best!")), + VARIANT(/* == */ 1, _(" But we didn't have far to\ngo!{WAIT_PRESS}\nLet's give it our best!")), + VARIANT_DEFAULT(_(" But we were very close!{WAIT_PRESS}\nLet's keep trying our best!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d13p03_station.h b/src/data/ground/ground_data_d13p03_station.h index 0d0c30a1..841cd35e 100644 --- a/src/data/ground/ground_data_d13p03_station.h +++ b/src/data/ground/ground_data_d13p03_station.h @@ -86,9 +86,9 @@ static const struct ScriptCommand s_gs209_g1_s0_lives0_dlg0[] = { /* 0x826223c * WAIT(60), { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Wh-wh-what?! Quake?!#W\nIt can't be!")), + VARIANT(/* == */ 1, _(" Wh-wh-what?! Quake?!{WAIT_PRESS}\nIt can't be!")), VARIANT(/* == */ 1, _(" We're up on clouds...")), - VARIANT_DEFAULT(_(" Wh-wh-what?!\nAn earthquake?!#W\nIt's not possible!")), + VARIANT_DEFAULT(_(" Wh-wh-what?!\nAn earthquake?!{WAIT_PRESS}\nIt's not possible!")), VARIANT_DEFAULT(_(" We're on top of clouds...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -96,15 +96,15 @@ static const struct ScriptCommand s_gs209_g1_s0_lives0_dlg0[] = { /* 0x826223c * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" These are shock waves!#W\nAnd they're huge!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" These are shock waves!{WAIT_PRESS}\nAnd they're huge!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" That's it! I get it now!#W\nLook straight up, $n2!")), - VARIANT_DEFAULT(_(" That's it! I got it!#W\nLook straight up, $n2!")), + VARIANT(/* == */ 1, _(" That's it! I get it now!{WAIT_PRESS}\nLook straight up, {NAME_2}!")), + VARIANT_DEFAULT(_(" That's it! I got it!{WAIT_PRESS}\nLook straight up, {NAME_2}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -272,9 +272,9 @@ static const struct ScriptCommand s_gs209_g2_s0_lives0_dlg0[] = { /* 0x8262f4c * VARIANT_DEFAULT(_(" It's a shooting star!\nAnd it's enormous!")), VARIANT_DEFAULT(_(" It will destroy the world\nif it continues on its path!")), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" That's why we came,\n$n2. We need you to destroy\nthat falling star!")), - VARIANT(/* == */ 3, _(" That's why we came,\n$n2.\nPlease, destroy the falling star!")), - VARIANT_DEFAULT(_(" That's why we came,\n$n2.\nPlease, destroy the falling star!")), + VARIANT(/* == */ 1, _(" That's why we came,\n{NAME_2}. We need you to destroy\nthat falling star!")), + VARIANT(/* == */ 3, _(" That's why we came,\n{NAME_2}.\nPlease, destroy the falling star!")), + VARIANT_DEFAULT(_(" That's why we came,\n{NAME_2}.\nPlease, destroy the falling star!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -288,15 +288,15 @@ static const struct ScriptCommand s_gs209_g2_s0_lives0_dlg0[] = { /* 0x8262f4c * VARIANT_DEFAULT(_(" Yes!\nPlease hurry and destroy it!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#WBefore I try...#W\nI need to know your resolve.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Before I try...{WAIT_PRESS}\nI need to know your resolve.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The star has come too close.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If I were to loose my\nHyper Beam here...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You would not escape\nunscathed!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" So what?!#W\nWe knew that right from the start!")), - VARIANT_DEFAULT(_(" So?!#W\nWe accepted that from the start!")), + VARIANT(/* == */ 1, _(" So what?!{WAIT_PRESS}\nWe knew that right from the start!")), + VARIANT_DEFAULT(_(" So?!{WAIT_PRESS}\nWe accepted that from the start!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Well said!") }, diff --git a/src/data/ground/ground_data_d15p01_station.h b/src/data/ground/ground_data_d15p01_station.h index ec478d00..baccf205 100644 --- a/src/data/ground/ground_data_d15p01_station.h +++ b/src/data/ground/ground_data_d15p01_station.h @@ -34,30 +34,30 @@ static const struct ScriptCommand s_gs211_g1_s0_lives0_dlg0[] = { /* 0x826425c * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gwooooooooooh!#W\n...H-how dare you!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gwooooooooooh!{WAIT_PRESS}\n...H-how dare you!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" How...#W\nHow did this happen...?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But regardless, you have\nwon.#W\nLet me hear your wish.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" How...{WAIT_PRESS}\nHow did this happen...?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But regardless, you have\nwon.{WAIT_PRESS}\nLet me hear your wish.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Hm?! This...#W\nThis is the #CIRed Wing#R...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#WYou...#W\nStand back!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Hm?! This...{WAIT_PRESS}\nThis is the {COLOR GREEN_I}Red Wing{RESET}...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}You...{WAIT_PRESS}\nStand back!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Raikou's thunderbolt\n#+electrified the #CIRed Wing#R!") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The #CIRed Wing#R...#W\n#+transformed into\n#+the #CISunset Wing#R!") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Its subtle gradation of yellow\n#+to red is a truly beauteous sight!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Raikou's thunderbolt\n{CENTER_ALIGN}electrified the {COLOR GREEN_I}Red Wing{RESET}!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {COLOR GREEN_I}Red Wing{RESET}...{WAIT_PRESS}\n{CENTER_ALIGN}transformed into\n{CENTER_ALIGN}the {COLOR GREEN_I}Sunset Wing{RESET}!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Its subtle gradation of yellow\n{CENTER_ALIGN}to red is a truly beauteous sight!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Go northeast!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" To a place called the\n#CDNorthwind Field#R.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" To a place called the\n{COLOR YELLOW_D}Northwind Field{RESET}.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You will find a Pokémon\nthere named Suicune.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If you are lucky enough to\nmeet Suicune...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Perhaps your wish will\ncome true!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY(212), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 received\n#+the #CISunset Wing#R.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Sunset Wing{RESET}.") }, { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+And...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And...") }, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Gained access to\n#+the #CDNorthwind Field#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Northwind Field{RESET}!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d16p01_station.h b/src/data/ground/ground_data_d16p01_station.h index 9dfced55..4c9ee700 100644 --- a/src/data/ground/ground_data_d16p01_station.h +++ b/src/data/ground/ground_data_d16p01_station.h @@ -67,8 +67,8 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gwooooooh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Urghgh...#W\nI... I lost...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You...#W\nWhat do you wish?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Urghgh...{WAIT_PRESS}\nI... I lost...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You...{WAIT_PRESS}\nWhat do you wish?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, @@ -76,9 +76,9 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, 0x00000018, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Wh-what?! This is...\nthe #CIClear Wing#R...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...I understand now.#W\nTo meet that Pokémon...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#WStand aside.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Wh-what?! This is...\nthe {COLOR GREEN_I}Clear Wing{RESET}...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...I understand now.{WAIT_PRESS}\nTo meet that Pokémon...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Stand aside.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, @@ -95,8 +95,8 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * WAIT(10), { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Entei's fiery blast made\n#+the #CIClear Wing#R flare!") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The #CIClear Wing#R...#W\n#+transformed into the #CIRed Wing#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Entei's fiery blast made\n{CENTER_ALIGN}the {COLOR GREEN_I}Clear Wing{RESET} flare!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {COLOR GREEN_I}Clear Wing{RESET}...{WAIT_PRESS}\n{CENTER_ALIGN}transformed into the {COLOR GREEN_I}Red Wing{RESET}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(10), @@ -111,9 +111,9 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * BGM_SWITCH(114), WAIT(60), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Take this and go west!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There, you will find\nthe #CDLightning Field#R.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There, you will find\nthe {COLOR YELLOW_D}Lightning Field{RESET}.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You will know your path\nthere!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Now go!\nTo the #CDLightning Field#R!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Now go!\nTo the {COLOR YELLOW_D}Lightning Field{RESET}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, WAIT(20), @@ -121,13 +121,13 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * WAIT(20), BGM_STOP, FANFARE_PLAY(212), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 received\n#+the #CIRed Wing#R.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Red Wing{RESET}.") }, { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+And...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And...") }, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Gained access to\n#+the #CDLightning Field#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Lightning Field{RESET}!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), diff --git a/src/data/ground/ground_data_d17p01_station.h b/src/data/ground/ground_data_d17p01_station.h index 03840f78..45562cda 100644 --- a/src/data/ground/ground_data_d17p01_station.h +++ b/src/data/ground/ground_data_d17p01_station.h @@ -65,12 +65,12 @@ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0002, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(685), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gwooooooooooh!#W\n...H-how dare you!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gwooooooooooh!{WAIT_PRESS}\n...H-how dare you!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" How...#W\nHow did this happen...?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But regardless, you have\nwon.#W\nLet me hear your wish.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" How...{WAIT_PRESS}\nHow did this happen...?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But regardless, you have\nwon.{WAIT_PRESS}\nLet me hear your wish.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, @@ -78,8 +78,8 @@ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, 0x00000018, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Hm?! This...#W\nThis is the #CIRed Wing#R...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#WYou...#W\nStand back!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Hm?! This...{WAIT_PRESS}\nThis is the {COLOR GREEN_I}Red Wing{RESET}...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}You...{WAIT_PRESS}\nStand back!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, @@ -94,8 +94,8 @@ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 * WAIT(1), { 0x27, 0x01, 0x0005, 0x00000003, 0x00505000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Raikou's thunderbolt\n#+electrified the #CIRed Wing#R!") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The #CIRed Wing#R...#W\n#+transformed into\n#+the #CISunset Wing#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Raikou's thunderbolt\n{CENTER_ALIGN}electrified the {COLOR GREEN_I}Red Wing{RESET}!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {COLOR GREEN_I}Red Wing{RESET}...{WAIT_PRESS}\n{CENTER_ALIGN}transformed into\n{CENTER_ALIGN}the {COLOR GREEN_I}Sunset Wing{RESET}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(10), @@ -108,11 +108,11 @@ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 * { 0xe2, 0x00, 0x01fb, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(114), WAIT(60), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Its subtle gradation of yellow\n#+to red is a truly beauteous sight!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Its subtle gradation of yellow\n{CENTER_ALIGN}to red is a truly beauteous sight!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Go northeast!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" To a place called the\n#CDNorthwind Field#R.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" To a place called the\n{COLOR YELLOW_D}Northwind Field{RESET}.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You will find a Pokémon\nthere named Suicune.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If you are lucky enough to\nmeet Suicune...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Perhaps your wish will\ncome true!") }, @@ -123,13 +123,13 @@ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 * WAIT(20), BGM_STOP, FANFARE_PLAY(212), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 received\n#+the #CISunset Wing#R.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Sunset Wing{RESET}.") }, { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+And...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And...") }, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Gained access to\n#+the #CDNorthwind Field#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Northwind Field{RESET}!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), diff --git a/src/data/ground/ground_data_d18p01_station.h b/src/data/ground/ground_data_d18p01_station.h index 1d13bfef..3e92ab97 100644 --- a/src/data/ground/ground_data_d18p01_station.h +++ b/src/data/ground/ground_data_d18p01_station.h @@ -76,9 +76,9 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, 0x00000018, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This!#W\nThe #CISunset Wing#R!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...I see.#W\nYou came seeking the mirage Pokémon...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...#WStep back.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This!{WAIT_PRESS}\nThe {COLOR GREEN_I}Sunset Wing{RESET}!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...I see.{WAIT_PRESS}\nYou came seeking the mirage Pokémon...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...{WAIT_PRESS}Step back.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, @@ -96,8 +96,8 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The north wind swirled\n#+around the #CISunset Wing#R!") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The #CISunset Wing#R...#W\n#+transformed into the #CIRainbow Wing#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The north wind swirled\n{CENTER_ALIGN}around the {COLOR GREEN_I}Sunset Wing{RESET}!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {COLOR GREEN_I}Sunset Wing{RESET}...{WAIT_PRESS}\n{CENTER_ALIGN}transformed into the {COLOR GREEN_I}Rainbow Wing{RESET}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(10), @@ -110,14 +110,14 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * { 0xe2, 0x00, 0x01fb, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(114), WAIT(60), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Glittering in the seven colors\n#+of the rainbow, this wing is\n#+beautiful beyond description!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Glittering in the seven colors\n{CENTER_ALIGN}of the rainbow, this wing is\n{CENTER_ALIGN}beautiful beyond description!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This #CIRainbow Wing#R...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This {COLOR GREEN_I}Rainbow Wing{RESET}...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It is the key to meeting\nthe mirage Pokémon.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Take this wing...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Take it to the mountain so\nhigh that its peak is obscured by clouds.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes...\nTake it to #CDMt. Faraway#R!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes...\nTake it to {COLOR YELLOW_D}Mt. Faraway{RESET}!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The mirage Pokémon is at\nits peak!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, @@ -126,13 +126,13 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * WAIT(20), BGM_STOP, FANFARE_PLAY(212), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 received\n#+the #CIRainbow Wing#R.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Rainbow Wing{RESET}.") }, { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+And...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And...") }, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Gained access to\n#+#CDMt. Faraway#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}{COLOR YELLOW_D}Mt. Faraway{RESET}!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), diff --git a/src/data/ground/ground_data_d19p01_station.h b/src/data/ground/ground_data_d19p01_station.h index 1f45dc02..e398ba08 100644 --- a/src/data/ground/ground_data_d19p01_station.h +++ b/src/data/ground/ground_data_d19p01_station.h @@ -39,26 +39,26 @@ static const struct ScriptCommand s_gs215_g1_s0_lives0_dlg0[] = { /* 0x82674cc * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I have lost...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I admit it.\nYou are strong.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This!#W\nThe #CISunset Wing#R!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...I see.#W\nYou came seeking the mirage Pokémon...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...#WStep back.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This!{WAIT_PRESS}\nThe {COLOR GREEN_I}Sunset Wing{RESET}!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...I see.{WAIT_PRESS}\nYou came seeking the mirage Pokémon...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...{WAIT_PRESS}Step back.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kyuuuuuuuuhn!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The north wind swirled\n#+around the #CISunset Wing#R!") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The #CISunset Wing#R...#W\n#+transformed into the #CIRainbow Wing#R!") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Glittering in the seven colors\n#+of the rainbow, this wing is\n#+beautiful beyond description!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The north wind swirled\n{CENTER_ALIGN}around the {COLOR GREEN_I}Sunset Wing{RESET}!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {COLOR GREEN_I}Sunset Wing{RESET}...{WAIT_PRESS}\n{CENTER_ALIGN}transformed into the {COLOR GREEN_I}Rainbow Wing{RESET}!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Glittering in the seven colors\n{CENTER_ALIGN}of the rainbow, this wing is\n{CENTER_ALIGN}beautiful beyond description!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This #CIRainbow Wing#R...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This {COLOR GREEN_I}Rainbow Wing{RESET}...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It is the key to meeting\nthe mirage Pokémon.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Take this wing...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Take it to the mountain so\nhigh that its peak is obscured by clouds.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes...\nTake it to #CDMt. Faraway#R!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes...\nTake it to {COLOR YELLOW_D}Mt. Faraway{RESET}!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The mirage Pokémon is at\nits peak!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 received\n#+the #CIRainbow Wing#R.") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+And...") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Gained access to\n#+#CDMt. Faraway#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Rainbow Wing{RESET}.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}{COLOR YELLOW_D}Mt. Faraway{RESET}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, diff --git a/src/data/ground/ground_data_d20p01_station.h b/src/data/ground/ground_data_d20p01_station.h index c1c58cf6..5392902b 100644 --- a/src/data/ground/ground_data_d20p01_station.h +++ b/src/data/ground/ground_data_d20p01_station.h @@ -24,8 +24,8 @@ static const struct ScriptCommand s_gs216_g1_s0_station_sref_script[] = { /* 0x8 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(216), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+One day...") }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+In a small cave\n#+in the distant west...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}One day...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}In a small cave\n{CENTER_ALIGN}in the distant west...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -55,7 +55,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * WAIT(30), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Hey!#W\nGet a move on!") }, + { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Hey!{WAIT_PRESS}\nGet a move on!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -63,7 +63,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Gasp, gasp...#W\nThis is rough going...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Gasp, gasp...{WAIT_PRESS}\nThis is rough going...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Heh! What's with you?\nYou're gonna whine about it now?") }, @@ -71,7 +71,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Saying you'd found a new\ncave and all!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yeah...#W\nI just happened to be swimming by in\nthe sea when I spotted this cave...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yeah...{WAIT_PRESS}\nI just happened to be swimming by in\nthe sea when I spotted this cave...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -79,19 +79,19 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I didn't expect it to be\na dungeon this rough...\nGasp, gasp...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Heh!#W\nI thought a different combo would be\na good change of pace...") }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" But you're pathetic!#W\nSo much for Mr. Big Shot $n1!") }, + { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Heh!{WAIT_PRESS}\nI thought a different combo would be\na good change of pace...") }, + { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" But you're pathetic!{WAIT_PRESS}\nSo much for Mr. Big Shot {NAME_1}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(472), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wh-what!#W\nCall me pathetic, will you?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wh-what!{WAIT_PRESS}\nCall me pathetic, will you?!") }, { 0x2e, 0x15, 0x0001, 0x00000003, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What you've seen of me\nso far is nothing!") }, { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Never...#W\nunderestimate $n1!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Never...{WAIT_PRESS}\nunderestimate {NAME_1}!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wroooooooaaaaar!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -99,14 +99,14 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, { 0x2e, 0x15, 0x0000, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Hahaha!#W\nThere! You're still feeling frisky!") }, + { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Hahaha!{WAIT_PRESS}\nThere! You're still feeling frisky!") }, { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" That's the spirit!#W\nI think we're getting close.\nLet's keep it going!") }, + { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" That's the spirit!{WAIT_PRESS}\nI think we're getting close.\nLet's keep it going!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...!#W\nSo you did that to motivate me...#W\n...Thanks.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...!{WAIT_PRESS}\nSo you did that to motivate me...{WAIT_PRESS}\n...Thanks.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Hey, no problem.\nLet's move!") }, @@ -120,12 +120,12 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * WAIT(60), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Hm?#W What's wrong?#W\nAre you still wiped out?") }, + { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Hm?{WAIT_PRESS} What's wrong?{WAIT_PRESS}\nAre you still wiped out?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), WAIT(30), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...No. That's not it.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Just now.#W\nDid you hear something?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Just now.{WAIT_PRESS}\nDid you hear something?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I thought I heard a voice...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -136,13 +136,13 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * { 0x92, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, WAIT(30), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" ...No?#W\nI don't hear anything.") }, + { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" ...No?{WAIT_PRESS}\nI don't hear anything.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_SWITCH(35), { 0x2b, 0x00, 0x0000, 0x0000003c, 0x0000003c, NULL }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ............#WIs it#W \nyou...?") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ......Who...disturbs...my sleep...#W\nIs it#W you?!\n") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Is it{WAIT_PRESS} \nyou...?") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ......Who...disturbs...my sleep...{WAIT_PRESS}\nIs it{WAIT_PRESS} you?!\n") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -156,7 +156,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * WAIT(30), { 0x2b, 0x00, 0x0000, -0x00000001, -0x00000001, NULL }, { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Wh-who's there?!") }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Who are you?!#W\nShow yourself!") }, + { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Who are you?!{WAIT_PRESS}\nShow yourself!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), FANFARE_PLAY2(453), @@ -164,7 +164,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * WAIT(60), { 0x2b, 0x00, 0x0000, 0x0000005a, 0x0000005a, NULL }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Me...?") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I was...#W\nEngineered...") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I was...{WAIT_PRESS}\nEngineered...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), WAIT(60), @@ -173,7 +173,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * { 0x28, 0x01, 0x0001, 0x00000005, 0x00ffffff, NULL }, WAIT(10), { 0x27, 0x01, 0x0001, 0x00000005, 0x00ffffff, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Created only to fight...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Created only to fight...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_STOP, @@ -189,7 +189,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * { 0x27, 0x01, 0x0001, 0x00000005, 0x00ffffff, NULL }, { 0x23, 0x01, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x2b, 0x00, 0x0000, 0x00000078, 0x00000078, NULL }, - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+The most powerful of all Pokémon!") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The most powerful of all Pokémon!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d21p01_station.h b/src/data/ground/ground_data_d21p01_station.h index 71677b58..666b2ecb 100644 --- a/src/data/ground/ground_data_d21p01_station.h +++ b/src/data/ground/ground_data_d21p01_station.h @@ -49,9 +49,9 @@ static const struct ScriptCommand s_gs217_g1_s0_lives0_dlg0[] = { /* 0x8269878 * WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#WPlease...\nPlease let me go...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I have to go...#W\nThere's somewhere that I have to go...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If...I don't hurry...#W\nM-my little sister...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Please...\nPlease let me go...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I have to go...{WAIT_PRESS}\nThere's somewhere that I have to go...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If...I don't hurry...{WAIT_PRESS}\nM-my little sister...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d22p01_station.h b/src/data/ground/ground_data_d22p01_station.h index 605622ad..9b97b896 100644 --- a/src/data/ground/ground_data_d22p01_station.h +++ b/src/data/ground/ground_data_d22p01_station.h @@ -88,7 +88,7 @@ static const struct ScriptCommand s_gs218_g1_s0_lives0_dlg0[] = { /* 0x826a108 * WAIT(60), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ............") }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...Y-you are...?") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...Did you maybe...#W\ncome to save me?") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...Did you maybe...{WAIT_PRESS}\ncome to save me?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEIN(20, 114), WAIT(10), @@ -98,8 +98,8 @@ static const struct ScriptCommand s_gs218_g1_s0_lives0_dlg0[] = { /* 0x826a108 * { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0d, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#W\nYes, I'll be fine.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My wing is still damaged\na little, but...#W\nI can go.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nYes, I'll be fine.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My wing is still damaged\na little, but...{WAIT_PRESS}\nI can go.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x6a, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d24p01_station.h b/src/data/ground/ground_data_d24p01_station.h index 17755706..349eb203 100644 --- a/src/data/ground/ground_data_d24p01_station.h +++ b/src/data/ground/ground_data_d24p01_station.h @@ -56,14 +56,14 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nWe're here at last!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This is it?\nThis is the deepest floor of the\n#CDMurky Cave#R?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This is it?\nThis is the deepest floor of the\n{COLOR YELLOW_D}Murky Cave{RESET}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, look!#W\nThere's a dais!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, look!{WAIT_PRESS}\nThere's a dais!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -77,7 +77,7 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(348), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n2 placed the #CI9-Tail Crest#R\n#+in the hollow spot.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2} placed the {COLOR GREEN_I}9-Tail Crest{RESET}\n{CENTER_ALIGN}in the hollow spot.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), BGM_STOP, @@ -107,7 +107,7 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * FANFARE_PLAY2(463), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............?#W\nHuh? I thought I heard something...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............?{WAIT_PRESS}\nHuh? I thought I heard something...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -132,13 +132,13 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That's odd...\nI could've sworn I heard something...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+...Wel...co...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}...Wel...co...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+...W...e...lc...ome...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}...W...e...lc...ome...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Welcome to\n#+the Murky Cave!") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Welcome to\n{CENTER_ALIGN}the Murky Cave!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(469), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -153,29 +153,29 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_SWITCH(6), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+I am the\n#+judge of darkness.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+You have nothing to fear from me.\n#+I mean you no harm.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Just now, a key was\n#+inserted to break a curse.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The curse...\n#+It is the one on $n3?") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I am the\n{CENTER_ALIGN}judge of darkness.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}You have nothing to fear from me.\n{CENTER_ALIGN}I mean you no harm.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Just now, a key was\n{CENTER_ALIGN}inserted to break a curse.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The curse...\n{CENTER_ALIGN}It is the one on {NAME_3}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh! Exactly!#W\nPlease lift the curse now!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh! Exactly!{WAIT_PRESS}\nPlease lift the curse now!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+I cannot allow that right away.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+I must first know if you\n#+have earned the right.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+I must evaluate you.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+You must bare your\n#+true feelings to me.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I cannot allow that right away.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I must first know if you\n{CENTER_ALIGN}have earned the right.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I must evaluate you.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}You must bare your\n{CENTER_ALIGN}true feelings to me.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh? What?#W\nYou're going to test me?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh? What?{WAIT_PRESS}\nYou're going to test me?") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What, I have to fight some\nboss creature?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Oh, no.\n#+Nothing so barbaric.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+All that I need is for some\n#+questions to be answered.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+However...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Oh, no.\n{CENTER_ALIGN}Nothing so barbaric.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}All that I need is for some\n{CENTER_ALIGN}questions to be answered.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}However...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(502), @@ -191,19 +191,19 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000046, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gegeh?! What the...?!#W\nI can't move!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gegeh?! What the...?!{WAIT_PRESS}\nI can't move!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n2, you will not\n#+be doing the answering...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2}, you will not\n{CENTER_ALIGN}be doing the answering...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(30), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0.\n#+You will answer.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0}.\n{CENTER_ALIGN}You will answer.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x6b, 0x00, 0x0080, 0x00000001, 0x00000000, NULL }, @@ -220,15 +220,15 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n2.#W\n#+Your heart is interwoven\n#+with conflicting emotions.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+You will probably never show\n#+the truth within your heart.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2}.{WAIT_PRESS}\n{CENTER_ALIGN}Your heart is interwoven\n{CENTER_ALIGN}with conflicting emotions.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}You will probably never show\n{CENTER_ALIGN}the truth within your heart.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh?!\nWhat?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 will enter\n#+$n2's heart.") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Please navigate carefully\n#+through $n2's emotions.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} will enter\n{CENTER_ALIGN}{NAME_2}'s heart.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Please navigate carefully\n{CENTER_ALIGN}through {NAME_2}'s emotions.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -337,11 +337,11 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * { 0x2d, 0x09, 0x0003, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(80), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n2.\n#+Whether you have the right\n#+to break the curse or not...") }, - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+I will now render\n#+my judgment.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2}.\n{CENTER_ALIGN}Whether you have the right\n{CENTER_ALIGN}to break the curse or not...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I will now render\n{CENTER_ALIGN}my judgment.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The curse...#W\n#+could not be lifted.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The curse...{WAIT_PRESS}\n{CENTER_ALIGN}could not be lifted.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -351,7 +351,7 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" W-wait...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+It is most regrettable, but\n#+the curse on $n3\n#+will last all eternity...") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}It is most regrettable, but\n{CENTER_ALIGN}the curse on {NAME_3}\n{CENTER_ALIGN}will last all eternity...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wait!\nWait a minute!") }, @@ -365,31 +365,31 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * { 0x6a, 0x00, 0x0100, -0x00000018, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, WAIT(20), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let me...#W\nLet me say something!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let me...{WAIT_PRESS}\nLet me say something!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEIN(60, 24), WAIT(60), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's true.\nI abandoned $n3 and ran.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's true.\nI abandoned {NAME_3} and ran.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I was afraid that the curse\nwould fall on me.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I had to get away, no matter\nwhat...#W\nThat's what I thought.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It didn't take long for me\nto forget about the curse and about\n$n3.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I had to get away, no matter\nwhat...{WAIT_PRESS}\nThat's what I thought.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It didn't take long for me\nto forget about the curse and about\n{NAME_3}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Many long years passed...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But $n3...#W\nShe never forgot about me.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" One night...#W\nIn $n4's dream, $n3\nsaid this...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But {NAME_3}...{WAIT_PRESS}\nShe never forgot about me.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" One night...{WAIT_PRESS}\nIn {NAME_4}'s dream, {NAME_3}\nsaid this...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That she considered me an\nirreplaceable friend, and that she still\nbelieved we would meet again...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n3 kept thinking\nabout someone like me.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_3} kept thinking\nabout someone like me.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000045, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But I...\nHow selfish I was.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I lived carefree all this\ntime...#W\nI realize now how selfish I was.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's not just $n3.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" #C5Team $t#R put up\nwith my selfishness and brought me here.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I lived carefree all this\ntime...{WAIT_PRESS}\nI realize now how selfish I was.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's not just {NAME_3}.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {COLOR CYAN}Team {TEAM_NAME}{RESET} put up\nwith my selfishness and brought me here.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I finally know what I was\nmissing.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What I lacked...#W\nIt was something for the others...#W\nA sense of gratitude.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What I lacked...{WAIT_PRESS}\nIt was something for the others...{WAIT_PRESS}\nA sense of gratitude.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(120), BGM_STOP, @@ -415,7 +415,7 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(15), - { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The lock bearing the curse...#W\n#+It has opened.") }, + { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The lock bearing the curse...{WAIT_PRESS}\n{CENTER_ALIGN}It has opened.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(506), @@ -429,7 +429,7 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000046, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ga-$n3!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ga-{NAME_3}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_FADEIN(60, 5), @@ -437,21 +437,21 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * WAIT(30), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" It worked, $n2!") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" It worked, {NAME_2}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" N-$n5!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" N-{NAME_5}!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...But...\nI don't know what you're saying...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" The curse has been broken.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I cast my curse, enraged at\nyour twisted heart.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" When your heart gained\nwhat it had been missing...\nThe curse was shattered.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" The final key to break the\ncurse...#W\nwas your sense of gratitude.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" The final key to break the\ncurse...{WAIT_PRESS}\nwas your sense of gratitude.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -459,13 +459,13 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Then, Gardevoir...?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" You may be reassured.\n$n3 has returned.#W\nShe will soon awaken.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" However...#W\nThat you were her partner in the past...") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" $n3 will have no\nrecollection of that.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" You may be reassured.\n{NAME_3} has returned.{WAIT_PRESS}\nShe will soon awaken.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nThat you were her partner in the past...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" {NAME_3} will have no\nrecollection of that.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#WThat doesn't matter.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n3 is back.#W\nThat's enough for me...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}That doesn't matter.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_3} is back.{WAIT_PRESS}\nThat's enough for me...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d24p02_station.h b/src/data/ground/ground_data_d24p02_station.h index f8656a47..d2cb62c6 100644 --- a/src/data/ground/ground_data_d24p02_station.h +++ b/src/data/ground/ground_data_d24p02_station.h @@ -45,7 +45,7 @@ static const struct ScriptCommand s_gs221_g1_s0_lives0_dlg0[] = { /* 0x826d898 * { 0x89, 0x50, 0x0099, 0x00000004, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You're going to the\n#CDMurky Cave#R?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You're going to the\n{COLOR YELLOW_D}Murky Cave{RESET}?") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Don't forget to take me,\nkekeh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_h29p01_station.h b/src/data/ground/ground_data_h29p01_station.h index 8ce53f82..a07f1a8b 100644 --- a/src/data/ground/ground_data_h29p01_station.h +++ b/src/data/ground/ground_data_h29p01_station.h @@ -293,16 +293,16 @@ static const struct ScriptCommand s_gs158_g2_s0_lives0_dlg0[] = { /* 0x820d22c * { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The guardian of the sea is\nsaid to arise.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Our arrival at the\n#CHLegendary Island#R...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Our arrival at the\n{COLOR GREEN_H}Legendary Island{RESET}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The three of us caused\nthe sea guardian to awaken.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It is what caused whirlpools\nto grow into tornadoes.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I have here the\n#C4Vortex Stone#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I have here the\n{COLOR GREEN}Vortex Stone{RESET}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Bearing it, you will gain\npassage through the sea's tornadoes...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It will lead you to a place\ncalled the #CDSilver Trench#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It will lead you to a place\ncalled the {COLOR YELLOW_D}Silver Trench{RESET}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There, you will find the\nguardian of the sea.") }, @@ -316,11 +316,11 @@ static const struct ScriptCommand s_gs158_g2_s0_lives0_dlg0[] = { /* 0x820d22c * WAIT(30), BGM_STOP, FANFARE_PLAY(212), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Obtained the #C4Vortex Stone#R.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Obtained the {COLOR GREEN}Vortex Stone{RESET}.") }, { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+And...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And...") }, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Gained access to\n#+the #CDSilver Trench#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Silver Trench{RESET}!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_s01_station.h b/src/data/ground/ground_data_s01_station.h index 4b181c24..fc545e43 100644 --- a/src/data/ground/ground_data_s01_station.h +++ b/src/data/ground/ground_data_s01_station.h @@ -19,12 +19,12 @@ static const struct ScriptCommand s_gs223_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO, BGM_STOP, SELECT_MAP(223), - { 0x37, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Welcome!") }, - { 0x37, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+This is the portal that leads\n#+to the world of Pokémon!") }, - { 0x37, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+But before I can let you through,\n#+I have several questions for you.") }, - { 0x37, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+I want you to answer them sincerely.") }, - { 0x37, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Are you ready?") }, - { 0x37, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+OK...#W\n#+Let the interview begin!") }, + { 0x37, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Welcome!") }, + { 0x37, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}This is the portal that leads\n{CENTER_ALIGN}to the world of Pokémon!") }, + { 0x37, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}But before I can let you through,\n{CENTER_ALIGN}I have several questions for you.") }, + { 0x37, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I want you to answer them sincerely.") }, + { 0x37, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Are you ready?") }, + { 0x37, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}OK...{WAIT_PRESS}\n{CENTER_ALIGN}Let the interview begin!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), BGM_SWITCH(12), diff --git a/src/data/ground/ground_data_t01p01_station.h b/src/data/ground/ground_data_t01p01_station.h index 4d172853..448152d5 100644 --- a/src/data/ground/ground_data_t01p01_station.h +++ b/src/data/ground/ground_data_t01p01_station.h @@ -390,7 +390,7 @@ static const struct ScriptCommand s_gs1_g0_s0_obj0_dlg2[] = { /* 0x8138fc0 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Welcome!\n#+The fun and bustling Pokémon Square!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Welcome!\n{CENTER_ALIGN}The fun and bustling Pokémon Square!") }, { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("Whiscash Pond ↑\n Pelipper Post Office →") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -402,7 +402,7 @@ static const struct ScriptCommand s_gs1_g0_s0_obj1_dlg2[] = { /* 0x81390c0 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+↑\n#+Whiscash Pond") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}↑\n{CENTER_ALIGN}Whiscash Pond") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, RET, @@ -413,7 +413,7 @@ static const struct ScriptCommand s_gs1_g0_s0_obj2_dlg2[] = { /* 0x8139158 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("\n#+Pelipper Post Office →") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("\n{CENTER_ALIGN}Pelipper Post Office →") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, RET, @@ -570,7 +570,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives6_dlg2[] = { /* 0x8139760 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What's your rescue rank?\nHow high'd you get it?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We're still Normal Rank.#W\nWe're trying, but...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We're still Normal Rank.{WAIT_PRESS}\nWe're trying, but...") }, JUMP_SCRIPT(END_TALK), }; @@ -580,10 +580,10 @@ static const struct ScriptCommand s_gs1_g1_s0_lives7_dlg2[] = { /* 0x8139840 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It sounds like the natural\ndisasters were interfering with our ability\nto evolve.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I think the timing's right.#W\nI should think about evolving...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But when I evolve...#W\nI become a #CMLudicolo#R...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You know? \n#CMLudicolo#R is a carefree Pokémon.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I don't know about having\nmy personality become carefree...#W\nWhat do you think? Huh?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I think the timing's right.{WAIT_PRESS}\nI should think about evolving...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But when I evolve...{WAIT_PRESS}\nI become a {COLOR CYAN_M}Ludicolo{RESET}...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You know? \n{COLOR CYAN_M}Ludicolo{RESET} is a carefree Pokémon.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I don't know about having\nmy personality become carefree...{WAIT_PRESS}\nWhat do you think? Huh?") }, JUMP_SCRIPT(END_TALK), }; @@ -593,8 +593,8 @@ static const struct ScriptCommand s_gs1_g1_s0_lives8_dlg2[] = { /* 0x8139a3c */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000050, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I've given up on trying to\nturn back into $m2.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" From now on, I'm living as\n$m1.\nPleased to meet you.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I've given up on trying to\nturn back into {POKEMON_2}.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" From now on, I'm living as\n{POKEMON_1}.\nPleased to meet you.") }, JUMP_SCRIPT(END_TALK), }; @@ -613,7 +613,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives10_dlg2[] = { /* 0x8139bf4 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder what's higher than\nthe Gold Rank?#W\nI can't imagine it.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder what's higher than\nthe Gold Rank?{WAIT_PRESS}\nI can't imagine it.") }, JUMP_SCRIPT(END_TALK), }; @@ -624,8 +624,8 @@ static const struct ScriptCommand s_gs1_g1_s0_lives11_dlg2[] = { /* 0x8139c9c */ WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" For many years, countless\nPokémon have served on rescue teams.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Many have engraved\ntheir names in glory.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But if anyone asks\nabout the greatest of them all...#W\nThere is but one hero.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's Lucario...#W\nwhose exploits as a rescue leader are the\nstuff of legend.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But if anyone asks\nabout the greatest of them all...{WAIT_PRESS}\nThere is but one hero.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's Lucario...{WAIT_PRESS}\nwhose exploits as a rescue leader are the\nstuff of legend.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I aspire to become like\nLucario.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" To become even closer to\nLucario's greatness...\nThat is my goal and my dream.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -846,7 +846,7 @@ static const struct ScriptCommand s_gs1_g4_s1_lives0_dlg0[] = { /* 0x813a9b4 */ { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, WAIT(60), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ....................................\n................................................\n................................................") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Belly...rumbling...#W\nHungry...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Belly...rumbling...{WAIT_PRESS}\nHungry...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -992,7 +992,7 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ WAIT(1), { 0x2e, 0x02, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, - ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" Munchlax hungry...#W\nYou have food?")), + ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" Munchlax hungry...{WAIT_PRESS}\nYou have food?")), CHOICE(/* label */ 1, _("Yes.")), CHOICE(/* label */ 2, _("No.")), LABEL(1), /* = 0x01 */ @@ -1008,19 +1008,19 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000045, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Nnnnn?#W\nOh... Don't have food...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Munchlax feel sad...#W\nMunchlax go now.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Nnnnn?{WAIT_PRESS}\nOh... Don't have food...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Munchlax feel sad...{WAIT_PRESS}\nMunchlax go now.") }, JUMP_SCRIPT(END_TALK), LABEL(3), /* = 0x03 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 gave Munchlax\n#+one #CI$i0#R.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} gave Munchlax\n{CENTER_ALIGN}one {COLOR GREEN_I}{MOVE_ITEM_0}{RESET}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Th-this #CI$i0#R!#W\nM-Munchlax big favorite!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Th-this {COLOR GREEN_I}{MOVE_ITEM_0}{RESET}!{WAIT_PRESS}\nM-Munchlax big favorite!") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(516), @@ -1030,7 +1030,7 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Nnnnnnnnn!#W\nDeeeeelicious!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Nnnnnnnnn!{WAIT_PRESS}\nDeeeeelicious!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000043, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Munchlax satisfied!") }, @@ -1038,7 +1038,7 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............#W\nYou, good to Munchlax.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nYou, good to Munchlax.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Munchlax say thank you\nwith this.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -1092,7 +1092,7 @@ static const struct ScriptCommand s_gs1_g4_s4_lives0_dlg2[] = { /* 0x813b988 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............#W\nYou, good to Munchlax.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nYou, good to Munchlax.") }, JUMP_SCRIPT(END_TALK), }; @@ -1411,14 +1411,14 @@ static const struct ScriptCommand s_gs1_g5_s4_lives0_dlg0[] = { /* 0x813c7e4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x0000007f, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" ............#WHey.#W\nThat belong to Munchlax.#W\nMunchlax want back.")), + ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" ............{WAIT_PRESS}Hey.{WAIT_PRESS}\nThat belong to Munchlax.{WAIT_PRESS}\nMunchlax want back.")), CHOICE(/* label */ 1, _("Return it.")), CHOICE(/* label */ 2, _("Keep it.")), LABEL(1), /* = 0x01 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), FANFARE_PLAY2(333), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 returned\n#+the #CIApple#R to Munchlax.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} returned\n{CENTER_ALIGN}the {COLOR GREEN_I}Apple{RESET} to Munchlax.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, @@ -1428,7 +1428,7 @@ static const struct ScriptCommand s_gs1_g5_s4_lives0_dlg0[] = { /* 0x813c7e4 */ { 0x2e, 0x15, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Snivel...\nMunchlax feel all squishy inside...") }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#W\nYou honest and nice.\nMunchlax like.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nYou honest and nice.\nMunchlax like.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Munchlax say thank you\nwith this.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -1448,18 +1448,18 @@ static const struct ScriptCommand s_gs1_g5_s4_lives0_dlg0[] = { /* 0x813c7e4 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000045, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Nnnnnnnnnnnn!#W\nNnnnnnnnnnnnnnnnnnnnnnnnnnnnnn!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Nnnnnnnnnnnn!{WAIT_PRESS}\nNnnnnnnnnnnnnnnnnnnnnnnnnnnnnn!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................#W\nMunchlax sad...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}\nMunchlax sad...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................#W\nMeanie...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}\nMeanie...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -1548,7 +1548,7 @@ static const struct ScriptCommand s_gs1_g5_s5_lives0_dlg2[] = { /* 0x813d140 */ DEBUGINFO, { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............#W\nYou, good to Munchlax.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nYou, good to Munchlax.") }, JUMP_SCRIPT(END_TALK), }; @@ -1565,7 +1565,7 @@ static const struct ScriptCommand s_gs1_g5_s6_lives0_dlg2[] = { /* 0x813d1d0 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x15, 0x0001, 0x00000045, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ..................#W\nMeanie...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}\nMeanie...") }, JUMP_SCRIPT(END_TALK), }; @@ -1626,36 +1626,36 @@ static const struct ScriptCommand s_gs1_g6_s0_lives0_dlg0[] = { /* 0x813d45c */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" That's the #C5Kecleon Shop#R.#W\nYou can buy and sell items there.")), - VARIANT_DEFAULT(_(" That's the #C5Kecleon Shop#R.#W\nYou can buy and sell items there.")), + VARIANT(/* == */ 1, _(" That's the {COLOR CYAN}Kecleon Shop{RESET}.{WAIT_PRESS}\nYou can buy and sell items there.")), + VARIANT_DEFAULT(_(" That's the {COLOR CYAN}Kecleon Shop{RESET}.{WAIT_PRESS}\nYou can buy and sell items there.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" That's #C5Felicity Bank#R.")), + VARIANT(/* == */ 1, _(" That's {COLOR CYAN}Felicity Bank{RESET}.")), VARIANT(/* == */ 1, _(" You can save your money\nthere.")), - VARIANT_DEFAULT(_(" That's #C5Felicity Bank#R.")), + VARIANT_DEFAULT(_(" That's {COLOR CYAN}Felicity Bank{RESET}.")), VARIANT_DEFAULT(_(" You can save your money\nthere.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" This is the\n#C5Gulpin Link Shop#R.#W\nGulpin will link moves for you.")), - VARIANT(/* == */ 1, _(" Hah?#W What's linking?#W\nWell, if you link moves...#W\nYou can use them at the same time.")), + VARIANT(/* == */ 1, _(" This is the\n{COLOR CYAN}Gulpin Link Shop{RESET}.{WAIT_PRESS}\nGulpin will link moves for you.")), + VARIANT(/* == */ 1, _(" Hah?{WAIT_PRESS} What's linking?{WAIT_PRESS}\nWell, if you link moves...{WAIT_PRESS}\nYou can use them at the same time.")), VARIANT(/* == */ 1, _(" If you need details, you'd\nbe better off asking Gulpin.")), - VARIANT(/* == */ 3, _(" This is the\n#C5Gulpin Link Shop#R.#W\nGulpin can link moves for you.")), - VARIANT(/* == */ 3, _(" Huh?#W What's linking?#W\nWell, if you link moves...#W\nYou can use them at the same time.")), + VARIANT(/* == */ 3, _(" This is the\n{COLOR CYAN}Gulpin Link Shop{RESET}.{WAIT_PRESS}\nGulpin can link moves for you.")), + VARIANT(/* == */ 3, _(" Huh?{WAIT_PRESS} What's linking?{WAIT_PRESS}\nWell, if you link moves...{WAIT_PRESS}\nYou can use them at the same time.")), VARIANT(/* == */ 3, _(" You should just ask Gulpin\nfor details.")), - VARIANT_DEFAULT(_(" This is the\n#C5Gulpin Link Shop#R.#W\nGulpin can link moves for you.")), - VARIANT_DEFAULT(_(" Huh?#W What's linking?#W\nWell, if you link moves...#W\nYou can use them at the same time.")), + VARIANT_DEFAULT(_(" This is the\n{COLOR CYAN}Gulpin Link Shop{RESET}.{WAIT_PRESS}\nGulpin can link moves for you.")), + VARIANT_DEFAULT(_(" Huh?{WAIT_PRESS} What's linking?{WAIT_PRESS}\nWell, if you link moves...{WAIT_PRESS}\nYou can use them at the same time.")), VARIANT_DEFAULT(_(" I think you should ask Gulpin\nif you want to know more.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" This is #C5Kangaskhan Storage#R.\nStore items here so they'll never be\nlost.")), + VARIANT(/* == */ 1, _(" This is {COLOR CYAN}Kangaskhan Storage{RESET}.\nStore items here so they'll never be\nlost.")), VARIANT(/* == */ 1, _(" If you have important\nitems, you should store them before you\nhead out to a dungeon.")), - VARIANT_DEFAULT(_(" This is #C5Kangaskhan Storage#R.\nIf you store items here, they'll never go\nmissing.")), + VARIANT_DEFAULT(_(" This is {COLOR CYAN}Kangaskhan Storage{RESET}.\nIf you store items here, they'll never go\nmissing.")), VARIANT_DEFAULT(_(" You should store important\nitems here before you go out on any\ndungeon adventure.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -1670,17 +1670,17 @@ static const struct ScriptCommand s_gs1_g6_s0_lives0_dlg0[] = { /* 0x813d45c */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Oh, yeah, there's also the\n#C5Pelipper Post Office#R.\nIt's straight ahead past here.")), - VARIANT_DEFAULT(_(" Oh, and there's also the\n#C5Pelipper Post Office#R.\nThat's up past here.")), + VARIANT(/* == */ 1, _(" Oh, yeah, there's also the\n{COLOR CYAN}Pelipper Post Office{RESET}.\nIt's straight ahead past here.")), + VARIANT_DEFAULT(_(" Oh, and there's also the\n{COLOR CYAN}Pelipper Post Office{RESET}.\nThat's up past here.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I'm sure you can get\ninformation on rescue jobs there.")), - VARIANT(/* == */ 1, _(" So, let's start with a visit\nto the #C5Pelipper Post Office#R.")), + VARIANT(/* == */ 1, _(" So, let's start with a visit\nto the {COLOR CYAN}Pelipper Post Office{RESET}.")), VARIANT(/* == */ 3, _(" I think we can get rescue-\njob information there.")), - VARIANT(/* == */ 3, _(" So, how about we go to\nthe #C5Pelipper Post Office#R first?")), + VARIANT(/* == */ 3, _(" So, how about we go to\nthe {COLOR CYAN}Pelipper Post Office{RESET} first?")), VARIANT_DEFAULT(_(" I think we can get some\ninformation on rescue jobs.")), - VARIANT_DEFAULT(_(" Let's first go to the\n#C5Pelipper Post Office#R.")), + VARIANT_DEFAULT(_(" Let's first go to the\n{COLOR CYAN}Pelipper Post Office{RESET}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -1810,8 +1810,8 @@ static const struct ScriptCommand s_gs1_g7_s0_lives7_dlg2[] = { /* 0x813e61c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Pardon?\nOh, the #C5Pelipper Post Office#R?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The #C5Pelipper Post Office#R\nwould be...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Pardon?\nOh, the {COLOR CYAN}Pelipper Post Office{RESET}?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The {COLOR CYAN}Pelipper Post Office{RESET}\nwould be...") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Straight down this path.") }, @@ -1855,10 +1855,10 @@ static const struct ScriptCommand s_gs1_g7_s1_lives0_dlg0[] = { /* 0x813e880 */ { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" We haven't gone to the\n#C5Pelipper Post Office#R yet?")), - VARIANT(/* == */ 1, _(" You can go home after we\ngo to the #C5Pelipper Post Office#R.")), - VARIANT_DEFAULT(_(" We haven't gone to the\n#C5Pelipper Post Office#R yet.")), - VARIANT_DEFAULT(_(" Let's go to the #C5Pelipper\nPost Office#R at least.")), + VARIANT(/* == */ 1, _(" We haven't gone to the\n{COLOR CYAN}Pelipper Post Office{RESET} yet?")), + VARIANT(/* == */ 1, _(" You can go home after we\ngo to the {COLOR CYAN}Pelipper Post Office{RESET}.")), + VARIANT_DEFAULT(_(" We haven't gone to the\n{COLOR CYAN}Pelipper Post Office{RESET} yet.")), + VARIANT_DEFAULT(_(" Let's go to the {COLOR CYAN}Pelipper\nPost Office{RESET} at least.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -2124,12 +2124,12 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Friends are my treasures!\nWelcome to $n2 Club--a circle\nof friends! ") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Oh?#W\nIs this your first visit here?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Oh, I get it!#W\nYou started a rescue team too, didn't you?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You've come to the right\nplace!#W I sell Friend Areas to add\nmembers to your rescue team.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Friends are my treasures!\nWelcome to {NAME_2} Club--a circle\nof friends! ") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Oh?{WAIT_PRESS}\nIs this your first visit here?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Oh, I get it!{WAIT_PRESS}\nYou started a rescue team too, didn't you?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You've come to the right\nplace!{WAIT_PRESS} I sell Friend Areas to add\nmembers to your rescue team.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Since you're here for the\nvery first time, I'll give you two Friend\nAreas for free!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let's do it!#W\nWigglytuff〜♪ Wigglytuff〜♪#W\nLet's be friends... Taaaaaaah!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let's do it!{WAIT_PRESS}\nWigglytuff〜♪ Wigglytuff〜♪{WAIT_PRESS}\nLet's be friends... Taaaaaaah!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(603), { 0x28, 0x01, 0x0005, 0x00000002, 0x00808010, NULL }, @@ -2139,12 +2139,12 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ { 0xe2, 0x00, 0x025b, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY(206), { 0x3b, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Congratulations!#W\nYou can go to the #CHWild Plains#R now.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You can also go to the\n#CHMist-Rise Forest#R.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Congratulations!{WAIT_PRESS}\nYou can go to the {COLOR GREEN_H}Wild Plains{RESET} now.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You can also go to the\n{COLOR GREEN_H}Mist-Rise Forest{RESET}.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Now you can recruit\nPokémon that live in these two Friend\nAreas.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" How do you recruit new\nmembers?#W Well, if you're fighting\nPokémon that live in a Friend Area...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" How do you recruit new\nmembers?{WAIT_PRESS} Well, if you're fighting\nPokémon that live in a Friend Area...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Sometimes, they will come\nto admire you as a friend.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" In that case, they may ask\nto join your team.#W\nJust keep trying!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" In that case, they may ask\nto join your team.{WAIT_PRESS}\nJust keep trying!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), SELECT_ENTITIES(-1, 1), @@ -2154,8 +2154,8 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" BZBZBZZT!#W\nIF YOU'RE GIVING FRIEND AREAS AWAY...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" CAN YOU ALSO GIVE MY\nFRIENDS ACCESS TO THE #CHPOWER PLANT#R\nFRIEND AREA?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" BZBZBZZT!{WAIT_PRESS}\nIF YOU'RE GIVING FRIEND AREAS AWAY...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" CAN YOU ALSO GIVE MY\nFRIENDS ACCESS TO THE {COLOR GREEN_H}POWER PLANT{RESET}\nFRIEND AREA?") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I ALSO WANT TO JOIN\nTHEIR RESCUE TEAM.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -2166,7 +2166,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm giving it away today!#W\nWigglytuff〜♪ Wigglytuff〜♪#W\nLet's be friends... Taaaaaaah!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm giving it away today!{WAIT_PRESS}\nWigglytuff〜♪ Wigglytuff〜♪{WAIT_PRESS}\nLet's be friends... Taaaaaaah!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(603), { 0x28, 0x01, 0x0005, 0x00000002, 0x00808010, NULL }, @@ -2175,7 +2175,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ { 0x27, 0x01, 0x0005, 0x00000002, 0x00808010, NULL }, { 0xe2, 0x00, 0x025b, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY(206), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Congratulations!#W\nYou can go to the #CHPower Plant#R now.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Congratulations!{WAIT_PRESS}\nYou can go to the {COLOR GREEN_H}Power Plant{RESET} now.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -2194,7 +2194,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" SORRY.#W\nI KNOW MY FRIEND TURNED DOWN YOUR\nOFFER TO JOIN YOUR TEAM YESTERDAY...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" SORRY.{WAIT_PRESS}\nI KNOW MY FRIEND TURNED DOWN YOUR\nOFFER TO JOIN YOUR TEAM YESTERDAY...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -2209,7 +2209,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I APOLOGIZE, BUT COULD\nYOU ALLOW MY FRIEND TO JOIN YOUR\nRESCUE TEAM?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, wow!#W\nDon't forget, we were the ones that asked\nyour friend to join us.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, wow!{WAIT_PRESS}\nDon't forget, we were the ones that asked\nyour friend to join us.") }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" So, yes, that'd be awesome!\nGlad to have your friend on board!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2228,12 +2228,12 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n4 became a team member!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_4} became a team member!") }, { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x3b, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, - ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to $n4?")), + ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to {NAME_4}?")), CHOICE(/* label */ 0, _("*Yes.")), CHOICE(/* label */ 1, _("No.")), LABEL(0), /* = 0x00 */ @@ -2248,8 +2248,8 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I'LL BE RESTING UP IN THE\n#CHPOWER PLANT#R FRIEND AREA.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" IF YOU WANT ME ALONG\nFOR A RESCUE, COME GET ME AT THE\n#CHPOWER PLANT#R.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I'LL BE RESTING UP IN THE\n{COLOR GREEN_H}POWER PLANT{RESET} FRIEND AREA.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" IF YOU WANT ME ALONG\nFOR A RESCUE, COME GET ME AT THE\n{COLOR GREEN_H}POWER PLANT{RESET}.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" OK! BZBZBZZ!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -2261,7 +2261,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You can go to your Friend\nAreas by taking the left path from your\nrescue team base.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There's a sign on the path\nto the left of your rescue team base,\nso you shouldn't have any trouble.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That's all the giveaways\ntoday!#W If you want more Friend Areas,\nyou'll have to buy them now.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That's all the giveaways\ntoday!{WAIT_PRESS} If you want more Friend Areas,\nyou'll have to buy them now.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -2458,7 +2458,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? What's going on over\nthere?#W\nThere seems to be a commotion.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? What's going on over\nthere?{WAIT_PRESS}\nThere seems to be a commotion.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(120), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -2495,7 +2495,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x05, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Huh? That scene there?") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" $n2's begging for\na rescue mission, but not finding any luck.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" {NAME_2}'s begging for\na rescue mission, but not finding any luck.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -2509,7 +2509,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x00, 0x0004, -0x00000002, 0x00000000, NULL }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" There, the one in the middle\nwith the pointy nose.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" He's a Pokémon named\n$m3.\nHe's got his own rescue team.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" He's a Pokémon named\n{POKEMON_3}.\nHe's got his own rescue team.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -2518,7 +2518,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x05, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" But his team's greedy.\nThey don't work unless they get paid\nroyally.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" $n2's been begging\nfor help, but...#W\nI feel sorry for that poor Pokémon.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" {NAME_2}'s been begging\nfor help, but...{WAIT_PRESS}\nI feel sorry for that poor Pokémon.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -2547,8 +2547,8 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! Wh-what do you want?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Oh! It's $n5!") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" That's $n5?!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Oh! It's {NAME_5}!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" That's {NAME_5}?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -2558,15 +2558,15 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Hey. Rather coldhearted,\naren't you?") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" To save $n2's\nfriend, a strong wind is needed.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" To save {NAME_2}'s\nfriend, a strong wind is needed.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Your leafy fans can whip up\npowerful winds.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" It's an easy matter for you.#W\nHelp that Pokémon out.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" It's an easy matter for you.{WAIT_PRESS}\nHelp that Pokémon out.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x10, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Grr...#W\nTch! OK, we'll do it.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Grr...{WAIT_PRESS}\nTch! OK, we'll do it.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -2577,7 +2577,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Wow...") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" That $n3 agreed without\nany argument...") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" That {NAME_3} agreed without\nany argument...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), BGM_FADEIN(80, 7), @@ -2595,7 +2595,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x05, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" What? You don't know?!\nIt's $n5's team!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" What? You don't know?!\nIt's {NAME_5}'s team!") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" They're the most famous\nrescue team around these parts.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), @@ -2607,21 +2607,21 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x00, 0x0004, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" That's $n6.#W\nHis Flamethrower can melt mountains!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" That's {NAME_6}.{WAIT_PRESS}\nHis Flamethrower can melt mountains!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" That's $n7.#W\nHe takes great pride in his armored\nbody and amazing strength.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" That's {NAME_7}.{WAIT_PRESS}\nHe takes great pride in his armored\nbody and amazing strength.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" And that's the leader,\n$n5.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" $n5 doesn't like\nphysical attacks.\nHe fights with his psychic powers.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" And that's the leader,\n{NAME_5}.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" {NAME_5} doesn't like\nphysical attacks.\nHe fights with his psychic powers.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" He's endowed with an\namazing brain and an IQ of 5,000.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Apparently, he's memorized\neverything that's happened in the world.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" $n5 does all the\ncommanding in the team.#W\nHe's clearly in charge.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" {NAME_5} does all the\ncommanding in the team.{WAIT_PRESS}\nHe's clearly in charge.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(16), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -2644,9 +2644,9 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, WAIT(46), - { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("#C6{SPEECH_BUBBLE}#R: C-cool...") }, + { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("{COLOR YELLOW}{SPEECH_BUBBLE}{RESET}: C-cool...") }, WAIT(60), - { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("#C6{SPEECH_BUBBLE}#R: I wouldn't expect less from a Gold\nRank rescue team.") }, + { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("{COLOR YELLOW}{SPEECH_BUBBLE}{RESET}: I wouldn't expect less from a Gold\nRank rescue team.") }, WAIT(40), { 0x91, 0x0a, 0x000b, 0x00000002, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -2680,7 +2680,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0f, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ......#W\nIt's fine. Nothing.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ......{WAIT_PRESS}\nIt's fine. Nothing.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(64), @@ -2707,11 +2707,11 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Whew, $n0...#W\nThat's what we've got to become.")), + VARIANT(/* == */ 1, _(" Whew, {NAME_0}...{WAIT_PRESS}\nThat's what we've got to become.")), VARIANT(/* == */ 1, _(" Let's get more members and\nmake our rescue team first-class!")), - VARIANT(/* == */ 3, _(" Whew, $n0!#W\nWe need to become like them!")), + VARIANT(/* == */ 3, _(" Whew, {NAME_0}!{WAIT_PRESS}\nWe need to become like them!")), VARIANT(/* == */ 3, _(" Let's recruit more members\nand make our rescue team first-class!")), - VARIANT_DEFAULT(_(" Whew, $n0!#W\nWe need to become like them!")), + VARIANT_DEFAULT(_(" Whew, {NAME_0}!{WAIT_PRESS}\nWe need to become like them!")), VARIANT_DEFAULT(_(" Let's recruit more members\nand make our rescue team first-class!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3182,10 +3182,10 @@ static const struct ScriptCommand s_gs1_g11_s0_lives6_dlg2[] = { /* 0x8144320 */ WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Alakazam and his sidekicks\nwere sure cool before.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That's how a real hero has\nto carry himself.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" By the way...#W\nApparently, it's been impossible for us to\nevolve lately.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" By the way...{WAIT_PRESS}\nApparently, it's been impossible for us to\nevolve lately.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You know how we Pokémon\nevolve if the conditions are right?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But for some reason, we\nhaven't been able to evolve at all.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's rumored that the natural\ndisasters are to blame, but...#W\nI wonder what's going on.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's rumored that the natural\ndisasters are to blame, but...{WAIT_PRESS}\nI wonder what's going on.") }, JUMP_SCRIPT(END_TALK), }; @@ -3203,7 +3203,7 @@ static const struct ScriptCommand s_gs1_g11_s0_lives7_dlg2[] = { /* 0x81445b8 */ WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Did you know that a new\ntraining gym--I think they called it\na dojo--opened in town?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You know how many rescue\nteams started up? To deal with all\nthe natural disasters?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There was a group of\nconcerned Pokémon...#W\nThey wanted to support rescue teams.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There was a group of\nconcerned Pokémon...{WAIT_PRESS}\nThey wanted to support rescue teams.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" So they got together and\nbuilt the dojo.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You can find the dojo easily.") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -3235,17 +3235,17 @@ static const struct ScriptCommand s_gs1_g11_s0_lives8_dlg2[] = { /* 0x8144938 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Alakazam's team has the\nGold Rank. Isn't that awesome?") }, - ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" You have a rescue team too,\ndon't you?#W\nWhat's your rank?")), + ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" You have a rescue team too,\ndon't you?{WAIT_PRESS}\nWhat's your rank?")), CHOICE(/* label */ 0, _("Nothing special.")), CHOICE(/* label */ 1, _("Gold Rank.")), LABEL(0), /* = 0x00 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I guess that's true.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It might be rude to say it...#W\nbut you obviously look like you really are\nnothing special.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It might be rude to say it...{WAIT_PRESS}\nbut you obviously look like you really are\nnothing special.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It just goes to show how\nawesome Alakazam's team is!") }, JUMP_SCRIPT(END_TALK), LABEL(1), /* = 0x01 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What?!\nYou're Gold Rank too?!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ......#W\nI'm not falling for a lie like that.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ......{WAIT_PRESS}\nI'm not falling for a lie like that.") }, JUMP_SCRIPT(END_TALK), }; @@ -3415,7 +3415,7 @@ static const struct ScriptCommand s_gs1_g13_s0_lives6_dlg2[] = { /* 0x8145218 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We heard.#W\nShiftry hasn't returned?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We heard.{WAIT_PRESS}\nShiftry hasn't returned?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder...\nDid Shiftry maybe just run off?") }, JUMP_SCRIPT(END_TALK), }; @@ -3528,9 +3528,9 @@ static const struct ScriptCommand s_gs1_g14_s0_lives7_dlg2[] = { /* 0x81457e4 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Is that right...\nShiftry was taken away to #CDMt. Thunder#R...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder what that place is\nlike?#W\nIt sounds rather horrible.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh? Me?#W\nI couldn't possibly go rescue him.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Is that right...\nShiftry was taken away to {COLOR YELLOW_D}Mt. Thunder{RESET}...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder what that place is\nlike?{WAIT_PRESS}\nIt sounds rather horrible.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh? Me?{WAIT_PRESS}\nI couldn't possibly go rescue him.") }, JUMP_SCRIPT(END_TALK), }; @@ -3687,7 +3687,7 @@ static const struct ScriptCommand s_gs1_g15_s0_lives6_dlg2[] = { /* 0x8146020 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004d, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Xatu?#W I wouldn't know.#W\nThere's really a Pokémon named that?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Xatu?{WAIT_PRESS} I wouldn't know.{WAIT_PRESS}\nThere's really a Pokémon named that?") }, JUMP_SCRIPT(END_TALK), }; @@ -3723,7 +3723,7 @@ static const struct ScriptCommand s_gs1_g15_s0_lives9_dlg2[] = { /* 0x8146288 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0, your team is\nfantastic!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, your team is\nfantastic!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's shocking to hear that\nyou've beaten Zapdos!") }, JUMP_SCRIPT(END_TALK), }; @@ -3830,8 +3830,8 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ WAIT(30), { 0x93, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hah?#W\nWhat are those guys talking about?")), - VARIANT_DEFAULT(_(" Huh?#W\nWhat are they chatting about?")), + VARIANT(/* == */ 1, _(" Hah?{WAIT_PRESS}\nWhat are those guys talking about?")), + VARIANT_DEFAULT(_(" Huh?{WAIT_PRESS}\nWhat are they chatting about?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -3846,7 +3846,7 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0f, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But could it be true?#W\nI'm having a hard time believing it...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But could it be true?{WAIT_PRESS}\nI'm having a hard time believing it...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -3863,7 +3863,7 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x10, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Well, you know the\n#C4$n6 legend#R?\nThat old story?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Well, you know the\n{COLOR GREEN}{NAME_6} legend{RESET}?\nThat old story?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -3871,7 +3871,7 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ { 0x91, 0x08, 0x0001, 0x00000001, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The $n6 legend?#W\nWhat's that?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The {NAME_6} legend?{WAIT_PRESS}\nWhat's that?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -3894,16 +3894,16 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Personally, I don't believe\nin rumors of that sort.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If you want to know more\nabout the $n6 legend...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If you want to know more\nabout the {NAME_6} legend...") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You should go see a\nPokémon named $n5.\nHe knows the story well.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You should go see a\nPokémon named {NAME_5}.\nHe knows the story well.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n5 is uh...#W\nYou know, in his pond.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_5} is uh...{WAIT_PRESS}\nYou know, in his pond.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -4129,8 +4129,8 @@ static const struct ScriptCommand s_gs1_g19_s0_lives0_dlg0[] = { /* 0x8147af4 */ { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...Listen, $n0.")), - VARIANT_DEFAULT(_(" ...Say, $n0.")), + VARIANT(/* == */ 1, _(" ...Listen, {NAME_0}.")), + VARIANT_DEFAULT(_(" ...Say, {NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, WAIT(10), @@ -4221,7 +4221,7 @@ static const struct ScriptCommand s_gs1_g20_s0_lives0_dlg0[] = { /* 0x8147f8c */ { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Maybe something's happened.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0, let's check\nit out!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, let's check\nit out!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -4313,7 +4313,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0005, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Let me tell you, I was\namazed!#W\nIt really was true!") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Let me tell you, I was\namazed!{WAIT_PRESS}\nIt really was true!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -4328,7 +4328,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" $n0, $n1.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_0}, {NAME_1}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -4336,7 +4336,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ FANFARE_PLAY2(463), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x05, 0x000a, 0x00000036, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, hi, $n3!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, hi, {NAME_3}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -4345,7 +4345,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0x93, 0x0a, 0x000a, 0x00000036, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Even you came out,\n$n3?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Even you came out,\n{NAME_3}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -4354,15 +4354,15 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Ssh!#W Quiet.") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Ssh!{WAIT_PRESS} Quiet.") }, { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" That guy there's telling us.\nKeep it down.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hah?#W\nWho's doing the talking?")), - VARIANT_DEFAULT(_(" Huh?#W Who's talking?")), + VARIANT(/* == */ 1, _(" Hah?{WAIT_PRESS}\nWho's doing the talking?")), + VARIANT_DEFAULT(_(" Huh?{WAIT_PRESS} Who's talking?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I-it's...") }, @@ -4390,13 +4390,13 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(SHOCK_FUNC), { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ge-$n2?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ge-{NAME_2}?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_SWITCH(9), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...So I went up to the\n#C5Hill of the Ancients#R.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...So I went up to the\n{COLOR CYAN}Hill of the Ancients{RESET}.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And that's where I saw it!\nIt was shocking stuff, I tell you!\nKekeh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -4404,11 +4404,11 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Shocking stuff?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This certain Pokémon was\ngetting advice from $n7.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This certain Pokémon was\ngetting advice from {NAME_7}.") }, { 0x2e, 0x15, 0x0002, 0x00000004, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That Pokémon...\nIt looks like an ordinary Pokémon...") }, { 0x2e, 0x15, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But get this!#W\nIt was originally a human!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But get this!{WAIT_PRESS}\nIt was originally a human!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -4428,12 +4428,12 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x15, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There's more.\n$n7 told the human...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There's more.\n{NAME_7} told the human...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That how the human became\na Pokémon has a lot to do with how\nthe world's balance is upset.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Wait a second...#W\nThat's exactly like the Ninetales legend!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Wait a second...{WAIT_PRESS}\nThat's exactly like the Ninetales legend!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -4443,7 +4443,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000004, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You all know how there've\nbeen many natural disasters, correct?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" According to $n7,\nthose disasters are caused by the world's\nbalance being upset.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" According to {NAME_7},\nthose disasters are caused by the world's\nbalance being upset.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And if the world's balance\nisn't restored soon...") }, { 0x2e, 0x15, 0x0002, 0x00000006, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The unthinkable will happen\nto the world! That's what Xatu said!\nKekeh!") }, @@ -4461,7 +4461,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0c, 0x0005, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" The world...#W\nThe unthinkable's going to happen?") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" The world...{WAIT_PRESS}\nThe unthinkable's going to happen?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" What are we to do?!") }, @@ -4469,12 +4469,12 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000003, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" That Gengar...!#W\nHe's getting everyone worked up...")), - VARIANT_DEFAULT(_(" That Gengar...!#W\nHe's deliberately working everyone up...")), + VARIANT(/* == */ 1, _(" That Gengar...!{WAIT_PRESS}\nHe's getting everyone worked up...")), + VARIANT_DEFAULT(_(" That Gengar...!{WAIT_PRESS}\nHe's deliberately working everyone up...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Now, now, people.#W\nThere's no need to panic.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Now, now, people.{WAIT_PRESS}\nThere's no need to panic.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Why, I think there's a way\nwe can do something about this.\nKekeh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), @@ -4508,7 +4508,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nAnd that human is the rotten coward\nthat abandoned $n8, correct?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nAnd that human is the rotten coward\nthat abandoned {NAME_8}, correct?") }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000004, 0x00000000, NULL }, @@ -4517,7 +4517,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ BGM_STOP, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Isn't that right,\n$n0?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Isn't that right,\n{NAME_0}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -4534,10 +4534,10 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ CLEAR_ARRAY(EVENT_LOCAL), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Wha...#W What?!#W\nIt... It can't be!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Wha...{WAIT_PRESS} What?!{WAIT_PRESS}\nIt... It can't be!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Y-you...#W\nYou were that human?!") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Y-you...{WAIT_PRESS}\nYou were that human?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -4548,17 +4548,17 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" W-w-whoa...#W\nThis is, like...\nWe can explain...")), - VARIANT_DEFAULT(_(" W-w-wait...#W\nThis is, like...\nThere's a good explanation for...")), + VARIANT(/* == */ 1, _(" W-w-whoa...{WAIT_PRESS}\nThis is, like...\nWe can explain...")), + VARIANT_DEFAULT(_(" W-w-wait...{WAIT_PRESS}\nThis is, like...\nThere's a good explanation for...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" We're not asking you.\nWe're asking $n0!") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" We're not asking you.\nWe're asking {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Hey! $n0!\nSo what is it?!") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Hey! {NAME_0}!\nSo what is it?!") }, { 0x2e, 0x15, 0x0006, -0x00000002, 0x00000000, NULL }, ASK3(FALSE, /*default*/ -1, /* speaker */ 6, _(" Are you really the human\nthat was in the legend?")), CHOICE(/* label */ 35, _("..................")), @@ -4570,16 +4570,16 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x05, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" $n0...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_0}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekekekekekeh!\nLooks like you have nothing to say\nin your defense, $n0!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekekekekekeh!\nLooks like you have nothing to say\nin your defense, {NAME_0}!") }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -4597,7 +4597,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let's get rid of\n$n0 and regain peace.\nKekekekekeh!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let's get rid of\n{NAME_0} and regain peace.\nKekekekekeh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -4615,9 +4615,9 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...Wh-what?")), - VARIANT(/* == */ 1, _(" E-everyone, hold up.\nWhat's with you?#W\nWhat are you going to do?")), + VARIANT(/* == */ 1, _(" E-everyone, hold up.\nWhat's with you?{WAIT_PRESS}\nWhat are you going to do?")), VARIANT_DEFAULT(_(" ...Wh-what?")), - VARIANT_DEFAULT(_(" E-everyone, what's gotten\ninto you?#W\nWhat are you going to do?")), + VARIANT_DEFAULT(_(" E-everyone, what's gotten\ninto you?{WAIT_PRESS}\nWhat are you going to do?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x05, 0x0002, 0x00000004, 0x00000000, NULL }, @@ -4628,7 +4628,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0x62, 0x00, 0x004c, -0x00000008, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" $n0, forgive me!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" {NAME_0}, forgive me!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, WAIT(20), @@ -4652,7 +4652,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waaaaah!#W\n$n0, run!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waaaaah!{WAIT_PRESS}\n{NAME_0}, run!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x93, 0x02, 0x000a, 0x00000022, 0x00000000, NULL }, @@ -5603,7 +5603,7 @@ static const struct ScriptCommand s_gs1_g23_s0_station_sref_script[] = { /* 0x81 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(1), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+Meanwhile, back in\n#+Pokémon Square...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Meanwhile, back in\n{CENTER_ALIGN}Pokémon Square...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -5645,7 +5645,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nYou lot!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Why aren't you out there\nhunting down $n0's team?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Why aren't you out there\nhunting down {NAME_0}'s team?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -5661,7 +5661,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x03, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" They say $n0's\nteam has gone way far out there.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" They say {NAME_0}'s\nteam has gone way far out there.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" If we went, the best we\ncould hope for is maybe the Lapis Cave.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), @@ -5677,8 +5677,8 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I joined the chase...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But they fled into Mt. Blaze.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" For the life of me, I can't\ngo in there.\nAnd that's where I lost their trail.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I'm a Grass type, see.#W\nFire doesn't agree with me at all.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I don't know what became\nof $n0's team after that.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I'm a Grass type, see.{WAIT_PRESS}\nFire doesn't agree with me at all.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I don't know what became\nof {NAME_0}'s team after that.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...But those fugitives...\nTo think they would risk Mt. Blaze...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" They've grown up tough!\nI can't keep up!") }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -5701,7 +5701,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We're out of that picture.\nKekeh!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Our role is to receive word\nabout $n0's demise.\nKekekekekeh!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Our role is to receive word\nabout {NAME_0}'s demise.\nKekekekekeh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x15, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -5720,24 +5720,24 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n7, what's\nthe word?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_7}, what's\nthe word?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0007, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" $n0...\n$n0 is...") }, + { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" {NAME_0}...\n{NAME_0} is...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! Finally!\nWe're finally rid of $n0!\nKekeh!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! Finally!\nWe're finally rid of {NAME_0}!\nKekeh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0007, 0x00000045, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" No!#W\nIt's the opposite!") }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" $n0 is back!") }, + { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" No!{WAIT_PRESS}\nIt's the opposite!") }, + { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" {NAME_0} is back!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(463), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -5773,7 +5773,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x05, 0x0006, 0x00000042, 0x00000000, NULL }, { 0x2f, 0x00, 0x0006, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" ...$n0!") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" ...{NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x03, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -5799,19 +5799,19 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" It's good to be back in the\nsquare again, $n0.")), - VARIANT_DEFAULT(_(" It feels kind of nostalgic\nto be back in the square, $n0.")), + VARIANT(/* == */ 1, _(" It's good to be back in the\nsquare again, {NAME_0}.")), + VARIANT_DEFAULT(_(" It feels kind of nostalgic\nto be back in the square, {NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hey, $n1!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hey, {NAME_1}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000003, 0x00000000, NULL }, { 0x93, 0x01, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hm! Oh, it's you,\n$n2.\nIt's been a while.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hm! Oh, it's you,\n{NAME_2}.\nIt's been a while.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" (Kekeh! What's with that\nsmug confidence?)") }, @@ -5822,12 +5822,12 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n2!#W\nYou spewed all sorts of trumped up\ngarbage, didn't you?!")), - VARIANT(/* == */ 1, _(" $n0 had nothing to\ndo with it!")), - VARIANT(/* == */ 1, _(" $n0 was innocent!")), - VARIANT_DEFAULT(_(" $n2!#W\nEverything you said was completely\nwrong!")), - VARIANT_DEFAULT(_(" $n0 had nothing to\ndo with it!")), - VARIANT_DEFAULT(_(" $n0 was innocent!")), + VARIANT(/* == */ 1, _(" {NAME_2}!{WAIT_PRESS}\nYou spewed all sorts of trumped up\ngarbage, didn't you?!")), + VARIANT(/* == */ 1, _(" {NAME_0} had nothing to\ndo with it!")), + VARIANT(/* == */ 1, _(" {NAME_0} was innocent!")), + VARIANT_DEFAULT(_(" {NAME_2}!{WAIT_PRESS}\nEverything you said was completely\nwrong!")), + VARIANT_DEFAULT(_(" {NAME_0} had nothing to\ndo with it!")), + VARIANT_DEFAULT(_(" {NAME_0} was innocent!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(463), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -5850,10 +5850,10 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" You bet.\nWe met Ninetales and found out.")), - VARIANT(/* == */ 1, _(" $n0 isn't the human\nfrom that legend.")), + VARIANT(/* == */ 1, _(" {NAME_0} isn't the human\nfrom that legend.")), VARIANT(/* == */ 1, _(" We came back when we\nfound that out.")), VARIANT_DEFAULT(_(" Yup.\nWe met Ninetales and asked.")), - VARIANT_DEFAULT(_(" $n0 isn't the human\nfrom the legend.")), + VARIANT_DEFAULT(_(" {NAME_0} isn't the human\nfrom the legend.")), VARIANT_DEFAULT(_(" We're back because we\ndiscovered the truth.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -5871,7 +5871,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh! W-wait a second!#W\nYou can't be trusted yet.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh! W-wait a second!{WAIT_PRESS}\nYou can't be trusted yet.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If you're going to make that\nclaim, let's see some proof.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, @@ -5891,7 +5891,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let's see some proof!\nCome on, out with it!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Proof...#W\nWe don't have any proof...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Proof...{WAIT_PRESS}\nWe don't have any proof...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(470), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -5900,13 +5900,13 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekekekekekeh!#W\nIt's too bad you don't have proof!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekekekekekeh!{WAIT_PRESS}\nIt's too bad you don't have proof!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You came back for us so\nwe could get rid of you easier!\nHow conveniently foolish! Kekekeh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Now, fellow Pokémon.#W\nHere's your chance to get rid of\n$n0! Kekekekekeh!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Now, fellow Pokémon.{WAIT_PRESS}\nHere's your chance to get rid of\n{NAME_0}! Kekekekekeh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(90), FANFARE_PLAY2(468), @@ -5915,14 +5915,14 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, WAIT(180), { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............#WKekeh?!#W\nWhat's wrong, everyone?\nDon't you want to be rid of $n0?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Kekeh?!{WAIT_PRESS}\nWhat's wrong, everyone?\nDon't you want to be rid of {NAME_0}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, { 0x2e, 0x02, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" I...#W\nI always believed in $n0!") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" I...{WAIT_PRESS}\nI always believed in {NAME_0}!") }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" You don't fool me!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -5947,9 +5947,9 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...I...\nI'm out.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I was saved by\n$n0's team before.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I was saved by\n{NAME_0}'s team before.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I joined the chase with a\nheavy heart because of your urging...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But I simply can't think\nof $n0 being bad in any way.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But I simply can't think\nof {NAME_0} being bad in any way.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(455), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -5964,7 +5964,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I've heard enough too!\nI believe $n0!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I've heard enough too!\nI believe {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -6014,7 +6014,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x0c, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" ......#W\nIt looks like a newspaper...\nDoesn't it?") }, + { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" ......{WAIT_PRESS}\nIt looks like a newspaper...\nDoesn't it?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -6027,12 +6027,12 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+\n#+= EXTRA =") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+ \n#+$n0 Innocent!") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 met with Ninetales under\n#+the watchful eye of Alakazam...") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+...And proved that it had nothing to\n#+do with the human in the legend.") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+As a result, Gengar's claims were\n#+found to be malicious lies.") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+-End-") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}\n{CENTER_ALIGN}= EXTRA =") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN} \n{CENTER_ALIGN}{NAME_0} Innocent!") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} met with Ninetales under\n{CENTER_ALIGN}the watchful eye of Alakazam...") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}...And proved that it had nothing to\n{CENTER_ALIGN}do with the human in the legend.") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}As a result, Gengar's claims were\n{CENTER_ALIGN}found to be malicious lies.") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}-End-") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(470), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -6088,11 +6088,11 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Welcome back!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000009, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yup! It's good to be back!#W\nWe're back like we promised.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yup! It's good to be back!{WAIT_PRESS}\nWe're back like we promised.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0006, 0x00000042, 0x00000000, NULL }, { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" ...Sniffle...") }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" I'm so glad...#W\n$n0 isn't suspected anymore...") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" I'm so glad...{WAIT_PRESS}\n{NAME_0} isn't suspected anymore...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yup, I'm glad too.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We won't have to keep\nrunning from everyone anymore.") }, @@ -6102,12 +6102,12 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" All right, $n0.")), + VARIANT(/* == */ 1, _(" All right, {NAME_0}.")), VARIANT(/* == */ 1, _(" We're both worn out.\nI'm going to get some sleep.")), - VARIANT(/* == */ 1, _(" Our rescue team is back\nin business tomorrow!#W\nLet's give it our best!")), - VARIANT_DEFAULT(_(" $n0.")), + VARIANT(/* == */ 1, _(" Our rescue team is back\nin business tomorrow!{WAIT_PRESS}\nLet's give it our best!")), + VARIANT_DEFAULT(_(" {NAME_0}.")), VARIANT_DEFAULT(_(" We're both exhausted.\nI'm going to get some sleep.")), - VARIANT_DEFAULT(_(" Our rescue team gets\nrevived tomorrow!#W\nLet's try to do our best!")), + VARIANT_DEFAULT(_(" Our rescue team gets\nrevived tomorrow!{WAIT_PRESS}\nLet's try to do our best!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -6757,9 +6757,9 @@ static const struct ScriptCommand s_gs1_g24_s0_lives0_dlg2[] = { /* 0x8152c74 */ JUMPIF_ARRAY(EVENT_M01E09A_2N, 0, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_2N, 0, 1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm so sorry.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I was fully convinced of\nyour guilt, $n0.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I was fully convinced of\nyour guilt, {NAME_0}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But I am glad to hear\nyou are free from that cloud of\nsuspicion〜♪") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll never give you my\nbusiness again!#W\nI hope you won't say that.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll never give you my\nbusiness again!{WAIT_PRESS}\nI hope you won't say that.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -6787,7 +6787,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives2_dlg2[] = { /* 0x8152edc */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_2N, 2, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_2N, 2, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I do apologize.#W\nHow could one run a bank without\ntrusting clients?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I do apologize.{WAIT_PRESS}\nHow could one run a bank without\ntrusting clients?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I promise to satisfy all\nyour banking needs from now on.\nI hope you'll stay.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ @@ -6834,7 +6834,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives5_dlg2[] = { /* 0x8153334 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_2N, 5, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_2N, 5, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I believed in you,\n$n0!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I believed in you,\n{NAME_0}!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Because you're my friend!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ @@ -6854,7 +6854,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives6_dlg2[] = { /* 0x8153470 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We got conned by Gengar...#W\nI'm sorry.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We got conned by Gengar...{WAIT_PRESS}\nI'm sorry.") }, JUMP_SCRIPT(END_TALK), }; @@ -6870,7 +6870,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives7_dlg2[] = { /* 0x815353c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm truly sorry for what\nhappened.#W\nSorry for suspecting you.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm truly sorry for what\nhappened.{WAIT_PRESS}\nSorry for suspecting you.") }, JUMP_SCRIPT(END_TALK), }; @@ -6887,8 +6887,8 @@ static const struct ScriptCommand s_gs1_g24_s0_lives8_dlg2[] = { /* 0x8153620 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...So, what became of\nAlakazam's team?\nDid they head underground?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Groudon...#W\nThe mythical Pokémon...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It is rather worrying...#W\nBut I suppose it is Alakazam's team.\nThey should be fine.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Groudon...{WAIT_PRESS}\nThe mythical Pokémon...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It is rather worrying...{WAIT_PRESS}\nBut I suppose it is Alakazam's team.\nThey should be fine.") }, JUMP_SCRIPT(END_TALK), }; @@ -6919,16 +6919,16 @@ static const struct ScriptCommand s_gs1_g24_s1_lives0_dlg0[] = { /* 0x8153894 */ { 0x2e, 0x0c, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I am so sorry!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I was convinced that\n$n0 had to be the one.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I was convinced that\n{NAME_0} had to be the one.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I'm very ashamed that I\ntreated a valuable customer with such\ndisdain and suspicion...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It isn't just you, my brother.#W\nI am guilty of the same.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It isn't just you, my brother.{WAIT_PRESS}\nI am guilty of the same.") }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" B-Brother...#W\nSniffle... My brother...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" B-Brother...{WAIT_PRESS}\nSniffle... My brother...") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -6969,9 +6969,9 @@ static const struct ScriptCommand s_gs1_g24_s1_lives2_dlg2[] = { /* 0x8153cd4 */ JUMPIF_ARRAY(EVENT_M01E09A_2N, 0, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_2N, 0, 1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm so sorry.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I was fully convinced of\nyour guilt, $n0.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I was fully convinced of\nyour guilt, {NAME_0}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But I am glad to hear\nyou are free from that cloud of\nsuspicion〜♪") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll never give you my\nbusiness again!#W\nI hope you won't say that.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll never give you my\nbusiness again!{WAIT_PRESS}\nI hope you won't say that.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -7116,7 +7116,7 @@ static const struct ScriptCommand s_gs1_g25_s0_lives8_dlg2[] = { /* 0x81543dc */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What's that?\nHas Alakazam's team returned?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm not sure...#W\nI haven't seen them around the square.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm not sure...{WAIT_PRESS}\nI haven't seen them around the square.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I don't think Alakazam's\nteam has come back.") }, JUMP_SCRIPT(END_TALK), }; @@ -7190,7 +7190,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Looks like they sent out\nto a lot of rescue teams for help.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I've seen some pretty\nfamous leaders from faraway places.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That $n3...\nI wonder what he's planning to do with\nall these rescue teams?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That {NAME_3}...\nI wonder what he's planning to do with\nall these rescue teams?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -7205,13 +7205,13 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Can I get everyone's\nattention here?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I, uh...#W\nIt's not my style to get up in front of\neveryone like this, and...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I, uh...{WAIT_PRESS}\nIt's not my style to get up in front of\neveryone like this, and...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...Sorry.\nThis isn't the time for that!") }, BGM_SWITCH(10), { 0x2e, 0x15, 0x0003, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" There's big trouble!#W\n$n8's team went underground...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" There's big trouble!{WAIT_PRESS}\n{NAME_8}'s team went underground...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But they haven't returned!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), @@ -7227,24 +7227,24 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ WAIT(10), { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, unfortunately.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" $n8 led his team\nunderground to quell $n9...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_8} led his team\nunderground to quell {NAME_9}...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" And that's it.\nWe haven't heard anything from them.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" To be honest...#W\nWe have no idea what became of them.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" To be honest...{WAIT_PRESS}\nWe have no idea what became of them.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(90), { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" No idea?#W\nHow is that possible?!#W\nThis is $n8 you're talking about?") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" No idea?{WAIT_PRESS}\nHow is that possible?!{WAIT_PRESS}\nThis is {NAME_8} you're talking about?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" But they haven't come back.\nThat's for real!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" That's right...\nAnd it sounds as if $n9 is out of\nour league...") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" That's right...\nAnd it sounds as if {NAME_9} is out of\nour league...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" What? It's that tough?\nThis Pokémon named $n9?") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" What? It's that tough?\nThis Pokémon named {NAME_9}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, @@ -7255,7 +7255,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" There's magma flowing everywhere\nunderground.#W\nI'd burn up if I went anywhere like that!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" There's magma flowing everywhere\nunderground.{WAIT_PRESS}\nI'd burn up if I went anywhere like that!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Quiet, please! Be quiet!") }, @@ -7285,8 +7285,8 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n0.\nThis is some chance. Let's go for it.")), - VARIANT_DEFAULT(_(" Say, $n0.\nThis is a great opportunity. Let's go.")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nThis is some chance. Let's go for it.")), + VARIANT_DEFAULT(_(" Say, {NAME_0}.\nThis is a great opportunity. Let's go.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -7337,10 +7337,10 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" It's B-$n4!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" It's B-{NAME_4}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" You mean...\n#C5Team Hydro#R's roughneck $n4?!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" You mean...\n{COLOR CYAN}Team Hydro{RESET}'s roughneck {NAME_4}?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Those waterspouts on his back can\nrocket water so fast that it punches\nthrough thick iron plates!") }, @@ -7352,9 +7352,9 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ WAIT(30), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, 0x00000000, 0x00000001, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" It's rumored $n9\nis a Ground type.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" It's rumored {NAME_9}\nis a Ground type.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I am a Water type.\nStrong against the Ground type.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" My Hydro Pump will put\n$n9 down in one shot.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" My Hydro Pump will put\n{NAME_9} down in one shot.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I'll join the party too.") }, @@ -7365,13 +7365,13 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Woohoo! It's $n5!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Woohoo! It's {NAME_5}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" She's #C5Team Constrictor#R's leader.") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" She's {COLOR CYAN}Team Constrictor{RESET}'s leader.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" She's known for persistent and\nclingy attacks.#W She ensnares foes with\nher tentacles, then head-butts them!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" She's known for persistent and\nclingy attacks.{WAIT_PRESS} She ensnares foes with\nher tentacles, then head-butts them!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" She'd be nasty to face in any battle\nof endurance.") }, @@ -7394,11 +7394,11 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Wow! $n6!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Wow! {NAME_6}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" He's the most brutal out of #C5Team\nRumblerock#R!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" He's the most brutal out of {COLOR CYAN}Team\nRumblerock{RESET}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" His body is rock hard.\nHe's supposed to be able to withstand\nhuge explosions without taking damage.") }, @@ -7409,7 +7409,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ WAIT(30), { 0x2e, 0x03, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0006, 0x00000000, 0x00000001, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" If $n9's awakened\nunderground, that suits me fine.") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" If {NAME_9}'s awakened\nunderground, that suits me fine.") }, { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" I'll use my Rock Throw to\nkeep it buried underground.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), @@ -7422,7 +7422,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ WAIT(30), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh, $n4!\n$n5! And $n6!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh, {NAME_4}!\n{NAME_5}! And {NAME_6}!") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" No one could complain\nabout your selection.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -7462,7 +7462,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Win it for us!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Save $n8's team!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Save {NAME_8}'s team!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -7480,8 +7480,8 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" OK...\nI guess we can't say anything,\n$n0.")), - VARIANT_DEFAULT(_(" Hmmm...\nIt can't be helped, $n0.")), + VARIANT(/* == */ 1, _(" OK...\nI guess we can't say anything,\n{NAME_0}.")), + VARIANT_DEFAULT(_(" Hmmm...\nIt can't be helped, {NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -8566,7 +8566,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives6_dlg2[] = { /* 0x815a520 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You bet I'm worried about\nAlakazam's team...#W\nBut Blastoise and company are tough.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You bet I'm worried about\nAlakazam's team...{WAIT_PRESS}\nBut Blastoise and company are tough.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Don't you worry now.\nThey'll get the job done.") }, JUMP_SCRIPT(END_TALK), }; @@ -8583,7 +8583,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives7_dlg2[] = { /* 0x815a660 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There have been so many\nearthquakes...#W\nI can't get a decent night's sleep!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There have been so many\nearthquakes...{WAIT_PRESS}\nI can't get a decent night's sleep!") }, JUMP_SCRIPT(END_TALK), }; @@ -8609,7 +8609,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives9_dlg2[] = { /* 0x815a810 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You know how we've had\nso many earthquakes lately?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Are they signs that\nsomething a lot worse is coming?#W\nI shudder to think!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Are they signs that\nsomething a lot worse is coming?{WAIT_PRESS}\nI shudder to think!") }, JUMP_SCRIPT(END_TALK), }; @@ -8664,15 +8664,15 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n2!")), + VARIANT(/* == */ 1, _(" Hey, {NAME_2}!")), VARIANT(/* == */ 1, _(" What's up here?")), - VARIANT_DEFAULT(_(" Oh! $n2!")), + VARIANT_DEFAULT(_(" Oh! {NAME_2}!")), VARIANT_DEFAULT(_(" What's going on here?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hey, $n1.\nW-well...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hey, {NAME_1}.\nW-well...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -8689,20 +8689,20 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(9), { 0x2e, 0x0e, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Look!\nIt's $n5!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Look!\nIt's {NAME_5}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n3!#W\nWhat's going on here?!")), - VARIANT_DEFAULT(_(" $n3!#W\nWhat happened here?!")), + VARIANT(/* == */ 1, _(" {NAME_3}!{WAIT_PRESS}\nWhat's going on here?!")), + VARIANT_DEFAULT(_(" {NAME_3}!{WAIT_PRESS}\nWhat happened here?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0003, 0x00000000, -0x00000001, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ............#W\nThey were wiped out...#W\nIn the underground dungeon...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nThey were wiped out...{WAIT_PRESS}\nIn the underground dungeon...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(SHOCK_FUNC), @@ -8711,7 +8711,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ WAIT(10), { 0x2e, 0x03, 0x0005, 0x00000003, 0x00000000, NULL }, { 0x2f, 0x00, 0x0005, 0x00000000, 0x00000001, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Groan... That place...#W\nIt's rough, seriously...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Groan... That place...{WAIT_PRESS}\nIt's rough, seriously...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -8719,7 +8719,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ WAIT(10), { 0x2e, 0x0d, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0006, 0x00000000, -0x00000001, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" ...We couldn't get far\nenough to even see $n9...") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" ...We couldn't get far\nenough to even see {NAME_9}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -8736,7 +8736,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...It appears the dungeon\nunderground...#W\nis far worse than we'd imagined...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...It appears the dungeon\nunderground...{WAIT_PRESS}\nis far worse than we'd imagined...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(60), WAIT(60), @@ -8754,15 +8754,15 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ CALL_SCRIPT(SHOCK_FUNC), WAIT(30), { 0x2e, 0x0e, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" What fools.#W\nThat's what you get for trying the\nimpossible.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" What fools.{WAIT_PRESS}\nThat's what you get for trying the\nimpossible.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x05, 0x0001, 0x00000003, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Ge-$n4!")), - VARIANT(/* == */ 1, _(" Why don't you shut up?!#W\nThis is about saving $n8's team.\nWe have to try!")), - VARIANT_DEFAULT(_(" Ge-$n4!")), - VARIANT_DEFAULT(_(" What are you saying?!#W\nIt's only expected that we try. This is for\nsaving $n8's team.")), + VARIANT(/* == */ 1, _(" Ge-{NAME_4}!")), + VARIANT(/* == */ 1, _(" Why don't you shut up?!{WAIT_PRESS}\nThis is about saving {NAME_8}'s team.\nWe have to try!")), + VARIANT_DEFAULT(_(" Ge-{NAME_4}!")), + VARIANT_DEFAULT(_(" What are you saying?!{WAIT_PRESS}\nIt's only expected that we try. This is for\nsaving {NAME_8}'s team.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, @@ -8788,10 +8788,10 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" It's too much...\nEven $n5 went down...") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" It's too much...\nEven {NAME_5} went down...") }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" It's gotta be awful tough.") }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Who'd want to go into a dungeon that\ndangerous?") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" There's no way. I can't go.#W\nI burn too easily.") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" There's no way. I can't go.{WAIT_PRESS}\nI burn too easily.") }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I can't take earthquakes.") }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" It'd be like going and knowing full\nwell we'd get wiped...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -8815,7 +8815,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I...#W\nMy leafy fans would burn up...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I...{WAIT_PRESS}\nMy leafy fans would burn up...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(NOTICE_FUNC), @@ -8826,7 +8826,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ WAIT(15), { 0x2e, 0x0e, 0x0001, 0x00000005, 0x00000000, NULL }, { 0x2f, 0x00, 0x0001, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" E-even $n3...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" E-even {NAME_3}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -8840,7 +8840,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0004, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ............Huh?#W\nDid I say something profound?\nKekekekekekekeh!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ............Huh?{WAIT_PRESS}\nDid I say something profound?\nKekekekekekekeh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, @@ -8855,31 +8855,31 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ BGM_FADEOUT(150), WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0...\nI don't know anymore...")), + VARIANT(/* == */ 1, _(" {NAME_0}...\nI don't know anymore...")), VARIANT(/* == */ 1, _(" What should we do?")), VARIANT(/* == */ 1, _(" Even if it's impossible...")), - VARIANT(/* == */ 3, _(" $n0...\nI don't know anymore...")), + VARIANT(/* == */ 3, _(" {NAME_0}...\nI don't know anymore...")), VARIANT(/* == */ 3, _(" What should we do?")), VARIANT(/* == */ 3, _(" Even if it's the impossible...")), - VARIANT_DEFAULT(_(" $n0...\nI don't know anymore...")), + VARIANT_DEFAULT(_(" {NAME_0}...\nI don't know anymore...")), VARIANT_DEFAULT(_(" What should we do?")), VARIANT_DEFAULT(_(" Even if it's the impossible...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(17), /* = 0x11 */ - ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" Should we still\ntry to rescue $n8?")), + ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" Should we still\ntry to rescue {NAME_8}?")), CHOICE(/* label */ 18, _("Let's go!")), CHOICE(/* label */ 19, _("Let's not.")), LABEL(19), /* = 0x13 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...#WReally...?#W\nYou honestly think we shouldn't go?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...{WAIT_PRESS}Really...?{WAIT_PRESS}\nYou honestly think we shouldn't go?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(17), LABEL(18), /* = 0x12 */ { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...#WYes...#W\nYeah, you're right.")), - VARIANT(/* == */ 1, _(" All right, $n0!")), - VARIANT_DEFAULT(_(" ...#WYes...#W\nI think so too.")), - VARIANT_DEFAULT(_(" OK, $n0!")), + VARIANT(/* == */ 1, _(" ...{WAIT_PRESS}Yes...{WAIT_PRESS}\nYeah, you're right.")), + VARIANT(/* == */ 1, _(" All right, {NAME_0}!")), + VARIANT_DEFAULT(_(" ...{WAIT_PRESS}Yes...{WAIT_PRESS}\nI think so too.")), + VARIANT_DEFAULT(_(" OK, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -8898,9 +8898,9 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" We're going!\nTo rescue $n8's team!")), - VARIANT(/* == */ 3, _(" We're going!\nTo rescue $n8's team!")), - VARIANT_DEFAULT(_(" We're going!\nTo rescue $n8's team!")), + VARIANT(/* == */ 1, _(" We're going!\nTo rescue {NAME_8}'s team!")), + VARIANT(/* == */ 3, _(" We're going!\nTo rescue {NAME_8}'s team!")), + VARIANT_DEFAULT(_(" We're going!\nTo rescue {NAME_8}'s team!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, @@ -8919,10 +8919,10 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Hey, who are they?") }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Can't say I know them...") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" It's #C5Team $t#R.#W\nThey're well known around these parts.") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" #C5Team $t#R...?#W\nYou mean the lot that were suspected of\ninvolvement in the Ninetales legend?") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I heard about that!#W\nWeren't they living like fugitives until\nrecently?") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Can they handle it?#W\nThey don't look very tough.") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" It's {COLOR CYAN}Team {TEAM_NAME}{RESET}.{WAIT_PRESS}\nThey're well known around these parts.") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" {COLOR CYAN}Team {TEAM_NAME}{RESET}...?{WAIT_PRESS}\nYou mean the lot that were suspected of\ninvolvement in the Ninetales legend?") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I heard about that!{WAIT_PRESS}\nWeren't they living like fugitives until\nrecently?") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Can they handle it?{WAIT_PRESS}\nThey don't look very tough.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -8937,27 +8937,27 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But...#W\nwe're still a rescue team.")), + VARIANT(/* == */ 1, _(" But...{WAIT_PRESS}\nwe're still a rescue team.")), VARIANT(/* == */ 1, _(" I wanted to help Pokémon\nthat were suffering from the natural\ndisasters...")), VARIANT(/* == */ 1, _(" That's why we started up\nour rescue team!")), - VARIANT(/* == */ 3, _(" But...#W\nEven so, we're still a rescue team.")), + VARIANT(/* == */ 3, _(" But...{WAIT_PRESS}\nEven so, we're still a rescue team.")), VARIANT(/* == */ 3, _(" To help Pokémon suffering\nfrom the natural disasters...")), VARIANT(/* == */ 3, _(" That's why we started up\nour rescue team!")), - VARIANT_DEFAULT(_(" But...#W\nwe're still a rescue team.")), + VARIANT_DEFAULT(_(" But...{WAIT_PRESS}\nwe're still a rescue team.")), VARIANT_DEFAULT(_(" To help Pokémon suffering\nfrom the natural disasters...")), VARIANT_DEFAULT(_(" That's why we started up\nour rescue team!")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" That's why I want to\nrescue $n8's team more than\nanything.")), - VARIANT(/* == */ 1, _(" Never giving up...\nThat's what #C5Team $t#R takes\npride in!")), - VARIANT(/* == */ 3, _(" That's why I want to rescue\n$n8's team, even if it's risky.")), - VARIANT(/* == */ 3, _(" Never giving up...\nThat's where #C5Team $t#R stakes\nits pride!")), - VARIANT_DEFAULT(_(" That's why I want to\nrescue $n8's team more than\nanything.")), - VARIANT_DEFAULT(_(" Never giving up...\nThat's where #C5Team $t#R stakes\nits pride!")), + VARIANT(/* == */ 1, _(" That's why I want to\nrescue {NAME_8}'s team more than\nanything.")), + VARIANT(/* == */ 1, _(" Never giving up...\nThat's what {COLOR CYAN}Team {TEAM_NAME}{RESET} takes\npride in!")), + VARIANT(/* == */ 3, _(" That's why I want to rescue\n{NAME_8}'s team, even if it's risky.")), + VARIANT(/* == */ 3, _(" Never giving up...\nThat's where {COLOR CYAN}Team {TEAM_NAME}{RESET} stakes\nits pride!")), + VARIANT_DEFAULT(_(" That's why I want to\nrescue {NAME_8}'s team more than\nanything.")), + VARIANT_DEFAULT(_(" Never giving up...\nThat's where {COLOR CYAN}Team {TEAM_NAME}{RESET} stakes\nits pride!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x0e, 0x0004, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ............#WKeh.#W Kekekeh!#W\nYou really aren't very bright, are you?") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Keh.{WAIT_PRESS} Kekekeh!{WAIT_PRESS}\nYou really aren't very bright, are you?") }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -8968,7 +8968,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ WAIT(10), { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0003, 0x00000000, -0x00000001, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...No.\n$n1 is right.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...No.\n{NAME_1} is right.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -9030,7 +9030,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0e, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n5!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_5}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ...This is no time to be\nlying around!") }, @@ -9068,7 +9068,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0e, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n6!\nAnd $n7 too!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_6}!\nAnd {NAME_7} too!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -9104,7 +9104,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Ugegegegegegegegeh!#W\nAre you dreaming?!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Ugegegegegegegegeh!{WAIT_PRESS}\nAre you dreaming?!") }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -9130,7 +9130,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Thank you, $n1.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Thank you, {NAME_1}.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" You stopped us from\nthrowing away the most important thing\nwe have--pride.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" My thanks from all of us.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -9139,7 +9139,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ WAIT(15), { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Everyone!#W\nIt's time to get to work!") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Everyone!{WAIT_PRESS}\nIt's time to get to work!") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Let's show them what we\nrescue teams are really about!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -10088,9 +10088,9 @@ static const struct ScriptCommand s_gs1_g29_s0_lives0_dlg2[] = { /* 0x8161054 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 0, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_8N, 0, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my goodness, yes!\n$n2's talk was such an\ninspiration!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my goodness, yes!\n{NAME_2}'s talk was such an\ninspiration!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It has stoked a raging fire\nin our hearts!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will keep bringing in fine\nmerchandise!#W This, I do for you!#W\nSo...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will keep bringing in fine\nmerchandise!{WAIT_PRESS} This, I do for you!{WAIT_PRESS}\nSo...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10118,7 +10118,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives2_dlg2[] = { /* 0x81612a0 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 2, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_8N, 2, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Aren't you remarkable?#W\nYour money will be jealously guarded,\nso feel secure on your outings!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Aren't you remarkable?{WAIT_PRESS}\nYour money will be jealously guarded,\nso feel secure on your outings!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10133,7 +10133,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives3_dlg2[] = { /* 0x81613b4 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 3, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_8N, 3, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n2's words struck\nme deeply.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_2}'s words struck\nme deeply.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You can count on me for all\nyour move-linking needs!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ @@ -10165,7 +10165,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives5_dlg2[] = { /* 0x816167c */ JUMPIF_ARRAY(EVENT_M01E09A_8N, 5, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_8N, 5, 1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll do my best to get more\nFriend Areas!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Because $n0's team\nare my friends!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Because {NAME_0}'s team\nare my friends!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10187,11 +10187,11 @@ static const struct ScriptCommand s_gs1_g29_s0_lives6_dlg2[] = { /* 0x81617c4 */ WAIT(1), { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What's it like?\nThis #CDMagma Cavern#R.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What's it like?\nThis {COLOR YELLOW_D}Magma Cavern{RESET}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It was teeming with tough\nPokémon, that's for sure.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I'm strong against fire...#W\nbut that place is special.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I'm strong against fire...{WAIT_PRESS}\nbut that place is special.") }, JUMP_SCRIPT(END_TALK), }; @@ -10210,11 +10210,11 @@ static const struct ScriptCommand s_gs1_g29_s0_lives7_dlg2[] = { /* 0x8161978 */ WAIT(1), { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What's it like?\nThis #CDMagma Cavern#R.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What's it like?\nThis {COLOR YELLOW_D}Magma Cavern{RESET}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It was teeming with tough\nPokémon, that's for sure.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I'm strong against fire...#W\nbut that place is special.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I'm strong against fire...{WAIT_PRESS}\nbut that place is special.") }, JUMP_SCRIPT(END_TALK), }; @@ -10233,11 +10233,11 @@ static const struct ScriptCommand s_gs1_g29_s0_lives8_dlg2[] = { /* 0x8161a88 */ WAIT(1), { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The #CDMagma Cavern#R...\nAbove all, there were many Fire-type\nPokémon.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The {COLOR YELLOW_D}Magma Cavern{RESET}...\nAbove all, there were many Fire-type\nPokémon.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Fire-type Pokémon...#W\nI think they would burn me up in no time...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But, no!#W\nI mustn't make excuses for myself!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Fire-type Pokémon...{WAIT_PRESS}\nI think they would burn me up in no time...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But, no!{WAIT_PRESS}\nI mustn't make excuses for myself!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Now is the time for each\nand every one of us to make a stand!") }, JUMP_SCRIPT(END_TALK), }; @@ -10257,11 +10257,11 @@ static const struct ScriptCommand s_gs1_g29_s0_lives9_dlg2[] = { /* 0x8161cac */ WAIT(1), { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The #CDMagma Cavern#R...\nAbove all, there were many Fire-type\nPokémon.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The {COLOR YELLOW_D}Magma Cavern{RESET}...\nAbove all, there were many Fire-type\nPokémon.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Fire-type Pokémon...#W\nI think they would burn me up in no time...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But, no!#W\nI mustn't make excuses for myself!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Fire-type Pokémon...{WAIT_PRESS}\nI think they would burn me up in no time...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But, no!{WAIT_PRESS}\nI mustn't make excuses for myself!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Now is the time for each\nand every one of us to make a stand!") }, JUMP_SCRIPT(END_TALK), }; @@ -10282,10 +10282,10 @@ static const struct ScriptCommand s_gs1_g29_s0_lives10_dlg2[] = { /* 0x8161dcc * { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oi, you lot shouldn't go.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The #CDMagma Cavern#R is\nalive with flames. You'll be burned up!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The {COLOR YELLOW_D}Magma Cavern{RESET} is\nalive with flames. You'll be burned up!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We can't do that!#W\nWe are a rescue team too.\nWe can't stand by idly!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We can't do that!{WAIT_PRESS}\nWe are a rescue team too.\nWe can't stand by idly!") }, JUMP_SCRIPT(END_TALK), }; @@ -10305,10 +10305,10 @@ static const struct ScriptCommand s_gs1_g29_s0_lives11_dlg2[] = { /* 0x8161f8c * { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oi, you lot shouldn't go.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The #CDMagma Cavern#R is\nalive with flames. You'll be burned up!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The {COLOR YELLOW_D}Magma Cavern{RESET} is\nalive with flames. You'll be burned up!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We can't do that!#W\nWe are a rescue team too.\nWe can't stand by idly!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We can't do that!{WAIT_PRESS}\nWe are a rescue team too.\nWe can't stand by idly!") }, JUMP_SCRIPT(END_TALK), }; @@ -10317,8 +10317,8 @@ static const struct ScriptCommand s_gs1_g29_s0_lives12_dlg2[] = { /* 0x816206c * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Several rescue teams have\nalready left for the #CDMagma Cavern#R.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0, you guys take\ncare, too.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Several rescue teams have\nalready left for the {COLOR YELLOW_D}Magma Cavern{RESET}.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, you guys take\ncare, too.") }, JUMP_SCRIPT(END_TALK), }; @@ -10339,18 +10339,18 @@ static const struct ScriptCommand s_gs1_g29_s1_lives0_dlg0[] = { /* 0x8162190 */ WAIT(1), { 0x2e, 0x0c, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" $n1's words\nshook me up with inspiration!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Especially the part about\ntaking pride...#W That made me...#W\nIt left me choked up...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_1}'s words\nshook me up with inspiration!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Especially the part about\ntaking pride...{WAIT_PRESS} That made me...{WAIT_PRESS}\nIt left me choked up...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It isn't just you, my brother.#W\nI am likewise inspired beyond words.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It isn't just you, my brother.{WAIT_PRESS}\nI am likewise inspired beyond words.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" B-Brother...#W\nSniffle... My brother...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" B-Brother...{WAIT_PRESS}\nSniffle... My brother...") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -10391,9 +10391,9 @@ static const struct ScriptCommand s_gs1_g29_s1_lives2_dlg2[] = { /* 0x8162580 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 0, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_8N, 0, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my goodness, yes!\n$n2's talk was such an\ninspiration!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my goodness, yes!\n{NAME_2}'s talk was such an\ninspiration!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It has stoked a raging fire\nin our hearts!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will keep bringing in fine\nmerchandise!#W This, I do for you!#W\nSo...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will keep bringing in fine\nmerchandise!{WAIT_PRESS} This, I do for you!{WAIT_PRESS}\nSo...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10445,9 +10445,9 @@ static const struct ScriptCommand s_gs1_g30_s0_lives0_dlg2[] = { /* 0x816280c */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 0, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_8N, 0, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my goodness, yes!\n$n2's talk was such an\ninspiration!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my goodness, yes!\n{NAME_2}'s talk was such an\ninspiration!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It has stoked a raging fire\nin our hearts!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will keep bringing in fine\nmerchandise!#W This, I do for you!#W\nSo...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will keep bringing in fine\nmerchandise!{WAIT_PRESS} This, I do for you!{WAIT_PRESS}\nSo...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10480,7 +10480,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives2_dlg2[] = { /* 0x81629bc */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 2, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_8N, 2, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Aren't you remarkable?#W\nYour money will be jealously guarded,\nso feel secure on your outings!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Aren't you remarkable?{WAIT_PRESS}\nYour money will be jealously guarded,\nso feel secure on your outings!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10495,7 +10495,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives3_dlg2[] = { /* 0x8162a6c */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 3, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_8N, 3, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n2's words struck\nme deeply.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_2}'s words struck\nme deeply.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You can count on me for all\nyour move-linking needs!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ @@ -10527,7 +10527,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives5_dlg2[] = { /* 0x8162c3c */ JUMPIF_ARRAY(EVENT_M01E09A_8N, 5, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_8N, 5, 1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll do my best to get more\nFriend Areas!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Because $n0's team\nare my friends!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Because {NAME_0}'s team\nare my friends!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10553,16 +10553,16 @@ static const struct ScriptCommand s_gs1_g30_s0_lives6_dlg2[] = { /* 0x8162d2c */ { 0x2e, 0x0d, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We got wiped again...#W\nFifteen times now we have been to that\ninfernal #CDMagma Cavern#R.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We got wiped again...{WAIT_PRESS}\nFifteen times now we have been to that\ninfernal {COLOR YELLOW_D}Magma Cavern{RESET}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Why does this keep\nhappening?#W\nWe can't be that weak!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Why does this keep\nhappening?{WAIT_PRESS}\nWe can't be that weak!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Maybe we're just lacking\nthe will to win.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The will to win?#W\nThat's it! This is about willpower!\nI didn't realize!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The will to win?{WAIT_PRESS}\nThat's it! This is about willpower!\nI didn't realize!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Darlings, we will will\nourselves to win, and we will win!") }, @@ -10592,16 +10592,16 @@ static const struct ScriptCommand s_gs1_g30_s0_lives7_dlg2[] = { /* 0x81630c0 */ { 0x2e, 0x0d, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We got wiped again...#W\nFifteen times now we have been to that\ninfernal #CDMagma Cavern#R.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We got wiped again...{WAIT_PRESS}\nFifteen times now we have been to that\ninfernal {COLOR YELLOW_D}Magma Cavern{RESET}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Why does this keep\nhappening?#W\nWe can't be that weak!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Why does this keep\nhappening?{WAIT_PRESS}\nWe can't be that weak!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Maybe we're just lacking\nthe will to win.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The will to win?#W\nThat's it! This is about willpower!\nI didn't realize!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The will to win?{WAIT_PRESS}\nThat's it! This is about willpower!\nI didn't realize!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Darlings, we will will\nourselves to win, and we will win!") }, @@ -10631,16 +10631,16 @@ static const struct ScriptCommand s_gs1_g30_s0_lives8_dlg2[] = { /* 0x81632d0 */ { 0x2e, 0x0d, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We got wiped again...#W\nFifteen times now we have been to that\ninfernal #CDMagma Cavern#R.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We got wiped again...{WAIT_PRESS}\nFifteen times now we have been to that\ninfernal {COLOR YELLOW_D}Magma Cavern{RESET}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Why does this keep\nhappening?#W\nWe can't be that weak!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Why does this keep\nhappening?{WAIT_PRESS}\nWe can't be that weak!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Maybe we're just lacking\nthe will to win.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The will to win?#W\nThat's it! This is about willpower!\nI didn't realize!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The will to win?{WAIT_PRESS}\nThat's it! This is about willpower!\nI didn't realize!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Darlings, we will will\nourselves to win, and we will win!") }, @@ -10675,8 +10675,8 @@ static const struct ScriptCommand s_gs1_g30_s0_lives9_dlg2[] = { /* 0x81635b0 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I ventured into the #CDMagma\nCavern#R, but...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I got nowhere.#W\nI got KO'd and kicked out as soon as I\nwent in...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I ventured into the {COLOR YELLOW_D}Magma\nCavern{RESET}, but...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I got nowhere.{WAIT_PRESS}\nI got KO'd and kicked out as soon as I\nwent in...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But I won't give up!\nNot ever!") }, JUMP_SCRIPT(END_TALK), }; @@ -10688,7 +10688,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives10_dlg2[] = { /* 0x81636d0 * WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's tough for us to get\nvery deep in there...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But it helps that other\nrescue teams give us information about\nwhat's underground.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" However...#W\nWhatever became of Alakazam?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nWhatever became of Alakazam?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If he had fallen in\na dungeon, he would've been\nexpelled back here...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Since he hasn't returned,\ndoes it mean he's still in the dungeon?") }, JUMP_SCRIPT(END_TALK), @@ -10700,7 +10700,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives11_dlg2[] = { /* 0x81638c0 * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I talked to other rescue\nteams.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" They all say the #CDMagma\nCavern#R goes very deep.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" They all say the {COLOR YELLOW_D}Magma\nCavern{RESET} goes very deep.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder exactly how deep\nit goes?") }, JUMP_SCRIPT(END_TALK), }; @@ -10712,7 +10712,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives12_dlg2[] = { /* 0x81639bc * WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I overheard some rescue\nteam Pokémon earlier.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" They say it's very taxing\nbecause it's so easy to get burns there.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Please be careful of burns,\n$n0.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Please be careful of burns,\n{NAME_0}.") }, JUMP_SCRIPT(END_TALK), }; @@ -10733,18 +10733,18 @@ static const struct ScriptCommand s_gs1_g30_s1_lives0_dlg0[] = { /* 0x8163b24 */ WAIT(1), { 0x2e, 0x0c, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" $n1's words\nshook me up with inspiration!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Especially the part about\ntaking pride...#W That made me...#W\nIt left me choked up...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_1}'s words\nshook me up with inspiration!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Especially the part about\ntaking pride...{WAIT_PRESS} That made me...{WAIT_PRESS}\nIt left me choked up...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It isn't just you, my brother.#W\nI am likewise inspired beyond words.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It isn't just you, my brother.{WAIT_PRESS}\nI am likewise inspired beyond words.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" B-Brother...#W\nSniffle... My brother...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" B-Brother...{WAIT_PRESS}\nSniffle... My brother...") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -10785,9 +10785,9 @@ static const struct ScriptCommand s_gs1_g30_s1_lives2_dlg2[] = { /* 0x8163dd4 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 0, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_8N, 0, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my goodness, yes!\n$n2's talk was such an\ninspiration!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my goodness, yes!\n{NAME_2}'s talk was such an\ninspiration!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It has stoked a raging fire\nin our hearts!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will keep bringing in fine\nmerchandise!#W This, I do for you!#W\nSo...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will keep bringing in fine\nmerchandise!{WAIT_PRESS} This, I do for you!{WAIT_PRESS}\nSo...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10828,7 +10828,7 @@ static const struct ScriptCommand s_gs1_g31_s0_station_sref_script[] = { /* 0x81 { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(1), - { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("#+And in the square...") }, + { 0x39, 0x00, 0x001e, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And in the square...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10862,7 +10862,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Is $n0's team\nalmost here?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Is {NAME_0}'s team\nalmost here?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -10912,14 +10912,14 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0004, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Great work!\nGreat work, $n0!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Great work!\nGreat work, {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" You really took down that\nGroudon?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Darlings, it's fantastic!#W\nYou have won me over!") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Darlings, it's fantastic!{WAIT_PRESS}\nYou have won me over!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -10942,14 +10942,14 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0d, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" You lot did great!#W\nWhy don't we team up sometime?\nGahahahaha!") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" You lot did great!{WAIT_PRESS}\nWhy don't we team up sometime?\nGahahahaha!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" You've earned everyone's\nrespect now.") }, - { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" Your #C5Team $t#R\nis a first-class rescue team.") }, - { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" Take pride in that.#W\n$n1, $n0.") }, + { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" Your {COLOR CYAN}Team {TEAM_NAME}{RESET}\nis a first-class rescue team.") }, + { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" Take pride in that.{WAIT_PRESS}\n{NAME_1}, {NAME_0}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -10957,15 +10957,15 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ WAIT(5), { 0x2e, 0x15, 0x0001, 0x00000008, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Sniff... Sniffle...#W\n$n0!#W This is great!")), + VARIANT(/* == */ 1, _(" Sniff... Sniffle...{WAIT_PRESS}\n{NAME_0}!{WAIT_PRESS} This is great!")), VARIANT(/* == */ 1, _(" All the work we put in...\nIt was all worth it!")), - VARIANT(/* == */ 3, _(" Sniff... Sniffle...#W\n$n0!#W I can't believe it!")), + VARIANT(/* == */ 3, _(" Sniff... Sniffle...{WAIT_PRESS}\n{NAME_0}!{WAIT_PRESS} I can't believe it!")), VARIANT(/* == */ 3, _(" Everything we experienced...\nIt was all worthwhile!")), - VARIANT_DEFAULT(_(" Sniff... Sniffle...#W\n$n0!#W This is great!")), + VARIANT_DEFAULT(_(" Sniff... Sniffle...{WAIT_PRESS}\n{NAME_0}!{WAIT_PRESS} This is great!")), VARIANT_DEFAULT(_(" Every bit of our effort...\nIt was all worthwhile!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Would you look at that?#W\nI didn't think someone that could take down\nGroudon'd be such a crybaby! Gahahahaha!") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Would you look at that?{WAIT_PRESS}\nI didn't think someone that could take down\nGroudon'd be such a crybaby! Gahahahaha!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -10983,8 +10983,8 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Huh?#W What was that?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I thought I heard something\njust for a moment...#W\nDid I just imagine it?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Huh?{WAIT_PRESS} What was that?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I thought I heard something\njust for a moment...{WAIT_PRESS}\nDid I just imagine it?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -11005,10 +11005,10 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" No. I heard it too.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Me too.#W\nEven now, I hear it...") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Me too.{WAIT_PRESS}\nEven now, I hear it...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" Someone talking?#W\n...Not sure.") }, + { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" Someone talking?{WAIT_PRESS}\n...Not sure.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -11031,16 +11031,16 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Th-this voice...#W\nI remember this voice.")), - VARIANT(/* == */ 1, _(" This voice...#W I think...#W\nThat's it! It's $n9!")), - VARIANT_DEFAULT(_(" Th-this voice...#W\nI've heard it before.")), - VARIANT_DEFAULT(_(" This voice...#W I'm sure...#W\nThat's it! It's $n9!")), + VARIANT(/* == */ 1, _(" Th-this voice...{WAIT_PRESS}\nI remember this voice.")), + VARIANT(/* == */ 1, _(" This voice...{WAIT_PRESS} I think...{WAIT_PRESS}\nThat's it! It's {NAME_9}!")), + VARIANT_DEFAULT(_(" Th-this voice...{WAIT_PRESS}\nI've heard it before.")), + VARIANT_DEFAULT(_(" This voice...{WAIT_PRESS} I'm sure...{WAIT_PRESS}\nThat's it! It's {NAME_9}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" $n9?#W\nAh, that's it! Telepathy!") }, - { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" $n9 is calling out\nto us using telepathy!") }, + { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" {NAME_9}?{WAIT_PRESS}\nAh, that's it! Telepathy!") }, + { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" {NAME_9} is calling out\nto us using telepathy!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(487), @@ -11050,7 +11050,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ BGM_SWITCH(19), { 0x2e, 0x00, 0x0009, -0x00000002, 0x00000000, NULL }, { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" ...To all Pokémon!\nCalling all Pokémon!") }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Terrible, it is!#W\nFrom the sky...#W Falls a star...") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Terrible, it is!{WAIT_PRESS}\nFrom the sky...{WAIT_PRESS} Falls a star...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -11533,7 +11533,7 @@ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" $n9.#W\nTell us.") }, + { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" {NAME_9}.{WAIT_PRESS}\nTell us.") }, { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" Can the falling star be\nstopped?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -11543,47 +11543,47 @@ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ { 0x27, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, WAIT(30), { 0x2e, 0x00, 0x0009, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" ............#WThere is a way.") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}There is a way.") }, { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" ...To prevent collision,\nthere is but one solution.") }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" You must ask $n7.") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" You must ask {NAME_7}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0d, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" $n7?#W\nWhat might that be?") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" {NAME_7}?{WAIT_PRESS}\nWhat might that be?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(487), { 0x28, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, { 0x27, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, WAIT(30), { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" A Pokémon, living far above\nus in the sky.\nLegendary, it is.") }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" $n7 must be asked\nto destroy the star from the sky.") }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" However...#W\nFar, far up in the sky lives $n7.\nKnown by few and seen by none.") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" {NAME_7} must be asked\nto destroy the star from the sky.") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nFar, far up in the sky lives {NAME_7}.\nKnown by few and seen by none.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" The sky...#W\nHow are we to go there?") }, + { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" The sky...{WAIT_PRESS}\nHow are we to go there?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(487), { 0x28, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, { 0x27, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, WAIT(30), - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" $n8 and I\namplify our Teleport together...") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" {NAME_8} and I\namplify our Teleport together...") }, { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" And send Pokémon to the\nsky.") }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" However...#W\nThe sky is a world above the clouds.") }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" What will become of the\nPokémon sent to the sky?#W\nEven I can guess nothing...") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nThe sky is a world above the clouds.") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" What will become of the\nPokémon sent to the sky?{WAIT_PRESS}\nEven I can guess nothing...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x10, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Then, we'll do it!#W\nWe'll go!")), - VARIANT(/* == */ 3, _(" Then, we'll do it!#W\nWe'll go!")), - VARIANT_DEFAULT(_(" Then, we'll do it!#W\nWe'll go!")), + VARIANT(/* == */ 1, _(" Then, we'll do it!{WAIT_PRESS}\nWe'll go!")), + VARIANT(/* == */ 3, _(" Then, we'll do it!{WAIT_PRESS}\nWe'll go!")), + VARIANT_DEFAULT(_(" Then, we'll do it!{WAIT_PRESS}\nWe'll go!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" I also...#W\nI thought there could be none but you...") }, - { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" But...#W Are you sure?#W\nThere's no telling what you would find\nin that world above the clouds.") }, + { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" I also...{WAIT_PRESS}\nI thought there could be none but you...") }, + { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" But...{WAIT_PRESS} Are you sure?{WAIT_PRESS}\nThere's no telling what you would find\nin that world above the clouds.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -11601,10 +11601,10 @@ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ { 0x28, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, { 0x27, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, WAIT(30), - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" $n1, $n0.#W\nDo you hear?#W This is $n9.") }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Discuss we will,\n$n8 and I, about how our\nTeleport can be amplified.") }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Departure, it is tomorrow.#W\nRest you should until then.") }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Last word.#W\nDangerous will be your adventure...#W\nBut fail, you must not. Surpass yourselves.") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" {NAME_1}, {NAME_0}.{WAIT_PRESS}\nDo you hear?{WAIT_PRESS} This is {NAME_9}.") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Discuss we will,\n{NAME_8} and I, about how our\nTeleport can be amplified.") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Departure, it is tomorrow.{WAIT_PRESS}\nRest you should until then.") }, + { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Last word.{WAIT_PRESS}\nDangerous will be your adventure...{WAIT_PRESS}\nBut fail, you must not. Surpass yourselves.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" No problem!\nWe'll be fine!") }, @@ -11613,8 +11613,8 @@ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n0!\nLet's get it done!")), - VARIANT_DEFAULT(_(" Right, $n0?\nLet's get it done!")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}!\nLet's get it done!")), + VARIANT_DEFAULT(_(" Right, {NAME_0}?\nLet's get it done!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -11807,8 +11807,8 @@ static const struct ScriptCommand s_gs1_g34_s0_lives0_dlg2[] = { /* 0x8167dbc */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0.")), - VARIANT_DEFAULT(_(" $n0.")), + VARIANT(/* == */ 1, _(" {NAME_0}.")), + VARIANT_DEFAULT(_(" {NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" Are you all ready for\nthe sky?")), @@ -11827,11 +11827,11 @@ static const struct ScriptCommand s_gs1_g34_s0_lives0_dlg2[] = { /* 0x8167dbc */ VARIANT(/* == */ 1, _(" Great!\nLooks like you're all set to roll!")), VARIANT(/* == */ 1, _(" We leave tomorrow.")), VARIANT(/* == */ 1, _(" Let's get plenty of rest\ntonight and get set for tomorrow.")), - VARIANT(/* == */ 1, _(" Tomorrow!#W\nLet's give it everything we've got,\n$n0!")), + VARIANT(/* == */ 1, _(" Tomorrow!{WAIT_PRESS}\nLet's give it everything we've got,\n{NAME_0}!")), VARIANT_DEFAULT(_(" Yup!\nLooks like we're ready to go!")), VARIANT_DEFAULT(_(" We leave tomorrow.")), VARIANT_DEFAULT(_(" So let's get plenty of rest\nfor tomorrow.")), - VARIANT_DEFAULT(_(" Tomorrow!#W\nLet's give it everything we can,\n$n0!")), + VARIANT_DEFAULT(_(" Tomorrow!{WAIT_PRESS}\nLet's give it everything we can,\n{NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(150), { 0x23, 0x01, 0x002d, 0x00000000, 0x00000000, NULL }, @@ -11877,7 +11877,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives3_dlg2[] = { /* 0x81683c4 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_1N, 2, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_1N, 2, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0, you're our\none hope!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, you're our\none hope!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -11891,7 +11891,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives4_dlg2[] = { /* 0x8168494 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_1N, 3, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_1N, 3, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm rooting for your\nsuccess, $n0!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm rooting for your\nsuccess, {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -11905,7 +11905,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives5_dlg2[] = { /* 0x816856c */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_1N, 4, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_1N, 4, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You'll do fine!#W\nI'm sure you'll find success!\nHave confidence in yourselves!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You'll do fine!{WAIT_PRESS}\nI'm sure you'll find success!\nHave confidence in yourselves!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -11941,7 +11941,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives8_dlg2[] = { /* 0x8168824 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Darlings, I can't begin to\nimagine a world above the clouds...#W\nThe best of luck!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Darlings, I can't begin to\nimagine a world above the clouds...{WAIT_PRESS}\nThe best of luck!") }, JUMP_SCRIPT(END_TALK), }; @@ -11970,7 +11970,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives11_dlg2[] = { /* 0x8168a5c * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This is getting heavy!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But I have this feeling\nthat you can do it.#W\nWe need you to win!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But I have this feeling\nthat you can do it.{WAIT_PRESS}\nWe need you to win!") }, JUMP_SCRIPT(END_TALK), }; @@ -11980,7 +11980,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives12_dlg2[] = { /* 0x8168b28 * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will wait for you.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0, I'm sure that\nyou will succeed and come back.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, I'm sure that\nyou will succeed and come back.") }, JUMP_SCRIPT(END_TALK), }; @@ -11999,7 +11999,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives14_dlg2[] = { /* 0x8168cbc * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm throwing in my lot with\n#C5Team $t#R!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm throwing in my lot with\n{COLOR CYAN}Team {TEAM_NAME}{RESET}!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Get out there and save\nthe world!") }, JUMP_SCRIPT(END_TALK), }; @@ -12009,7 +12009,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives15_dlg2[] = { /* 0x8168d80 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You can do it!#W\nYou can stop the star from falling!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You can do it!{WAIT_PRESS}\nYou can stop the star from falling!") }, JUMP_SCRIPT(END_TALK), }; @@ -12057,7 +12057,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives2_dlg2[] = { /* 0x816901c */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_3N, 2, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_3N, 2, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0, don't let us\ndown!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, don't let us\ndown!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12071,7 +12071,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives3_dlg2[] = { /* 0x81690ec */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_3N, 3, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_3N, 3, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm rooting for you!\nGo get 'em, $n0!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm rooting for you!\nGo get 'em, {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12120,7 +12120,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives7_dlg2[] = { /* 0x816941c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0, take care,\ndarling.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, take care,\ndarling.") }, JUMP_SCRIPT(END_TALK), }; @@ -12219,7 +12219,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives1_dlg2[] = { /* 0x81699e0 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_5N, 1, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_5N, 1, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0, I'm certain\nthat you will succeed!\nGood luck!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, I'm certain\nthat you will succeed!\nGood luck!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12298,7 +12298,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives7_dlg2[] = { /* 0x8169f3c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Darling, you've only begun.#W\n$n0, keep your chin up!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Darling, you've only begun.{WAIT_PRESS}\n{NAME_0}, keep your chin up!") }, JUMP_SCRIPT(END_TALK), }; @@ -12307,7 +12307,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives8_dlg2[] = { /* 0x8169fdc */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? There's a tower of\nclouds in the sky?!#W\nIt exists? Amazing!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? There's a tower of\nclouds in the sky?!{WAIT_PRESS}\nIt exists? Amazing!") }, JUMP_SCRIPT(END_TALK), }; @@ -12401,7 +12401,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives0_dlg2[] = { /* 0x816a4d8 */ WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 0, /* to label */ 0), SET_ARRAYVAL(EVENT_M02E01A_2N, 0, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yes! You did it,\n$n0!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yes! You did it,\n{NAME_0}!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Now that peace has been\nrestored, I can sell my wares with\npeace of mind.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you so much!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12431,7 +12431,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives2_dlg2[] = { /* 0x816a6d8 */ WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 2, /* to label */ 0), SET_ARRAYVAL(EVENT_M02E01A_2N, 2, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Peace has returned!\nThank you, $n0!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Peace has returned!\nThank you, {NAME_0}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12485,7 +12485,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives6_dlg2[] = { /* 0x816aa80 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You guys were amazing...#W\nTruly, you've impressed me.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You guys were amazing...{WAIT_PRESS}\nTruly, you've impressed me.") }, JUMP_SCRIPT(END_TALK), }; @@ -12494,7 +12494,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives7_dlg2[] = { /* 0x816ab1c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You've done it,\n$n0!\nYou're the greatest! Really!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You've done it,\n{NAME_0}!\nYou're the greatest! Really!") }, JUMP_SCRIPT(END_TALK), }; @@ -12504,7 +12504,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives8_dlg2[] = { /* 0x816abb8 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0! $n2!\nYou both hung in there! Great job!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}! {NAME_2}!\nYou both hung in there! Great job!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...But you're still not up to\nour caliber!") }, JUMP_SCRIPT(END_TALK), }; @@ -12545,7 +12545,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives12_dlg2[] = { /* 0x816ae70 * WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We will soon be departing\nthe area.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sincerely, thank you for\nall the help and kindness you've given us.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0 and\n$n2, please do take care!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0} and\n{NAME_2}, please do take care!") }, JUMP_SCRIPT(END_TALK), }; @@ -12557,8 +12557,8 @@ static const struct ScriptCommand s_gs1_g38_s0_lives13_dlg2[] = { /* 0x816af9c * WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We will soon be leaving\nthis area.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We Jumpluff travel the\nworld, carried wherever the winds will\ntake us.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0 and\n$n2, we owe so much to you.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you for everything.#W\nMay we meet again.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0} and\n{NAME_2}, we owe so much to you.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you for everything.{WAIT_PRESS}\nMay we meet again.") }, JUMP_SCRIPT(END_TALK), }; @@ -12580,19 +12580,19 @@ static const struct ScriptCommand s_gs1_g38_s1_lives0_dlg0[] = { /* 0x816b150 */ { 0x2e, 0x0c, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I'm all shaken up with\nemotion!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Knowing that the square will\nbe safe...#W That made me...#W\nIt left me choked up...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Knowing that the square will\nbe safe...{WAIT_PRESS} That made me...{WAIT_PRESS}\nIt left me choked up...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It isn't just you, my brother.#W\nI am likewise overcome with joy.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It isn't just you, my brother.{WAIT_PRESS}\nI am likewise overcome with joy.") }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" B-Brother...#W\nSniffle... My brother...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" B-Brother...{WAIT_PRESS}\nSniffle... My brother...") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" $n0 and\n$n1...#W\nWe only have gratitude for you.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_0} and\n{NAME_1}...{WAIT_PRESS}\nWe only have gratitude for you.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Thank you ever so much!") }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12623,7 +12623,7 @@ static const struct ScriptCommand s_gs1_g38_s1_lives1_dlg2[] = { /* 0x816b4d4 */ WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 0, /* to label */ 0), SET_ARRAYVAL(EVENT_M02E01A_2N, 0, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my, you've outdone\nyourself, $n0!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my, you've outdone\nyourself, {NAME_0}!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Because peace has been\nrestored, I may go about securely in my\nbusiness.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you ever so much!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12675,11 +12675,11 @@ static const struct ScriptCommand s_gs1_g39_s0_lives0_dlg2[] = { /* 0x816b7a0 */ COND_EQUAL(1, /* to label */ 2), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you!") }, FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n1 \n#+became a member!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_1} \n{CENTER_ALIGN}became a member!") }, { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x1e, 0x0000, 0x00000000, 0x00000000, NULL }, - ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to $n1?")), + ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to {NAME_1}?")), CHOICE(/* label */ 3, _("*Yes.")), CHOICE(/* label */ 4, _("No.")), LABEL(3), /* = 0x03 */ @@ -12695,14 +12695,14 @@ static const struct ScriptCommand s_gs1_g39_s0_lives0_dlg2[] = { /* 0x816b7a0 */ JUMP_SCRIPT(END_TALK), LABEL(2), /* = 0x02 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yes!\nThank you!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...But there appears to be\nno room for me in my Friend Area...#W\nHow disappointing...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I would be able to join your\nrescue team if there were less Pokémon\nin #C4Sky Blue Plains#R...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...But there appears to be\nno room for me in my Friend Area...{WAIT_PRESS}\nHow disappointing...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I would be able to join your\nrescue team if there were less Pokémon\nin {COLOR GREEN}Sky Blue Plains{RESET}...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Please let me know then.") }, JUMP_SCRIPT(END_TALK), LABEL(1), /* = 0x01 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, I see...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There still is no room for\nme in the Friend Area I must go to...\nHow disappointing...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I would be able to join your\nrescue team if there were less Pokémon\nin #C4Sky Blue Plains#R...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I would be able to join your\nrescue team if there were less Pokémon\nin {COLOR GREEN}Sky Blue Plains{RESET}...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Please let me know then.") }, JUMP_SCRIPT(END_TALK), }; @@ -12721,10 +12721,10 @@ static const struct ScriptCommand s_gs1_g40_s0_lives0_dlg2[] = { /* 0x816bc34 */ WAIT(1), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? What's that?#W\n...Oh, you mean what happened at sea?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? What's that?{WAIT_PRESS}\n...Oh, you mean what happened at sea?") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wasn't drowning!#W\nSheesh, they're making up stories about\nme!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wasn't drowning!{WAIT_PRESS}\nSheesh, they're making up stories about\nme!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -12742,13 +12742,13 @@ static const struct ScriptCommand s_gs1_g40_s0_lives0_dlg2[] = { /* 0x816bc34 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" See, I went out to the sea\nto frolic a while back.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You know?#W\nI was trying that Dive thing.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You know?{WAIT_PRESS}\nI was trying that Dive thing.") }, { 0x2e, 0x15, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" So, I was having fun\ngoing underwater...#W\nAnd I got washed out to sea a bit.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" So, I was having fun\ngoing underwater...{WAIT_PRESS}\nAnd I got washed out to sea a bit.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" All of a sudden, these\nwicked clouds rolled in...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And before I knew it, there\nwas a full-blown storm raging!") }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There's more!#W\nA dungeon appeared in the sea!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There's more!{WAIT_PRESS}\nA dungeon appeared in the sea!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I was shocked witless!\nI got out of there fast!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But who'd've guessed it?\nA dungeon in a stormy sea!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12760,7 +12760,7 @@ static const struct ScriptCommand s_gs1_g40_s0_lives0_dlg2[] = { /* 0x816bc34 */ FANFARE_PLAY2(468), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?#W\nYou want to know more about that\ndungeon in the sea?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?{WAIT_PRESS}\nYou want to know more about that\ndungeon in the sea?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I vamoosed it out of there,\nso I can't tell you much...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -12768,7 +12768,7 @@ static const struct ScriptCommand s_gs1_g40_s0_lives0_dlg2[] = { /* 0x816bc34 */ FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I know!#W\nMaybe Whiscash would know something.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I know!{WAIT_PRESS}\nMaybe Whiscash would know something.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yeah, that'd be best.\nGo talk to Whiscash.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, RESET_ARRAY(EVENT_LOCAL), @@ -12824,18 +12824,18 @@ static const struct ScriptCommand s_gs1_g41_s0_lives0_dlg2[] = { /* 0x816c540 */ WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It is said to be near the\n#C4Legendary Island#R Friend Area.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It hasn't caused any damage\nso far as I know...#W\nBut it does concern me.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It is said to be near the\n{COLOR GREEN}Legendary Island{RESET} Friend Area.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It hasn't caused any damage\nso far as I know...{WAIT_PRESS}\nBut it does concern me.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The #C4Legendary Island#R\nbelongs to your team.") }, - ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Will you travel to the\n#C4Legendary Island#R and observe what is\ntaking place?")), + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The {COLOR GREEN}Legendary Island{RESET}\nbelongs to your team.") }, + ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Will you travel to the\n{COLOR GREEN}Legendary Island{RESET} and observe what is\ntaking place?")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), LABEL(3), /* = 0x03 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Feeling contrary today?#W\nWe need your help, please.") }, - ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Will you travel to the\n#C4Legendary Island#R and observe what is\ntaking place?")), + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Feeling contrary today?{WAIT_PRESS}\nWe need your help, please.") }, + ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Will you travel to the\n{COLOR GREEN}Legendary Island{RESET} and observe what is\ntaking place?")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), LABEL(2), /* = 0x02 */ @@ -12986,7 +12986,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives0_dlg0[] = { /* 0x816cf4c */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Never seen it before.#W\nIt's not from around these parts.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Never seen it before.{WAIT_PRESS}\nIt's not from around these parts.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(120), WAIT(10), @@ -13000,14 +13000,14 @@ static const struct ScriptCommand s_gs1_g43_s0_lives0_dlg0[] = { /* 0x816cf4c */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" No more...#W\nI can't walk anymore...") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" No more...{WAIT_PRESS}\nI can't walk anymore...") }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" I'm falling down...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Goodness!#W\nIt needs help!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Goodness!{WAIT_PRESS}\nIt needs help!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -13115,8 +13115,8 @@ static const struct ScriptCommand s_gs1_g44_s0_lives0_dlg2[] = { /* 0x816d78c */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000073, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I...#W\nI've given up on ever seeing the mirage\nPokémon...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I...#W\nI've reached the limit of my endurance...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I...{WAIT_PRESS}\nI've given up on ever seeing the mirage\nPokémon...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I...{WAIT_PRESS}\nI've reached the limit of my endurance...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm as tired as tired can\nbe...") }, JUMP_SCRIPT(END_TALK), }; @@ -13156,11 +13156,11 @@ static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...I see.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............I see, I see.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Ah... Understood.\nSo, it is named Ho-Oh...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ah, I see indeed!#W\nTruly!#W Truly, I envy you!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ah, I see indeed!{WAIT_PRESS}\nTruly!{WAIT_PRESS} Truly, I envy you!") }, { 0x3b, 0x23, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 1), COND_EQUAL(1, /* to label */ 1), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Wait!#W Huh?!#W\nYou are!#W You are the one-and-only Ho-Oh?!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Wait!{WAIT_PRESS} Huh?!{WAIT_PRESS}\nYou are!{WAIT_PRESS} You are the one-and-only Ho-Oh?!") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, LABEL(1), /* = 0x01 */ @@ -13172,22 +13172,22 @@ static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ { 0x3b, 0x23, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(2, /* to label */ 2), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wroooooooah!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I...#W You...#W\nYou've made me open my eyes!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I...{WAIT_PRESS} You...{WAIT_PRESS}\nYou've made me open my eyes!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Well, they still look googly,\nbut still...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The lesson is: we mustn't\never give up!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Because if you give up,\nthat's when it ends!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Thank you!#W\nYou have inspired me to resume my\ntravels!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I will again travel the\nworld to find rare Pokémon, perhaps even\nbefore you.#W Farewell!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Thank you!{WAIT_PRESS}\nYou have inspired me to resume my\ntravels!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I will again travel the\nworld to find rare Pokémon, perhaps even\nbefore you.{WAIT_PRESS} Farewell!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(3), LABEL(2), /* = 0x02 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Waaaaaaaaaaaah!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My head...#W Is spinning...#W\nMy head's spinning...#W Waaaaaah!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My head...{WAIT_PRESS} Is spinning...{WAIT_PRESS}\nMy head's spinning...{WAIT_PRESS} Waaaaaah!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -13198,15 +13198,15 @@ static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm so sorry I keeled over\nlike that...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And you even came to my\naid when I was down...#W\nThank you...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But I...#W\nI'm feeling overcome by emotion.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Never...#W\nNever did I expect to meet the mirage\nPokémon...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And you even came to my\naid when I was down...{WAIT_PRESS}\nThank you...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But I...{WAIT_PRESS}\nI'm feeling overcome by emotion.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Never...{WAIT_PRESS}\nNever did I expect to meet the mirage\nPokémon...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I feel giddily elated...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The lesson is we mustn't\never give up!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Because if you give up,\nthat's when it ends!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Thank you!#W\nYou have inspired me to resume my\ntravels!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Thank you!{WAIT_PRESS}\nYou have inspired me to resume my\ntravels!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My meeting you...\nIt will be a memory I will cherish\nforever!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I will keep the memory...#W\nin a special place deep in my heart!#W\nFarewell!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I will keep the memory...{WAIT_PRESS}\nin a special place deep in my heart!{WAIT_PRESS}\nFarewell!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(3), /* = 0x03 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -13441,7 +13441,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hey, you came along at\nthe right time.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We're having a little\nargument about who the most powerful\nPokémon happens to be.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n0, what do you\nthink?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_0}, what do you\nthink?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, ASK3( TRUE, /*default*/ -1, /* speaker */ 2, _(" Who do you think is the\nmost powerful Pokémon?")), CHOICE(/* label */ 5, _("Rayquaza.")), @@ -13457,12 +13457,12 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, yeah?\n$n0, you think so too?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, yeah?\n{NAME_0}, you think so too?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yeah, you bet it is!#W\nRayquaza is the toughest!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yeah, you bet it is!{WAIT_PRESS}\nRayquaza is the toughest!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(8), LABEL(6), /* = 0x06 */ @@ -13475,7 +13475,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Ah, yes!\n$n0! Isn't that right!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Ah, yes!\n{NAME_0}! Isn't that right!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -13502,7 +13502,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("...............................................................\n...............................................................\n...............................................................") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...#WWell, uh...#W\nI know you want to become tougher, but...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...{WAIT_PRESS}Well, uh...{WAIT_PRESS}\nI know you want to become tougher, but...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I hope you never give up\nchasing your dreams.") }, @@ -13528,7 +13528,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Somewhere in the world is\na Pokémon that was made for fighting.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" A Pokémon...#W\nmade for fighting?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" A Pokémon...{WAIT_PRESS}\nmade for fighting?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Yup.") }, @@ -13546,12 +13546,12 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Rumors say...#W\nit is storing its power...") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Rumors say...{WAIT_PRESS}\nit is storing its power...") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" They say it is sleeping in\na dungeon somewhere...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(60), WAIT(30), - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" That rumor...#W\nIt's true...") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" That rumor...{WAIT_PRESS}\nIt's true...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -13567,7 +13567,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ WAIT(120), { 0x62, 0x00, 0x0080, 0x00000010, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n6...#W\nAnd $n7...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_6}...{WAIT_PRESS}\nAnd {NAME_7}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -13577,12 +13577,12 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh my gosh!\nWhat happened to you?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They're hurt bad...#W\nWhat exactly happened?!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They're hurt bad...{WAIT_PRESS}\nWhat exactly happened?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0006, 0x00000003, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0007, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" Urgh...#W\nIt's what that $n4 was saying...") }, + { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" Urgh...{WAIT_PRESS}\nIt's what that {NAME_4} was saying...") }, { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" ...We were wiped out by\nthat Pokémon...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -13596,9 +13596,9 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wh-what did you say?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Grgh... There's no mistake...#W\nIt said it was born to fight...") }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" ...But that Pokémon's\npower...#W\nThere was nothing fake about it...") }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" ...It really was the most\npowerful...#W\n...Gfah!") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Grgh... There's no mistake...{WAIT_PRESS}\nIt said it was born to fight...") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" ...But that Pokémon's\npower...{WAIT_PRESS}\nThere was nothing fake about it...") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" ...It really was the most\npowerful...{WAIT_PRESS}\n...Gfah!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, @@ -13609,17 +13609,17 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ch-$n6!\nAre you OK?!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ch-{NAME_6}!\nAre you OK?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), WAIT(60), - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" There is a cave...\nfar in the west...#W\nIt's there...") }, + { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" There is a cave...\nfar in the west...{WAIT_PRESS}\nIt's there...") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" I never want...#W\nto go back again...#W Gfwoh!") }, + { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" I never want...{WAIT_PRESS}\nto go back again...{WAIT_PRESS} Gfwoh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -13629,7 +13629,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh, my gosh!\nBlastoise went down, too!#W\nThey need help now!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh, my gosh!\nBlastoise went down, too!{WAIT_PRESS}\nThey need help now!") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I'll go get someone!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -13639,11 +13639,11 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0x2e, 0x0c, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x12, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Wow, it really exists...#W\nA Pokémon that tough...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Wow, it really exists...{WAIT_PRESS}\nA Pokémon that tough...") }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...But, you know?#W\nSo we now know that Pokémon is in the\n#CDWestern Cave#R...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...But, you know?{WAIT_PRESS}\nSo we now know that Pokémon is in the\n{COLOR YELLOW_D}Western Cave{RESET}...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I still don't feel like going\nout there...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Going anywhere like that'd\nbe too scary by half!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -13662,10 +13662,10 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The cave shunned\n#+by all out of fear...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The cave shunned\n{CENTER_ALIGN}by all out of fear...") }, BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The #CDWestern Cave#R\n#+is now open for exploration!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {COLOR YELLOW_D}Western Cave{RESET}\n{CENTER_ALIGN}is now open for exploration!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -14053,8 +14053,8 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ { 0x6a, 0x00, 0x0100, 0x00000050, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n0.\nEveryone's gathered around.")), - VARIANT_DEFAULT(_(" Look, $n0.\nEveryone's gathered around.")), + VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nEveryone's gathered around.")), + VARIANT_DEFAULT(_(" Look, {NAME_0}.\nEveryone's gathered around.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -14094,7 +14094,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" My bank wasn't hit, but...#W\nThese are frightening times.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" My bank wasn't hit, but...{WAIT_PRESS}\nThese are frightening times.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -14104,7 +14104,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" No problem.#W\nNothing gets stolen from under my eye.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" No problem.{WAIT_PRESS}\nNothing gets stolen from under my eye.") }, { 0x2e, 0x0f, 0x0005, 0x00000001, 0x00000000, NULL }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" This mama's not about to\nmake a stupid mistake like that! Kakakah!") }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -14114,7 +14114,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You're insinuating...#W\nthat we were robbed for being careless?!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You're insinuating...{WAIT_PRESS}\nthat we were robbed for being careless?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, @@ -14127,19 +14127,19 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ { 0x2e, 0x0f, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Now wait.") }, WAIT(10), - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Tell me, Kecleon.#W\nYou saw...this thief?") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Tell me, Kecleon.{WAIT_PRESS}\nYou saw...this thief?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hmm...?#W\nNo, not very clearly, I didn't.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hmm...?{WAIT_PRESS}\nNo, not very clearly, I didn't.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" When I saw it, it had\nalready taken off...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Taken off?#W\nYou mean it flew away?") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Taken off?{WAIT_PRESS}\nYou mean it flew away?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.") }, @@ -14156,7 +14156,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" The yonder direction...#W\nThat would be the Northern Range...") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" The yonder direction...{WAIT_PRESS}\nThat would be the Northern Range...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, @@ -14164,21 +14164,21 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" So we'll need to investigate\nthis matter properly.") }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x11, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes. I beg for justice.#W\nMy business faces ruination.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes. I beg for justice.{WAIT_PRESS}\nMy business faces ruination.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0.\nWant to go check it out?")), - VARIANT_DEFAULT(_(" $n0.\nWant to look into this?")), + VARIANT(/* == */ 1, _(" {NAME_0}.\nWant to go check it out?")), + VARIANT_DEFAULT(_(" {NAME_0}.\nWant to look into this?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0's team took on\n#+the case of pursuing the burglar\n#+that struck Kecleon's shop.") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The burglar's alleged\n#+getaway spot...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0}'s team took on\n{CENTER_ALIGN}the case of pursuing the burglar\n{CENTER_ALIGN}that struck Kecleon's shop.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The burglar's alleged\n{CENTER_ALIGN}getaway spot...") }, BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The #CDNorthern Range#R\n#+is now open for investigation!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {COLOR YELLOW_D}Northern Range{RESET}\n{CENTER_ALIGN}is now open for investigation!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -14376,9 +14376,9 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is Pokémon Square.")), - VARIANT(/* == */ 1, _(" You passed out in the\n#CDNorthern Range#R, so we brought you back\nwith us.")), + VARIANT(/* == */ 1, _(" You passed out in the\n{COLOR YELLOW_D}Northern Range{RESET}, so we brought you back\nwith us.")), VARIANT_DEFAULT(_(" This is Pokémon Square.")), - VARIANT_DEFAULT(_(" You fainted in the #CDNorthern\nRange#R, so we brought you back here.")), + VARIANT_DEFAULT(_(" You fainted in the {COLOR YELLOW_D}Northern\nRange{RESET}, so we brought you back here.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -14393,13 +14393,13 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, -0x00000003, 0x00000001, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Now wait.#W\nThere must be a good reason for this.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Now wait.{WAIT_PRESS}\nThere must be a good reason for this.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We should at least hear\nthat.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ...!#W That's right!\nI have to get my sister...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ...!{WAIT_PRESS} That's right!\nI have to get my sister...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -14423,35 +14423,35 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ BGM_SWITCH(114), WAIT(60), { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I have a younger sister.\nHer name is Latias.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Latias...#W\nCrashed somewhere in the #CDPitfall Valley#R...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Latias...{WAIT_PRESS}\nCrashed somewhere in the {COLOR YELLOW_D}Pitfall Valley{RESET}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" What?!#W\nThe #CDPitfall Valley#R?!") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" What?!{WAIT_PRESS}\nThe {COLOR YELLOW_D}Pitfall Valley{RESET}?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" ...What is that?#W\nWhat's the #CDPitfall Valley#R?")), - VARIANT_DEFAULT(_(" ...What is that?#W\nWhat is the #CDPitfall Valley#R?")), + VARIANT(/* == */ 1, _(" ...What is that?{WAIT_PRESS}\nWhat's the {COLOR YELLOW_D}Pitfall Valley{RESET}?")), + VARIANT_DEFAULT(_(" ...What is that?{WAIT_PRESS}\nWhat is the {COLOR YELLOW_D}Pitfall Valley{RESET}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It is near the #CDNorthern\nRange#R.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They say that anyone so\nunlucky to fall into the #CDPitfall Valley#R...#W\nwill never again emerge.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It is near the {COLOR YELLOW_D}Northern\nRange{RESET}.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They say that anyone so\nunlucky to fall into the {COLOR YELLOW_D}Pitfall Valley{RESET}...{WAIT_PRESS}\nwill never again emerge.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Latias and I were flying\nover the Northern Range.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" When suddenly, what\nappeared to be a meteorite struck\nLatias on the wing...") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Her wing shattered by the\nblow, Latias tumbled down into the\ndepths of the #CDPitfall Valley#R...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Her wing shattered by the\nblow, Latias tumbled down into the\ndepths of the {COLOR YELLOW_D}Pitfall Valley{RESET}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -14460,12 +14460,12 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" A meteorite?!") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0!#W\nDo you think maybe that it's a chunk of\nthe blown-up meteor?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!{WAIT_PRESS}\nDo you think maybe that it's a chunk of\nthe blown-up meteor?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I went to the #CDPitfall Valley#R\nin hopes of rescuing my sister, but...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I went to the {COLOR YELLOW_D}Pitfall Valley{RESET}\nin hopes of rescuing my sister, but...") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I made little headway...\nI wasn't up to the task...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -14473,11 +14473,11 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" So that drove you to steal\nTechnical Machines...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Yes.#W\nI intended to make amends after I saved\nmy sister...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Yes.{WAIT_PRESS}\nI intended to make amends after I saved\nmy sister...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" But that doesn't mean I can\nget away with thievery.#W\nIt was wrong, and I'm sorry.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" But that doesn't mean I can\nget away with thievery.{WAIT_PRESS}\nIt was wrong, and I'm sorry.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -14487,7 +14487,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh... Oh, my!#W\nIt is not a problem! Not a problem at all!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh... Oh, my!{WAIT_PRESS}\nIt is not a problem! Not a problem at all!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" For a reason so compelling,\nit can't be helped. Hahaha.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -14496,32 +14496,32 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" However...#W\nEven if you were to plumb the depths of\n#CDPitfall Valley#R...") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nEven if you were to plumb the depths of\n{COLOR YELLOW_D}Pitfall Valley{RESET}...") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" What would you do then?") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" The nether regions of the\n#CDPitfall Valley#R are a void...") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You will wander forever,\nneither falling...#Wnor living...#W\nWhat then?") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" The nether regions of the\n{COLOR YELLOW_D}Pitfall Valley{RESET} are a void...") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You will wander forever,\nneither falling...{WAIT_PRESS}nor living...{WAIT_PRESS}\nWhat then?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ............#W\nSo much time has passed since my sister\ncrashed.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nSo much time has passed since my sister\ncrashed.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Latias hasn't been able to\nclimb out of the depths.\nShe is all alone down there.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Even if I end up like her,\nunable to escape...#W\nTwo would be better than one.") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Even if I end up like her,\nunable to escape...{WAIT_PRESS}\nTwo would be better than one.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Latias wouldn't have to\nbe so alone...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" How foolish...#W\nDo you think Latias wishes for that?") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" How foolish...{WAIT_PRESS}\nDo you think Latias wishes for that?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" But...#W\nIt's a place you can never escape, right?")), + VARIANT(/* == */ 1, _(" But...{WAIT_PRESS}\nIt's a place you can never escape, right?")), VARIANT(/* == */ 1, _(" How are we supposed to pull\noff a rescue from a place like that...?")), - VARIANT_DEFAULT(_(" But...#W\nIt's a place you can't escape, isn't it?")), + VARIANT_DEFAULT(_(" But...{WAIT_PRESS}\nIt's a place you can't escape, isn't it?")), VARIANT_DEFAULT(_(" I don't see how we could\ndo a rescue in a place like that...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" No...#W There is...#W\nThere is but one possible way...") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" No...{WAIT_PRESS} There is...{WAIT_PRESS}\nThere is but one possible way...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -14532,42 +14532,42 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ CALL_SCRIPT(SHOCK_FUNC), { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You can?!#W\nHow?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You can?!{WAIT_PRESS}\nHow?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You already have the means\nin your possession.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" The #CITeleport Gem#R.#W\nUse that.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" The {COLOR GREEN_I}Teleport Gem{RESET}.{WAIT_PRESS}\nUse that.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The #CITeleport Gem#R?#W\nThe one we used to get up to the sky\nwhere Rayquaza lives?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The {COLOR GREEN_I}Teleport Gem{RESET}?{WAIT_PRESS}\nThe one we used to get up to the sky\nwhere Rayquaza lives?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But it got broken in the\nfalling star's explosion.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" While it is unlikely to\ncarry you to the sky again, it should\nbe able to carry you a shorter distance.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" If you were to use the\n#CITeleport Gem#R from deep within the #CDPitfall\nValley#R...") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" If you were to use the\n{COLOR GREEN_I}Teleport Gem{RESET} from deep within the {COLOR YELLOW_D}Pitfall\nValley{RESET}...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0001, 0x00000009, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That's it!#W\nIf we did that, we could escape with\nLatias!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That's it!{WAIT_PRESS}\nIf we did that, we could escape with\nLatias!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0!#W\nThis is a rescue that only we can do!")), + VARIANT(/* == */ 1, _(" {NAME_0}!{WAIT_PRESS}\nThis is a rescue that only we can do!")), VARIANT(/* == */ 1, _(" Let's get out there and\nhelp Latias!")), - VARIANT(/* == */ 3, _(" $n0!#W\nThis is a rescue that only we can do!")), + VARIANT(/* == */ 3, _(" {NAME_0}!{WAIT_PRESS}\nThis is a rescue that only we can do!")), VARIANT(/* == */ 3, _(" Let's go get Latias!")), - VARIANT_DEFAULT(_(" $n0!#W\nThis is a rescue that only we can do!")), + VARIANT_DEFAULT(_(" {NAME_0}!{WAIT_PRESS}\nThis is a rescue that only we can do!")), VARIANT_DEFAULT(_(" Let's go rescue Latias!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 gained access to\n#+the #CDPitfall Valley#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Pitfall Valley{RESET}!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -14789,7 +14789,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" $n6!") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" {NAME_6}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, @@ -14825,7 +14825,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0x2e, 0x03, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" My sister is safe, all\nthanks to you.") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" To be honest, I came close\nto giving up...") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" But we're back together\nagain...#W\nIt's happiness beyond words...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" But we're back together\nagain...{WAIT_PRESS}\nIt's happiness beyond words...") }, { 0x2e, 0x15, 0x0005, 0x00000001, 0x00000000, NULL }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" We owe you so much\ngratitude! Thank you!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -14834,13 +14834,13 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ WAIT(10), { 0x2e, 0x02, 0x0001, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, now, that's OK.#W\nIt's even a little embarrassing when you\nput it that way, hahaha!")), - VARIANT_DEFAULT(_(" It's OK, really.#W\nWhen you put it that way, it's even a little\nembarrassing. Hahaha.")), + VARIANT(/* == */ 1, _(" Hey, now, that's OK.{WAIT_PRESS}\nIt's even a little embarrassing when you\nput it that way, hahaha!")), + VARIANT_DEFAULT(_(" It's OK, really.{WAIT_PRESS}\nWhen you put it that way, it's even a little\nembarrassing. Hahaha.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" However...\nWe have no money or any other way of\nrepaying your kindness.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" So, and it's the least we\ncan do...#W\nMay we join your rescue team?") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" So, and it's the least we\ncan do...{WAIT_PRESS}\nMay we join your rescue team?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -14853,13 +14853,13 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" We would like to join #C5Team\n$t#R and help with your rescue\nwork.") }, + { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" We would like to join {COLOR CYAN}Team\n{TEAM_NAME}{RESET} and help with your rescue\nwork.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Would that work?#W\nWould you be willing to accept us on\nyour rescue team?") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Would that work?{WAIT_PRESS}\nWould you be willing to accept us on\nyour rescue team?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -14867,8 +14867,8 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), - VARIANT(/* == */ 1, _(" $n0, what do you\nsay?#W\nShould we let Latios and Latias join?")), - VARIANT_DEFAULT(_(" $n0, what should\nwe do?#W\nDo we let Latios and Latias join?")), + VARIANT(/* == */ 1, _(" {NAME_0}, what do you\nsay?{WAIT_PRESS}\nShould we let Latios and Latias join?")), + VARIANT_DEFAULT(_(" {NAME_0}, what should\nwe do?{WAIT_PRESS}\nDo we let Latios and Latias join?")), CHOICE(/* label */ 10, _("Yes.")), CHOICE(/* label */ 11, _("No.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -14915,7 +14915,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Latios and Latias are\nPokémon so rarely seen that they are\nconsidered mythical.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" If you part ways with them\nnow, you may never see them again.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Strike that.\nYou will never again see them.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Even knowing that...#W\nEven if you would never see them again,\nyou will still not accept them?") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Even knowing that...{WAIT_PRESS}\nEven if you would never see them again,\nyou will still not accept them?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -14927,8 +14927,8 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0, think good\nand hard about this.")), - VARIANT_DEFAULT(_(" $n0, give it good\nthought.")), + VARIANT(/* == */ 1, _(" {NAME_0}, think good\nand hard about this.")), + VARIANT_DEFAULT(_(" {NAME_0}, give it good\nthought.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -14976,15 +14976,15 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Delighted to join!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+And thus...") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+#C5Team $t#R was\n#+joined by $n5 and $n6!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And thus...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{COLOR CYAN}Team {TEAM_NAME}{RESET} was\n{CENTER_ALIGN}joined by {NAME_5} and {NAME_6}!") }, BGM_STOP, FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n5 and $n6\n#+became team members!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_5} and {NAME_6}\n{CENTER_ALIGN}became team members!") }, { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x24, 0x0000, 0x00000000, 0x00000000, NULL }, - ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to $n5?")), + ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to {NAME_5}?")), CHOICE(/* label */ 17, _("*Yes.")), CHOICE(/* label */ 18, _("No.")), LABEL(17), /* = 0x11 */ @@ -14993,7 +14993,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0x3b, 0x25, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x26, 0x0000, 0x00000000, 0x00000000, NULL }, - ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to $n6?")), + ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to {NAME_6}?")), CHOICE(/* label */ 19, _("*Yes.")), CHOICE(/* label */ 20, _("No.")), LABEL(19), /* = 0x13 */ @@ -15262,12 +15262,12 @@ static const struct ScriptCommand s_gs1_g50_s0_lives0_dlg2[] = { /* 0x8177b2c */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), SET_ARRAYVAL(EVENT_S07E01, 0, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hey, have you heard?\nAbout the #CDBuried Relic#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hey, have you heard?\nAbout the {COLOR YELLOW_D}Buried Relic{RESET}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" They're rumoring that there\nare treasures in there.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And they say the treasures\naren't just lying around on the ground.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Know what they're saying?#W\nThey're saying that treasures are even\nembedded in the walls!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you knock down the walls,\nthere might be treasures galore!#W\nSounds really enticing, eh?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I think Shiftry knows where\nthe #CDBuried Relic#R is.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Know what they're saying?{WAIT_PRESS}\nThey're saying that treasures are even\nembedded in the walls!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you knock down the walls,\nthere might be treasures galore!{WAIT_PRESS}\nSounds really enticing, eh?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I think Shiftry knows where\nthe {COLOR YELLOW_D}Buried Relic{RESET} is.") }, JUMP_SCRIPT(END_TALK), }; @@ -15278,7 +15278,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives1_dlg2[] = { /* 0x8177da0 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), SET_ARRAYVAL(EVENT_S07E01, 1, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I heard rumors that\nPokémon from ancient times live in the\n#CDBuried Relic#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I heard rumors that\nPokémon from ancient times live in the\n{COLOR YELLOW_D}Buried Relic{RESET}.") }, JUMP_SCRIPT(END_TALK), }; @@ -15289,8 +15289,8 @@ static const struct ScriptCommand s_gs1_g50_s0_lives2_dlg2[] = { /* 0x8177e60 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), SET_ARRAYVAL(EVENT_S07E01, 2, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I've heard that there are\ntreasures to be found in the relic.#W\nI wonder how much is true?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But, I must admit...#W\nI do get a certain thrill from it!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I've heard that there are\ntreasures to be found in the relic.{WAIT_PRESS}\nI wonder how much is true?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But, I must admit...{WAIT_PRESS}\nI do get a certain thrill from it!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I guess there's a sense of\ndrama and adventure about it.") }, JUMP_SCRIPT(END_TALK), }; @@ -15315,18 +15315,18 @@ static const struct ScriptCommand s_gs1_g50_s0_lives3_dlg2[] = { /* 0x817803c */ FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What's that?\nWhere is the #CDBuried Relic#R?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The #CDBuried Relic#R is deep\nin the jungle to the southeast.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What's that?\nWhere is the {COLOR YELLOW_D}Buried Relic{RESET}?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The {COLOR YELLOW_D}Buried Relic{RESET} is deep\nin the jungle to the southeast.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Are you dreaming about\nthe treasures too?") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Kukukuh...#W Me too!#W\nBest of luck, compadre!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Kukukuh...{WAIT_PRESS} Me too!{WAIT_PRESS}\nBest of luck, compadre!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, JUMPIF_SCENE_GT(SCENARIO_SUB7, 49, 2, /* to label */ 1), WAIT(30), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Leaving aside the disturbing fact that\n#+$n1 made them compadres...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Leaving aside the disturbing fact that\n{CENTER_ALIGN}{NAME_1} made them compadres...") }, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0's team gained\n#+access to the #CDBuried Relic#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0}'s team gained\n{CENTER_ALIGN}access to the {COLOR YELLOW_D}Buried Relic{RESET}!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMPIF_SCENE_GT(SCENARIO_SUB7, 49, 2, /* to label */ 1), @@ -15378,7 +15378,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives5_dlg2[] = { /* 0x8178564 */ WAIT(1), JUMPIF_ARRAY(EVENT_S07E01, 6, /* to label */ 0), SET_ARRAYVAL(EVENT_S07E01, 6, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, isn't it exciting?#W\nWhy, I wouldn't mind closing up the shop\nso I could go treasure hunting!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, isn't it exciting?{WAIT_PRESS}\nWhy, I wouldn't mind closing up the shop\nso I could go treasure hunting!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And now...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ @@ -15409,7 +15409,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives7_dlg2[] = { /* 0x8178780 */ WAIT(1), JUMPIF_ARRAY(EVENT_S07E01, 8, /* to label */ 0), SET_ARRAYVAL(EVENT_S07E01, 8, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder what kinds of\nfriends are in the #CDBuried Relic#R?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder what kinds of\nfriends are in the {COLOR YELLOW_D}Buried Relic{RESET}?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -15424,7 +15424,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives8_dlg2[] = { /* 0x8178870 */ WAIT(1), JUMPIF_ARRAY(EVENT_S07E01, 9, /* to label */ 0), SET_ARRAYVAL(EVENT_S07E01, 9, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You're going too, aren't you?\nTo the #CDBuried Relic#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You're going too, aren't you?\nTo the {COLOR YELLOW_D}Buried Relic{RESET}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This mama's behind you all\nthe way! Go for it!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" OK...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -15441,7 +15441,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives9_dlg2[] = { /* 0x81789bc */ WAIT(1), JUMPIF_ARRAY(EVENT_S07E01, 10, /* to label */ 0), SET_ARRAYVAL(EVENT_S07E01, 10, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What treasures can be\nfound in the #CDBuried Relic#R, I wonder?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What treasures can be\nfound in the {COLOR YELLOW_D}Buried Relic{RESET}, I wonder?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It makes me drool thinking\nwhat I could swallow in a place like that.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ @@ -15455,9 +15455,9 @@ static const struct ScriptCommand s_gs1_g51_s0_lives0_dlg2[] = { /* 0x8178b08 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I think Gengar headed off\nto #CDMt. Freeze#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I think Gengar headed off\nto {COLOR YELLOW_D}Mt. Freeze{RESET}.") }, { 0x2e, 0x02, 0x0001, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I have heard it is a place\nthat is very difficult.#W\nWill he be OK?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I have heard it is a place\nthat is very difficult.{WAIT_PRESS}\nWill he be OK?") }, SCENARIO_CALC(SCENARIO_SUB9, 53, 4), JUMP_SCRIPT(END_TALK), }; @@ -15481,7 +15481,7 @@ static const struct ScriptCommand s_gs1_g52_s0_lives0_dlg2[] = { /* 0x8178d0c */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I have done a lot of\nthinking...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I would like to join #C5Team \n$t#R and help on rescues.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I would like to join {COLOR CYAN}Team \n{TEAM_NAME}{RESET} and help on rescues.") }, ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" Please, may I become\na member?")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), @@ -15489,16 +15489,16 @@ static const struct ScriptCommand s_gs1_g52_s0_lives0_dlg2[] = { /* 0x8178d0c */ { 0x3b, 0x30, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(1, /* to label */ 4), { 0x2e, 0x02, 0x0001, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you!#W\nI promise to do my best for the team!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you!{WAIT_PRESS}\nI promise to do my best for the team!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n1 became the\n#+rescue team's newest member!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_1} became the\n{CENTER_ALIGN}rescue team's newest member!") }, { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x3b, 0x31, 0x0000, 0x00000000, 0x00000000, NULL }, - ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to $n1?")), + ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to {NAME_1}?")), CHOICE(/* label */ 6, _("*Yes.")), CHOICE(/* label */ 7, _("No.")), LABEL(6), /* = 0x06 */ @@ -15516,14 +15516,14 @@ static const struct ScriptCommand s_gs1_g52_s0_lives0_dlg2[] = { /* 0x8178d0c */ { 0x2e, 0x02, 0x0001, 0x00000041, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yes!\nThank you!") }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...However, there seems to\nbe no space for me in my Friend Area...#W\nThis is disappointing...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I could join your rescue\nteam if there were less Pokémon in\n#C4Sky Blue Plains#R...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...However, there seems to\nbe no space for me in my Friend Area...{WAIT_PRESS}\nThis is disappointing...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I could join your rescue\nteam if there were less Pokémon in\n{COLOR GREEN}Sky Blue Plains{RESET}...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Please tell me then.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(END_TALK), LABEL(3), /* = 0x03 */ { 0x2e, 0x15, 0x0001, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...I see.#W\nThis is disappointing...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...I see.{WAIT_PRESS}\nThis is disappointing...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(END_TALK), }; diff --git a/src/data/ground/ground_data_t01p02a_station.h b/src/data/ground/ground_data_t01p02a_station.h index 9b1fecaa..5ac12a2b 100644 --- a/src/data/ground/ground_data_t01p02a_station.h +++ b/src/data/ground/ground_data_t01p02a_station.h @@ -196,8 +196,8 @@ static const struct ScriptCommand s_gs2_g0_s2_evt0_sref_script[] = { /* 0x817df3 { 0x01, 0x00, -0x0001, 0x00000008, 0x00000000, NULL }, HALT, LABEL(0), /* = 0x00 */ - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The entrance is too narrow.\n#+There is only room for one.") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Come alone to enter!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The entrance is too narrow.\n{CENTER_ALIGN}There is only room for one.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Come alone to enter!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, RET, }; @@ -243,7 +243,7 @@ static const struct ScriptCommand s_gs2_g1_s0_lives0_dlg2[] = { /* 0x817e130 */ WAIT(1), { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I went into the cave, but...#W\nI couldn't evolve into Butterfree.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I went into the cave, but...{WAIT_PRESS}\nI couldn't evolve into Butterfree.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That's too bad, Metapod.") }, @@ -251,7 +251,7 @@ static const struct ScriptCommand s_gs2_g1_s0_lives0_dlg2[] = { /* 0x817e130 */ { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If you train and raise your\nlevel, I think you'll be able to evolve.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh, so it's my level!#W\nI get it! I'll work at leveling up!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh, so it's my level!{WAIT_PRESS}\nI get it! I'll work at leveling up!") }, JUMP_SCRIPT(END_TALK), }; @@ -271,7 +271,7 @@ static const struct ScriptCommand s_gs2_g1_s0_lives1_dlg2[] = { /* 0x817e3c0 */ WAIT(1), { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I went into the cave, but...#W\nI couldn't evolve into Butterfree.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I went into the cave, but...{WAIT_PRESS}\nI couldn't evolve into Butterfree.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That's too bad, Metapod.") }, @@ -279,7 +279,7 @@ static const struct ScriptCommand s_gs2_g1_s0_lives1_dlg2[] = { /* 0x817e3c0 */ { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If you train and raise your\nlevel, I think you'll be able to evolve.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh, so it's my level!#W\nI get it! I'll work at leveling up!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh, so it's my level!{WAIT_PRESS}\nI get it! I'll work at leveling up!") }, JUMP_SCRIPT(END_TALK), }; @@ -361,7 +361,7 @@ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg2[] = { /* 0x817e834 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I, too, have heard of it.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I have heard of a place that\nis far off our coast...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It is a sea churned by\ntorrential storms and violent waves.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It is a place appropriately\nnamed the #CDStormy Sea#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It is a place appropriately\nnamed the {COLOR YELLOW_D}Stormy Sea{RESET}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There, one will find a\ndungeon that leads to the bottom of\nthe sea.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The sea is infinitely dark,\nand its depth unimaginable.\nThat is what I have heard.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -369,50 +369,50 @@ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg2[] = { /* 0x817e834 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho!#W\nYou look eager to go.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho!{WAIT_PRESS}\nYou look eager to go.") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" However...#W\nTo go beneath the sea, a Hidden Machine\nnamed #CIDive#R is needed.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Without #CIDive#R, you cannot\ngo to the #CDStormy Sea#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nTo go beneath the sea, a Hidden Machine\nnamed {COLOR GREEN_I}Dive{RESET} is needed.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Without {COLOR GREEN_I}Dive{RESET}, you cannot\ngo to the {COLOR YELLOW_D}Stormy Sea{RESET}.") }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho! Your face tells me\nyou are desperate to go.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" So be it.#W\nYou may have this.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" So be it.{WAIT_PRESS}\nYou may have this.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x3c, 0x2c, 0x0000, 0x000000e7, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I understand that it is\na very rare item that was found in a place\ncalled the #CDSolar Cave#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I understand that it is\na very rare item that was found in a place\ncalled the {COLOR YELLOW_D}Solar Cave{RESET}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you were to carry that\nHidden Machine as an item...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Or if any team member\nwishing to enter the dungeon used that\nHidden Machine to learn #CIDive#R...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You would be able to enter\nthe #CDStormy Sea#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Or if any team member\nwishing to enter the dungeon used that\nHidden Machine to learn {COLOR GREEN_I}Dive{RESET}...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You would be able to enter\nthe {COLOR YELLOW_D}Stormy Sea{RESET}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Gained access to\n#+the #CDStormy Sea#R!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Stormy Sea{RESET}!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Beware--you must take the HM #CIDive#R,\n#+or a team member must learn #CIDive#R\n#+as a move for the team to enter!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Beware--you must take the HM {COLOR GREEN_I}Dive{RESET},\n{CENTER_ALIGN}or a team member must learn {COLOR GREEN_I}Dive{RESET}\n{CENTER_ALIGN}as a move for the team to enter!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(8), { 0xaf, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, SCENARIO_CALC(SCENARIO_SUB2, 33, 4), JUMP_SCRIPT(END_TALK), LABEL(0), /* = 0x00 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you were to carry the\nHidden Machine #CIDive#R as an item...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Or if any team member\nwishing to enter the dungeon used that\nHidden Machine to learn #CIDive#R...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You would be able to enter\nthe #CDStormy Sea#R.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh?#W\nWhat happens if you lose the\nHidden Machine #CIDive#R?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" All I had was the one\nI gave you...#W\nHmm... What should one do?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The Hidden Machine #CIDive#R\nwas apparently found in the #CDSolar Cave#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you were to carry the\nHidden Machine {COLOR GREEN_I}Dive{RESET} as an item...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Or if any team member\nwishing to enter the dungeon used that\nHidden Machine to learn {COLOR GREEN_I}Dive{RESET}...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You would be able to enter\nthe {COLOR YELLOW_D}Stormy Sea{RESET}.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh?{WAIT_PRESS}\nWhat happens if you lose the\nHidden Machine {COLOR GREEN_I}Dive{RESET}?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" All I had was the one\nI gave you...{WAIT_PRESS}\nHmm... What should one do?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The Hidden Machine {COLOR GREEN_I}Dive{RESET}\nwas apparently found in the {COLOR YELLOW_D}Solar Cave{RESET}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I suppose it wouldn't hurt\nto search there.") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho.#W\nAdventures keep you young.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho.{WAIT_PRESS}\nAdventures keep you young.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Why, if I were only a little\nyounger, I might have joined you on your\nadventures.") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -473,10 +473,10 @@ static const struct ScriptCommand s_gs2_g4_s0_lives0_dlg2[] = { /* 0x817f4e4 */ WAIT(1), SET_ARRAYVAL(EVENT_S07E01, 3, 1), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho.#W\nThere is an old saying about the #CDBuried\nRelic#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho.{WAIT_PRESS}\nThere is an old saying about the {COLOR YELLOW_D}Buried\nRelic{RESET}.") }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Three parts there are,\nguarded by three disciples.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" When the three parts\nare gathered in hand...#W\nA mirage shall appear to the bearer...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" When the three parts\nare gathered in hand...{WAIT_PRESS}\nA mirage shall appear to the bearer...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...What this actually means,\nthere is no telling now. Hohoho.") }, JUMP_SCRIPT(END_TALK), }; @@ -568,7 +568,7 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ { 0x2e, 0x15, 0x0002, 0x00000001, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000002, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My wish...\nIt will finally come true!#W\nPshehehe!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My wish...\nIt will finally come true!{WAIT_PRESS}\nPshehehe!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -580,14 +580,14 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Listen, $n3.#W\nWe must keep this a secret just between\nthe two of us.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Listen, {NAME_3}.{WAIT_PRESS}\nWe must keep this a secret just between\nthe two of us.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We can't tell any Pokémon.\nNot even Gengar.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I know that!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let's decide on how\nwe're going to do this...#W First...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let's decide on how\nwe're going to do this...{WAIT_PRESS} First...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(465), @@ -612,11 +612,11 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ WAIT(60), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I...#W\nI don't know anything!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I...{WAIT_PRESS}\nI don't know anything!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Me too!\nI don't know a thing!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I don't know anything about\nmaking wishes come true!#W\nI know nothing!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I don't know anything about\nmaking wishes come true!{WAIT_PRESS}\nI know nothing!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -765,12 +765,12 @@ static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" $n3, listen.#W\nI'm thinking it is best if only we go\ninto the dungeon.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_3}, listen.{WAIT_PRESS}\nI'm thinking it is best if only we go\ninto the dungeon.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If either one of us\nfalls before the end...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh, I get it.#W\nThe other one can still go make wishes!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That's smart, $n2!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh, I get it.{WAIT_PRESS}\nThe other one can still go make wishes!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That's smart, {NAME_2}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000001, 0x00000000, NULL }, @@ -814,11 +814,11 @@ static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ WAIT(60), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I...#W\nI don't know anything!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I...{WAIT_PRESS}\nI don't know anything!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Me too!\nI don't know a thing!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I don't know anything about\na dungeon that makes wishes come true!#W\nI know nothing!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I don't know anything about\na dungeon that makes wishes come true!{WAIT_PRESS}\nI know nothing!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -966,7 +966,7 @@ static const struct ScriptCommand s_gs2_g9_s1_lives0_dlg0[] = { /* 0x818131c */ WAIT(60), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wh-what are you staring\nat, you?!") }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm having a hard time\ntrying to make up my mind!#W\nGet lost!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm having a hard time\ntrying to make up my mind!{WAIT_PRESS}\nGet lost!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -1100,7 +1100,7 @@ static const struct ScriptCommand s_gs2_g12_s0_lives0_dlg2[] = { /* 0x8181c58 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Seeing the innocence of\nchildren at play is a good thing.\nHohoho.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" When I was small...#W\nI was tiny...#W\nHohoho.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" When I was small...{WAIT_PRESS}\nI was tiny...{WAIT_PRESS}\nHohoho.") }, JUMP_SCRIPT(END_TALK), }; @@ -1117,10 +1117,10 @@ static const struct ScriptCommand s_gs2_g12_s0_lives1_dlg2[] = { /* 0x8181d6c */ { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000005e, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh! $n0 and\n$n2! Long time no see!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh! {NAME_0} and\n{NAME_2}! Long time no see!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I have a new friend!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" His name is $n3.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm going to call on\n$n3 and go play in the woods!\nIt's going to be fun!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" His name is {NAME_3}.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm going to call on\n{NAME_3} and go play in the woods!\nIt's going to be fun!") }, JUMP_SCRIPT(END_TALK), }; @@ -1145,7 +1145,7 @@ static const struct ScriptCommand s_gs2_g13_s0_lives0_dlg2[] = { /* 0x8181f38 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I've not seen $n2\nor other children lately.\nI wonder how they are keeping.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I've not seen {NAME_2}\nor other children lately.\nI wonder how they are keeping.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Not seeing the children\ngives me a twinge of sadness...") }, JUMP_SCRIPT(END_TALK), }; @@ -1178,14 +1178,14 @@ static const struct ScriptCommand s_gs2_g14_s0_lives0_dlg2[] = { /* 0x81820f0 */ WAIT(1), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's good to see the\nyoungsters back.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I heard you saved them.#W\nGetting through the dungeon must have\nbeen very taxing on you.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I heard you saved them.{WAIT_PRESS}\nGetting through the dungeon must have\nbeen very taxing on you.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm also grateful for what\nyou've done. Thank you.") }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Incidentally...#W\nI have heard of a particularly challenging\ndungeon somewhere in our world.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It starts your level at one...#W\nclears all your gained stats...#W\nand empties your Toolbox at the start.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Incidentally...{WAIT_PRESS}\nI have heard of a particularly challenging\ndungeon somewhere in our world.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It starts your level at one...{WAIT_PRESS}\nclears all your gained stats...{WAIT_PRESS}\nand empties your Toolbox at the start.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" In other words, it forces\none to enter in a completely clean state.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It has never been conquered\nby any rescue team...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It has earned its title as\nthe #CDUltimate Dungeon#R...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It has earned its title as\nthe {COLOR YELLOW_D}Ultimate Dungeon{RESET}...") }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Perhaps your team will take\non that challenge one day? Hohoho!") }, JUMP_SCRIPT(END_TALK), @@ -1203,7 +1203,7 @@ static const struct ScriptCommand s_gs2_g14_s0_lives1_dlg2[] = { /* 0x81824b4 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000005e, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I can play with $n2\nagain!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I can play with {NAME_2}\nagain!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you!") }, JUMP_SCRIPT(END_TALK), }; @@ -1214,7 +1214,7 @@ static const struct ScriptCommand s_gs2_g14_s0_lives2_dlg2[] = { /* 0x818255c */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0 and\n$n2, thank you!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0} and\n{NAME_2}, thank you!") }, JUMP_SCRIPT(END_TALK), }; @@ -1264,7 +1264,7 @@ static const struct ScriptCommand s_gs2_g15_s0_lives1_dlg2[] = { /* 0x8182768 */ WAIT(1), { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yay, $n3!\nWhat'll we do next?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yay, {NAME_3}!\nWhat'll we do next?") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Let's play battle!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" OK, I use String Shot!") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Then, I use Harden!") }, @@ -1288,7 +1288,7 @@ static const struct ScriptCommand s_gs2_g15_s0_lives2_dlg2[] = { /* 0x8182904 */ WAIT(1), { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yay, $n3!\nWhat'll we do next?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yay, {NAME_3}!\nWhat'll we do next?") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Let's play battle!") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" OK, I use String Shot!") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Then, I use Harden!") }, @@ -1321,12 +1321,12 @@ static const struct ScriptCommand s_gs2_g16_s0_lives0_dlg2[] = { /* 0x8182a70 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho.\nYou wish to hear me tell old folklore?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" What was that?\nYou wish to hear the #C4$n2 legend#R?")), + ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" What was that?\nYou wish to hear the {COLOR GREEN}{NAME_2} legend{RESET}?")), CHOICE(/* label */ 1, _("Yes.")), CHOICE(/* label */ 2, _("No.")), LABEL(1), /* = 0x01 */ BGM_FADEOUT(90), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho. Fine, then.#W\nLet me recount the tale.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho. Fine, then.{WAIT_PRESS}\nLet me recount the tale.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, EXECUTE_STATION(-1, 16, 1), HALT, @@ -1349,7 +1349,7 @@ static const struct ScriptCommand s_gs2_g16_s0_lives1_dlg2[] = { /* 0x8182ce8 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000062, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n2 told us\nfolklore from long ago.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_2} told us\nfolklore from long ago.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It was fun.") }, JUMP_SCRIPT(END_TALK), }; @@ -1360,7 +1360,7 @@ static const struct ScriptCommand s_gs2_g16_s0_lives2_dlg2[] = { /* 0x8182da0 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000062, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The folklore was fun and\ninteresting.#W\n$n2 is very wise.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The folklore was fun and\ninteresting.{WAIT_PRESS}\n{NAME_2} is very wise.") }, JUMP_SCRIPT(END_TALK), }; @@ -1395,11 +1395,11 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ { 0x6b, 0x00, 0x0100, 0x0000000c, 0x00000000, NULL }, { 0x8b, 0x1e, 0x0004, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(6), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There once lived a Pokémon\nby the name of $n2.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There once lived a Pokémon\nby the name of {NAME_2}.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Now, $n2 had\nmany tails, all of them imbued with\npsychic power...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Now, {NAME_2} had\nmany tails, all of them imbued with\npsychic power...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It was said that anyone so\nfoolish as to touch a tail would be cursed\nfor a thousand years.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But there was someone\nso foolish as to grab a tail.#W\nAnd it was a human.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But there was someone\nso foolish as to grab a tail.{WAIT_PRESS}\nAnd it was a human.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0003, 0x00000004, 0x00000000, NULL }, @@ -1408,7 +1408,7 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ WAIT(10), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yes, a human.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" As one might expect, the\nhuman that grabbed the tail was subjected\nto a thousand-year curse.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" However, just when the\ncurse was cast, a Pokémon named\n$n4 shielded the human...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" However, just when the\ncurse was cast, a Pokémon named\n{NAME_4} shielded the human...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And sacrificed herself to\nabsorb the curse.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -1416,21 +1416,21 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Why would that Pokémon,\nGardevoir, take the human's place?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" To $n4, that human\nwas her partner.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" To {NAME_4}, that human\nwas her partner.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There exist strong bonds\nbetween humans and Pokémon.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0003, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 3), - VARIANT(/* == */ 1, _(" ...All right.#W\nBut humans... Aren't there good ones and\nbad ones too?")), - VARIANT_DEFAULT(_(" ...OK.#W\nBut humans... Aren't there good humans\nand bad ones too?")), + VARIANT(/* == */ 1, _(" ...All right.{WAIT_PRESS}\nBut humans... Aren't there good ones and\nbad ones too?")), + VARIANT_DEFAULT(_(" ...OK.{WAIT_PRESS}\nBut humans... Aren't there good humans\nand bad ones too?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Correct.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Taking pity on $n4,\n$n2 asked the human this...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" “Do you wish to save\n$n4?” it asked...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But the human had already\nabandoned $n4 and fled.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n2 became\ndisillusioned with the human...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Taking pity on {NAME_4},\n{NAME_2} asked the human this...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" “Do you wish to save\n{NAME_4}?” it asked...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But the human had already\nabandoned {NAME_4} and fled.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_2} became\ndisillusioned with the human...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And it made this prediction...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" “That human will one day\nbe reborn as a Pokémon...”") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1439,7 +1439,7 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ FANFARE_PLAY2(466), CALL_SCRIPT(SHOCK_FUNC), { 0x2e, 0x03, 0x0003, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" What?!#W\nA human turn into a Pokémon?!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" What?!{WAIT_PRESS}\nA human turn into a Pokémon?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -1459,7 +1459,7 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ........................") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ah-hah!#W\nYou found it so interesting, you're at\na loss for words? Hohoho.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ah-hah!{WAIT_PRESS}\nYou found it so interesting, you're at\na loss for words? Hohoho.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There's no need to wear\nsuch a serious expression.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Certainly some rumors say\nthat the legend may actually be true...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But it is only ancient\nfolklore, nothing more.") }, @@ -1520,11 +1520,11 @@ static const struct ScriptCommand s_gs2_g16_s1_lives2_dlg2[] = { /* 0x8183d24 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho.\nYou wish to hear me tell old folklore?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" What was that?\nYou wish to hear the #C4$n2 legend#R?")), + ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" What was that?\nYou wish to hear the {COLOR GREEN}{NAME_2} legend{RESET}?")), CHOICE(/* label */ 1, _("Yes.")), CHOICE(/* label */ 2, _("No.")), LABEL(1), /* = 0x01 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho. Fine, then.#W\nLet me recount the tale.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho. Fine, then.{WAIT_PRESS}\nLet me recount the tale.") }, EXECUTE_STATION(-1, 16, 1), HALT, LABEL(2), /* = 0x02 */ @@ -1567,7 +1567,7 @@ static const struct ScriptCommand s_gs2_g18_s0_lives0_dlg0[] = { /* 0x8183f98 */ WAIT(30), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes, a human.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" As one might expect, the\nhuman that grabbed the tail was subjected\nto a curse of a thousand years.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" However, just when the\ncurse was cast, a Pokémon named\n$n3 shielded the human...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" However, just when the\ncurse was cast, a Pokémon named\n{NAME_3} shielded the human...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And sacrificed herself to\nabsorb the curse.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -1576,7 +1576,7 @@ static const struct ScriptCommand s_gs2_g18_s0_lives0_dlg0[] = { /* 0x8183f98 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Why would that Pokémon,\nGardevoir, take the human's place?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" To $n3, that human\nwas her partner.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" To {NAME_3}, that human\nwas her partner.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There exist strong bonds\nbetween humans and Pokémon.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -1643,8 +1643,8 @@ static const struct ScriptCommand s_gs2_g20_s0_lives0_dlg2[] = { /* 0x81843a8 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I regret this...#W\nHow some old folklore I told...#W\ncould cause such an uproar...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I got carried away and\nrecounted that tale...#W\nI should've left well enough alone...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I regret this...{WAIT_PRESS}\nHow some old folklore I told...{WAIT_PRESS}\ncould cause such an uproar...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I got carried away and\nrecounted that tale...{WAIT_PRESS}\nI should've left well enough alone...") }, JUMP_SCRIPT(END_TALK), }; @@ -1669,7 +1669,7 @@ static const struct ScriptCommand s_gs2_g20_s0_lives1_dlg2[] = { /* 0x8184568 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm so glad $n0\nisn't under suspicion anymore.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm so glad {NAME_0}\nisn't under suspicion anymore.") }, JUMP_SCRIPT(END_TALK), }; @@ -1678,7 +1678,7 @@ static const struct ScriptCommand s_gs2_g20_s0_lives2_dlg2[] = { /* 0x81845fc */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I just knew $n0\ncouldn't be evil.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I just knew {NAME_0}\ncouldn't be evil.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I hope you keep doing good\nwith your rescue work!") }, JUMP_SCRIPT(END_TALK), }; @@ -1705,7 +1705,7 @@ static const struct ScriptCommand s_gs2_g21_s0_lives0_dlg2[] = { /* 0x8184754 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wroooar!\nI can't relax!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" My whiskers...#W\nThey tell me of coming earthquakes.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" My whiskers...{WAIT_PRESS}\nThey tell me of coming earthquakes.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And many quakes are indeed\ncoming.") }, JUMP_SCRIPT(END_TALK), }; @@ -1732,7 +1732,7 @@ static const struct ScriptCommand s_gs2_g21_s0_lives1_dlg2[] = { /* 0x81848ec */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That earthquake really\nfrightened me...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I was so scared, I spat silk\nall over the place...#W\nIt was a mess for everyone...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I was so scared, I spat silk\nall over the place...{WAIT_PRESS}\nIt was a mess for everyone...") }, JUMP_SCRIPT(END_TALK), }; @@ -1742,7 +1742,7 @@ static const struct ScriptCommand s_gs2_g21_s0_lives2_dlg2[] = { /* 0x81849e0 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I hardened when the quake\nhit...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I couldn't take a step...#W\nI was just shaking inside my shell...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I couldn't take a step...{WAIT_PRESS}\nI was just shaking inside my shell...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waaah!\nThinking about it is scary!") }, JUMP_SCRIPT(END_TALK), }; @@ -1769,7 +1769,7 @@ static const struct ScriptCommand s_gs2_g22_s0_lives0_dlg2[] = { /* 0x8184b7c */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wroooar!\nI can't relax!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" My whiskers...#W\nThey tell me of coming earthquakes.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" My whiskers...{WAIT_PRESS}\nThey tell me of coming earthquakes.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And many quakes are indeed\ncoming.") }, JUMP_SCRIPT(END_TALK), }; @@ -1830,7 +1830,7 @@ static const struct ScriptCommand s_gs2_g23_s0_lives0_dlg2[] = { /* 0x8184e44 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Your words in the square\nstruck me to my heart.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I shouldn't be panicking.#W\nI have the ability to sense quakes.\nI must remain calm.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I shouldn't be panicking.{WAIT_PRESS}\nI have the ability to sense quakes.\nI must remain calm.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It appears I've learned\nsomething from you youngsters.") }, JUMP_SCRIPT(END_TALK), }; @@ -1857,7 +1857,7 @@ static const struct ScriptCommand s_gs2_g23_s0_lives1_dlg2[] = { /* 0x818502c */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" $n0!\nPlease take care!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!\nPlease take care!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We'll be OK.\nWe'll try not to be scared of the quakes!") }, JUMP_SCRIPT(END_TALK), }; @@ -1894,7 +1894,7 @@ static const struct ScriptCommand s_gs2_g24_s0_lives0_dlg2[] = { /* 0x8185214 */ WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sniffle...\nThis is so inspiring...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Pokémon have united in\ntheir efforts to rescue Alakazam's team...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I can feel their resolve...#W\nThe same feeling...from everyone.\nSniffle...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I can feel their resolve...{WAIT_PRESS}\nThe same feeling...from everyone.\nSniffle...") }, JUMP_SCRIPT(END_TALK), }; @@ -1919,11 +1919,11 @@ static const struct ScriptCommand s_gs2_g24_s0_lives1_dlg2[] = { /* 0x81853ec */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" My mom has joined other\nPokémon to fight in the #CDMagma Cavern#R.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" My mom has joined other\nPokémon to fight in the {COLOR YELLOW_D}Magma Cavern{RESET}.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Mom is weak to fire, so it\nisn't easy for her...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But she is doing her best.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Mom also told me...#W\nIt is hard going because there are so many\nmonster houses.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If my information helps\neven a little, $n0, I'm happy.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Mom also told me...{WAIT_PRESS}\nIt is hard going because there are so many\nmonster houses.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If my information helps\neven a little, {NAME_0}, I'm happy.") }, JUMP_SCRIPT(END_TALK), }; @@ -1956,9 +1956,9 @@ static const struct ScriptCommand s_gs2_g25_s0_lives0_dlg2[] = { /* 0x81856d4 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" A shooting star is on\na collision course...#W\nThis is indeed a desperate time.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But there is nothing that\nI can do.#W\nAll our hopes ride with you.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I realize that it is a heavy\nburden to bear, but...#W\nwe must count on you to succeed.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" A shooting star is on\na collision course...{WAIT_PRESS}\nThis is indeed a desperate time.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But there is nothing that\nI can do.{WAIT_PRESS}\nAll our hopes ride with you.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I realize that it is a heavy\nburden to bear, but...{WAIT_PRESS}\nwe must count on you to succeed.") }, JUMP_SCRIPT(END_TALK), }; @@ -1973,7 +1973,7 @@ static const struct ScriptCommand s_gs2_g25_s0_lives1_dlg2[] = { /* 0x8185874 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll use Harden and wait for\n$n0's team to come back!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll use Harden and wait for\n{NAME_0}'s team to come back!") }, JUMP_SCRIPT(END_TALK), }; @@ -2016,7 +2016,7 @@ static const struct ScriptCommand s_gs2_g26_s0_lives1_dlg2[] = { /* 0x8185aa0 */ { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You're soon going...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But this is $n0\nand $n2.#W\nYou can't fail.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But this is {NAME_0}\nand {NAME_2}.{WAIT_PRESS}\nYou can't fail.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I believe in you.\nSo I'll be waiting for you.") }, JUMP_SCRIPT(END_TALK), }; @@ -2027,7 +2027,7 @@ static const struct ScriptCommand s_gs2_g26_s0_lives2_dlg2[] = { /* 0x8185bac */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hello, I am Caterpie's\nmother. It's been a while.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You also have my support.#W\nPlease do your best. And please be careful!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You also have my support.{WAIT_PRESS}\nPlease do your best. And please be careful!") }, JUMP_SCRIPT(END_TALK), }; @@ -2036,7 +2036,7 @@ static const struct ScriptCommand s_gs2_g26_s0_lives3_dlg2[] = { /* 0x8185ca4 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll use Harden and wait for\n$n0's team to come back!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll use Harden and wait for\n{NAME_0}'s team to come back!") }, JUMP_SCRIPT(END_TALK), }; @@ -2061,7 +2061,7 @@ static const struct ScriptCommand s_gs2_g27_s0_lives0_dlg2[] = { /* 0x8185d90 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ah...#W The #CDSky Tower#R,\nyou say...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ah...{WAIT_PRESS} The {COLOR YELLOW_D}Sky Tower{RESET},\nyou say...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" In all my long years, I'd\nnot known of any world above the clouds.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The world remains a vast\nmystery...") }, JUMP_SCRIPT(END_TALK), @@ -2079,7 +2079,7 @@ static const struct ScriptCommand s_gs2_g27_s0_lives1_dlg2[] = { /* 0x8185edc */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This is $n0\nand $n2 after all.#W\nYou can't fail.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This is {NAME_0}\nand {NAME_2} after all.{WAIT_PRESS}\nYou can't fail.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I believe in you.\nSo I'll be waiting for you.") }, JUMP_SCRIPT(END_TALK), }; @@ -2089,7 +2089,7 @@ static const struct ScriptCommand s_gs2_g27_s0_lives2_dlg2[] = { /* 0x8185f90 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I believe too.\n$n0, don't let us down!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I believe too.\n{NAME_0}, don't let us down!") }, JUMP_SCRIPT(END_TALK), }; @@ -2185,7 +2185,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hi, $n4!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hi, {NAME_4}!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -2200,9 +2200,9 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Hey, $n4?#W\nHave you seen Snubbull around?")), + VARIANT(/* == */ 1, _(" Hey, {NAME_4}?{WAIT_PRESS}\nHave you seen Snubbull around?")), VARIANT(/* == */ 1, _(" I heard something weird\nhappened to him.")), - VARIANT_DEFAULT(_(" Hi, $n4.\nHave you seen Snubbull?")), + VARIANT_DEFAULT(_(" Hi, {NAME_4}.\nHave you seen Snubbull?")), VARIANT_DEFAULT(_(" I heard something strange\nhappened to him.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -2217,7 +2217,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Whaaaat?!#W\nYou're Snubbull?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Whaaaat?!{WAIT_PRESS}\nYou're Snubbull?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But you don't look anything\nlike the way you did before!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -2263,13 +2263,13 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ WAIT(15), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Yup.#W\nAnd I came out looking like this...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Yup.{WAIT_PRESS}\nAnd I came out looking like this...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Snubbull underwent\n“evolution.”#W\nHe evolved.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Snubbull underwent\n“evolution.”{WAIT_PRESS}\nHe evolved.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -2283,8 +2283,8 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Evolution? Evolved?#W\nWhat's that about?")), - VARIANT_DEFAULT(_(" Evolution? Evolved?#W\nI don't follow.")), + VARIANT(/* == */ 1, _(" Evolution? Evolved?{WAIT_PRESS}\nWhat's that about?")), + VARIANT_DEFAULT(_(" Evolution? Evolved?{WAIT_PRESS}\nI don't follow.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Pokémon, upon satisfying\ncertain conditions, may evolve.") }, @@ -2298,13 +2298,13 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(NOTICE_FUNC), { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, wow!#W\nYour own appearance...#W\nThat can change?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, wow!{WAIT_PRESS}\nYour own appearance...{WAIT_PRESS}\nThat can change?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I suspect that cave is where\nevolution can take place.") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" This is merely a guess...") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Perhaps evolution could\nnot take place before because the world's\nbalance was askew.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" However, now that the star\nhas been destroyed...#W\nThe world's balance has been restored...") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" However, now that the star\nhas been destroyed...{WAIT_PRESS}\nThe world's balance has been restored...") }, { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" And perhaps that cave\nbecame unsealed.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -2312,17 +2312,17 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" So if I evolved, I would\nbecome like $n3?!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" So if I evolved, I would\nbecome like {NAME_3}?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0003, -0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I wish...#W\nI want to be Butterfree quickly...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I wish...{WAIT_PRESS}\nI want to be Butterfree quickly...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" W-wait a second.#W\nI don't know if I like this or not...") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" W-wait a second.{WAIT_PRESS}\nI don't know if I like this or not...") }, { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" My cute little face turned\nall craggy...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -2339,7 +2339,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(NOTICE_FUNC), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Oh! Really?!#W\nI...#W I might be stronger?!") }, + { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Oh! Really?!{WAIT_PRESS}\nI...{WAIT_PRESS} I might be stronger?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That makes me want to\nevolve even more!") }, @@ -2365,16 +2365,16 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Yes.#W\nBut it would depend on the conditions.") }, + { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Yes.{WAIT_PRESS}\nBut it would depend on the conditions.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0.#W\nWe should go to the cave if we want to\nevolve.")), - VARIANT(/* == */ 3, _(" $n0.#W\nLet's go to the cave if we're ready to\nevolve.")), - VARIANT_DEFAULT(_(" $n0.#W\nLet's go to the cave if we're ready to\nevolve.")), + VARIANT(/* == */ 1, _(" {NAME_0}.{WAIT_PRESS}\nWe should go to the cave if we want to\nevolve.")), + VARIANT(/* == */ 3, _(" {NAME_0}.{WAIT_PRESS}\nLet's go to the cave if we're ready to\nevolve.")), + VARIANT_DEFAULT(_(" {NAME_0}.{WAIT_PRESS}\nLet's go to the cave if we're ready to\nevolve.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -2640,7 +2640,7 @@ static const struct ScriptCommand s_gs2_g30_s0_lives3_dlg2[] = { /* 0x818856c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I might become\nstronger!#W\nOoh, it's exciting...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I might become\nstronger!{WAIT_PRESS}\nOoh, it's exciting...") }, JUMP_SCRIPT(END_TALK), }; diff --git a/src/data/ground/ground_data_t01p03_station.h b/src/data/ground/ground_data_t01p03_station.h index b8de3531..ffb3a72a 100644 --- a/src/data/ground/ground_data_t01p03_station.h +++ b/src/data/ground/ground_data_t01p03_station.h @@ -339,7 +339,7 @@ static const struct ScriptCommand s_gs4_g1_s0_lives1_dlg2[] = { /* 0x818a974 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" My #C5Team Hydro#R is Bronze\nRank.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" My {COLOR CYAN}Team Hydro{RESET} is Bronze\nRank.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We need to do better.") }, JUMP_SCRIPT(END_TALK), }; @@ -349,8 +349,8 @@ static const struct ScriptCommand s_gs4_g1_s0_lives2_dlg2[] = { /* 0x818aa20 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Our #C5Team Rumblerock#R\nis famous for savagery...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But we're actually only\nNormal Rank.#W\nIt's an embarrassment...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Our {COLOR CYAN}Team Rumblerock{RESET}\nis famous for savagery...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But we're actually only\nNormal Rank.{WAIT_PRESS}\nIt's an embarrassment...") }, JUMP_SCRIPT(END_TALK), }; @@ -362,13 +362,13 @@ static const struct ScriptCommand s_gs4_g1_s0_lives3_dlg2[] = { /* 0x818ab0c */ JUMPIF_UNK_BD(118, /* to label */ 0), /* likely "is friend area unlocked" (by GroundEnter id) */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Darlings, did you know?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Every so often, there are\nrescue jobs that reward you with a new\nFriend Area...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Well, lately there've been\nrumors about a new Friend Area!#W\nThe #CHSky Blue Plains#R, they say!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Well, lately there've been\nrumors about a new Friend Area!{WAIT_PRESS}\nThe {COLOR GREEN_H}Sky Blue Plains{RESET}, they say!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Just maybe, getting that\nFriend Area could be the start of\nsomething enchanting.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Darlings, if you spot rescue\njobs that seem promising, you should\ntry them!") }, JUMP_SCRIPT(END_TALK), LABEL(0), /* = 0x00 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Darlings, I'll have you know\nthat my #C5Team Constrictor#R is actually\nSilver Rank.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Not too bad, is it?#W\nWe surprise people with our excellence.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Darlings, I'll have you know\nthat my {COLOR CYAN}Team Constrictor{RESET} is actually\nSilver Rank.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Not too bad, is it?{WAIT_PRESS}\nWe surprise people with our excellence.") }, JUMP_SCRIPT(END_TALK), }; @@ -396,32 +396,32 @@ static const struct ScriptCommand s_gs4_g1_s0_lives4_dlg2[] = { /* 0x818aecc */ COND_EQUAL(1, /* to label */ 1), COND_EQUAL(2, /* to label */ 2), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, hello!\nDid you know?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Somewhere in the world\nthere is an extremely rare Pokémon...#W\nnamed Chansey.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This is what they say about\nChansey...#W If you are lucky enough to\nmeet one, you will be filled with happiness.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder what sort of\na Pokémon it is.#W\nWouldn't you like to meet one, even once?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Somewhere in the world\nthere is an extremely rare Pokémon...{WAIT_PRESS}\nnamed Chansey.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This is what they say about\nChansey...{WAIT_PRESS} If you are lucky enough to\nmeet one, you will be filled with happiness.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder what sort of\na Pokémon it is.{WAIT_PRESS}\nWouldn't you like to meet one, even once?") }, JUMP_SCRIPT(END_TALK), LABEL(1), /* = 0x01 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............#WOh-oh-oh?!#W\nYou've met Chansey?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Oh-oh-oh?!{WAIT_PRESS}\nYou've met Chansey?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That is so lucky!\nWhat are the chances of that?") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my gosh!\nHow wonderful for you!\nHow I envy you!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wish I could meet Chansey\nand be filled with happiness...") }, JUMP_SCRIPT(END_TALK), LABEL(2), /* = 0x02 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, hello!\nDid you know?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Somewhere in the world\nthere is an extremely rare Pokémon...#W\nnamed Chansey.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This is what they say about\nChansey.#W If you are lucky enough to meet\none, you will be filled with happiness.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder what sort of\na Pokémon it is.#W Wouldn't you like to meet\none, even once?#W Wait a second...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Somewhere in the world\nthere is an extremely rare Pokémon...{WAIT_PRESS}\nnamed Chansey.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This is what they say about\nChansey.{WAIT_PRESS} If you are lucky enough to meet\none, you will be filled with happiness.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder what sort of\na Pokémon it is.{WAIT_PRESS} Wouldn't you like to meet\none, even once?{WAIT_PRESS} Wait a second...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waaaaaaaaaaaaaaaaaaaah!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You're...#W\nMaybe...#W Chansey?!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You are! You really are!#W\nI'm so lucky!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You're...{WAIT_PRESS}\nMaybe...{WAIT_PRESS} Chansey?!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You are! You really are!{WAIT_PRESS}\nI'm so lucky!") }, SET_ARRAYVAL(EVENT_T01P03, 2, 1), JUMP_SCRIPT(END_TALK), LABEL(0), /* = 0x00 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my gosh...\nI've finally met you...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm bursting with happiness!#W\nOh, I am so lucky!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm bursting with happiness!{WAIT_PRESS}\nOh, I am so lucky!") }, JUMP_SCRIPT(END_TALK), }; @@ -478,13 +478,13 @@ static const struct ScriptCommand s_gs4_g1_s1_lives0_dlg0[] = { /* 0x818b710 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" (Papa still hasn't come\nhome...)") }, - { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Our son!#W\nSorry to make you wait!") }, + { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Our son!{WAIT_PRESS}\nSorry to make you wait!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...Oh!#W\nThat voice!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...Oh!{WAIT_PRESS}\nThat voice!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -551,7 +551,7 @@ static const struct ScriptCommand s_gs4_g1_s1_lives0_dlg0[] = { /* 0x818b710 */ { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Our son, we're sorry for\ncausing you anxiety.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa.#W\nWhere were you?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa.{WAIT_PRESS}\nWhere were you?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We were traveling the\nworld.") }, @@ -559,17 +559,17 @@ static const struct ScriptCommand s_gs4_g1_s1_lives0_dlg0[] = { /* 0x818b710 */ WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The world is vast.#W\nThere are countless Pokémon around the\nworld that are unknown in these areas.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The world is vast.{WAIT_PRESS}\nThere are countless Pokémon around the\nworld that are unknown in these areas.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That's why you were gone...#W\nPapa, did you see all the Pokémon that\naren't known in these areas?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That's why you were gone...{WAIT_PRESS}\nPapa, did you see all the Pokémon that\naren't known in these areas?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................#W\nOf course.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}\nOf course.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you take us for?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! Of course!#W\nPapa, you're so special!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! Of course!{WAIT_PRESS}\nPapa, you're so special!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -719,7 +719,7 @@ static const struct ScriptCommand s_gs4_g1_s2_lives0_dlg2[] = { /* 0x818c768 */ DEBUGINFO, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What do you take us for?!#W\n...Uh, er... Um, yes.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What do you take us for?!{WAIT_PRESS}\n...Uh, er... Um, yes.") }, JUMP_SCRIPT(END_TALK), }; @@ -787,7 +787,7 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There was a job posted on\nthe Bulletin Board which said, “Punish bad\n#CNMankey#R.”") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There was a job posted on\nthe Bulletin Board which said, “Punish bad\n{COLOR YELLOW_N}Mankey{RESET}.”") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Did you two put up that job?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -840,8 +840,8 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" $n0, we should go.")), - VARIANT_DEFAULT(_(" $n0, we should go.")), + VARIANT(/* == */ 1, _(" {NAME_0}, we should go.")), + VARIANT_DEFAULT(_(" {NAME_0}, we should go.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Thank you!\nWe're counting on you!") }, @@ -855,10 +855,10 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The place where the Mankey gang\n#+is wreaking havoc on others...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The place where the Mankey gang\n{CENTER_ALIGN}is wreaking havoc on others...") }, BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The #CDUproar Forest#R is now\n#+open for exploration!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {COLOR YELLOW_D}Uproar Forest{RESET} is now\n{CENTER_ALIGN}open for exploration!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -982,40 +982,40 @@ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" “Smeargle's desperate plea,“\nhuh...?#W\nThat's some title.")), - VARIANT(/* == */ 1, _(" What's it say?#W\nCan you read it?")), - VARIANT_DEFAULT(_(" “Smeargle's desperate plea,”\nhuh...?#W\nThat's quite the title.")), - VARIANT_DEFAULT(_(" What does it say?#W\nCan you read it?")), + VARIANT(/* == */ 1, _(" “Smeargle's desperate plea,“\nhuh...?{WAIT_PRESS}\nThat's some title.")), + VARIANT(/* == */ 1, _(" What's it say?{WAIT_PRESS}\nCan you read it?")), + VARIANT_DEFAULT(_(" “Smeargle's desperate plea,”\nhuh...?{WAIT_PRESS}\nThat's quite the title.")), + VARIANT_DEFAULT(_(" What does it say?{WAIT_PRESS}\nCan you read it?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 read the letter.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} read the letter.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("“Please allow me to introduce myself.\nMy name is Smeargle.") }, { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("I once had aspirations of becoming\nan artist.") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("Then, one day...#W\nThere was an incident of an unforgivable\nnature...") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("I fled because I didn't want to become an\nadult.#W\nBut then I lost my way...") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("Then, one day...{WAIT_PRESS}\nThere was an incident of an unforgivable\nnature...") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("I fled because I didn't want to become an\nadult.{WAIT_PRESS}\nBut then I lost my way...") }, { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("I now find myself in this forest, unable to\nextricate myself...") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("I am lost in the #CDHowling Forest#R!#W\nSomebody!#W Please save me!”") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("I am lost in the {COLOR YELLOW_D}Howling Forest{RESET}!{WAIT_PRESS}\nSomebody!{WAIT_PRESS} Please save me!”") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" .............#W\nIt says he ran away because he didn't want\nto be an adult...#W What's up with that?")), - VARIANT(/* == */ 1, _(" I don't really get it, but...#W\nWell, let's go rescue this Smeargle!")), - VARIANT_DEFAULT(_(" .............#W\nHe ran away because he didn't want to\nbecome an adult...#W What's that about?")), - VARIANT_DEFAULT(_(" I don't really get this...#W\nBut let's go rescue this Smeargle anyway!")), + VARIANT(/* == */ 1, _(" .............{WAIT_PRESS}\nIt says he ran away because he didn't want\nto be an adult...{WAIT_PRESS} What's up with that?")), + VARIANT(/* == */ 1, _(" I don't really get it, but...{WAIT_PRESS}\nWell, let's go rescue this Smeargle!")), + VARIANT_DEFAULT(_(" .............{WAIT_PRESS}\nHe ran away because he didn't want to\nbecome an adult...{WAIT_PRESS} What's that about?")), + VARIANT_DEFAULT(_(" I don't really get this...{WAIT_PRESS}\nBut let's go rescue this Smeargle anyway!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The forest in which Smeargle\n#+is thought to have gone missing...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The forest in which Smeargle\n{CENTER_ALIGN}is thought to have gone missing...") }, BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The #CDHowling Forest#R\n#+is now open for exploration!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {COLOR YELLOW_D}Howling Forest{RESET}\n{CENTER_ALIGN}is now open for exploration!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -1130,21 +1130,21 @@ static const struct ScriptCommand s_gs4_g7_s0_lives0_dlg0[] = { /* 0x818e464 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x02, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+$n0 read the SOS Mail\n#+apparently sent by Medicham.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} read the SOS Mail\n{CENTER_ALIGN}apparently sent by Medicham.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("“My name is Medicham.") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("We had no trouble entering this dungeon...#W\nBut it's horrible here!\nIt is much too difficult!") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("We had no trouble entering this dungeon...{WAIT_PRESS}\nBut it's horrible here!\nIt is much too difficult!") }, { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("Ekans, he was defeated right away.\nIt makes me want to scream!") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("Somebody!#W\nPlease help me!") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("The place is the #CDWish Cave#R.") }, - { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("The reward is a secret〜♪#W\nBut it's really very nice--you can be\nsure of that〜♪”") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("Somebody!{WAIT_PRESS}\nPlease help me!") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("The place is the {COLOR YELLOW_D}Wish Cave{RESET}.") }, + { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("The reward is a secret〜♪{WAIT_PRESS}\nBut it's really very nice--you can be\nsure of that〜♪”") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The place in which Medicham\n#+is thought to have gone missing...") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The place in which Medicham\n{CENTER_ALIGN}is thought to have gone missing...") }, BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The #CDWish Cave#R is now\n#+open for exploration!") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {COLOR YELLOW_D}Wish Cave{RESET} is now\n{CENTER_ALIGN}open for exploration!") }, { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -1237,7 +1237,7 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, - ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" Say, sweetie.#W\nHave you seen Gengar around?")), + ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" Say, sweetie.{WAIT_PRESS}\nHave you seen Gengar around?")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), LABEL(2), /* = 0x02 */ @@ -1246,11 +1246,11 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hunh? You did?#W\n...Wh-where?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hunh? You did?{WAIT_PRESS}\n...Wh-where?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................#W\nOh, you're just joking.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}\nOh, you're just joking.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(3), /* = 0x03 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), @@ -1275,24 +1275,24 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You think so?#W\nHis expression...\nIt looks the same as usual, no?") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You think so?{WAIT_PRESS}\nHis expression...\nIt looks the same as usual, no?") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" All I have seen is him\nlaughing in his usual mean way?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000005c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" No, it's different.#W\nI can tell.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" No, it's different.{WAIT_PRESS}\nI can tell.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The way he sets his mouth.\nIt's different just a little at the corners.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Hmm...#W\nPerhaps that is so.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Hmm...{WAIT_PRESS}\nPerhaps that is so.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Anyway, without Gengar\naround, #C5Team Meanies#R can't operate.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Anyway, without Gengar\naround, {COLOR CYAN}Team Meanies{RESET} can't operate.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Such a vexing problem!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), @@ -1368,7 +1368,7 @@ static const struct ScriptCommand s_gs4_g10_s0_lives0_dlg2[] = { /* 0x818f4f4 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Anyway, without Gengar\naround, #C5Team Meanies#R can't operate.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Anyway, without Gengar\naround, {COLOR CYAN}Team Meanies{RESET} can't operate.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Such a vexing problem!") }, JUMP_SCRIPT(END_TALK), }; @@ -1537,8 +1537,8 @@ static const struct ScriptCommand s_gs4_g12_s0_lives0_dlg0[] = { /* 0x818fcdc */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), - VARIANT(/* == */ 1, _(" Over there... The\n#C5Pelipper Post Office#R.")), - VARIANT_DEFAULT(_(" That building is the\n#C5Pelipper Post Office#R.")), + VARIANT(/* == */ 1, _(" Over there... The\n{COLOR CYAN}Pelipper Post Office{RESET}.")), + VARIANT_DEFAULT(_(" That building is the\n{COLOR CYAN}Pelipper Post Office{RESET}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -1568,34 +1568,34 @@ static const struct ScriptCommand s_gs4_g12_s0_lives0_dlg0[] = { /* 0x818fcdc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" See?\nThere were jobs listed, right?")), - VARIANT(/* == */ 1, _(" If you want to go on a\nrescue, you first choose the job by\nselecting it with #C6Accept#R...")), - VARIANT(/* == */ 1, _(" Then, on the #C5Job List#R,\nchoose the job, then confirm it with\n#C6Take Job#R to go on that rescue mission.")), - VARIANT(/* == */ 1, _(" If you don't select #C6Take Job#R,\nyou won't be able to do the rescue job even\nif you go to the dungeon.")), + VARIANT(/* == */ 1, _(" If you want to go on a\nrescue, you first choose the job by\nselecting it with {COLOR YELLOW}Accept{RESET}...")), + VARIANT(/* == */ 1, _(" Then, on the {COLOR CYAN}Job List{RESET},\nchoose the job, then confirm it with\n{COLOR YELLOW}Take Job{RESET} to go on that rescue mission.")), + VARIANT(/* == */ 1, _(" If you don't select {COLOR YELLOW}Take Job{RESET},\nyou won't be able to do the rescue job even\nif you go to the dungeon.")), VARIANT(/* == */ 1, _(" For the time being, we\nshould just stick with the jobs posted\nhere.")), VARIANT(/* == */ 1, _(" Our team'll become known\nafter we do some rescue jobs.")), VARIANT(/* == */ 1, _(" I bet we'll get job offers\nin our Mailbox soon.")), VARIANT(/* == */ 3, _(" See?\nThere were jobs listed, right?")), - VARIANT(/* == */ 3, _(" If you want to do a rescue\njob, you first select it with #C6Accept#R...")), - VARIANT(/* == */ 3, _(" Then, on the #C5Job List#R,\nchoose the job, then confirm it with\n#C6Take Job#R to go on that rescue mission.")), - VARIANT(/* == */ 3, _(" If you don't select #C6Take Job#R,\nyou can't do that rescue job even if you go\nto the dungeon. Be careful!")), + VARIANT(/* == */ 3, _(" If you want to do a rescue\njob, you first select it with {COLOR YELLOW}Accept{RESET}...")), + VARIANT(/* == */ 3, _(" Then, on the {COLOR CYAN}Job List{RESET},\nchoose the job, then confirm it with\n{COLOR YELLOW}Take Job{RESET} to go on that rescue mission.")), + VARIANT(/* == */ 3, _(" If you don't select {COLOR YELLOW}Take Job{RESET},\nyou can't do that rescue job even if you go\nto the dungeon. Be careful!")), VARIANT(/* == */ 3, _(" While we're starting out,\nwe should handle the jobs that are posted\nhere.")), VARIANT(/* == */ 3, _(" Doing that should get our\nteam some recognition.")), VARIANT(/* == */ 3, _(" That should pull in job\noffers to our Mailbox soon.")), VARIANT_DEFAULT(_(" See?\nThere were jobs listed, right?")), - VARIANT_DEFAULT(_(" To do a rescue job, you first\nselect it with #C6Accept#R...")), - VARIANT_DEFAULT(_(" Then, on the #C5Job List#R,\nchoose the job, then confirm it with\n#C6Take Job#R to go on that rescue mission.")), - VARIANT_DEFAULT(_(" If you don't select #C6Take Job#R,\nyou can't do that rescue job even if you go\nto the dungeon.")), + VARIANT_DEFAULT(_(" To do a rescue job, you first\nselect it with {COLOR YELLOW}Accept{RESET}...")), + VARIANT_DEFAULT(_(" Then, on the {COLOR CYAN}Job List{RESET},\nchoose the job, then confirm it with\n{COLOR YELLOW}Take Job{RESET} to go on that rescue mission.")), + VARIANT_DEFAULT(_(" If you don't select {COLOR YELLOW}Take Job{RESET},\nyou can't do that rescue job even if you go\nto the dungeon.")), VARIANT_DEFAULT(_(" Since we're just starting up,\nwe should handle the jobs that are posted\nhere.")), VARIANT_DEFAULT(_(" Our team name will get\nbetter known by doing that.")), VARIANT_DEFAULT(_(" I think that will bring\njob offers to our Mailbox.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" And if you want to take on\na rescue job...")), - VARIANT(/* == */ 1, _(" Choose the job on the #C5Job\nList#R...#W Then, select #C6Take Job#R.#W\nGet in the habit of doing that regularly!")), + VARIANT(/* == */ 1, _(" Choose the job on the {COLOR CYAN}Job\nList{RESET}...{WAIT_PRESS} Then, select {COLOR YELLOW}Take Job{RESET}.{WAIT_PRESS}\nGet in the habit of doing that regularly!")), VARIANT(/* == */ 3, _(" And if you want to go on\na rescue mission...")), - VARIANT(/* == */ 3, _(" Choose the job on the #C5Job\nList#R...#W Then, select #C6Take Job#R.#W\nDon't forget to do that before you leave!")), + VARIANT(/* == */ 3, _(" Choose the job on the {COLOR CYAN}Job\nList{RESET}...{WAIT_PRESS} Then, select {COLOR YELLOW}Take Job{RESET}.{WAIT_PRESS}\nDon't forget to do that before you leave!")), VARIANT_DEFAULT(_(" And if you want to go on\na rescue mission...")), - VARIANT_DEFAULT(_(" Choose the job on the #C5Job\nList#R...#W Then, select #C6Take Job#R.#W\nTry to always do that before you leave!")), + VARIANT_DEFAULT(_(" Choose the job on the {COLOR CYAN}Job\nList{RESET}...{WAIT_PRESS} Then, select {COLOR YELLOW}Take Job{RESET}.{WAIT_PRESS}\nTry to always do that before you leave!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -1754,16 +1754,16 @@ static const struct ScriptCommand s_gs4_g16_s1_lives0_dlg0[] = { /* 0x8190fcc */ WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?#W\nPapa, have you ever gone out to sea?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?{WAIT_PRESS}\nPapa, have you ever gone out to sea?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................#W\nOf course.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}\nOf course.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you take us for?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! You have!#W\nPapa, you're so special!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! You have!{WAIT_PRESS}\nPapa, you're so special!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -1867,16 +1867,16 @@ static const struct ScriptCommand s_gs4_g17_s1_lives0_dlg0[] = { /* 0x819154c */ WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?#W\nPapa, have you ever gone out to sea?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?{WAIT_PRESS}\nPapa, have you ever gone out to sea?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................#W\nOf course.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}\nOf course.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you take us for?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! You have!#W\nPapa, you're so special!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! You have!{WAIT_PRESS}\nPapa, you're so special!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -1948,17 +1948,17 @@ static const struct ScriptCommand s_gs4_g18_s0_lives0_dlg2[] = { /* 0x8191968 */ { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" .........(Does that mean Papa\ncan swim...?)") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - ASK3( TRUE, /*default*/ -1, /* speaker */ 3, _(" $n0.#W\n$n0, can you swim?")), + ASK3( TRUE, /*default*/ -1, /* speaker */ 3, _(" {NAME_0}.{WAIT_PRESS}\n{NAME_0}, can you swim?")), CHOICE(/* label */ 0, _("Yes.")), CHOICE(/* label */ 1, _("No.")), LABEL(0), /* = 0x00 */ - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh.\nSo you can swim too, $n0...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh.\nSo you can swim too, {NAME_0}...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" OK!\nI'm going to try hard to swim too!") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(END_TALK), LABEL(1), /* = 0x01 */ - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh.\nSo you can't swim either, $n0...") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh.\nSo you can't swim either, {NAME_0}...") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But that's natural.\nSwimming isn't very easy.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" My papa is special!\nI'm going to try hard to swim too!") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -1989,16 +1989,16 @@ static const struct ScriptCommand s_gs4_g18_s1_lives0_dlg2[] = { /* 0x8191d1c */ CHOICE(/* label */ 0, _("Yes.")), CHOICE(/* label */ 1, _("No.")), LABEL(0), /* = 0x00 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, you already knew?#W\nThat's OK, then.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, you already knew?{WAIT_PRESS}\nThat's OK, then.") }, JUMP_SCRIPT(END_TALK), LABEL(1), /* = 0x01 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you choose jobs in the\nsame dungeon on the #C5Job List#R, you can\ndo them at the same time.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you choose jobs in the\nsame dungeon on the {COLOR CYAN}Job List{RESET}, you can\ndo them at the same time.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" For example, say there are\ntwo rescue jobs in the same dungeon, but\none on 5F and one on 10F.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You can accept these two\njobs, then select #C6Take Job#R on both of them\nbefore heading into that dungeon.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You can accept these two\njobs, then select {COLOR YELLOW}Take Job{RESET} on both of them\nbefore heading into that dungeon.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You can complete the first\nrescue on 5F. Then, instead of exiting,\ngo on to the job on 10F.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That way, you can do two\nrescue jobs in one outing.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" See?#W If you do that, you\ncan take care of rescue jobs efficiently.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Ehe, this is what Alakazam\ntold me.#W I just repeated what he said,\nso don't tell anyone else.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" See?{WAIT_PRESS} If you do that, you\ncan take care of rescue jobs efficiently.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Ehe, this is what Alakazam\ntold me.{WAIT_PRESS} I just repeated what he said,\nso don't tell anyone else.") }, JUMP_SCRIPT(END_TALK), }; @@ -2057,16 +2057,16 @@ static const struct ScriptCommand s_gs4_g19_s1_lives0_dlg0[] = { /* 0x81922f8 */ { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, Papa.") }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?#W\nPapa, can you swim?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?{WAIT_PRESS}\nPapa, can you swim?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................#W\nOf course.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}\nOf course.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you take us for?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! So you can swim!#W\nPapa, you're so special!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! So you can swim!{WAIT_PRESS}\nPapa, you're so special!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -2199,12 +2199,12 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?#W\nPapa, how do you swim in the sea?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?{WAIT_PRESS}\nPapa, how do you swim in the sea?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................#W\nWell, Son...#W\nThe three of us cooperate, and...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}\nWell, Son...{WAIT_PRESS}\nThe three of us cooperate, and...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2246,11 +2246,11 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2b, 0x00, 0x0000, -0x00000001, -0x00000001, NULL }, { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...And that's sort of how\nwe swim!#W\nGasp, gasp...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you...#W\nTake us for?!#W\nGasp, gasp...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...And that's sort of how\nwe swim!{WAIT_PRESS}\nGasp, gasp...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you...{WAIT_PRESS}\nTake us for?!{WAIT_PRESS}\nGasp, gasp...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" OK!#W\nPapa, you're so special!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" OK!{WAIT_PRESS}\nPapa, you're so special!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -2451,20 +2451,20 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Well, our son!\nTell me, do the earthquakes frighten you?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, Papa.#W\nThey are very scary.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, Papa.{WAIT_PRESS}\nThey are very scary.") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Especially when I'm\nburrowing. It makes me twitchy because\nI get so scared.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?#W\nPapa, aren't you afraid of earthquakes?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?{WAIT_PRESS}\nPapa, aren't you afraid of earthquakes?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ........................#W\nOf course they don't scare us.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you...#W\nTake us for?!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If we were in charge...#W\nThis is what we'd do to any earthquake!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ........................{WAIT_PRESS}\nOf course they don't scare us.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you...{WAIT_PRESS}\nTake us for?!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If we were in charge...{WAIT_PRESS}\nThis is what we'd do to any earthquake!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -2508,7 +2508,7 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gasp, gasp...") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" OK!#W\nPapa, you're so special!") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" OK!{WAIT_PRESS}\nPapa, you're so special!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -2707,19 +2707,19 @@ static const struct ScriptCommand s_gs4_g22_s1_lives0_dlg0[] = { /* 0x81947b4 */ { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Well, my son?\nDoes Groudon frighten you?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, Papa.#W\nIt frightens me so much I don't know\nwhat to think.") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, Papa.{WAIT_PRESS}\nIt frightens me so much I don't know\nwhat to think.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?#W\nAre you going to the #CDMagma Cavern#R too,\nPapa?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?{WAIT_PRESS}\nAre you going to the {COLOR YELLOW_D}Magma Cavern{RESET} too,\nPapa?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ........................#W\nOf course.") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ........................{WAIT_PRESS}\nOf course.") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you take us for?!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If we were in charge...#W\nThis is what we'd do to the #CDMagma\nCavern#R!#W Hah!") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If we were in charge...{WAIT_PRESS}\nThis is what we'd do to the {COLOR YELLOW_D}Magma\nCavern{RESET}!{WAIT_PRESS} Hah!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2b, 0x00, 0x0000, 0x0000000a, 0x0000000a, NULL }, @@ -2731,7 +2731,7 @@ static const struct ScriptCommand s_gs4_g22_s1_lives0_dlg0[] = { /* 0x81947b4 */ { 0x2b, 0x00, 0x0000, -0x00000001, -0x00000001, NULL }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ............") }, { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ........................") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ....................................#WHuh?#W\nPapa?#W Where did you go, Papa?") }, + { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ....................................{WAIT_PRESS}Huh?{WAIT_PRESS}\nPapa?{WAIT_PRESS} Where did you go, Papa?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -2829,14 +2829,14 @@ static const struct ScriptCommand s_gs4_g23_s0_lives0_dlg2[] = { /* 0x8194fac */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Papa hasn't come back...#W\nI wonder where they went?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Papa hasn't come back...{WAIT_PRESS}\nI wonder where they went?") }, FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh!#W Maybe they've already\ngone to the #CDMagma Cavern#R...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh!{WAIT_PRESS} Maybe they've already\ngone to the {COLOR YELLOW_D}Magma Cavern{RESET}...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And maybe they're already\nfighting Groudon.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And, maybe, maybe...#W\nMaybe they've already won.#W\nMaybe they've already beaten Groudon!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, wow! That's amazing!#W\nMaybe Papa is special!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And, maybe, maybe...{WAIT_PRESS}\nMaybe they've already won.{WAIT_PRESS}\nMaybe they've already beaten Groudon!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, wow! That's amazing!{WAIT_PRESS}\nMaybe Papa is special!") }, JUMP_SCRIPT(END_TALK), }; @@ -2875,7 +2875,7 @@ static const struct ScriptCommand s_gs4_g24_s0_lives0_dlg2[] = { /* 0x81952bc */ FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh!#W\nMaybe they've already gone to the sky...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh!{WAIT_PRESS}\nMaybe they've already gone to the sky...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And maybe they've already\nmet Rayquaza...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...That's not possible.\nEven Papa can't fly.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sigh...\nWhere did Papa go...?") }, @@ -2909,7 +2909,7 @@ static const struct ScriptCommand s_gs4_g24_s0_lives2_dlg2[] = { /* 0x81955d8 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh my, isn't this awful!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But I get the feeling that\nyou can make a difference, $n0!\nPlease don't let us down!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But I get the feeling that\nyou can make a difference, {NAME_0}!\nPlease don't let us down!") }, JUMP_SCRIPT(END_TALK), }; @@ -2938,7 +2938,7 @@ static const struct ScriptCommand s_gs4_g25_s0_lives0_dlg2[] = { /* 0x8195750 */ FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh!#W\nMaybe they've already gone to the sky...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh!{WAIT_PRESS}\nMaybe they've already gone to the sky...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And maybe they've already\nmet Rayquaza...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...That's not possible.\nEven Papa can't fly.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sigh...\nWhere did Papa go...?") }, @@ -3000,7 +3000,7 @@ static const struct ScriptCommand s_gs4_g26_s0_lives0_dlg2[] = { /* 0x8195a5c */ FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh!#W\nMaybe they've already gone to the sky...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh!{WAIT_PRESS}\nMaybe they've already gone to the sky...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And maybe they've already\nmet Rayquaza...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...That's not possible.\nEven Papa can't fly.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sigh...\nWhere did Papa go...?") }, @@ -3082,13 +3082,13 @@ static const struct ScriptCommand s_gs4_g28_s0_lives0_dlg2[] = { /* 0x8195e54 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But Papa still hasn't come\nback...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Everyone says they haven't\nseen them...#W\nWhere did my papa go?") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Everyone says they haven't\nseen them...{WAIT_PRESS}\nWhere did my papa go?") }, FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh!#W\nMaybe they got left behind in the sky...") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh!{WAIT_PRESS}\nMaybe they got left behind in the sky...") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And maybe Rayquaza is\nhaving them as a meal...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ......#WThat's not possible.#W\nPapa can't fly in the first place.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ......{WAIT_PRESS}That's not possible.{WAIT_PRESS}\nPapa can't fly in the first place.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sigh...\nWhere did Papa go...?") }, JUMP_SCRIPT(END_TALK), }; @@ -3112,7 +3112,7 @@ static const struct ScriptCommand s_gs4_g28_s0_lives1_dlg2[] = { /* 0x819614c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, how marvelous,\n$n0!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, how marvelous,\n{NAME_0}!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I can go on living again\nwithout fear. Thank you!") }, JUMP_SCRIPT(END_TALK), }; @@ -3132,7 +3132,7 @@ static const struct ScriptCommand s_gs4_g28_s0_lives3_dlg2[] = { /* 0x81962d8 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, darlings, you've outdone\nyourselves, $n0!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, darlings, you've outdone\nyourselves, {NAME_0}!") }, JUMP_SCRIPT(END_TALK), }; @@ -3141,7 +3141,7 @@ static const struct ScriptCommand s_gs4_g28_s0_lives4_dlg2[] = { /* 0x8196370 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You fought your way up\na tower of clouds?#W I can't even imagine\nthat. Sounds kind of wow!#W Ayup!") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You fought your way up\na tower of clouds?{WAIT_PRESS} I can't even imagine\nthat. Sounds kind of wow!{WAIT_PRESS} Ayup!") }, JUMP_SCRIPT(END_TALK), }; diff --git a/src/data/ground/ground_data_t01p04_station.h b/src/data/ground/ground_data_t01p04_station.h index 8cfad439..ea74365d 100644 --- a/src/data/ground/ground_data_t01p04_station.h +++ b/src/data/ground/ground_data_t01p04_station.h @@ -196,7 +196,7 @@ static const struct ScriptCommand s_gs5_g3_s0_lives0_dlg0[] = { /* 0x8198234 */ { 0x2d, 0x09, 0x0002, 0x0000002f, 0x00000000, NULL }, { 0x3b, 0x0c, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! Welcome back!#W\nThe rescue...#Wwent badly, I see...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! Welcome back!{WAIT_PRESS}\nThe rescue...{WAIT_PRESS}went badly, I see...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But that wasn't the final\nchance! Don't give up!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -204,7 +204,7 @@ static const struct ScriptCommand s_gs5_g3_s0_lives0_dlg0[] = { /* 0x8198234 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, RET, LABEL(0), /* = 0x00 */ - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! Welcome back!#W\nThe rescue...#Wwent badly, I see...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! Welcome back!{WAIT_PRESS}\nThe rescue...{WAIT_PRESS}went badly, I see...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm terribly sorry, but you\nmay not go on that rescue again...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Please inform your friend\nthat, regrettably, the friend rescue\nmission ended in failure.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -249,7 +249,7 @@ static const struct ScriptCommand s_gs5_g4_s0_lives0_dlg0[] = { /* 0x81985f8 */ { 0x2d, 0x09, 0x0002, 0x0000002f, 0x00000000, NULL }, { 0x3b, 0x0c, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! Welcome back!#W\nThe rescue...#Wwent badly, I see...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! Welcome back!{WAIT_PRESS}\nThe rescue...{WAIT_PRESS}went badly, I see...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But that wasn't the final\nchance! Don't give up!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -257,7 +257,7 @@ static const struct ScriptCommand s_gs5_g4_s0_lives0_dlg0[] = { /* 0x81985f8 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, RET, LABEL(0), /* = 0x00 */ - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! Welcome back!#W\nThe rescue...#Wwent badly, I see...") }, + { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! Welcome back!{WAIT_PRESS}\nThe rescue...{WAIT_PRESS}went badly, I see...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm terribly sorry, but you\nmay not go on that rescue again...") }, { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Please inform your friend\nthat, regrettably, the friend rescue\nmission ended in failure.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_t01p05_station.h b/src/data/ground/ground_data_t01p05_station.h index aee2e7b0..8f26ab2c 100644 --- a/src/data/ground/ground_data_t01p05_station.h +++ b/src/data/ground/ground_data_t01p05_station.h @@ -164,9 +164,9 @@ static const struct ScriptCommand s_gs6_g1_s1_evt0_sref_script[] = { /* 0x819952 { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+There appears to be no one inside.") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+............!#W\n#+There is a notice posted in the back.") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+Under Construction - Keep Out\n#+- Makuhita Dojo -") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}There appears to be no one inside.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}............!{WAIT_PRESS}\n{CENTER_ALIGN}There is a notice posted in the back.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Under Construction - Keep Out\n{CENTER_ALIGN}- Makuhita Dojo -") }, JUMP_SCRIPT(END_TALK), }; diff --git a/src/data/ground/ground_event_data.h b/src/data/ground/ground_event_data.h index f7f71488..8895c17a 100644 --- a/src/data/ground/ground_event_data.h +++ b/src/data/ground/ground_event_data.h @@ -37,7 +37,7 @@ static const struct ScriptCommand s_script_WAIT_START_FUNC[] = { /* 0x811ef28 */ static const struct ScriptCommand s_script_INCOMPLETE_TALK[] = { /* 0x811ef58 */ DEBUGINFO, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#CWUnregistered dialog script#R") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{COLOR RED_W}Unregistered dialog script{RESET}") }, JUMP_SCRIPT(END_TALK), }; @@ -75,7 +75,7 @@ static const struct ScriptCommand s_script_OBJECT_REPLY_NORMAL[] = { /* 0x811f0a static const struct ScriptCommand s_script_EXAMINE_MISS[] = { /* 0x811f0e8 */ DEBUGINFO, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("$n0 checked underfoot.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{NAME_0} checked underfoot.") }, { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("But there was nothing to be found...") }, JUMP_SCRIPT(END_TALK), }; @@ -135,16 +135,16 @@ static const struct ScriptCommand s_script_HABITAT_TALK_S01E02A[] = { /* 0x811f3 RET, LABEL(0), /* = 0x00 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hello!") }, - ASK3(FALSE, /*default*/ 1, /* speaker */ 1, _(" Oh?#W Did you perhaps wish\nto change the team flag's design?")), + ASK3(FALSE, /*default*/ 1, /* speaker */ 1, _(" Oh?{WAIT_PRESS} Did you perhaps wish\nto change the team flag's design?")), CHOICE(/* label */ 1, _("No need to change.")), CHOICE(/* label */ 2, _("Yes, please.")), LABEL(1), /* = 0x01 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I see.#W If you would like the\nflag's design changed, please tell me.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I see.{WAIT_PRESS} If you would like the\nflag's design changed, please tell me.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, RET, LABEL(2), /* = 0x02 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ah, very well!#W\nI may be unknown, but nonetheless, I am\nan artist.") }, + { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ah, very well!{WAIT_PRESS}\nI may be unknown, but nonetheless, I am\nan artist.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will do my best to create\na splendid design for you!\nPlease check the rescue team flag later!") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If my design fails to\nimpress you, please let me know.") }, { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If so, I will change the\ndesign to one perhaps more to your liking.") }, @@ -556,8 +556,8 @@ static const struct ScriptCommand s_script_DISMISSAL_SALLY_MEMBER_FUNC[] = { /* { 0xf2, 0x00, 0x0002, 0x00000000, 0x00000000, _("DISMISSAL_SALLY_MEMBER_FUNC\n") }, { 0x3b, 0x09, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The rescue team member(s)\n#+dispersed to the Friend Area(s).") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+If you want to add members to\n#+the rescue team, go visit\n#+them in their Friend Areas.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The rescue team member(s)\n{CENTER_ALIGN}dispersed to the Friend Area(s).") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}If you want to add members to\n{CENTER_ALIGN}the rescue team, go visit\n{CENTER_ALIGN}them in their Friend Areas.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ RET_DIRECT, @@ -568,8 +568,8 @@ static const struct ScriptCommand s_script_DISMISSAL_SALLY_MEMBER2_FUNC[] = { /* { 0xf2, 0x00, 0x0002, 0x00000000, 0x00000000, _("DISMISSAL_SALLY_MEMBER2_FUNC\n") }, { 0x3b, 0x09, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The rescue team member(s)\n#+dispersed to the Friend Area(s).") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+If you want to add members to\n#+the rescue team, go visit\n#+them in their Friend Areas.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The rescue team member(s)\n{CENTER_ALIGN}dispersed to the Friend Area(s).") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}If you want to add members to\n{CENTER_ALIGN}the rescue team, go visit\n{CENTER_ALIGN}them in their Friend Areas.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ RET_DIRECT, @@ -580,8 +580,8 @@ static const struct ScriptCommand s_script_DISMISSAL_SALLY_MEMBER3_FUNC[] = { /* { 0xf2, 0x00, 0x0002, 0x00000000, 0x00000000, _("DISMISSAL_SALLY_MEMBER3_FUNC\n") }, { 0x3b, 0x09, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The rescue team member(s)\n#+dispersed to the Friend Area(s).") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+If you want to add members to\n#+the rescue team, go visit\n#+them in their Friend Areas.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The rescue team member(s)\n{CENTER_ALIGN}dispersed to the Friend Area(s).") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}If you want to add members to\n{CENTER_ALIGN}the rescue team, go visit\n{CENTER_ALIGN}them in their Friend Areas.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ RET_DIRECT, @@ -592,8 +592,8 @@ static const struct ScriptCommand s_script_DISMISSAL_SALLY_MEMBER4_FUNC[] = { /* { 0xf2, 0x00, 0x0002, 0x00000000, 0x00000000, _("DISMISSAL_SALLY_MEMBER4_FUNC\n") }, { 0x3b, 0x09, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+The rescue team member(s)\n#+dispersed to the Friend Area(s).") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("#+If you want to add members to\n#+the rescue team, go visit\n#+them in their Friend Areas.") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The rescue team member(s)\n{CENTER_ALIGN}dispersed to the Friend Area(s).") }, + { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}If you want to add members to\n{CENTER_ALIGN}the rescue team, go visit\n{CENTER_ALIGN}them in their Friend Areas.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ RET_DIRECT, @@ -1763,11 +1763,11 @@ static const struct ScriptCommand s_script_EVENT_DIVIDE_WARP_LOCK_FUNC[] = { /* { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Huh?\nAre you going home already?")), - VARIANT(/* == */ 1, _(" We haven't gone to the\n#C5Pelipper Post Office#R yet?")), - VARIANT(/* == */ 1, _(" You can go home after we\ngo to the #C5Pelipper Post Office#R.")), + VARIANT(/* == */ 1, _(" We haven't gone to the\n{COLOR CYAN}Pelipper Post Office{RESET} yet?")), + VARIANT(/* == */ 1, _(" You can go home after we\ngo to the {COLOR CYAN}Pelipper Post Office{RESET}.")), VARIANT_DEFAULT(_(" Huh?\nYou want to go home already?")), VARIANT_DEFAULT(_(" We're already here.\nLet me show you around a bit more.")), - VARIANT_DEFAULT(_(" Let's go to the #C5Pelipper\nPost Office#R at least.")), + VARIANT_DEFAULT(_(" Let's go to the {COLOR CYAN}Pelipper\nPost Office{RESET} at least.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, RET_DIRECT, LABEL(1), /* = 0x01 */ diff --git a/src/data/gulpin_shop.h b/src/data/gulpin_shop.h index c9312ab6..8bd5d190 100644 --- a/src/data/gulpin_shop.h +++ b/src/data/gulpin_shop.h @@ -30,12 +30,12 @@ ALIGNED(4) static const u8 sWillAMoveBeForgotten[] = _( "Will a move be forgotten?"); ALIGNED(4) static const u8 sForgetMoveAndLinkedOnes[] = _( - "{CENTER_ALIGN}Forget the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and\n" + "{CENTER_ALIGN}Forget the move {COLOR GREEN}{POKEMON_1}{RESET} and\n" "{CENTER_ALIGN}any moves linked to it, and learn the move\n" - "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?"); + "{CENTER_ALIGN}{COLOR CYAN}{POKEMON_0}{RESET}?"); ALIGNED(4) static const u8 sForgetMoveOnly[] = _( - "{CENTER_ALIGN}Forget the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}\n" - "{CENTER_ALIGN}and learn {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?"); + "{CENTER_ALIGN}Forget the move {COLOR GREEN}{POKEMON_1}{RESET}\n" + "{CENTER_ALIGN}and learn {COLOR CYAN}{POKEMON_0}{RESET}?"); ALIGNED(4) static const u8 sForget[] = _("Forget"); \ No newline at end of file diff --git a/src/data/gulpin_shop_801FB50.h b/src/data/gulpin_shop_801FB50.h index 6570573f..cf1567c8 100644 --- a/src/data/gulpin_shop_801FB50.h +++ b/src/data/gulpin_shop_801FB50.h @@ -48,7 +48,7 @@ ALIGNED(4) static const u8 gUnknown_80DC394[] = _( "{R_BUTTON}+{A_BUTTON}: Switch link {SELECT_BUTTON} Set"); ALIGNED(4) static const u8 gGulpinProceed[] = _("Proceed"); -ALIGNED(4) static const u8 gGulpinInfo[] = _("{COLOR_1 YELLOW}Info{END_COLOR_TEXT_1} "); +ALIGNED(4) static const u8 gGulpinInfo[] = _("{COLOR YELLOW}Info{RESET} "); ALIGNED(4) static const u8 gUnknown_80DC3D8[] = _("Moves"); ALIGNED(4) static const u8 gUnknown_80DC3E0[] = _("Summary"); ALIGNED(4) static const u8 gUnknown_80DC3E8[] = _("Check IQ"); diff --git a/src/data/iq_skill_info_menu.h b/src/data/iq_skill_info_menu.h index 3cf8c3ba..a652eb8c 100644 --- a/src/data/iq_skill_info_menu.h +++ b/src/data/iq_skill_info_menu.h @@ -1,2 +1,2 @@ -ALIGNED(4) static const u8 sFmtMoveItem0[] = _("{ARG_MOVE_ITEM_0}"); -ALIGNED(4) static const u8 sFmtPkmn0[] = _("{ARG_POKEMON_0}"); \ No newline at end of file +ALIGNED(4) static const u8 sFmtMoveItem0[] = _("{MOVE_ITEM_0}"); +ALIGNED(4) static const u8 sFmtPkmn0[] = _("{POKEMON_0}"); \ No newline at end of file diff --git a/src/data/iq_skill_list_menu.h b/src/data/iq_skill_list_menu.h index fd25289f..a3182b37 100644 --- a/src/data/iq_skill_list_menu.h +++ b/src/data/iq_skill_list_menu.h @@ -19,4 +19,4 @@ static const UnkTextStruct2 sUnknown_80DBDF0 = { ALIGNED(4) static const u8 sIQSkills[] = _("IQ Skills"); ALIGNED(4) static const u8 sStarBullet[] = _("{STAR_BULLET}"); ALIGNED(4) static const u8 sUnknown_80DBE18[] = _("{UNK_ICON_40}"); -ALIGNED(4) static const u8 sFmt01[] = _("{ARG_MOVE_ITEM_0}{ARG_MOVE_ITEM_1}"); \ No newline at end of file +ALIGNED(4) static const u8 sFmt01[] = _("{MOVE_ITEM_0}{MOVE_ITEM_1}"); \ No newline at end of file diff --git a/src/data/kecleon_bros2.h b/src/data/kecleon_bros2.h index 1265c2f4..055ff803 100644 --- a/src/data/kecleon_bros2.h +++ b/src/data/kecleon_bros2.h @@ -17,4 +17,4 @@ static const UnkTextStruct2 sUnknown_80DB8CC = { }; ALIGNED(4) static const u8 sGoods[] = _("Goods"); -ALIGNED(4) static const u8 sFmtRed[] = _("{COLOR_1 RED}%s{END_COLOR_TEXT_1}"); \ No newline at end of file +ALIGNED(4) static const u8 sFmtRed[] = _("{COLOR RED}%s{RESET}"); \ No newline at end of file diff --git a/src/data/kecleon_bros3.h b/src/data/kecleon_bros3.h index 6e5f32ca..ceb5b732 100644 --- a/src/data/kecleon_bros3.h +++ b/src/data/kecleon_bros3.h @@ -17,4 +17,4 @@ static const UnkTextStruct2 sUnknown_80DB914 = { }; ALIGNED(4) static const u8 sGoods[] = _("Goods"); -ALIGNED(4) static const u8 sFmtRed[] = _("{COLOR_1 RED}%s{END_COLOR_TEXT_1}"); \ No newline at end of file +ALIGNED(4) static const u8 sFmtRed[] = _("{COLOR RED}%s{RESET}"); \ No newline at end of file diff --git a/src/data/kecleon_bros4.h b/src/data/kecleon_bros4.h index 2338493f..8c89d684 100644 --- a/src/data/kecleon_bros4.h +++ b/src/data/kecleon_bros4.h @@ -18,7 +18,7 @@ static const UnkTextStruct2 sUnknown_80DB95C = { ALIGNED(4) static const u8 sTeamToolboxA[] = _("Team Toolbox A"); ALIGNED(4) static const u8 sTeamToolboxB[] = _("Team Toolbox B"); -ALIGNED(4) static const u8 sFmtMoveItem0[] = _("{COLOR_1 UNK_COLOR_2}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}"); -ALIGNED(4) static const u8 sFmtRed[] = _("{COLOR_1 RED}%s{END_COLOR_TEXT_1}"); +ALIGNED(4) static const u8 sFmtMoveItem0[] = _("{COLOR RED_RAW}{MOVE_ITEM_0}{RESET}"); +ALIGNED(4) static const u8 sFmtRed[] = _("{COLOR RED}%s{RESET}"); ALIGNED(4) static const u8 sItems[] = _("Items"); ALIGNED(4) static const u8 sSlash[] = _("/"); \ No newline at end of file diff --git a/src/data/luminous_cave.h b/src/data/luminous_cave.h index f10c58c9..8cbdd669 100644 --- a/src/data/luminous_cave.h +++ b/src/data/luminous_cave.h @@ -77,12 +77,12 @@ ALIGNED(4) static const u8 sLetUsBegin[] = _( "{CENTER_ALIGN}Let us begin."); ALIGNED(4) static const u8 sFmtChangedAppearance[] = _( - "{CENTER_ALIGN}...{WAIT_PRESS}{ARG_NICKNAME_0} is undergoing changes...{EXTRA_MSG}" - "{CENTER_ALIGN}{ARG_NICKNAME_0}'s appearance changed...{EXTRA_MSG}"); + "{CENTER_ALIGN}...{WAIT_PRESS}{NAME_0} is undergoing changes...{EXTRA_MSG}" + "{CENTER_ALIGN}{NAME_0}'s appearance changed...{EXTRA_MSG}"); ALIGNED(4) static const u8 sFmtEvolved[] = _( - "{CENTER_ALIGN}It evolved from {COLOR_1 GREEN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}\n" - "{CENTER_ALIGN}to {COLOR_1 YELLOW}{ARG_POKEMON_1}{END_COLOR_TEXT_1}!"); + "{CENTER_ALIGN}It evolved from {COLOR GREEN}{POKEMON_0}{RESET}\n" + "{CENTER_ALIGN}to {COLOR YELLOW}{POKEMON_1}{RESET}!"); ALIGNED(4) static const u8 sComeAlone[] = _( "{CENTER_ALIGN}...{EXTRA_MSG}" diff --git a/src/data/main_menu2.h b/src/data/main_menu2.h index 935626ce..a7cb731f 100644 --- a/src/data/main_menu2.h +++ b/src/data/main_menu2.h @@ -219,7 +219,7 @@ static const MenuItem sUnknown_80E5DF0[] = {sUnknown_80E5E08, 0xFFDE}, {0, 0xFFDD} }; -ALIGNED(4) static const u8 sUnknown_80E5E08[] = _("{COLOR_1 RED}Beware{END_COLOR_TEXT_1}! This will delete it forever!"); +ALIGNED(4) static const u8 sUnknown_80E5E08[] = _("{COLOR RED}Beware{RESET}! This will delete it forever!"); ALIGNED(4) static const u8 sUnknown_80E5E34[] = _("This will delete your saved game data."); static const u8 sUnknown_80E5E74[]; diff --git a/src/data/makuhita_dojo1.h b/src/data/makuhita_dojo1.h index f2b10cc5..ea5c04a4 100644 --- a/src/data/makuhita_dojo1.h +++ b/src/data/makuhita_dojo1.h @@ -8,7 +8,7 @@ static const UnkTextStruct2 sUnknown_80E0760 = { }; ALIGNED(4) static const u8 sReceivedBonslyDoll[] = _( - "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_NICKNAME_0}{END_COLOR_TEXT_1} received the {COLOR_1 GREEN_2}Bonsly Doll{END_COLOR_TEXT_1}!\n" + "{CENTER_ALIGN}{COLOR YELLOW_N}{NAME_0}{RESET} received the {COLOR GREEN_I}Bonsly Doll{RESET}!\n" "{CENTER_ALIGN}It has been placed outside your\n" "{CENTER_ALIGN}rescue team base."); diff --git a/src/data/makuhita_dojo2.h b/src/data/makuhita_dojo2.h index 80f12b76..f3472bda 100644 --- a/src/data/makuhita_dojo2.h +++ b/src/data/makuhita_dojo2.h @@ -18,4 +18,4 @@ static const UnkTextStruct2 sUnknown_80E0804 = { ALIGNED(4) static const u8 sCourses[] = _("Courses"); ALIGNED(4) static const u8 sStarBullet[] = _("{STAR_BULLET}"); -ALIGNED(4) static const u8 sFmtColor[] = _("{COLOR_2}%c%s{END_COLOR_TEXT_2}"); \ No newline at end of file +ALIGNED(4) static const u8 sFmtColor[] = _("{color}%c%s{reset}"); \ No newline at end of file diff --git a/src/data/other_menus1.h b/src/data/other_menus1.h index 2c1d2110..094c266e 100644 --- a/src/data/other_menus1.h +++ b/src/data/other_menus1.h @@ -26,7 +26,7 @@ const MenuItem sUnknown_80E656C[4] = { // TODO: MAKE STATIC WHEN other_menus1.s }; ALIGNED(4) static const u8 sUnknown_80E658C[] = _("{CENTER_ALIGN}Don't turn the power off!"); ALIGNED(4) static const u8 sUnknown_80E65AC[] = _("{CENTER_ALIGN}Item transmitting!"); -ALIGNED(4) static const u8 sUnknown_80E65C4[] = _("{CENTER_ALIGN}{COLOR_1 RED}Caution!{END_COLOR_TEXT_1} "); +ALIGNED(4) static const u8 sUnknown_80E65C4[] = _("{CENTER_ALIGN}{COLOR RED}Caution!{RESET} "); static const u8 sUnknown_80E65F8[]; const MenuItem sUnknown_80E65D8[4] = { // TODO: MAKE STATIC WHEN other_menus1.s IS DED @@ -82,7 +82,7 @@ static const MenuItem sUnknown_80E66D4[4] = { }; ALIGNED(4) static const u8 sUnknown_80E66F4[] = _("{CENTER_ALIGN}Please press any button."); ALIGNED(4) static const u8 sUnknown_80E6710[] = _("{CENTER_ALIGN}Your adventure will be continued."); -ALIGNED(4) static const u8 sUnknown_80E6734[] = _("{CENTER_ALIGN}{COLOR_1 LIGHT_BLUE}Success!{END_COLOR_TEXT_1} "); +ALIGNED(4) static const u8 sUnknown_80E6734[] = _("{CENTER_ALIGN}{COLOR CYAN_G}Success!{RESET} "); static const UnkTextStruct2 sUnknown_80E6748 = { 0, 0, 0, 0, @@ -104,7 +104,7 @@ static const MenuItem sUnknown_80E6760[4] = { }; ALIGNED(4) static const u8 sUnknown_80E6780[] = _("{CENTER_ALIGN}please try again."); ALIGNED(4) static const u8 sUnknown_80E6794[] = _("{CENTER_ALIGN}Check the Game Link cable and"); -ALIGNED(4) static const u8 sUnknown_80E67B4[] = _("{CENTER_ALIGN}{COLOR_1 RED}Communication error!{END_COLOR_TEXT_1} "); +ALIGNED(4) static const u8 sUnknown_80E67B4[] = _("{CENTER_ALIGN}{COLOR RED}Communication error!{RESET} "); static const UnkTextStruct2 sUnknown_80E67D4 = { 0, 0, 0, 0, @@ -164,7 +164,7 @@ static const MenuItem sUnknown_80E68B4[4] = { }; ALIGNED(4) static const u8 sUnknown_80E68D4[] = _("{CENTER_ALIGN}someone's storage space was full."); ALIGNED(4) static const u8 sUnknown_80E68FC[] = _("{CENTER_ALIGN}An item could not be transferred because"); -ALIGNED(4) static const u8 sUnknown_80E6928[] = _("{CENTER_ALIGN}{COLOR_1 RED}Error!{END_COLOR_TEXT_1} "); +ALIGNED(4) static const u8 sUnknown_80E6928[] = _("{CENTER_ALIGN}{COLOR RED}Error!{RESET} "); static const UnkTextStruct2 sUnknown_80E6938 = { 0, 0, 0, 0, @@ -184,7 +184,7 @@ static const MenuItem sUnknown_80E6950[4] = { {NULL, 3}, }; ALIGNED(4) static const u8 sUnknown_80E6970[] = _("{CENTER_ALIGN}Please check again."); -ALIGNED(4) static const u8 sUnknown_80E6988[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} can't be used."); +ALIGNED(4) static const u8 sUnknown_80E6988[] = _("{CENTER_ALIGN}This {COLOR CYAN_G}SOS Mail{RESET} can't be used."); static const UnkTextStruct2 sUnknown_80E69B0 = { 0, 0, 0, 0, @@ -202,7 +202,7 @@ static const MenuItem sUnknown_80E69C8[4] = { {sUnknown_80E6970, 5}, {NULL, 3}, }; -ALIGNED(4) static const u8 sUnknown_80E69E8[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} can't be used."); +ALIGNED(4) static const u8 sUnknown_80E69E8[] = _("{CENTER_ALIGN}This {COLOR CYAN_G}A-OK Mail{RESET} can't be used."); static const UnkTextStruct2 sUnknown_80E6A10 = { 0, 0, 0, 0, @@ -220,7 +220,7 @@ static const MenuItem sUnknown_80E6A28[4] = { {sUnknown_80E6970, 5}, {NULL, 3}, }; -ALIGNED(4) static const u8 sUnknown_80E6A48[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} can't be used."); +ALIGNED(4) static const u8 sUnknown_80E6A48[] = _("{CENTER_ALIGN}This {COLOR CYAN_G}Thank-You Mail{RESET} can't be used."); static const UnkTextStruct2 sUnknown_80E6A74 = { 0, 0, 0, 0, @@ -260,7 +260,7 @@ UNUSED static const MenuItem sUnknown_80E6B04[4] = { {NULL, 3}, }; ALIGNED(4) static const u8 sUnknown_80E6B24[] = _("{CENTER_ALIGN}You need to go further in the story."); -ALIGNED(4) static const u8 sUnknown_80E6B4C[] = _("{CENTER_ALIGN}You may not go to that {COLOR_1 LIGHT_BLUE}dungeon{END_COLOR_TEXT_1} yet."); +ALIGNED(4) static const u8 sUnknown_80E6B4C[] = _("{CENTER_ALIGN}You may not go to that {COLOR CYAN_G}dungeon{RESET} yet."); static const UnkTextStruct2 sUnknown_80E6B78 = { 0, 0, 0, 0, diff --git a/src/data/party_list_menu.h b/src/data/party_list_menu.h index a0d73d0e..33a2d849 100644 --- a/src/data/party_list_menu.h +++ b/src/data/party_list_menu.h @@ -58,38 +58,38 @@ ALIGNED(4) static const u8 sUnknown_80DD420[] = _( "Will you release it anyway?"); ALIGNED(4) static const u8 sUnknown_80DD4C4[] = _( - "{CENTER_ALIGN}{ARG_POKEMON_1} joined the\n" + "{CENTER_ALIGN}{POKEMON_1} joined the\n" "{CENTER_ALIGN}rescue team for adventures!"); ALIGNED(4) static const u8 sUnknown_80DD4F4[] = _( - "{CENTER_ALIGN}{ARG_POKEMON_1} left the team to remain\n" + "{CENTER_ALIGN}{POKEMON_1} left the team to remain\n" "{CENTER_ALIGN}on standby in the Friend Area."); ALIGNED(4) static const u8 sBecameLeader[] = _( - "{CENTER_ALIGN}{ARG_POKEMON_1} became the leader\n" + "{CENTER_ALIGN}{POKEMON_1} became the leader\n" "{CENTER_ALIGN}of the rescue team."); ALIGNED(4) static const u8 sUnknown_80DD564[] = _( - "{CENTER_ALIGN}{ARG_POKEMON_1} left\n" + "{CENTER_ALIGN}{POKEMON_1} left\n" "{CENTER_ALIGN}the Friend Area.\n" - "{CENTER_ALIGN}Bye-bye, {ARG_POKEMON_1}!"); + "{CENTER_ALIGN}Bye-bye, {POKEMON_1}!"); ALIGNED(4) static const u8 sUnknown_80DD594[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n" + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_1}{RESET} was\n" "{CENTER_ALIGN}handed over. "); ALIGNED(4) static const u8 sUnknown_80DD5B8[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n" + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_1}{RESET} was\n" "{CENTER_ALIGN}handed over.{EXTRA_MSG}" - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n" + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_0}{RESET} was\n" "{CENTER_ALIGN}returned to the Toolbox."); ALIGNED(4) static const u8 sUnknown_80DD60C[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n" + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_0}{RESET} was\n" "{CENTER_ALIGN}returned to the Toolbox."); ALIGNED(4) static const u8 sUnknown_80DD63C[] = _( - "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n" + "{CENTER_ALIGN}The {COLOR GREEN}{MOVE_ITEM_0}{RESET} was\n" "{CENTER_ALIGN}sent to storage."); ALIGNED(4) static const u8 sPartyMenuStandBy[] = "Stand By"; @@ -102,5 +102,5 @@ ALIGNED(4) static const u8 sPartyMenuSayFarewell[] = "Say Farewell"; ALIGNED(4) static const u8 sPartyMenuSummary[] = "Summary"; ALIGNED(4) static const u8 sPartyMenuMoves[] = "Moves"; ALIGNED(4) static const u8 sPartyMenuCheckIQ[] = "Check IQ"; -ALIGNED(4) static const u8 sPartyMenuItemPlaceholder[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} "); +ALIGNED(4) static const u8 sPartyMenuItemPlaceholder[] = _("Item: {COLOR GREEN}{MOVE_ITEM_0}{RESET} "); ALIGNED(4) static const u8 sUnknown_80DD6E0[] = "%s"; \ No newline at end of file diff --git a/src/data/personality_test1.h b/src/data/personality_test1.h index c9f7dfa7..6755ce44 100644 --- a/src/data/personality_test1.h +++ b/src/data/personality_test1.h @@ -1214,7 +1214,7 @@ static const s16 gStarters[NUM_PERSONALITIES][2] = ALIGNED(4) static const u8 gStarterReveal[] = _( "\n" - "{CENTER_ALIGN}The Pokémon {ARG_POKEMON_0}!"); + "{CENTER_ALIGN}The Pokémon {POKEMON_0}!"); UNUSED ALIGNED(4) static const u8* const gStarterRevealPtr[] = { gStarterReveal }; ALIGNED(4) static const u8 gPartnerPrompt[] = _( diff --git a/src/data/pokemon_mail.h b/src/data/pokemon_mail.h index 0197766c..0634bf71 100644 --- a/src/data/pokemon_mail.h +++ b/src/data/pokemon_mail.h @@ -53,12 +53,12 @@ const u8 * const gUnknown_80E8BF8[7] = { }; ALIGNED(4) static const u8 sUnknown_80E8C14[] = _("{STAR_BULLET}"); -ALIGNED(4) static const u8 sUnknown_80E8C18[] = _("{COLOR_1 RED}S{END_COLOR_TEXT_1}"); -ALIGNED(4) static const u8 sUnknown_80E8C20[] = _("{COLOR_1 CYAN}A{END_COLOR_TEXT_1}"); -ALIGNED(4) static const u8 sUnknown_80E8C28[] = _("{COLOR_1 CYAN}B{END_COLOR_TEXT_1}"); -ALIGNED(4) static const u8 sUnknown_80E8C30[] = _("{COLOR_1 GREEN}C{END_COLOR_TEXT_1}"); -ALIGNED(4) static const u8 sUnknown_80E8C38[] = _("{COLOR_1 GREEN}D{END_COLOR_TEXT_1}"); -ALIGNED(4) static const u8 sUnknown_80E8C40[] = _("{COLOR_1 WHITE}E{END_COLOR_TEXT_1}"); +ALIGNED(4) static const u8 sUnknown_80E8C18[] = _("{COLOR RED}S{RESET}"); +ALIGNED(4) static const u8 sUnknown_80E8C20[] = _("{COLOR CYAN}A{RESET}"); +ALIGNED(4) static const u8 sUnknown_80E8C28[] = _("{COLOR CYAN}B{RESET}"); +ALIGNED(4) static const u8 sUnknown_80E8C30[] = _("{COLOR GREEN}C{RESET}"); +ALIGNED(4) static const u8 sUnknown_80E8C38[] = _("{COLOR GREEN}D{RESET}"); +ALIGNED(4) static const u8 sUnknown_80E8C40[] = _("{COLOR DEFAULT}E{RESET}"); static const u8 sUnknown_80E8C60[]; static const u8 sUnknown_80E8C64[]; @@ -78,8 +78,8 @@ static const u8 * const gMissionRewardText[6] = { ALIGNED(4) static const u8 sUnknown_80E8C60[] = _("???"); ALIGNED(4) static const u8 sUnknown_80E8C64[] = _("Friend Area"); -ALIGNED(4) static const u8 sUnknown_80E8C70[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1} + ?"); -ALIGNED(4) static const u8 sUnknown_80E8C7C[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1}"); +ALIGNED(4) static const u8 sUnknown_80E8C70[] = _("{COLOR GREEN}%s{RESET} + ?"); +ALIGNED(4) static const u8 sUnknown_80E8C7C[] = _("{COLOR GREEN}%s{RESET}"); ALIGNED(4) static const u8 sUnknown_80E8C84[] = _("%d {POKE} + ?"); ALIGNED(4) static const u8 sUnknown_80E8C90[] = _("%d {POKE}"); @@ -248,9 +248,9 @@ ALIGNED(4) static const u8 sUnknown_80E914C[] = _("Hasn't come back."); ALIGNED(4) static const u8 sUnknown_80E9160[] = _("I'm worried."); ALIGNED(4) static const u8 sUnknown_80E9170[] = _("Somebody!"); ALIGNED(4) static const u8 sUnknown_80E917C[] = _("Failed to return."); -ALIGNED(4) static const u8 sUnknown_80E9190[] = _("Hurry, save {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); -ALIGNED(4) static const u8 sUnknown_80E91A8[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} needs help!"); -ALIGNED(4) static const u8 sUnknown_80E91BC[] = _("Please help {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); +ALIGNED(4) static const u8 sUnknown_80E9190[] = _("Hurry, save {COLOR YELLOW}%s{RESET}!"); +ALIGNED(4) static const u8 sUnknown_80E91A8[] = _("{COLOR YELLOW}%s{RESET} needs help!"); +ALIGNED(4) static const u8 sUnknown_80E91BC[] = _("Please help {COLOR YELLOW}%s{RESET}!"); static const u8 sUnknown_80E9288[]; static const u8 sUnknown_80E92A4[]; @@ -346,51 +346,51 @@ static const u8 * const gUnknown_80E91D4[45] = { sUnknown_80E9288 }; -ALIGNED(4) static const u8 sUnknown_80E9288[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} fell into a trap!"); -ALIGNED(4) static const u8 sUnknown_80E92A4[] = _("I lost contact with {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); -ALIGNED(4) static const u8 sUnknown_80E92C4[] = _("I can't contact {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); -ALIGNED(4) static const u8 sUnknown_80E92E0[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} can't walk anymore!"); -ALIGNED(4) static const u8 sUnknown_80E9300[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}'s been missing three days!"); -ALIGNED(4) static const u8 sUnknown_80E9328[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} went the wrong way!"); -ALIGNED(4) static const u8 sUnknown_80E9344[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is lost!"); -ALIGNED(4) static const u8 sUnknown_80E9358[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} appears to be stuck!"); -ALIGNED(4) static const u8 sUnknown_80E9378[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} appears to be lost!"); -ALIGNED(4) static const u8 sUnknown_80E9394[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} may have had an accident!"); -ALIGNED(4) static const u8 sUnknown_80E93B8[] = _("I'm worried for {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}'s safety!"); -ALIGNED(4) static const u8 sUnknown_80E93E0[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is fighting all alone!"); -ALIGNED(4) static const u8 sUnknown_80E9400[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is too hungry to move!"); -ALIGNED(4) static const u8 sUnknown_80E9420[] = _("Hurry, bring back {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}."); -ALIGNED(4) static const u8 sUnknown_80E9440[] = _("I got separated from {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}."); -ALIGNED(4) static const u8 sUnknown_80E9460[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is running out of time!"); -ALIGNED(4) static const u8 sUnknown_80E9480[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} was attacked, maybe!"); -ALIGNED(4) static const u8 sUnknown_80E94A0[] = _("Something happened to {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); -ALIGNED(4) static const u8 sUnknown_80E94C0[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} appears to be trapped!"); -ALIGNED(4) static const u8 sUnknown_80E94E0[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is stuck in a cave!"); -ALIGNED(4) static const u8 sUnknown_80E94FC[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} appears to be helpless!"); -ALIGNED(4) static const u8 sUnknown_80E951C[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} hasn't reemerged!"); -ALIGNED(4) static const u8 sUnknown_80E9538[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} was attacked by assailants!"); -ALIGNED(4) static const u8 sUnknown_80E955C[] = _("It appears as if {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} can't escape!"); -ALIGNED(4) static const u8 sUnknown_80E9588[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} may have fainted already!"); -ALIGNED(4) static const u8 sUnknown_80E95AC[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is about to faint!"); -ALIGNED(4) static const u8 sUnknown_80E95C8[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}'s been gone a long time!"); -ALIGNED(4) static const u8 sUnknown_80E95EC[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} has been cornered!"); -ALIGNED(4) static const u8 sUnknown_80E9608[] = _("I'm worried about {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); -ALIGNED(4) static const u8 sUnknown_80E9628[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}'s whereabouts are unknown!"); -ALIGNED(4) static const u8 sUnknown_80E9650[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} was paralyzed!"); -ALIGNED(4) static const u8 sUnknown_80E9668[] = _("Trouble may have found {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); -ALIGNED(4) static const u8 sUnknown_80E9688[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} appears to be freezing!"); -ALIGNED(4) static const u8 sUnknown_80E96A8[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} may be confused!"); -ALIGNED(4) static const u8 sUnknown_80E96C4[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is too scared to move!"); -ALIGNED(4) static const u8 sUnknown_80E96E4[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} went missing this morning!"); -ALIGNED(4) static const u8 sUnknown_80E9708[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} appears to be injured!"); -ALIGNED(4) static const u8 sUnknown_80E9728[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} may be facing danger!"); -ALIGNED(4) static const u8 sUnknown_80E9748[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} might be unable to return."); -ALIGNED(4) static const u8 sUnknown_80E976C[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} hasn't come back!"); -ALIGNED(4) static const u8 sUnknown_80E9788[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} can't swim!"); -ALIGNED(4) static const u8 sUnknown_80E97A0[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} hasn't been heard from!"); -ALIGNED(4) static const u8 sUnknown_80E97C4[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is still missing."); -ALIGNED(4) static const u8 sUnknown_80E97E0[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} may be endangered!"); -ALIGNED(4) static const u8 sUnknown_80E97FC[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} passed out from the heat!"); +ALIGNED(4) static const u8 sUnknown_80E9288[] = _("{COLOR YELLOW}%s{RESET} fell into a trap!"); +ALIGNED(4) static const u8 sUnknown_80E92A4[] = _("I lost contact with {COLOR YELLOW}%s{RESET}!"); +ALIGNED(4) static const u8 sUnknown_80E92C4[] = _("I can't contact {COLOR YELLOW}%s{RESET}!"); +ALIGNED(4) static const u8 sUnknown_80E92E0[] = _("{COLOR YELLOW}%s{RESET} can't walk anymore!"); +ALIGNED(4) static const u8 sUnknown_80E9300[] = _("{COLOR YELLOW}%s{RESET}'s been missing three days!"); +ALIGNED(4) static const u8 sUnknown_80E9328[] = _("{COLOR YELLOW}%s{RESET} went the wrong way!"); +ALIGNED(4) static const u8 sUnknown_80E9344[] = _("{COLOR YELLOW}%s{RESET} is lost!"); +ALIGNED(4) static const u8 sUnknown_80E9358[] = _("{COLOR YELLOW}%s{RESET} appears to be stuck!"); +ALIGNED(4) static const u8 sUnknown_80E9378[] = _("{COLOR YELLOW}%s{RESET} appears to be lost!"); +ALIGNED(4) static const u8 sUnknown_80E9394[] = _("{COLOR YELLOW}%s{RESET} may have had an accident!"); +ALIGNED(4) static const u8 sUnknown_80E93B8[] = _("I'm worried for {COLOR YELLOW}%s{RESET}'s safety!"); +ALIGNED(4) static const u8 sUnknown_80E93E0[] = _("{COLOR YELLOW}%s{RESET} is fighting all alone!"); +ALIGNED(4) static const u8 sUnknown_80E9400[] = _("{COLOR YELLOW}%s{RESET} is too hungry to move!"); +ALIGNED(4) static const u8 sUnknown_80E9420[] = _("Hurry, bring back {COLOR YELLOW}%s{RESET}."); +ALIGNED(4) static const u8 sUnknown_80E9440[] = _("I got separated from {COLOR YELLOW}%s{RESET}."); +ALIGNED(4) static const u8 sUnknown_80E9460[] = _("{COLOR YELLOW}%s{RESET} is running out of time!"); +ALIGNED(4) static const u8 sUnknown_80E9480[] = _("{COLOR YELLOW}%s{RESET} was attacked, maybe!"); +ALIGNED(4) static const u8 sUnknown_80E94A0[] = _("Something happened to {COLOR YELLOW}%s{RESET}!"); +ALIGNED(4) static const u8 sUnknown_80E94C0[] = _("{COLOR YELLOW}%s{RESET} appears to be trapped!"); +ALIGNED(4) static const u8 sUnknown_80E94E0[] = _("{COLOR YELLOW}%s{RESET} is stuck in a cave!"); +ALIGNED(4) static const u8 sUnknown_80E94FC[] = _("{COLOR YELLOW}%s{RESET} appears to be helpless!"); +ALIGNED(4) static const u8 sUnknown_80E951C[] = _("{COLOR YELLOW}%s{RESET} hasn't reemerged!"); +ALIGNED(4) static const u8 sUnknown_80E9538[] = _("{COLOR YELLOW}%s{RESET} was attacked by assailants!"); +ALIGNED(4) static const u8 sUnknown_80E955C[] = _("It appears as if {COLOR YELLOW}%s{RESET} can't escape!"); +ALIGNED(4) static const u8 sUnknown_80E9588[] = _("{COLOR YELLOW}%s{RESET} may have fainted already!"); +ALIGNED(4) static const u8 sUnknown_80E95AC[] = _("{COLOR YELLOW}%s{RESET} is about to faint!"); +ALIGNED(4) static const u8 sUnknown_80E95C8[] = _("{COLOR YELLOW}%s{RESET}'s been gone a long time!"); +ALIGNED(4) static const u8 sUnknown_80E95EC[] = _("{COLOR YELLOW}%s{RESET} has been cornered!"); +ALIGNED(4) static const u8 sUnknown_80E9608[] = _("I'm worried about {COLOR YELLOW}%s{RESET}!"); +ALIGNED(4) static const u8 sUnknown_80E9628[] = _("{COLOR YELLOW}%s{RESET}'s whereabouts are unknown!"); +ALIGNED(4) static const u8 sUnknown_80E9650[] = _("{COLOR YELLOW}%s{RESET} was paralyzed!"); +ALIGNED(4) static const u8 sUnknown_80E9668[] = _("Trouble may have found {COLOR YELLOW}%s{RESET}!"); +ALIGNED(4) static const u8 sUnknown_80E9688[] = _("{COLOR YELLOW}%s{RESET} appears to be freezing!"); +ALIGNED(4) static const u8 sUnknown_80E96A8[] = _("{COLOR YELLOW}%s{RESET} may be confused!"); +ALIGNED(4) static const u8 sUnknown_80E96C4[] = _("{COLOR YELLOW}%s{RESET} is too scared to move!"); +ALIGNED(4) static const u8 sUnknown_80E96E4[] = _("{COLOR YELLOW}%s{RESET} went missing this morning!"); +ALIGNED(4) static const u8 sUnknown_80E9708[] = _("{COLOR YELLOW}%s{RESET} appears to be injured!"); +ALIGNED(4) static const u8 sUnknown_80E9728[] = _("{COLOR YELLOW}%s{RESET} may be facing danger!"); +ALIGNED(4) static const u8 sUnknown_80E9748[] = _("{COLOR YELLOW}%s{RESET} might be unable to return."); +ALIGNED(4) static const u8 sUnknown_80E976C[] = _("{COLOR YELLOW}%s{RESET} hasn't come back!"); +ALIGNED(4) static const u8 sUnknown_80E9788[] = _("{COLOR YELLOW}%s{RESET} can't swim!"); +ALIGNED(4) static const u8 sUnknown_80E97A0[] = _("{COLOR YELLOW}%s{RESET} hasn't been heard from!"); +ALIGNED(4) static const u8 sUnknown_80E97C4[] = _("{COLOR YELLOW}%s{RESET} is still missing."); +ALIGNED(4) static const u8 sUnknown_80E97E0[] = _("{COLOR YELLOW}%s{RESET} may be endangered!"); +ALIGNED(4) static const u8 sUnknown_80E97FC[] = _("{COLOR YELLOW}%s{RESET} passed out from the heat!"); static const u8 sUnknown_80E9848[]; static const u8 sUnknown_80E985C[]; @@ -664,83 +664,83 @@ ALIGNED(4) static const u8 sUnknown_80EA1A8[] = _( ALIGNED(4) static const u8 sUnknown_80EA1FC[] = _("Please help my brother!"); ALIGNED(4) static const u8 sUnknown_80EA214[] = _( - "We've been rivals with {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} for\n" + "We've been rivals with {COLOR YELLOW}%s{RESET} for\n" "generations. It can't suddenly end like this!"); ALIGNED(4) static const u8 sUnknown_80EA26C[] = _( - "{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} has been a rival since my\n" + "{COLOR YELLOW}%s{RESET} has been a rival since my\n" "ancestors' time. The rivalry can't end!"); ALIGNED(4) static const u8 sUnknown_80EA2BC[] = _( - "{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} can't leave without settling\n" + "{COLOR YELLOW}%s{RESET} can't leave without settling\n" "which one of us is better. Please help!"); ALIGNED(4) static const u8 sUnknown_80EA30C[] = _( - "Please save {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}.\n" + "Please save {COLOR YELLOW}%s{RESET}.\n" "We owe each other a game!"); ALIGNED(4) static const u8 sUnknown_80EA33C[] = _( - "Please rescue {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}! We detest\n" + "Please rescue {COLOR YELLOW}%s{RESET}! We detest\n" "each other, but we need each other!"); ALIGNED(4) static const u8 sUnknown_80EA384[] = _("Rescue my rival!"); ALIGNED(4) static const u8 sUnknown_80EA398[] = _( - "I can't live without {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!\n" + "I can't live without {COLOR YELLOW}%s{RESET}!\n" "My heart is breaking! Please! Help!"); ALIGNED(4) static const u8 sUnknown_80EA3DC[] = _( - "Please save {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!\n" + "Please save {COLOR YELLOW}%s{RESET}!\n" "We're no good if we're not together!"); ALIGNED(4) static const u8 sUnknown_80EA41C[] = _( - "Please save my {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}! Now I\n" - "know what {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} means to me..."); + "Please save my {COLOR YELLOW}%s{RESET}! Now I\n" + "know what {COLOR YELLOW}%s{RESET} means to me..."); ALIGNED(4) static const u8 sUnknown_80EA45C[] = _( - "Please rescue {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}! We\n" + "Please rescue {COLOR YELLOW}%s{RESET}! We\n" "promised our futures together! Please!"); ALIGNED(4) static const u8 sUnknown_80EA4A0[] = _( - "Please rescue my precious {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!\n" + "Please rescue my precious {COLOR YELLOW}%s{RESET}!\n" "We're in love! Please help!"); ALIGNED(4) static const u8 sUnknown_80EA4E4[] = _( - "Please! Please rescue {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!\n" + "Please! Please rescue {COLOR YELLOW}%s{RESET}!\n" "We're madly in love!"); ALIGNED(4) static const u8 sUnknown_80EA51C[] = _("Please save my love!"); ALIGNED(4) static const u8 sUnknown_80EA534[] = _( "We make each other happy--it's in our\n" - "nature. Please save {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); + "nature. Please save {COLOR YELLOW}%s{RESET}!"); ALIGNED(4) static const u8 sUnknown_80EA57C[] = _( - "Please rescue {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}! The beach\n" + "Please rescue {COLOR YELLOW}%s{RESET}! The beach\n" "feels empty without my usual friend..."); ALIGNED(4) static const u8 sUnknown_80EA5C4[] = _( - "I feel lonely without {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} to pull\n" + "I feel lonely without {COLOR YELLOW}%s{RESET} to pull\n" "pranks and mess around with. Please help!"); ALIGNED(4) static const u8 sUnknown_80EA614[] = _( - "Help {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}, please!\n" + "Help {COLOR YELLOW}%s{RESET}, please!\n" "We often took strolls on the wind!"); ALIGNED(4) static const u8 sUnknown_80EA650[] = _( - "Please save {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}! We're both\n" + "Please save {COLOR YELLOW}%s{RESET}! We're both\n" "old-timers who are longtime friends!"); ALIGNED(4) static const u8 sUnknown_80EA698[] = _( - "Please save {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}. We've been in\n" + "Please save {COLOR YELLOW}%s{RESET}. We've been in\n" "the delivery business for many years!"); ALIGNED(4) static const u8 sUnknown_80EA6E4[] = _( - "I'm sad without {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}'s company.\n" + "I'm sad without {COLOR YELLOW}%s{RESET}'s company.\n" "We showed flowers to each other..."); ALIGNED(4) static const u8 sUnknown_80EA730[] = _( - "Without {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}, there's no one for\n" + "Without {COLOR YELLOW}%s{RESET}, there's no one for\n" "me to play with in the dark! Please help!"); ALIGNED(4) static const u8 sUnknown_80EA784[] = _( @@ -748,15 +748,15 @@ ALIGNED(4) static const u8 sUnknown_80EA784[] = _( "Who was it?"); ALIGNED(4) static const u8 sUnknown_80EA7A8[] = _( - "Please save {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}. We're both alike\n" + "Please save {COLOR YELLOW}%s{RESET}. We're both alike\n" "in being kind of vacant and unpredictable!"); ALIGNED(4) static const u8 sUnknown_80EA7FC[] = _( - "Without {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} around, there's no\n" + "Without {COLOR YELLOW}%s{RESET} around, there's no\n" "one to heckle! Please break my boredom!"); ALIGNED(4) static const u8 sUnknown_80EA84C[] = _( - "Please help {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!\n" + "Please help {COLOR YELLOW}%s{RESET}!\n" "My tiny and round best friend!"); ALIGNED(4) static const u8 sUnknown_80EA880[] = _( @@ -764,15 +764,15 @@ ALIGNED(4) static const u8 sUnknown_80EA880[] = _( "sharp our claws could be... Someone, help!"); ALIGNED(4) static const u8 sUnknown_80EA8D0[] = _( - "I lock horns with {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} for fun.\n" + "I lock horns with {COLOR YELLOW}%s{RESET} for fun.\n" "I terribly miss doing that..."); ALIGNED(4) static const u8 sUnknown_80EA914[] = _( - "Please help {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}! We're both lazy,\n" + "Please help {COLOR YELLOW}%s{RESET}! We're both lazy,\n" "so we're comfortable around each other!"); ALIGNED(4) static const u8 sUnknown_80EA968[] = _( - "I want to help {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!\n" + "I want to help {COLOR YELLOW}%s{RESET}!\n" "We both have a thing for pincers!"); ALIGNED(4) static const u8 sUnknown_80EA9A4[] = _( @@ -780,35 +780,35 @@ ALIGNED(4) static const u8 sUnknown_80EA9A4[] = _( "and hypnosis shows together. Please help!"); ALIGNED(4) static const u8 sUnknown_80EA9F8[] = _( - "Someone save {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}--my friend\n" + "Someone save {COLOR YELLOW}%s{RESET}--my friend\n" "and rival at ball juggling!"); ALIGNED(4) static const u8 sUnknown_80EAA34[] = _( - "Please help {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}! Our cries are\n" + "Please help {COLOR YELLOW}%s{RESET}! Our cries are\n" "identical! We can tell each other anything!"); ALIGNED(4) static const u8 sUnknown_80EAA84[] = _( "I can't play the biting game without my pal\n" - "{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}! Please help!"); + "{COLOR YELLOW}%s{RESET}! Please help!"); ALIGNED(4) static const u8 sUnknown_80EAAC8[] = _( - "{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is really noisy.\n" + "{COLOR YELLOW}%s{RESET} is really noisy.\n" "But it's lonely without the racket... Sob..."); ALIGNED(4) static const u8 sUnknown_80EAB10[] = _( - "Without {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}, it's no fun playing\n" + "Without {COLOR YELLOW}%s{RESET}, it's no fun playing\n" "with toxic powders! Someone, please help!"); ALIGNED(4) static const u8 sUnknown_80EAB68[] = _( - "Please rescue {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!\n" + "Please rescue {COLOR YELLOW}%s{RESET}!\n" "We've been friends since we were eggs!"); ALIGNED(4) static const u8 sUnknown_80EABA8[] = _( - "Please help {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}--a good\n" + "Please help {COLOR YELLOW}%s{RESET}--a good\n" "friend who shares my love of fire!"); ALIGNED(4) static const u8 sUnknown_80EABE8[] = _( - "{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} and I are of the same height.\n" + "{COLOR YELLOW}%s{RESET} and I are of the same height.\n" "We're lifelong friends! Please help!"); ALIGNED(4) static const u8 sUnknown_80EAC38[] = _( @@ -816,27 +816,27 @@ ALIGNED(4) static const u8 sUnknown_80EAC38[] = _( "both evolved from Wurmple. Please help!"); ALIGNED(4) static const u8 sUnknown_80EAC88[] = _( - "Help! I'm friends with {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}\n" + "Help! I'm friends with {COLOR YELLOW}%s{RESET}\n" "because we both evolve fast! Please help!"); ALIGNED(4) static const u8 sUnknown_80EACD4[] = _( - "Help! {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} isn't much now, but\n" + "Help! {COLOR YELLOW}%s{RESET} isn't much now, but\n" "my friend is amazing after evolution!"); ALIGNED(4) static const u8 sUnknown_80EAD20[] = _( - "Please rescue {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!\n" + "Please rescue {COLOR YELLOW}%s{RESET}!\n" "We always play together!"); ALIGNED(4) static const u8 sUnknown_80EAD50[] = _( - "Please rescue {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}.\n" + "Please rescue {COLOR YELLOW}%s{RESET}.\n" "I can't stand to see a sludge buddy hurt!"); ALIGNED(4) static const u8 sUnknown_80EAD94[] = _( - "Please save my best friend {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!\n" + "Please save my best friend {COLOR YELLOW}%s{RESET}!\n" "We're both bivalves!"); ALIGNED(4) static const u8 sUnknown_80EADD0[] = _( - "Please save {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1},\n" + "Please save {COLOR YELLOW}%s{RESET},\n" "my drilling buddy!"); ALIGNED(4) static const u8 sUnknown_80EADFC[] = _( @@ -860,7 +860,7 @@ static const u8 * const gUnknown_80EAE5C[4] = { ALIGNED(4) static const u8 EscortMe_Text[] = _("Escort me!"); ALIGNED(4) static const u8 TakeMeWith_Text[] = _("Please take me with you!"); -ALIGNED(4) static const u8 WantToSee_Text[] = _("I want to see {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}."); +ALIGNED(4) static const u8 WantToSee_Text[] = _("I want to see {COLOR YELLOW}%s{RESET}."); ALIGNED(4) static const u8 TakeMe_Text[] = _("Take me!"); static const u8 CloseFriends_80EAF08[]; @@ -907,26 +907,26 @@ static const u8 * const gUnknown_80EAEB8[20] = { CloseFriends_80EAF08 }; -ALIGNED(4) static const u8 CloseFriends_80EAF08[] = _("I'm close friends with {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); -ALIGNED(4) static const u8 Apologize_80EAF2C[] = _("I want to apologize to {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}."); +ALIGNED(4) static const u8 CloseFriends_80EAF08[] = _("I'm close friends with {COLOR YELLOW}%s{RESET}!"); +ALIGNED(4) static const u8 Apologize_80EAF2C[] = _("I want to apologize to {COLOR YELLOW}%s{RESET}."); ALIGNED(4) static const u8 MustMeet_80EAF4C[] = _("I don't care how--we must meet!"); ALIGNED(4) static const u8 HaveToMeet_80EAF70[] = _("We have to meet--whatever it takes!"); ALIGNED(4) static const u8 HaveToGo_80EAF94[] = _("I have to go!"); ALIGNED(4) static const u8 LongTime_80EAFA4[] = _("We haven't seen each other in a long time."); ALIGNED(4) static const u8 SickWorry_80EAFD4[] = _("I'm sick with worry..."); -ALIGNED(4) static const u8 FaintedInside_80EAFF0[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} may have fainted inside..."); -ALIGNED(4) static const u8 HasntReturned_80EB014[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} hasn't returned!"); -ALIGNED(4) static const u8 WantToHelp_80EB030[] = _("I want to help {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); -ALIGNED(4) static const u8 InTrouble_80EB048[] = _("Hurry, {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is in trouble..."); -ALIGNED(4) static const u8 WaitingForever_80EB06C[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} has been waiting forever..."); -ALIGNED(4) static const u8 WaitingInDungeon_80EB090[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is waiting in the dungeon."); +ALIGNED(4) static const u8 FaintedInside_80EAFF0[] = _("{COLOR YELLOW}%s{RESET} may have fainted inside..."); +ALIGNED(4) static const u8 HasntReturned_80EB014[] = _("{COLOR YELLOW}%s{RESET} hasn't returned!"); +ALIGNED(4) static const u8 WantToHelp_80EB030[] = _("I want to help {COLOR YELLOW}%s{RESET}!"); +ALIGNED(4) static const u8 InTrouble_80EB048[] = _("Hurry, {COLOR YELLOW}%s{RESET} is in trouble..."); +ALIGNED(4) static const u8 WaitingForever_80EB06C[] = _("{COLOR YELLOW}%s{RESET} has been waiting forever..."); +ALIGNED(4) static const u8 WaitingInDungeon_80EB090[] = _("{COLOR YELLOW}%s{RESET} is waiting in the dungeon."); ALIGNED(4) static const u8 TooWeak_80EB0B4[] = _("I'm too weak. It's not possible."); ALIGNED(4) static const u8 OwnPower_80EB0DC[] = _("I can't go on my own power..."); ALIGNED(4) static const u8 GoMyself_80EB0FC[] = _("I can't go by myself..."); -ALIGNED(4) static const u8 WorriedAbout_80EB118[] = _("I'm worried about {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}..."); -ALIGNED(4) static const u8 WantMeet_80EB138[] = _("I want to meet with {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}."); +ALIGNED(4) static const u8 WorriedAbout_80EB118[] = _("I'm worried about {COLOR YELLOW}%s{RESET}..."); +ALIGNED(4) static const u8 WantMeet_80EB138[] = _("I want to meet with {COLOR YELLOW}%s{RESET}."); ALIGNED(4) static const u8 PromisedMeet_80EB158[] = _("We promised to meet in the dungeon!"); -ALIGNED(4) static const u8 WaitingForMe_80EB17C[] = _("{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is waiting for me!"); +ALIGNED(4) static const u8 WaitingForMe_80EB17C[] = _("{COLOR YELLOW}%s{RESET} is waiting for me!"); static const u8 SomeonePleaseEscort[]; static const u8 PleaseEscortMe[]; @@ -943,7 +943,7 @@ static const u8 * const gUnknown_80EB198[4] = { ALIGNED(4) static const u8 SomeonePleaseEscort[] = _("Someone, please escort me!"); ALIGNED(4) static const u8 PleaseEscortMe[] = _("Please escort me there!"); ALIGNED(4) static const u8 PleaseTakeMeThere[] = _("Please take me there with you!"); -ALIGNED(4) static const u8 PleaseTakeMeToSee[] = _("Please take me to see {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); +ALIGNED(4) static const u8 PleaseTakeMeToSee[] = _("Please take me to see {COLOR YELLOW}%s{RESET}!"); static const u8 Without_80EB238[]; static const u8 Worried_80EB250[]; @@ -961,12 +961,12 @@ static const u8 * const gUnknown_80EB220[6] = { Without_80EB238 }; -ALIGNED(4) static const u8 Without_80EB238[] = _("Without {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}, I..."); -ALIGNED(4) static const u8 Worried_80EB250[] = _("I'm so worried about {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}..."); -ALIGNED(4) static const u8 WantMeet_80EB274[] = _("I really want to meet {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); -ALIGNED(4) static const u8 HelpMeet_80EB294[] = _("Help me meet {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); -ALIGNED(4) static const u8 Escort_80EB2AC[] = _("Please escort me to my {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); -ALIGNED(4) static const u8 TakeMeet_80EB2CC[] = _("Please! Take me to meet {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!"); +ALIGNED(4) static const u8 Without_80EB238[] = _("Without {COLOR YELLOW}%s{RESET}, I..."); +ALIGNED(4) static const u8 Worried_80EB250[] = _("I'm so worried about {COLOR YELLOW}%s{RESET}..."); +ALIGNED(4) static const u8 WantMeet_80EB274[] = _("I really want to meet {COLOR YELLOW}%s{RESET}!"); +ALIGNED(4) static const u8 HelpMeet_80EB294[] = _("Help me meet {COLOR YELLOW}%s{RESET}!"); +ALIGNED(4) static const u8 Escort_80EB2AC[] = _("Please escort me to my {COLOR YELLOW}%s{RESET}!"); +ALIGNED(4) static const u8 TakeMeet_80EB2CC[] = _("Please! Take me to meet {COLOR YELLOW}%s{RESET}!"); static const u8 Lonely_80EB308[]; static const u8 NoGood_80EB334[]; @@ -1040,28 +1040,28 @@ static const u8 * const gUnknown_80EB3F8[22] = { sUnknown_80EB450 }; -ALIGNED(4) static const u8 sUnknown_80EB450[] = _("Is it true about the {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}?"); -ALIGNED(4) static const u8 sUnknown_80EB470[] = _("The item {COLOR_1 GREEN}%s{END_COLOR_TEXT_1} is the in thing!"); -ALIGNED(4) static const u8 sUnknown_80EB494[] = _("Wanted: my own {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}."); -ALIGNED(4) static const u8 sUnknown_80EB4AC[] = _("I lost my {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}."); -ALIGNED(4) static const u8 sUnknown_80EB4C0[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1} wanted for nostalgia."); -ALIGNED(4) static const u8 sUnknown_80EB4E0[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1} wanted to test effects."); -ALIGNED(4) static const u8 sUnknown_80EB500[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1}'s texture is comforting."); -ALIGNED(4) static const u8 sUnknown_80EB524[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1}--it's my mom's favorite."); -ALIGNED(4) static const u8 sUnknown_80EB54C[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1} makes me strong."); -ALIGNED(4) static const u8 sUnknown_80EB568[] = _("I can't sleep without it: {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}."); -ALIGNED(4) static const u8 sUnknown_80EB590[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1}--I get scared without it!"); -ALIGNED(4) static const u8 sUnknown_80EB5B4[] = _("Hard-to-find {COLOR_1 GREEN}%s{END_COLOR_TEXT_1} sought."); -ALIGNED(4) static const u8 sUnknown_80EB5D4[] = _("I can't find one more {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}."); -ALIGNED(4) static const u8 sUnknown_80EB5F8[] = _("Help this {COLOR_1 GREEN}%s{END_COLOR_TEXT_1} collector!"); -ALIGNED(4) static const u8 sUnknown_80EB618[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1}! Seeking in quantity!"); -ALIGNED(4) static const u8 sUnknown_80EB638[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1} wanted as a charm."); -ALIGNED(4) static const u8 sUnknown_80EB654[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1}--I can't leave without it."); -ALIGNED(4) static const u8 sUnknown_80EB67C[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1}--I'd love to utilize one!"); -ALIGNED(4) static const u8 sUnknown_80EB6A0[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1} wanted for exploration."); -ALIGNED(4) static const u8 sUnknown_80EB6C0[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1} wanted after long search."); -ALIGNED(4) static const u8 sUnknown_80EB6E4[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1}--it's convenient to have."); -ALIGNED(4) static const u8 sUnknown_80EB708[] = _("Having one {COLOR_1 GREEN}%s{END_COLOR_TEXT_1} is reassuring."); +ALIGNED(4) static const u8 sUnknown_80EB450[] = _("Is it true about the {COLOR GREEN}%s{RESET}?"); +ALIGNED(4) static const u8 sUnknown_80EB470[] = _("The item {COLOR GREEN}%s{RESET} is the in thing!"); +ALIGNED(4) static const u8 sUnknown_80EB494[] = _("Wanted: my own {COLOR GREEN}%s{RESET}."); +ALIGNED(4) static const u8 sUnknown_80EB4AC[] = _("I lost my {COLOR GREEN}%s{RESET}."); +ALIGNED(4) static const u8 sUnknown_80EB4C0[] = _("{COLOR GREEN}%s{RESET} wanted for nostalgia."); +ALIGNED(4) static const u8 sUnknown_80EB4E0[] = _("{COLOR GREEN}%s{RESET} wanted to test effects."); +ALIGNED(4) static const u8 sUnknown_80EB500[] = _("{COLOR GREEN}%s{RESET}'s texture is comforting."); +ALIGNED(4) static const u8 sUnknown_80EB524[] = _("{COLOR GREEN}%s{RESET}--it's my mom's favorite."); +ALIGNED(4) static const u8 sUnknown_80EB54C[] = _("{COLOR GREEN}%s{RESET} makes me strong."); +ALIGNED(4) static const u8 sUnknown_80EB568[] = _("I can't sleep without it: {COLOR GREEN}%s{RESET}."); +ALIGNED(4) static const u8 sUnknown_80EB590[] = _("{COLOR GREEN}%s{RESET}--I get scared without it!"); +ALIGNED(4) static const u8 sUnknown_80EB5B4[] = _("Hard-to-find {COLOR GREEN}%s{RESET} sought."); +ALIGNED(4) static const u8 sUnknown_80EB5D4[] = _("I can't find one more {COLOR GREEN}%s{RESET}."); +ALIGNED(4) static const u8 sUnknown_80EB5F8[] = _("Help this {COLOR GREEN}%s{RESET} collector!"); +ALIGNED(4) static const u8 sUnknown_80EB618[] = _("{COLOR GREEN}%s{RESET}! Seeking in quantity!"); +ALIGNED(4) static const u8 sUnknown_80EB638[] = _("{COLOR GREEN}%s{RESET} wanted as a charm."); +ALIGNED(4) static const u8 sUnknown_80EB654[] = _("{COLOR GREEN}%s{RESET}--I can't leave without it."); +ALIGNED(4) static const u8 sUnknown_80EB67C[] = _("{COLOR GREEN}%s{RESET}--I'd love to utilize one!"); +ALIGNED(4) static const u8 sUnknown_80EB6A0[] = _("{COLOR GREEN}%s{RESET} wanted for exploration."); +ALIGNED(4) static const u8 sUnknown_80EB6C0[] = _("{COLOR GREEN}%s{RESET} wanted after long search."); +ALIGNED(4) static const u8 sUnknown_80EB6E4[] = _("{COLOR GREEN}%s{RESET}--it's convenient to have."); +ALIGNED(4) static const u8 sUnknown_80EB708[] = _("Having one {COLOR GREEN}%s{RESET} is reassuring."); static const u8 sUnknown_80EB784[]; static const u8 sUnknown_80EB7A8[]; @@ -1329,7 +1329,7 @@ ALIGNED(4) static const u8 sLucarioRankText[] = _( ALIGNED(4) static const u8 sLucarioRankHeadline[] = _("Congratulations - Lucario Rank!"); ALIGNED(4) static const u8 sBuriedRelicText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Mystery Ruin Found Underground!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Mystery Ruin Found Underground!{RESET}\n" "Its site had been hidden by the crater of a\n" "meteor strike in ancient times. The Buried\n" "Relic is thought to date back beyond\n" @@ -1341,11 +1341,11 @@ ALIGNED(4) static const u8 sBuriedRelicText[] = _( ALIGNED(4) static const u8 sBuriedRelicHeadline[] = _("Buried Relic Discovered!"); ALIGNED(4) static const u8 sNewsText2[] = _( - "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_POKEMON_0} Innocent! Part 2{END_COLOR_TEXT_1}\n" - "{COLOR_1 GREEN}Quote from Charizard on the scene:{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN}{COLOR CYAN}{POKEMON_0} Innocent! Part 2{RESET}\n" + "{COLOR GREEN}Quote from Charizard on the scene:{RESET}\n" "“That's what I thought right from\n" "the start, hahaha!”\n" - "{COLOR_1 GREEN}Quote from Tyranitar on the scene:{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Quote from Tyranitar on the scene:{RESET}\n" "“That muckraking Gengar...\n" "He's not getting away with this!\n" "He'd better be ready for it!”"); @@ -1353,13 +1353,13 @@ ALIGNED(4) static const u8 sNewsText2[] = _( ALIGNED(4) static const u8 sNewsHeadline2[] = _("Pokémon News Extra 2"); ALIGNED(4) static const u8 sNewsText1[] = _( - "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_POKEMON_0} Innocent! Part 1{END_COLOR_TEXT_1}\n" - "{ARG_POKEMON_1} met with Ninetales on {COLOR_1 RED}Mt. Freeze{END_COLOR_TEXT_1}.\n" - "Ninetales testified that {ARG_POKEMON_0} was\n" + "{CENTER_ALIGN}{COLOR CYAN}{POKEMON_0} Innocent! Part 1{RESET}\n" + "{POKEMON_1} met with Ninetales on {COLOR RED}Mt. Freeze{RESET}.\n" + "Ninetales testified that {POKEMON_0} was\n" "not the human that appeared in the legend.\n" "As a result, Gengar's claims were found to\n" "be malicious lies.\n" - "{COLOR_1 GREEN}The clearly dismayed Gengar's quote:{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}The clearly dismayed Gengar's quote:{RESET}\n" "“Ugegegegegegegegegegegeh!”"); ALIGNED(4) static const u8 sNewsHeadline1[] = _("Pokémon News Extra 1"); @@ -1376,39 +1376,39 @@ ALIGNED(4) static const u8 sPelipperText[] = _( ALIGNED(4) static const u8 sPelipperHeadline[] =_("A Letter from Pelipper"); ALIGNED(4) static const u8 sLinkedProText2[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Try These Linked Moves to KO Foes!{END_COLOR_TEXT_1}\n\n" + "{CENTER_ALIGN COLOR YELLOW}Try These Linked Moves to KO Foes!{RESET}\n\n" "Psyduck\n" - "{COLOR_1 GREEN}Confusion{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Disable{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Confusion{RESET} + {COLOR GREEN}Disable{RESET}\n" "Totodile\n" - "{COLOR_1 GREEN}Bite{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Scary Face{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Bite{RESET} + {COLOR GREEN}Scary Face{RESET}\n" "Cyndaquil\n" - "{COLOR_1 GREEN}Flame Wheel{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Smokescreen{END_COLOR_TEXT_1}{EXTRA_MSG}" + "{COLOR GREEN}Flame Wheel{RESET} + {COLOR GREEN}Smokescreen{RESET}{EXTRA_MSG}" "Pikachu\n" - "{COLOR_1 GREEN}Thunderbolt{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Double Team{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Thunderbolt{RESET} + {COLOR GREEN}Double Team{RESET}\n" "Skitty\n" - "{COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Doubleslap{END_COLOR_TEXT_1}"); + "{COLOR GREEN}Tail Whip{RESET} + {COLOR GREEN}Doubleslap{RESET}"); ALIGNED(4) static const u8 sLinkedProHeadline2[] =_("#50 Linked Moves Pro Level 2"); ALIGNED(4) static const u8 sLinkedProText1[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}These Linked Move Combinations{END_COLOR_TEXT_1}\n" - "{CENTER_ALIGN COLOR_1 YELLOW}Can Be Devastating!{END_COLOR_TEXT_1}\n\n" + "{CENTER_ALIGN COLOR YELLOW}These Linked Move Combinations{RESET}\n" + "{CENTER_ALIGN COLOR YELLOW}Can Be Devastating!{RESET}\n\n" "Bulbasaur\n" - "{COLOR_1 GREEN}Razor Leaf{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Sleep Powder{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Razor Leaf{RESET} + {COLOR GREEN}Sleep Powder{RESET}\n" "Chikorita\n" - "{COLOR_1 GREEN}Body Slam{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Reflect{END_COLOR_TEXT_1}{EXTRA_MSG}" + "{COLOR GREEN}Body Slam{RESET} + {COLOR GREEN}Reflect{RESET}{EXTRA_MSG}" "Treecko\n" - "{COLOR_1 GREEN}Screech{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Pound{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Screech{RESET} + {COLOR GREEN}Pound{RESET}\n" "Machop\n" - "{COLOR_1 GREEN}Focus Energy{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Karate Chop{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Focus Energy{RESET} + {COLOR GREEN}Karate Chop{RESET}\n" "Cubone\n" - "{COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Bonemerang{END_COLOR_TEXT_1}"); + "{COLOR GREEN}Tail Whip{RESET} + {COLOR GREEN}Bonemerang{RESET}"); ALIGNED(4) static const u8 sLinkedProHeadline1[] = _("#49 Linked Moves Pro Level 1"); ALIGNED(4) static const u8 sSlakothText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Relief for Delicate Souls Who Can't{END_COLOR_TEXT_1}\n" - "{CENTER_ALIGN COLOR_1 YELLOW}Sleep with Different Pillows!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Relief for Delicate Souls Who Can't{RESET}\n" + "{CENTER_ALIGN COLOR YELLOW}Sleep with Different Pillows!{RESET}\n" "Insomniacs rejoiced over the announcement\n" "of the Slakoth Pillow, which is said to\n" "induce sleepiness just by seeing it.\n" @@ -1431,14 +1431,14 @@ ALIGNED(4) static const u8 sPitfallText[] = _( ALIGNED(4) static const u8 sPitfallHeadline[] = _("#47 Beware of Pitfalls"); ALIGNED(4) static const u8 sSeaRescueText[] = _( - "A high-seas rescue in the {COLOR_1 RED}Stormy Sea{END_COLOR_TEXT_1} by\n" - "{COLOR_1 CYAN}Team Sea Dragons{END_COLOR_TEXT_1} ended yesterday with\n" + "A high-seas rescue in the {COLOR RED}Stormy Sea{RESET} by\n" + "{COLOR CYAN}Team Sea Dragons{RESET} ended yesterday with\n" "the successful recovery of Tentacool.\n" "The client, Corsola, is said to be delighted\n" "by the outcome.\n" "Tentacool stated, “I didn't realize how far\n" "I'd been washed out to sea.”\n" - "The {COLOR_1 RED}Stormy Sea{END_COLOR_TEXT_1} is unforgiving!"); + "The {COLOR RED}Stormy Sea{RESET} is unforgiving!"); ALIGNED(4) static const u8 sSeaRescueHeadline[] = _("#46 Sea Rescue a Success!"); @@ -1454,7 +1454,7 @@ ALIGNED(4) static const u8 sVileplumeText[] = _( ALIGNED(4) static const u8 sVileplumeHeadline[] = _("#45 Vileplume's Weighty Problem"); ALIGNED(4) static const u8 sRawstText[] = _( - "Research has revealed that {COLOR_1 GREEN}Rawst Berries{END_COLOR_TEXT_1}\n" + "Research has revealed that {COLOR GREEN}Rawst Berries{RESET}\n" "found in dungeons are usually unripened\n" "and colored green. When ripe, they turn a\n" "sky blue color. An unripened one is easier\n" @@ -1521,10 +1521,10 @@ ALIGNED(4) static const u8 sCastformHeadline[] = _("#39 Castform's Daily Weather ALIGNED(4) static const u8 sGasText[] = _( "Reports of a noxious gas leak caused\n" - "widespread chaos in the {COLOR_1 YELLOW_4}Sinister Woods{END_COLOR_TEXT_1}.\n" + "widespread chaos in the {COLOR YELLOW_D}Sinister Woods{RESET}.\n" "Specialists speculate that the recent\n" "natural disasters are to blame. However,\n" - "some also blame {COLOR_1 CYAN}Team Koffing{END_COLOR_TEXT_1}'s training\n" + "some also blame {COLOR CYAN}Team Koffing{RESET}'s training\n" "in the area for the foul-smelling gas.\n" "The answer, apparently, is blowing in the\n" "wind."); @@ -1532,7 +1532,7 @@ ALIGNED(4) static const u8 sGasText[] = _( ALIGNED(4) static const u8 sGasHeadline[] = _("#38 Noxious Gas Leak?!"); ALIGNED(4) static const u8 sKeyItemText2[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}When Used Somewhere Special...{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}When Used Somewhere Special...{RESET}\n" "Eevee and Water Stone, Fire Stone,\n" "Thunderstone, or...\n" "Exeggcute and Leaf Stone...\n" @@ -1542,7 +1542,7 @@ ALIGNED(4) static const u8 sKeyItemText2[] = _( ALIGNED(4) static const u8 sKeyItemHeadline2[] = _("#37 Key Items for Pokémon 2"); ALIGNED(4) static const u8 sKeyItemText1[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}When Used Somewhere Special...{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}When Used Somewhere Special...{RESET}\n" "Sunkern and Sun Stone...\n" "Skitty and Moon Stone...\n" "Growlithe and Fire Stone...\n" @@ -1553,14 +1553,14 @@ ALIGNED(4) static const u8 sKeyItemText1[] = _( ALIGNED(4) static const u8 sKeyItemHeadline1[] = _("#36 Key Items for Pokémon 1"); ALIGNED(4) static const u8 sSwitchText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Power Up Combination Attacks!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Power Up Combination Attacks!{RESET}\n" "Some dungeons allow rescue teams to\n" "switch leaders on the spot for doing\n" "combination attacks and so on.\n" "When you enter a dungeon, open the menu,\n" "choose the Pokémon you want as the\n" - "leader under {COLOR_1 YELLOW}Team{END_COLOR_TEXT_1}, then select the\n" - "command {COLOR_1 YELLOW}Leader{END_COLOR_TEXT_1}."); + "leader under {COLOR YELLOW}Team{RESET}, then select the\n" + "command {COLOR YELLOW}Leader{RESET}."); ALIGNED(4) static const u8 sSwitchHeadline[] = _("#35 Switching Leaders"); @@ -1591,7 +1591,7 @@ ALIGNED(4) static const u8 sWobbuffetText[] = _( "Earlier today, Wobbuffet reportedly\n" "wobbled the wrong way and wandered off.\n" "It had to be rescued by the famous\n" - "{COLOR_1 CYAN}Team Hydro{END_COLOR_TEXT_1}.\n" + "{COLOR CYAN}Team Hydro{RESET}.\n" "Fortunately, the wayward wanderer\n" "Wobbuffet was only wobbly and otherwise\n" "unharmed."); @@ -1602,8 +1602,8 @@ ALIGNED(4) static const u8 sPechaText[] = _( "Among rescue teams, there is growing\n" "demand for equipment that is not only\n" "practical, but also fashionably appealing.\n" - "The pink {COLOR_1 GREEN}Pecha Scarf{END_COLOR_TEXT_1} is especially popular.\n" - "Even the {COLOR_1 CYAN}Kecleon Shop{END_COLOR_TEXT_1} is having trouble\n" + "The pink {COLOR GREEN}Pecha Scarf{RESET} is especially popular.\n" + "Even the {COLOR CYAN}Kecleon Shop{RESET} is having trouble\n" "keeping it in stock.\n" "If you're lucky enough to spot one, make a\n" "beeline for it!"); @@ -1635,19 +1635,19 @@ ALIGNED(4) static const u8 sAzurillText[] = _( ALIGNED(4) static const u8 sAzurillHeadline[] = _("#29 Azurill--the Little Hero!"); ALIGNED(4) static const u8 sKeyText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Head Out to the Desert Region!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Head Out to the Desert Region!{RESET}\n" "If you've been wondering what lies behind\n" - "the mysterious locked doors of the {COLOR_1 YELLOW_4}Solar\n" - "Cave{END_COLOR_TEXT_1}, there's been a breakthrough!\n" + "the mysterious locked doors of the {COLOR YELLOW_D}Solar\n" + "Cave{RESET}, there's been a breakthrough!\n" "Reports indicate the door keys are easily\n" - "found in the {COLOR_1 YELLOW_4}Desert Region{END_COLOR_TEXT_1}. Explorers are\n" + "found in the {COLOR YELLOW_D}Desert Region{RESET}. Explorers are\n" "advised to compose teams with Pokémon\n" "adapted to the desert environment."); ALIGNED(4) static const u8 sKeyHeadline[] = _("#28 The Key"); ALIGNED(4) static const u8 sSweetText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Feel a Little Envious?{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Feel a Little Envious?{RESET}\n" "Teddiursa is often seen licking its paws\n" "that have soaked up sweet honey. While it\n" "may be sticky shaking paws with\n" @@ -1657,10 +1657,10 @@ ALIGNED(4) static const u8 sSweetText[] = _( ALIGNED(4) static const u8 sSweetHeadline[] = _("#27 Sweet Hands!"); ALIGNED(4) static const u8 sRangeText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}All Moves Have Effective Ranges{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}All Moves Have Effective Ranges{RESET}\n" "Moves that affect an entire room have a\n" "range of two tiles in a corridor. The move\n" - "{COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}, which lowers the Attack stat of\n" + "{COLOR GREEN}Growl{RESET}, which lowers the Attack stat of\n" "foes in a room, will reach two tiles away\n" "in a corridor, for example. If, however,\n" "the visibility is limited to just one tile,\n" @@ -1669,8 +1669,8 @@ ALIGNED(4) static const u8 sRangeText[] = _( ALIGNED(4) static const u8 sRangeHeadline[] = _("#26 The Range of Moves"); ALIGNED(4) static const u8 sIQText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Make Your Explorations Easier by{END_COLOR_TEXT_1}\n" - "{CENTER_ALIGN COLOR_1 YELLOW}Boosting the IQ of Team Members!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Make Your Explorations Easier by{RESET}\n" + "{CENTER_ALIGN COLOR YELLOW}Boosting the IQ of Team Members!{RESET}\n" "Eating Gummis boosts the IQ of Pokémon.\n" "Upon reaching certain IQ levels, a Pokémon\n" "learns IQ Skills that can be very helpful\n" @@ -1681,7 +1681,7 @@ ALIGNED(4) static const u8 sIQText[] = _( ALIGNED(4) static const u8 sIQHeadline[] = _("#25 IQ"); ALIGNED(4) static const u8 sTrapTileText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}New Types of Floor Tiles?{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}New Types of Floor Tiles?{RESET}\n" "There have been numerous reports of new\n" "floor tiles other than Wonder Tiles.\n" "Believed to have been made by the recent\n" @@ -1693,32 +1693,32 @@ ALIGNED(4) static const u8 sTrapTileText[] = _( ALIGNED(4) static const u8 sTrapTileHeadline[] = _("#24 New Floor Tiles?"); ALIGNED(4) static const u8 sMakuhitaText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Study Type Matchups{END_COLOR_TEXT_1}\n" - "{CENTER_ALIGN COLOR_1 YELLOW}at the Makuhita Dojo!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Study Type Matchups{RESET}\n" + "{CENTER_ALIGN COLOR YELLOW}at the Makuhita Dojo!{RESET}\n" "At the Makuhita Dojo, one can learn how\n" "Pokémon type matchups affect battles.\n" "It's because the dojo's training rooms are\n" - "divided by type. For example, in the {COLOR_1 YELLOW_4}Fire\n" - "Maze{END_COLOR_TEXT_1}, there are only Fire-type Pokémon.\n" + "divided by type. For example, in the {COLOR YELLOW_D}Fire\n" + "Maze{RESET}, there are only Fire-type Pokémon.\n" "Try move types to see what works best!"); ALIGNED(4) static const u8 sMakuhitaHeadline[] = _("#23 Train at the Makuhita Dojo!"); ALIGNED(4) static const u8 sMachineText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}New Types of Machines Discovered?{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}New Types of Machines Discovered?{RESET}\n" "In a recently discovered cave, explorers\n" "found unique types of Technical Machines.\n" "They apparently do not break after a single\n" "use. Further studies are said to be under\n" "consideration by the authorities.\n" "In related news, the cave is to be named\n" - "the {COLOR_1 YELLOW_4}Solar Cave{END_COLOR_TEXT_1}."); + "the {COLOR YELLOW_D}Solar Cave{RESET}."); ALIGNED(4) static const u8 sMachineHeadline[] = _("#22 New Types of Machines?"); ALIGNED(4) static const u8 sUltimateText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}The Ultimate Dungeon{END_COLOR_TEXT_1}\n" - "{CENTER_ALIGN COLOR_1 YELLOW}Challenges You to Do Your Best!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}The Ultimate Dungeon{RESET}\n" + "{CENTER_ALIGN COLOR YELLOW}Challenges You to Do Your Best!{RESET}\n" "Somewhere in the world, there supposedly\n" "is an incredibly tough dungeon. One must\n" "enter alone at Level 1, and without any\n" @@ -1729,7 +1729,7 @@ ALIGNED(4) static const u8 sUltimateText[] = _( ALIGNED(4) static const u8 sUltimateHeadline[] = _("#21 The Ultimate Dungeon"); ALIGNED(4) static const u8 sGummiText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Gummis That Make You Smart{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Gummis That Make You Smart{RESET}\n" "Research has revealed that popular Gummi\n" "treats not only enhance intelligence, they\n" "also have different effects depending on\n" @@ -1741,12 +1741,12 @@ ALIGNED(4) static const u8 sGummiText[] = _( ALIGNED(4) static const u8 sGummiHeadline[] = _("#20 Secrets of the Gummi"); ALIGNED(4) static const u8 sMoveTipsText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Moving Diagonally{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Moving Diagonally{RESET}\n" "Move diagonally to avoid foes!\n" "Keeping {R_BUTTON}" " pressed, use\n" "{DPAD} to move diagonally.\n" - "{CENTER_ALIGN COLOR_1 YELLOW}Changing Direction{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Changing Direction{RESET}\n" "It's also very important to change\n" "directions without moving. Check Hints to\n" "see how you can do this maneuver!"); @@ -1766,7 +1766,7 @@ ALIGNED(4) static const u8 sAddMembersText[] = _( ALIGNED(4) static const u8 sAddMembersHeadline[] = _("#18 Adding Team Members"); ALIGNED(4) static const u8 sTeamMoveText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Use Team Members Effectively!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Use Team Members Effectively!{RESET}\n" "When you're fighting in a dungeon, it's\n" "important to use your team members. If\n" "attacked from the side, move horizontally.\n" @@ -1778,7 +1778,7 @@ ALIGNED(4) static const u8 sTeamMoveText[] = _( ALIGNED(4) static const u8 sTeamMoveHeadline[] = _("#17 Moving as a Team"); ALIGNED(4) static const u8 sWondersText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}The Seven Wonders of Pokémon?{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}The Seven Wonders of Pokémon?{RESET}\n" "The mysterious feet of Diglett.\n" "What is inside Forretress's shell.\n" "The intelligence of Girafarig's tail.\n" @@ -1790,73 +1790,73 @@ ALIGNED(4) static const u8 sWondersText[] = _( ALIGNED(4) static const u8 sWondersHeadline[] = _("#16 Seven Wonders of Pokémon"); ALIGNED(4) static const u8 sPollText[] = _( - "{COLOR_1 YELLOW}First{UNK_MACRO_3D_50}Gravelerock{END_COLOR_TEXT_1}\n" - "{COLOR_1 YELLOW}Second{UNK_MACRO_3D_50}Oran Berry{END_COLOR_TEXT_1}\n" + "{COLOR YELLOW}First{UNK_MACRO_3D_50}Gravelerock{RESET}\n" + "{COLOR YELLOW}Second{UNK_MACRO_3D_50}Oran Berry{RESET}\n" "In a nationwide survey involving rescue\n" "teams, the most popular item was found to\n" - "be {COLOR_1 GREEN}Gravelerocks{END_COLOR_TEXT_1}. According to Sudowoodo\n" - "of {COLOR_1 CYAN}Team Fakers{END_COLOR_TEXT_1}, “It lets you attack\n" + "be {COLOR GREEN}Gravelerocks{RESET}. According to Sudowoodo\n" + "of {COLOR CYAN}Team Fakers{RESET}, “It lets you attack\n" "from far away. It's invaluable.” The next\n" - "most popular item was {COLOR_1 GREEN}Oran Berries{END_COLOR_TEXT_1}."); + "most popular item was {COLOR GREEN}Oran Berries{RESET}."); ALIGNED(4) static const u8 sPollHeadline[] = _("#15 Poll: Top Two Items"); ALIGNED(4) static const u8 sLinkedEntryText3[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}These Are the Final Linked Moves{END_COLOR_TEXT_1}\n" - "{CENTER_ALIGN COLOR_1 YELLOW}We Recommend in the Entry Level!{END_COLOR_TEXT_1}\n" - "{COLOR_1 RED}Electric and Water Types{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}These Are the Final Linked Moves{RESET}\n" + "{CENTER_ALIGN COLOR YELLOW}We Recommend in the Entry Level!{RESET}\n" + "{COLOR RED}Electric and Water Types{RESET}\n" "Pikachu\n" - "{COLOR_1 GREEN}Thundershock{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Thundershock{RESET} + {COLOR GREEN}Growl{RESET}\n" "Squirtle\n" - "{COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Tackle{END_COLOR_TEXT_1}{EXTRA_MSG}Totodile\n" - "{COLOR_1 GREEN}Leer{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Scratch{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Tail Whip{RESET} + {COLOR GREEN}Tackle{RESET}{EXTRA_MSG}Totodile\n" + "{COLOR GREEN}Leer{RESET} + {COLOR GREEN}Scratch{RESET}\n" "Mudkip\n" - "{COLOR_1 GREEN}Water Gun{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Mud-Slap{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Water Gun{RESET} + {COLOR GREEN}Mud-Slap{RESET}\n" "Psyduck\n" - "{COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Scratch{END_COLOR_TEXT_1}"); + "{COLOR GREEN}Tail Whip{RESET} + {COLOR GREEN}Scratch{RESET}"); ALIGNED(4) static const u8 sLinkedEntryHeadline3[] = _("#14 Linked Moves Entry Level 3"); ALIGNED(4) static const u8 sLinkedEntryText2[] = _( - "{COLOR_1 RED}Fire and Normal Types{END_COLOR_TEXT_1}\n" + "{COLOR RED}Fire and Normal Types{RESET}\n" "Charmander\n" - "{COLOR_1 GREEN}Ember{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Ember{RESET} + {COLOR GREEN}Growl{RESET}\n" "Cyndaquil\n" - "{COLOR_1 GREEN}Leer{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Tackle{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Leer{RESET} + {COLOR GREEN}Tackle{RESET}\n" "Torchic\n" - "{COLOR_1 GREEN}Ember{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}{EXTRA_MSG}Eevee\n" - "{COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Tackle{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Ember{RESET} + {COLOR GREEN}Growl{RESET}{EXTRA_MSG}Eevee\n" + "{COLOR GREEN}Tail Whip{RESET} + {COLOR GREEN}Tackle{RESET}\n" "Meowth\n" - "{COLOR_1 GREEN}Scratch{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Scratch{RESET} + {COLOR GREEN}Growl{RESET}\n" "Skitty\n" - "{COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Tackle{END_COLOR_TEXT_1}"); + "{COLOR GREEN}Tail Whip{RESET} + {COLOR GREEN}Tackle{RESET}"); ALIGNED(4) static const u8 sLinkedEntryHeadline2[] = _("#13 Linked Moves Entry Level 2"); ALIGNED(4) static const u8 sLinkedEntryText1[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}These Are the Recommended{END_COLOR_TEXT_1}\n" - "{CENTER_ALIGN COLOR_1 YELLOW}Linked Moves for Beginners!{END_COLOR_TEXT_1}\n" - "{COLOR_1 RED}Grass, Fighting, and Ground Types{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}These Are the Recommended{RESET}\n" + "{CENTER_ALIGN COLOR YELLOW}Linked Moves for Beginners!{RESET}\n" + "{COLOR RED}Grass, Fighting, and Ground Types{RESET}\n" "Bulbasaur\n" - "{COLOR_1 GREEN}Vine Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Vine Whip{RESET} + {COLOR GREEN}Growl{RESET}\n" "Chikorita\n" - "{COLOR_1 GREEN}Razor Leaf{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}{EXTRA_MSG}Treecko\n" - "{COLOR_1 GREEN}Leer{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Pound{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Razor Leaf{RESET} + {COLOR GREEN}Growl{RESET}{EXTRA_MSG}Treecko\n" + "{COLOR GREEN}Leer{RESET} + {COLOR GREEN}Pound{RESET}\n" "Machop\n" - "{COLOR_1 GREEN}Leer{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Low Kick{END_COLOR_TEXT_1}\n" + "{COLOR GREEN}Leer{RESET} + {COLOR GREEN}Low Kick{RESET}\n" "Cubone\n" - "{COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Bone Club{END_COLOR_TEXT_1}"); + "{COLOR GREEN}Tail Whip{RESET} + {COLOR GREEN}Bone Club{RESET}"); ALIGNED(4) static const u8 sLinkedEntryHeadline1[] = _("#12 Linked Moves Entry Level 1"); ALIGNED(4) static const u8 sTypeText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Learn How Types Match Up!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Learn How Types Match Up!{RESET}\n" "All Pokémon are of certain types, such as\n" - "{COLOR_1 RED}Fire{END_COLOR_TEXT_1} and {COLOR_1 CYAN}Water{END_COLOR_TEXT_1}. In a battle, the damage\n" + "{COLOR RED}Fire{RESET} and {COLOR CYAN}Water{RESET}. In a battle, the damage\n" "inflicted depends on how the Pokémon's\n" "type matches up with the move's type.\n" - "For example, a {COLOR_1 RED}Fire{END_COLOR_TEXT_1}-type Pokémon is\n" - "weak against {COLOR_1 CYAN}Water{END_COLOR_TEXT_1}-type moves.\n" + "For example, a {COLOR RED}Fire{RESET}-type Pokémon is\n" + "weak against {COLOR CYAN}Water{RESET}-type moves.\n" "Exploit type matchups to win battles!"); ALIGNED(4) static const u8 sTypeHeadline[] = _("#11 Types and Matchups"); @@ -1867,17 +1867,17 @@ ALIGNED(4) static const u8 sDungeonText[] = _( "all the money you are carrying.\n" "Beware of what you're carrying before\n" "you go off on a rescue or an outing.\n" - "Use {COLOR_1 CYAN}Kangaskhan Storage{END_COLOR_TEXT_1} to keep\n" + "Use {COLOR CYAN}Kangaskhan Storage{RESET} to keep\n" "invaluable items safely stored.\n" " - Pokémon Rescue Organization -"); ALIGNED(4) static const u8 sDungeonHeadline[] = _("#10 Mysterious Dungeons?"); ALIGNED(4) static const u8 sWonderText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Wonder Tiles Reset Attack and Defense!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Wonder Tiles Reset Attack and Defense!{RESET}\n" "If your Attack is lowered by a foe's\n" - "{COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}, or your Defense is lowered\n" - "by a foe's {COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1}, for example, the\n" + "{COLOR GREEN}Growl{RESET}, or your Defense is lowered\n" + "by a foe's {COLOR GREEN}Tail Whip{RESET}, for example, the\n" "affected stat can be reset to normal by\n" "stepping on a Wonder Tile or going to the\n" "next floor. Beware, enhanced stats are\n" @@ -1886,30 +1886,30 @@ ALIGNED(4) static const u8 sWonderText[] = _( ALIGNED(4) static const u8 sWonderHeadline[] = _("#9 Wonder Tiles"); ALIGNED(4) static const u8 sMoveText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}The Benefits of Using Moves{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}The Benefits of Using Moves{RESET}\n" "If a move is used on a foe, when it is\n" - "defeated, {COLOR_1 CYAN}you earn more Exp. Points{END_COLOR_TEXT_1}!\n" + "defeated, {COLOR CYAN}you earn more Exp. Points{RESET}!\n" "A move only has to be used once on the\n" "foe: after that it can be defeated using a\n" "regular attack to earn more Exp. Points.\n" "Moves are also more likely to become\n" - "{COLOR_1 CYAN}critical hits{END_COLOR_TEXT_1}! Don't overuse them, though!"); + "{COLOR CYAN}critical hits{RESET}! Don't overuse them, though!"); ALIGNED(4) static const u8 sMoveHeadline[] = _("#8 Let's Use Moves!"); ALIGNED(4) static const u8 sOptionsText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Change Your Option Settings{END_COLOR_TEXT_1}\n" - "{CENTER_ALIGN COLOR_1 YELLOW}to Suit Your Play Style!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Change Your Option Settings{RESET}\n" + "{CENTER_ALIGN COLOR YELLOW}to Suit Your Play Style!{RESET}\n" "Press {B_BUTTON} to open the menu, then\n" - "choose {COLOR_1 YELLOW}Others{END_COLOR_TEXT_1} and {COLOR_1 YELLOW}Game Options{END_COLOR_TEXT_1}.\n" + "choose {COLOR YELLOW}Others{RESET} and {COLOR YELLOW}Game Options{RESET}.\n" "You can change settings to suit the way\n" "you play."); ALIGNED(4) static const u8 sOptionsHeadline[] = _("#7 Game Options"); ALIGNED(4) static const u8 sDisasterText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Investigations Under Way into{END_COLOR_TEXT_1}\n" - "{CENTER_ALIGN COLOR_1 YELLOW}Recent Rash of Natural Disasters{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Investigations Under Way into{RESET}\n" + "{CENTER_ALIGN COLOR YELLOW}Recent Rash of Natural Disasters{RESET}\n" "Pokémon in affected areas attack any\n" "outsider without hesitation. Some believe\n" "a mysterious force is behind their\n" @@ -1920,7 +1920,7 @@ ALIGNED(4) static const u8 sDisasterText[] = _( ALIGNED(4) static const u8 sDisasterHeadline[] = _("#6 Recent Natural Disasters"); ALIGNED(4) static const u8 sSeedText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Seeds Can Be Thrown, Too!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Seeds Can Be Thrown, Too!{RESET}\n" "Seeds are usually meant to be eaten.\n" "But did you know? They can also be thrown\n" "at other Pokémon to unlock their effects.\n" @@ -1931,14 +1931,14 @@ ALIGNED(4) static const u8 sSeedText[] = _( ALIGNED(4) static const u8 sSeedHeadline[] = _("#5 Throw Seeds!"); ALIGNED(4) static const u8 sHungerText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Eat Something When You Get Hungry!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Eat Something When You Get Hungry!{RESET}\n" "While you're exploring a dungeon, you will\n" "get progressively hungry (your Belly goes\n" "down). If you become famished, you will\n" "eventually lose HP and even faint.\n" "That's why you should eat something to fill\n" "your Belly! You can always buy food at the\n" - "{COLOR_1 CYAN}Kecleon Shop{END_COLOR_TEXT_1}."); + "{COLOR CYAN}Kecleon Shop{RESET}."); ALIGNED(4) static const u8 sHungerHeadline[] = _("#4 Getting Hungry"); @@ -1946,8 +1946,8 @@ ALIGNED(4) static const u8 sJobText[] = _( "If you want to go on a rescue job listed\n" "on the Bulletin Board at the Pelipper Post\n" "Office, or one that's delivered to your\n" - "Mailbox, you first need to {COLOR_1 YELLOW}Accept{END_COLOR_TEXT_1} the job,\n" - "then choose {COLOR_1 YELLOW}Take Job{END_COLOR_TEXT_1}. Only then will you\n" + "Mailbox, you first need to {COLOR YELLOW}Accept{RESET} the job,\n" + "then choose {COLOR YELLOW}Take Job{RESET}. Only then will you\n" "be able to handle that job.\n" "Try to do accepted jobs quickly!\n" " - Pokémon Rescue Organization -"); @@ -1955,7 +1955,7 @@ ALIGNED(4) static const u8 sJobText[] = _( ALIGNED(4) static const u8 sJobHeadline[] = _("#3 Accepting Rescue Jobs"); ALIGNED(4) static const u8 sBasicsText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}Saving Your Adventure and Pokémon News{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}Saving Your Adventure and Pokémon News{RESET}\n" "You can save your adventure by going to\n" "your bed. Get in the habit of saving often.\n" "You should also store old Pokémon News.\n" @@ -1967,7 +1967,7 @@ ALIGNED(4) static const u8 sBasicsText[] = _( ALIGNED(4) static const u8 sBasicsHeadline[] = _("#2 Rescue Team Basics"); ALIGNED(4) static const u8 sWelcomeText[] = _( - "{CENTER_ALIGN COLOR_1 YELLOW}To All New Members!{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN COLOR YELLOW}To All New Members!{RESET}\n" "Your badge has the power to send back\n" "to town any Pokémon you've rescued. Just\n" "hold the badge up, and it does the rest.\n" diff --git a/src/data/pokemon_mail_pre.h b/src/data/pokemon_mail_pre.h index 1c1f7262..2d9cbecb 100644 --- a/src/data/pokemon_mail_pre.h +++ b/src/data/pokemon_mail_pre.h @@ -518,31 +518,31 @@ const s16 gUnknown_80E81D4[386][2] = { { MONSTER_MACHOP, ITEM_ORANGE_GUMMI } }; -ALIGNED(4) const u8 gMankeyMission[] = _("Punish bad {COLOR_1 YELLOW}Mankey{END_COLOR_TEXT_1}!"); -ALIGNED(4) const u8 gSmeargleMission[] = _("{COLOR_1 YELLOW}Smeargle{END_COLOR_TEXT_1}'s desperate plea!"); -ALIGNED(4) const u8 gMedichamMission[] = _("{COLOR_1 YELLOW}Medicham{END_COLOR_TEXT_1}: Help me!"); -ALIGNED(4) const u8 gUnknown_80E8830[] = _("Deliver one {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}."); -ALIGNED(4) const u8 gUnknown_80E8848[] = _("One {COLOR_1 GREEN}%s{END_COLOR_TEXT_1} wanted!"); +ALIGNED(4) const u8 gMankeyMission[] = _("Punish bad {COLOR YELLOW}Mankey{RESET}!"); +ALIGNED(4) const u8 gSmeargleMission[] = _("{COLOR YELLOW}Smeargle{RESET}'s desperate plea!"); +ALIGNED(4) const u8 gMedichamMission[] = _("{COLOR YELLOW}Medicham{RESET}: Help me!"); +ALIGNED(4) const u8 gUnknown_80E8830[] = _("Deliver one {COLOR GREEN}%s{RESET}."); +ALIGNED(4) const u8 gUnknown_80E8848[] = _("One {COLOR GREEN}%s{RESET} wanted!"); ALIGNED(4) const u8 gUnknown_80E885C[] = _("Save my child!"); ALIGNED(4) const u8 gUnknown_80E886C[] = _("Escort me to my love!"); ALIGNED(4) const u8 gUnknown_80E8884[] = _("Near %s"); ALIGNED(4) const u8 gUnknown_80E888C[] = _("Rescue Description"); -ALIGNED(4) const u8 gMankeyMissionDescription[] = _("Please punish bad {COLOR_1 YELLOW}Mankey{END_COLOR_TEXT_1}'s gang."); +ALIGNED(4) const u8 gMankeyMissionDescription[] = _("Please punish bad {COLOR YELLOW}Mankey{RESET}'s gang."); ALIGNED(4) const u8 gSmeargleMissionDescription[] = _( "I didn't want to become a grown-up, so I\n" "fled, but now I've lost my way! Help!"); ALIGNED(4) const u8 gMedichamMissionDescription[] = _( - "This is {COLOR_1 YELLOW}Medicham{END_COLOR_TEXT_1}. Rescue me, please!\n" + "This is {COLOR YELLOW}Medicham{RESET}. Rescue me, please!\n" "The reward is a secret〜♪ "); ALIGNED(4) const u8 gUnknown_80E8968[] = _( - "With the item {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}, I can\n" + "With the item {COLOR GREEN}%s{RESET}, I can\n" "evolve! I'm yearning to evolve! Help!"); ALIGNED(4) const u8 gUnknown_80E89B0[] = _( - "The {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}! What I love to eat\n" + "The {COLOR GREEN}%s{RESET}! What I love to eat\n" "and can't live without! Please get one!"); ALIGNED(4) const u8 gUnknown_80E89FC[] = _( @@ -558,14 +558,14 @@ ALIGNED(4) const u8 gUnknown_80E8A7C[] = _( "Send your thanks to your friend!"); ALIGNED(4) const u8 gUnknown_80E8AC8[] = _("Client:"); -ALIGNED(4) const u8 gUnknown_80E8AD0[] = _("%s{COLOR_1 GREEN}{UNK_ICON_81_69}%s{UNK_ICON_81_6A}{END_COLOR_TEXT_1}"); +ALIGNED(4) const u8 gUnknown_80E8AD0[] = _("%s{COLOR GREEN}{UNK_ICON_81_69}%s{UNK_ICON_81_6A}{RESET}"); ALIGNED(4) const u8 gUnknown_80E8AE0[] = _("Objective:"); ALIGNED(4) const u8 gUnknown_80E8AEC[] = _("Friend Rescue"); -ALIGNED(4) const u8 gUnknown_80E8AFC[] = _("Deliver {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}."); -ALIGNED(4) const u8 gUnknown_80E8B10[] = _("Find {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}."); +ALIGNED(4) const u8 gUnknown_80E8AFC[] = _("Deliver {COLOR GREEN}%s{RESET}."); +ALIGNED(4) const u8 gUnknown_80E8B10[] = _("Find {COLOR GREEN}%s{RESET}."); ALIGNED(4) const u8 gUnknown_80E8B20[] = _("Help me."); -ALIGNED(4) const u8 gUnknown_80E8B2C[] = _("Escort to {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}."); -ALIGNED(4) const u8 gUnknown_80E8B40[] = _("Find {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}."); +ALIGNED(4) const u8 gUnknown_80E8B2C[] = _("Escort to {COLOR YELLOW}%s{RESET}."); +ALIGNED(4) const u8 gUnknown_80E8B40[] = _("Find {COLOR YELLOW}%s{RESET}."); ALIGNED(4) const u8 gSpecialMissionText[] = _("Special mission"); ALIGNED(4) const u8 gPlaceText[] = _("Place:"); ALIGNED(4) const u8 gDifficultyText[] = _("Difficulty:"); diff --git a/src/data/post_office_guide1.h b/src/data/post_office_guide1.h index 8a9c1cb0..de55f370 100644 --- a/src/data/post_office_guide1.h +++ b/src/data/post_office_guide1.h @@ -38,7 +38,7 @@ static const MenuItem sPostOfficeHelpStartMenu[] = }; ALIGNED(4) static const u8 sCancel[] = _("Cancel"); -ALIGNED(4) static const u8 sFriendRescue[] = _("{COLOR_1 YELLOW}Friend Rescue{END_COLOR_TEXT_1} "); +ALIGNED(4) static const u8 sFriendRescue[] = _("{COLOR YELLOW}Friend Rescue{RESET} "); ALIGNED(4) static const u8 sDelivery[] = _("Delivery"); ALIGNED(4) static const u8 sBulletinBoard[] = _("Bulletin Board"); ALIGNED(4) static const u8 sPostOffice[] = _("Post Office"); @@ -61,8 +61,8 @@ static const MenuItem gPostOfficeHelpFriendRescueMenu[] = ALIGNED(4) static const u8 sExit[] = _("Exit"); ALIGNED(4) static const u8 sDeletingMailInfo[] = _("Deleting Mail Info"); -ALIGNED(4) static const u8 sGetHelp[] = _("{COLOR_1 YELLOW}Get help{END_COLOR_TEXT_1} "); -ALIGNED(4) static const u8 sGoRescue[] = _("{COLOR_1 YELLOW}Go rescue{END_COLOR_TEXT_1} "); +ALIGNED(4) static const u8 sGetHelp[] = _("{COLOR YELLOW}Get help{RESET} "); +ALIGNED(4) static const u8 sGoRescue[] = _("{COLOR YELLOW}Go rescue{RESET} "); ALIGNED(4) static const u8 sFriendRescueInfo[] = _("Friend Rescue Info"); static const MenuItem sPostOfficeHelpGoRescueMenu[] = @@ -93,98 +93,98 @@ ALIGNED(4) static const u8 sWhatdYouWantToKnow[] = ALIGNED(4) static const u8 sGettingHelpExplanation[] = _(" If you need to call for\n" "help, first send your friend\n" - "an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "an {COLOR CYAN_G}SOS Mail{RESET}.{EXTRA_MSG}" " Once you send that mail,\n" "wait until your friend sends you back\n" - "an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "an {COLOR CYAN_G}A-OK Mail{RESET}.{EXTRA_MSG}" " When you get that\n" - "{COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} back, your team\n" + "{COLOR CYAN_G}A-OK Mail{RESET} back, your team\n" "can continue from where it went down.{EXTRA_MSG}" " Make sure you send your\n" - "friend a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.\n" + "friend a {COLOR CYAN_G}Thank-You Mail{RESET}.\n" "That's if you get revived, of course."); ALIGNED(4) static const u8 sSendSOSMailExplanation[] = _(" If your team gets defeated\n" - "in a dungeon, you can send an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}\n" + "in a dungeon, you can send an {COLOR CYAN_G}SOS Mail{RESET}\n" "to a friend willing to help.{EXTRA_MSG}" " But I have to warn you.\n" "You can't get anyone to rescue you\n" "in certain places.{EXTRA_MSG}" " If you need to send\n" - "an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}, you send it from the\n" - "{COLOR_1 LIGHT_BLUE}main menu{END_COLOR_TEXT_1}."); + "an {COLOR CYAN_G}SOS Mail{RESET}, you send it from the\n" + "{COLOR CYAN_G}main menu{RESET}."); ALIGNED(4) static const u8 sReceiveAOKMailExplanation[] = _(" If your friend manages to\n" "rescue your team, you need to receive\n" - "an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} from your friend.{EXTRA_MSG}" + "an {COLOR CYAN_G}A-OK Mail{RESET} from your friend.{EXTRA_MSG}" " See, once you get that\n" - "{COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}, your team can continue from\n" + "{COLOR CYAN_G}A-OK Mail{RESET}, your team can continue from\n" "where it went down in the dungeon.{EXTRA_MSG}" " And, if you use\n" - "a {COLOR_1 LIGHT_BLUE}Game Link cable{END_COLOR_TEXT_1}, your friend can\n" - "even send you a {COLOR_1 LIGHT_BLUE}helper Pokémon{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "a {COLOR CYAN_G}Game Link cable{RESET}, your friend can\n" + "even send you a {COLOR CYAN_G}helper Pokémon{RESET}.{EXTRA_MSG}" " There's just one thing.\n" - "A {COLOR_1 LIGHT_BLUE}helper Pokémon{END_COLOR_TEXT_1} can't bring\n" + "A {COLOR CYAN_G}helper Pokémon{RESET} can't bring\n" "any item it happens to be holding.{EXTRA_MSG}" " You can receive that\n" - "team-saving {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} on the {COLOR_1 LIGHT_BLUE}main menu{END_COLOR_TEXT_1},\n" + "team-saving {COLOR CYAN_G}A-OK Mail{RESET} on the {COLOR CYAN_G}main menu{RESET},\n" "all right?"); ALIGNED(4) static const u8 sSendThankYouMailExplanation[] = _(" If your team gets rescued,\n" "be sure to send your friend\n" - "a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "a {COLOR CYAN_G}Thank-You Mail{RESET}.{EXTRA_MSG}" " You do that by going to\n" - "the {COLOR_1 LIGHT_BLUE}right counter{END_COLOR_TEXT_1}, or\n" - "by selecting it from the {COLOR_1 LIGHT_BLUE}main menu{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "the {COLOR CYAN_G}right counter{RESET}, or\n" + "by selecting it from the {COLOR CYAN_G}main menu{RESET}.{EXTRA_MSG}" " You can attach an item in\n" - "storage to your {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}\n" - "as a {COLOR_1 LIGHT_BLUE}reward item{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "storage to your {COLOR CYAN_G}Thank-You Mail{RESET}\n" + "as a {COLOR CYAN_G}reward item{RESET}.{EXTRA_MSG}" " You don't want to ever\n" "forget to express your thanks."); ALIGNED(4) static const u8 sRescueProceduresExplanation[] = _(" If you want to go and\n" "rescue your friend's KO'd team,\n" - "you need to receive an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "you need to receive an {COLOR CYAN_G}SOS Mail{RESET}.{EXTRA_MSG}" " When you get that mail,\n" "you can rescue your friend at\n" - "the {COLOR_1 LIGHT_BLUE}left counter{END_COLOR_TEXT_1} over there.{EXTRA_MSG}" + "the {COLOR CYAN_G}left counter{RESET} over there.{EXTRA_MSG}" " If you do manage to rescue\n" "the team, you send your friend\n" - "an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "an {COLOR CYAN_G}A-OK Mail{RESET}.{EXTRA_MSG}" " After you do that, your\n" "friend can send back to you\n" - "a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}."); + "a {COLOR CYAN_G}Thank-You Mail{RESET}."); ALIGNED(4) static const u8 sReceiveSOSMailExplanation[] = _(" To go off on a rescue,\n" "you first need to receive your friend's\n" - "{COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "{COLOR CYAN_G}SOS Mail{RESET}.{EXTRA_MSG}" " You do that at\n" - "the {COLOR_1 LIGHT_BLUE}left counter{END_COLOR_TEXT_1} over there,\n" - "or by selecting it from the {COLOR_1 LIGHT_BLUE}main menu{END_COLOR_TEXT_1}."); + "the {COLOR CYAN_G}left counter{RESET} over there,\n" + "or by selecting it from the {COLOR CYAN_G}main menu{RESET}."); ALIGNED(4) static const u8 sSendAOKMailExplanation[] = _(" If you succeed in rescuing\n" "that team, you send your friend an\n" - "{COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "{COLOR CYAN_G}A-OK Mail{RESET}.{EXTRA_MSG}" " You do that by going to\n" - "the {COLOR_1 LIGHT_BLUE}left counter{END_COLOR_TEXT_1},\n" - "or from the {COLOR_1 LIGHT_BLUE}main menu{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "the {COLOR CYAN_G}left counter{RESET},\n" + "or from the {COLOR CYAN_G}main menu{RESET}.{EXTRA_MSG}" " You can send your friend\n" "a Pokémon as a helper from your Friend\n" - "Areas using a {COLOR_1 LIGHT_BLUE}Game Link cable{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "Areas using a {COLOR CYAN_G}Game Link cable{RESET}.{EXTRA_MSG}" " This Pokémon won't\n" "disappear from its Friend Area, so\n" "don't you worry any."); ALIGNED(4) static const u8 sLeaveForRescueExplanation[] = - _(" If you get an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1},\n" + _(" If you get an {COLOR CYAN_G}SOS Mail{RESET},\n" "you head off on the rescue from\n" - "the {COLOR_1 LIGHT_BLUE}left counter{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "the {COLOR CYAN_G}left counter{RESET}.{EXTRA_MSG}" " But, I have to warn you.\n" "You can't go off to rescue in a dungeon\n" "if you can't get into it.{EXTRA_MSG}" @@ -194,14 +194,14 @@ ALIGNED(4) static const u8 sLeaveForRescueExplanation[] = ALIGNED(4) static const u8 sGetThankYouMailExplanation[] = _(" If you send your friend\n" - "an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}, you can look forward\n" - "to getting a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} back.{EXTRA_MSG}" + "an {COLOR CYAN_G}A-OK Mail{RESET}, you can look forward\n" + "to getting a {COLOR CYAN_G}Thank-You Mail{RESET} back.{EXTRA_MSG}" " You can receive it at\n" - "the {COLOR_1 LIGHT_BLUE}right counter{END_COLOR_TEXT_1}\n" - "or on the {COLOR_1 LIGHT_BLUE}main menu{END_COLOR_TEXT_1}.{EXTRA_MSG}" - " But you need to {COLOR_1 RED}be careful{END_COLOR_TEXT_1}.\n" - "You {COLOR_1 RED}must not delete the A-OK Mail{END_COLOR_TEXT_1}\n" - "before you get the {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} back."); + "the {COLOR CYAN_G}right counter{RESET}\n" + "or on the {COLOR CYAN_G}main menu{RESET}.{EXTRA_MSG}" + " But you need to {COLOR RED}be careful{RESET}.\n" + "You {COLOR RED}must not delete the A-OK Mail{RESET}\n" + "before you get the {COLOR CYAN_G}Thank-You Mail{RESET} back."); ALIGNED(4) static const u8 sImYourGuide[] = _(" I'm your guide to what you\n" @@ -213,24 +213,24 @@ ALIGNED(4) static const u8 sAnythingElse[] = "anything else?"); ALIGNED(4) static const u8 sPostOfficeExplanation[] = - _(" {COLOR_1 LIGHT_BLUE}The Pelipper Post Office{END_COLOR_TEXT_1}\n" + _(" {COLOR CYAN_G}The Pelipper Post Office{RESET}\n" "keeps track of information from\n" "around the world.{EXTRA_MSG}" " We inform folks\n" "about everything from gossip to calls\n" "for help from fellow Pokémon.{EXTRA_MSG}" " For the latest news, check\n" - "{COLOR_1 LIGHT_BLUE}your Mailbox{END_COLOR_TEXT_1} or the {COLOR_1 LIGHT_BLUE}Bulletin Board{END_COLOR_TEXT_1}\n" + "{COLOR CYAN_G}your Mailbox{RESET} or the {COLOR CYAN_G}Bulletin Board{RESET}\n" "outside, all right?{EXTRA_MSG}" " Oh, that's not all.\n" - "You can arrange for {COLOR_1 LIGHT_BLUE}Friend Rescue{END_COLOR_TEXT_1}\n" + "You can arrange for {COLOR CYAN_G}Friend Rescue{RESET}\n" "missions at that counter there.{EXTRA_MSG}" - " The {COLOR_1 LIGHT_BLUE}left counter{END_COLOR_TEXT_1} is\n" - "for rescues, and the {COLOR_1 LIGHT_BLUE}right counter{END_COLOR_TEXT_1}\n" + " The {COLOR CYAN_G}left counter{RESET} is\n" + "for rescues, and the {COLOR CYAN_G}right counter{RESET}\n" "is for Thank-You Mail."); ALIGNED(4) static const u8 sBulletinBoardExplanation[] = - _(" The {COLOR_1 LIGHT_BLUE}Bulletin Board{END_COLOR_TEXT_1} outside\n" + _(" The {COLOR CYAN_G}Bulletin Board{RESET} outside\n" "here lists rescue requests.{EXTRA_MSG}" " Take on rescue jobs from\n" "the Bulletin Board. Be a hero and handle\n" @@ -240,25 +240,25 @@ ALIGNED(4) static const u8 sDeliveryExplanation[] = _(" If your rescue team\n" "becomes famous for doing lots of rescues,\n" "expect to get rescue requests directly.{EXTRA_MSG}" - " Our delivery {ARG_POKEMON_0}\n" + " Our delivery {POKEMON_0}\n" "will take those jobs straight to your\n" - "{COLOR_1 LIGHT_BLUE}Mailbox{END_COLOR_TEXT_1}."); + "{COLOR CYAN_G}Mailbox{RESET}."); ALIGNED(4) static const u8 sFriendRescueExplanation[] = _(" Friend Rescue is what we\n" "call rescue missions between friends using\n" - "a {COLOR_1 LIGHT_BLUE}Game Link cable{END_COLOR_TEXT_1}, {COLOR_1 LIGHT_BLUE}passwords{END_COLOR_TEXT_1}, etc.{EXTRA_MSG}" + "a {COLOR CYAN_G}Game Link cable{RESET}, {COLOR CYAN_G}passwords{RESET}, etc.{EXTRA_MSG}" " For instance, you can send\n" "out for help saying your team wiped out\n" "in a dungeon at such and such a place.{EXTRA_MSG}" " Your friend could play\n" "the hero and come to your team's rescue.\n" "Or it can be the other way around, too.{EXTRA_MSG}" - " If you use {COLOR_1 LIGHT_BLUE}passwords{END_COLOR_TEXT_1},\n" + " If you use {COLOR CYAN_G}passwords{RESET},\n" "you can do rescues with friends in\n" "far-away places.{EXTRA_MSG}" " You can apply for Friend\n" - "Rescue jobs at the {COLOR_1 LIGHT_BLUE}left counter{END_COLOR_TEXT_1} of\n" + "Rescue jobs at the {COLOR CYAN_G}left counter{RESET} of\n" "that counter there."); ALIGNED(4) static const u8 sDeletingMailExplanation[] = @@ -266,10 +266,10 @@ ALIGNED(4) static const u8 sDeletingMailExplanation[] = "getting rid of old mail that you don't\n" "need anymore.{EXTRA_MSG}" " If you do lots of Friend\n" - "Rescues, you'll find {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} and\n" - "{COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} piling up.{EXTRA_MSG}" - " Once you get {COLOR_1 LIGHT_BLUE}30 pieces{END_COLOR_TEXT_1},\n" + "Rescues, you'll find {COLOR CYAN_G}SOS Mail{RESET} and\n" + "{COLOR CYAN_G}A-OK Mail{RESET} piling up.{EXTRA_MSG}" + " Once you get {COLOR CYAN_G}30 pieces{RESET},\n" "you won't be able to receive more mail.\n" "That's why you'll need to delete old mail.{EXTRA_MSG}" " You can look through old\n" - "mail at the {COLOR_1 LIGHT_BLUE}left counter{END_COLOR_TEXT_1} over there."); \ No newline at end of file + "mail at the {COLOR CYAN_G}left counter{RESET} over there."); \ No newline at end of file diff --git a/src/data/post_office_guide2.h b/src/data/post_office_guide2.h index b3eb997a..190161e6 100644 --- a/src/data/post_office_guide2.h +++ b/src/data/post_office_guide2.h @@ -22,9 +22,9 @@ static const UnkTextStruct2 sUnknown_80E1F18 = ALIGNED(4) static const u8 sObjectives[] = "Objectives"; ALIGNED(4) static const u8 sFmt1[] = "%dF"; -ALIGNED(4) static const u8 sFmtRescue[] = _(" Rescue {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}"); +ALIGNED(4) static const u8 sFmtRescue[] = _(" Rescue {COLOR YELLOW}%s{RESET}"); ALIGNED(4) static const u8 sJustGo[] = "Just go!"; -ALIGNED(4) static const u8 sFmtBring[] = _(" Bring {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}"); -ALIGNED(4) static const u8 sFmtFind[] = _(" Find {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}"); -ALIGNED(4) static const u8 sFmtEscort[] = _(" Escort to {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}"); -ALIGNED(4) static const u8 sRedQuestionMarks[] = _("{COLOR_1 RED_2}???{END_COLOR_TEXT_1}"); +ALIGNED(4) static const u8 sFmtBring[] = _(" Bring {COLOR GREEN}%s{RESET}"); +ALIGNED(4) static const u8 sFmtFind[] = _(" Find {COLOR GREEN}%s{RESET}"); +ALIGNED(4) static const u8 sFmtEscort[] = _(" Escort to {COLOR YELLOW}%s{RESET}"); +ALIGNED(4) static const u8 sRedQuestionMarks[] = _("{COLOR RED_W}???{RESET}"); diff --git a/src/data/story_missions.h b/src/data/story_missions.h index d305474f..c7eae187 100644 --- a/src/data/story_missions.h +++ b/src/data/story_missions.h @@ -80,7 +80,7 @@ ALIGNED(4) const u8 gUnknown_8109B78[] = _("Meet sea guardian."); ALIGNED(4) const u8 gUnknown_8109B8C[] = _("Explore seafloor."); ALIGNED(4) const u8 gUnknown_8109BA0[] = _("Rescue Smeargle."); ALIGNED(4) const u8 gUnknown_8109BB4[] = _("Punish bad Mankey."); -ALIGNED(4) const u8 gUnknown_8109BC8[] = _("{COLOR_1 YELLOW_3}Scenario Progress Dummy{END_COLOR_TEXT_1}"); +ALIGNED(4) const u8 gUnknown_8109BC8[] = _("{COLOR YELLOW_C}Scenario Progress Dummy{RESET}"); ALIGNED(4) const u8 gUnknown_8109BE8[] = _("Seek Rayquaza's help."); ALIGNED(4) const u8 gUnknown_8109C00[] = _("Rescue Alakazam."); ALIGNED(4) const u8 gUnknown_8109C14[] = _("Meet Ninetales."); diff --git a/src/data/thank_you_wonder_mail.h b/src/data/thank_you_wonder_mail.h index e60cedbd..2c2d469f 100644 --- a/src/data/thank_you_wonder_mail.h +++ b/src/data/thank_you_wonder_mail.h @@ -36,7 +36,7 @@ ALIGNED(4) const u8 gUnknown_80DF138[]= _( "Please try again from the start."); ALIGNED(4) const u8 gUnknown_80DF194[]= _( - " Your {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}\n" + " Your {COLOR CYAN_G}Thank-You Mail{RESET}\n" "has been sent."); ALIGNED(4) const u8 gUnknown_80DF1C0[]= @@ -46,28 +46,28 @@ ALIGNED(4) const u8 gUnknown_80DF1C0[]= ALIGNED(4) const u8 gUnknown_80DF208[]= _( " ...Oh? This password doesn't\n" - "appear to be for a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}."); + "appear to be for a {COLOR CYAN_G}Thank-You Mail{RESET}."); ALIGNED(4) const u8 gUnknown_80DF250[]= _( ": This is the counter for\n" - "{COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" - ": Oh, hi, {COLOR_1 YELLOW_5}%s{END_COLOR_TEXT_1}.\n" + "{COLOR CYAN_G}Thank-You Mail{RESET}.{EXTRA_MSG}" + ": Oh, hi, {COLOR YELLOW_N}%s{RESET}.\n" "I've been waiting for you. You wanted me\n" - "to process a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?{EXTRA_MSG}" + "to process a {COLOR CYAN_G}Thank-You Mail{RESET}?{EXTRA_MSG}" ": Let me get on it right away."); ALIGNED(4) const u8 gUnknown_80DF304[]= _( " Is it OK to send this\n" - "{COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?"); + "{COLOR CYAN_G}Thank-You Mail{RESET}?"); ALIGNED(4) const u8 gUnknown_80DF330[]= _( " Please choose the\n" - "{COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} that you want to\n" + "{COLOR CYAN_G}Thank-You Mail{RESET} that you want to\n" "send to your friend."); ALIGNED(4) const u8 gUnknown_80DF380[]= _( " OK. Please enter the\n" - "{COLOR_1 LIGHT_BLUE}Thank-You Mail password{END_COLOR_TEXT_1}."); + "{COLOR CYAN_G}Thank-You Mail password{RESET}."); ALIGNED(4) const u8 gUnknown_80DF3B4[]= _( " Please give this password\n" @@ -77,7 +77,7 @@ ALIGNED(4) const u8 gUnknown_80DF3B4[]= _( ALIGNED(4) const u8 gUnknown_80DF418[]= _( " OK, here is your\n" - "{COLOR_1 LIGHT_BLUE}Thank-You Mail password{END_COLOR_TEXT_1}."); + "{COLOR CYAN_G}Thank-You Mail password{RESET}."); ALIGNED(4) const u8 gUnknown_80DF44C[]= " I need to save your\n" @@ -91,7 +91,7 @@ ALIGNED(4) const u8 gUnknown_80DF46C[]= _( "Please keep up your rescue work!"); ALIGNED(4) const u8 gUnknown_80DF4F4[]= _( - " A {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} has\n" + " A {COLOR CYAN_G}Thank-You Mail{RESET} has\n" "arrived from your friend for your rescue\n" "mission."); @@ -102,17 +102,17 @@ ALIGNED(4) const u8 gUnknown_80DF544[]= _( ALIGNED(4) const u8 gUnknown_80DF594[]= _( " There. I've sent your\n" - "{COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.\n" + "{COLOR CYAN_G}Thank-You Mail{RESET}.\n" "I need to save your adventure."); ALIGNED(4) const u8 gUnknown_80DF5E4[]= _( " Please connect the GBA\n" - "systems with a {COLOR_1 LIGHT_BLUE}Game Link cable{END_COLOR_TEXT_1}.\n" + "systems with a {COLOR CYAN_G}Game Link cable{RESET}.\n" "Is your friend also ready?"); ALIGNED(4) const u8 gUnknown_80DF63C[]= _( " There, all done.\n" - "{COLOR_1 YELLOW_5}%s{END_COLOR_TEXT_1}, I hope your friend\n" + "{COLOR YELLOW_N}%s{RESET}, I hope your friend\n" "appreciates your sense of gratitude."); ALIGNED(4) const u8 gUnknown_80DF694[]= _( @@ -134,12 +134,12 @@ ALIGNED(4) const u8 gUnknown_80DF73C[]= ALIGNED(4) const u8 gUnknown_80DF77C[]= _( " Would you like to choose\n" - "a {COLOR_1 LIGHT_BLUE}reward item{END_COLOR_TEXT_1} from storage and\n" + "a {COLOR CYAN_G}reward item{RESET} from storage and\n" "send it with your mail?"); ALIGNED(4) const u8 gUnknown_80DF7D4[]= _( " ...Oh?\n" - "You've already attached a {COLOR_1 LIGHT_BLUE}reward item{END_COLOR_TEXT_1}\n" + "You've already attached a {COLOR CYAN_G}reward item{RESET}\n" "to this mail.{EXTRA_MSG}" " I'm sorry, but once an item\n" "has been attached to mail, it can't be\n" @@ -151,11 +151,11 @@ ALIGNED(4) const u8 gUnknown_80DF870[]= ALIGNED(4) const u8 gUnknown_80DF8B4[]= _( " ...Oh?\n" - "You don't seem to have a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}."); + "You don't seem to have a {COLOR CYAN_G}Thank-You Mail{RESET}."); ALIGNED(4) const u8 gUnknown_80DF8EC[]= _( " Hello.\n" - "I handle {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}.\n" + "I handle {COLOR CYAN_G}Thank-You Mail{RESET}.\n" "How may I serve you?"); ALIGNED(4) const u8 gUnknown_80DF928[]= @@ -168,8 +168,8 @@ ALIGNED(4) const u8 gUnknown_80DF94C[] = ALIGNED(4) const u8 gUnknown_80DF96C[] = _( " How would you like to send\n" - "your {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?"); + "your {COLOR CYAN_G}Thank-You Mail{RESET}?"); ALIGNED(4) const u8 gUnknown_80DF9A4[]= _( " How would you like to\n" - "receive your friend's {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?"); \ No newline at end of file + "receive your friend's {COLOR CYAN_G}Thank-You Mail{RESET}?"); \ No newline at end of file diff --git a/src/data/trade_items_menu.h b/src/data/trade_items_menu.h index d6adc969..e38cf833 100644 --- a/src/data/trade_items_menu.h +++ b/src/data/trade_items_menu.h @@ -62,7 +62,7 @@ static const MenuItem sUnknown_80E618C[3] = { ALIGNED(4) static const u8 sWhatDoPrompt[] = "What would you like to do? "; ALIGNED(4) static const u8 sPleaseChooseItem[] = "Please choose the item to be sent."; ALIGNED(4) static const u8 sFmtWillBeSentPrompt[] = _( - "{COLOR_1 LIGHT_BLUE}{ARG_VALUE_0}{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}\n" + "{COLOR CYAN_G}{VALUE_0}{RESET} {COLOR GREEN_I}{MOVE_ITEM_0}(s){RESET}\n" "will be sent.\n" "Is that OK?"); @@ -83,10 +83,10 @@ ALIGNED(4) static const u8 sInCommunication[] = _( ALIGNED(4) static const u8 sFmtYouReceived[] = _( "You received\n" - "{COLOR_1 LIGHT_BLUE}{ARG_VALUE_0}{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\n" + "{COLOR CYAN_G}{VALUE_0}{RESET} {COLOR GREEN_I}{MOVE_ITEM_0}(s){RESET}.\n" "Your adventure will be saved."); -ALIGNED(4) static const u8 sFmtYouSent[] = _("You sent {COLOR_1 LIGHT_BLUE}{ARG_VALUE_0}{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}."); +ALIGNED(4) static const u8 sFmtYouSent[] = _("You sent {COLOR CYAN_G}{VALUE_0}{RESET} {COLOR GREEN_I}{MOVE_ITEM_0}(s){RESET}."); // Trade Items Menu Link Error Messages ALIGNED(4) static const u8 sCommunicationError[] = "There was a communication error."; diff --git a/src/data/wigglytuff_shop1.h b/src/data/wigglytuff_shop1.h index 7a1f6663..bfce03b7 100644 --- a/src/data/wigglytuff_shop1.h +++ b/src/data/wigglytuff_shop1.h @@ -17,5 +17,5 @@ static const UnkTextStruct2 sUnknown_80DC47C = { }; ALIGNED(4) static const u8 sFriendAreas[] = _("Friend Areas"); -ALIGNED(4) static const u8 sFmtRedString[] = _("{COLOR_1 RED}%s{END_COLOR_TEXT_1}"); -ALIGNED(4) static const u8 sFmtGreenString[] = _("{COLOR_1 GREEN}%s{END_COLOR_TEXT_1}"); \ No newline at end of file +ALIGNED(4) static const u8 sFmtRedString[] = _("{COLOR RED}%s{RESET}"); +ALIGNED(4) static const u8 sFmtGreenString[] = _("{COLOR GREEN}%s{RESET}"); \ No newline at end of file diff --git a/src/data/wigglytuff_shop2.h b/src/data/wigglytuff_shop2.h index 1064f4cc..70e99973 100644 --- a/src/data/wigglytuff_shop2.h +++ b/src/data/wigglytuff_shop2.h @@ -17,6 +17,6 @@ static const UnkTextStruct2 sUnknown_80DC4D8 = { &sUnknown_80DC4D4 }; -ALIGNED(4) static const u8 sUnknown_80DC4F0[] = _("Inhabitants (Friends: {COLOR_2 CYAN}Light blue{END_COLOR_TEXT_2})"); +ALIGNED(4) static const u8 sUnknown_80DC4F0[] = _("Inhabitants (Friends: {color CYAN}Light blue{reset})"); ALIGNED(4) static const u8 sInhabitants[] = _("Inhabitants"); -ALIGNED(4) static const u8 sFmtCyanString[] = _("{COLOR_2 CYAN}%s{END_COLOR_TEXT_2}"); +ALIGNED(4) static const u8 sFmtCyanString[] = _("{color CYAN}%s{reset}"); diff --git a/src/data/wonder_mail_1.h b/src/data/wonder_mail_1.h index ef6da20e..fd1d3aed 100644 --- a/src/data/wonder_mail_1.h +++ b/src/data/wonder_mail_1.h @@ -103,7 +103,7 @@ ALIGNED(4) const char gUnknown_80DDBA8[] = _( ALIGNED(4) const char gUnknown_80DDBFC[] = _( " All righty!\n" - "Here's your {COLOR_1 LIGHT_BLUE}A-OK Mail password{END_COLOR_TEXT_1}."); + "Here's your {COLOR CYAN_G}A-OK Mail password{RESET}."); ALIGNED(4) const char gUnknown_80DDC30[] = _( " Okeydoke! That's all done.\n" @@ -111,7 +111,7 @@ ALIGNED(4) const char gUnknown_80DDC30[] = _( ALIGNED(4) const char gUnknown_80DDC70[] = _( " Okeydoke! I sent off your\n" - "{COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "{COLOR CYAN_G}A-OK Mail{RESET}.{EXTRA_MSG}" " Let me save your adventure."); ALIGNED(4) const char gUnknown_80DDCBC[] = _( @@ -133,16 +133,16 @@ ALIGNED(4) const char gUnknown_80DDDBC[] = _( ALIGNED(4) const char gUnknown_80DDDD8[] = _( " All righty. I need you to\n" - "pick the {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} you want to send."); + "pick the {COLOR CYAN_G}A-OK Mail{RESET} you want to send."); ALIGNED(4) const char gUnknown_80DDE20[] = _( " ...Uh, no?\n" - "I don't see any {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} here."); + "I don't see any {COLOR CYAN_G}A-OK Mail{RESET} here."); ALIGNED(4) const char gUnknown_80DDE58[] = _( " Did you know? If you use\n" - "a {COLOR_1 LIGHT_BLUE}Game Link cable{END_COLOR_TEXT_1}, you can send\n" - "a {COLOR_1 LIGHT_BLUE}helper Pokémon{END_COLOR_TEXT_1} to your friend."); + "a {COLOR CYAN_G}Game Link cable{RESET}, you can send\n" + "a {COLOR CYAN_G}helper Pokémon{RESET} to your friend."); ALIGNED(4) const char gUnknown_80DDEC0[] = _( " Don't you worry. Sending\n" @@ -159,7 +159,7 @@ ALIGNED(4) const char gUnknown_80DDF2C[] = _( ALIGNED(4) const char gUnknown_80DDFB8[] = _( " All righty! Connect up\n" - "the {COLOR_1 LIGHT_BLUE}Game Link cable{END_COLOR_TEXT_1}, if you'd please.\n" + "the {COLOR CYAN_G}Game Link cable{RESET}, if you'd please.\n" "Your friend ready, too?"); ALIGNED(4) const char gUnknown_80DE01C[] = _( @@ -169,7 +169,7 @@ ALIGNED(4) const char gUnknown_80DE01C[] = _( ALIGNED(4) const char gUnknown_80DE06C[] = _( " Okeydoke!\n" - "I received your friend's {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "I received your friend's {COLOR CYAN_G}SOS Mail{RESET}.{EXTRA_MSG}" " Let me save your adventure."); ALIGNED(4) const char gUnknown_80DE0C0[] = _( @@ -179,22 +179,22 @@ ALIGNED(4) const char gUnknown_80DE0C0[] = _( ALIGNED(4) const char gUnknown_80DE124[] = _( " OK, I need you to enter\n" - "the {COLOR_1 LIGHT_BLUE}SOS Mail password{END_COLOR_TEXT_1} that your\n" + "the {COLOR CYAN_G}SOS Mail password{RESET} that your\n" "friend gave you."); ALIGNED(4) const char gUnknown_80DE178[] = _( " How do you want to receive\n" - "your friend's {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}?"); + "your friend's {COLOR CYAN_G}SOS Mail{RESET}?"); ALIGNED(4) const char gUnknown_80DE1B4[] = _( " How do you want to send\n" - "your {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}?"); + "your {COLOR CYAN_G}A-OK Mail{RESET}?"); ALIGNED(4) const char gUnknown_80DE1E4[] = _( " ...Uh, no?\n" - "You don't have an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "You don't have an {COLOR CYAN_G}SOS Mail{RESET}.{EXTRA_MSG}" " You'll need to arrange\n" - "to receive your friend's {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} first.\n" + "to receive your friend's {COLOR CYAN_G}SOS Mail{RESET} first.\n" "That's what you need to do."); ALIGNED(4) const char gUnknown_80DE280[] = _( @@ -204,7 +204,7 @@ ALIGNED(4) const char gUnknown_80DE280[] = _( ALIGNED(4) const char gUnknown_80DE2B0[] = _( " ...Uh, no?\n" "Doesn't look like you can go to the dungeon\n" - "named in this {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "named in this {COLOR CYAN_G}SOS Mail{RESET}.{EXTRA_MSG}" " Come see me about doing\n" "this rescue when you can actually go\n" "to that dungeon, all right?"); @@ -219,7 +219,7 @@ ALIGNED(4) const char gUnknown_80DE368[] = _( ALIGNED(4) const char gUnknown_80DE430[] = _( " Okeydoke.\n" - "I'll need you to choose the {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}\n" + "I'll need you to choose the {COLOR CYAN_G}SOS Mail{RESET}\n" "for you to go on a rescue mission."); ALIGNED(4) const char gUnknown_80DE48C[] = _( @@ -228,25 +228,25 @@ ALIGNED(4) const char gUnknown_80DE48C[] = _( ALIGNED(4) const char gUnknown_80DE4B8[] = _( " All righty. Choose\n" - "the {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} you don't need."); + "the {COLOR CYAN_G}SOS Mail{RESET} you don't need."); ALIGNED(4) const char gUnknown_80DE4F0[] = _( " ...Uh, no?\n" - "You don't have any {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}."); + "You don't have any {COLOR CYAN_G}SOS Mail{RESET}."); ALIGNED(4) const char gUnknown_80DE524[] = _( - " If you want a reward, {COLOR_1 RED}don't\n" - "delete an A-OK Mail{END_COLOR_TEXT_1} before getting a\n" - "{COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} back for it.{EXTRA_MSG}" - " {COLOR_1 RED}Be careful{END_COLOR_TEXT_1} if you're going\n" - "to delete any {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + " If you want a reward, {COLOR RED}don't\n" + "delete an A-OK Mail{RESET} before getting a\n" + "{COLOR CYAN_G}Thank-You Mail{RESET} back for it.{EXTRA_MSG}" + " {COLOR RED}Be careful{RESET} if you're going\n" + "to delete any {COLOR CYAN_G}A-OK Mail{RESET}.{EXTRA_MSG}" " Okeydoke.\n" - "Choose an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}\n" + "Choose an {COLOR CYAN_G}A-OK Mail{RESET}\n" "you don't need anymore."); ALIGNED(4) const char gUnknown_80DE614[] = _( " ...Uh, no?\n" - "You don't have any {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}."); + "You don't have any {COLOR CYAN_G}A-OK Mail{RESET}."); ALIGNED(4) const char gUnknown_80DE648[] = _( " Uh, OK.\n" @@ -259,8 +259,8 @@ ALIGNED(4) const char gUnknown_80DE694[] = _( "mail on you!"); ALIGNED(4) const char gUnknown_80DE6D4[] = _( - " So, delete all your {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1},\n" - "{COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}, and your {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?\n" + " So, delete all your {COLOR CYAN_G}SOS Mail{RESET},\n" + "{COLOR CYAN_G}A-OK Mail{RESET}, and your {COLOR CYAN_G}Thank-You Mail{RESET}?\n" "You're absolutely, positively sure?"); ALIGNED(4) const char gUnknown_80DE754[] = _( @@ -281,7 +281,7 @@ ALIGNED(4) const char gUnknown_80DE808[] = _( ALIGNED(4) const char gUnknown_80DE830[] = _( " Okeydoke.\n" - "I'll delete {COLOR_1 LIGHT_BLUE}every piece of mail{END_COLOR_TEXT_1}."); + "I'll delete {COLOR CYAN_G}every piece of mail{RESET}."); ALIGNED(4) const char gUnknown_80DE864[] = _( " Okeydoke.\n" @@ -290,7 +290,7 @@ ALIGNED(4) const char gUnknown_80DE864[] = _( ALIGNED(4) const char gUnknown_80DE8B4[] = _( " Well, hello, there!\n" - "This is the {COLOR_1 LIGHT_BLUE}Friend Rescue{END_COLOR_TEXT_1} counter.\n" + "This is the {COLOR CYAN_G}Friend Rescue{RESET} counter.\n" "What can I help you with today?"); ALIGNED(4) const char gUnknown_80DE918[] = _( @@ -348,8 +348,8 @@ ALIGNED(4) const char gWonderMailPasswordIncorrectText[] = _( ALIGNED(4) const char gWonderMailSOSPasswordIncorrectText[] = _( " ...Uh, no? This password's\n" - "not for any {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}."); + "not for any {COLOR CYAN_G}SOS Mail{RESET}."); ALIGNED(4) const char gWonderMailAOKMailReceivedText[] = _( - ": I received the {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}.\n" + ": I received the {COLOR CYAN_G}SOS Mail{RESET}.\n" "Your adventure will be saved."); \ No newline at end of file diff --git a/src/data/wonder_mail_802D098.h b/src/data/wonder_mail_802D098.h index f7ccd9f7..7c0839f6 100644 --- a/src/data/wonder_mail_802D098.h +++ b/src/data/wonder_mail_802D098.h @@ -45,19 +45,19 @@ UNUSED static const UnkTextStruct2 sUnknown_80DFE34 = { ALIGNED(4) static const u8 sReplaceOldMailPrompt[] = _( "Are you sure you want to replace the\n" - "old {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} with the new one?"); + "old {COLOR CYAN_G}Wonder Mail{RESET} with the new one?"); ALIGNED(4) static const u8 sMailAlreadyReceived[] = _( - "This {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} has already been\n" + "This {COLOR CYAN_G}Wonder Mail{RESET} has already been\n" "received."); ALIGNED(4) static const u8 sMailAlreadyReceivedMayNotReceiveAgain[] = _( - "This {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} has already been\n" + "This {COLOR CYAN_G}Wonder Mail{RESET} has already been\n" "received.\n" "You may not receive the same one again."); ALIGNED(4) static const u8 sOnlyOneMailCanBeHeldPleaseCompleteFirst[] = _( - "Only {COLOR_1 LIGHT_BLUE}one piece{END_COLOR_TEXT_1} of {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} can be held.\n" + "Only {COLOR CYAN_G}one piece{RESET} of {COLOR CYAN_G}Wonder Mail{RESET} can be held.\n" "Please receive it after completing any\n" "rescue mission in progress."); @@ -71,15 +71,15 @@ ALIGNED(4) static const u8 sTeamQuicksavedCannotDelete[] = _( "a dungeon with a mission in progress.\n" "Mail cannot be deleted now."); -ALIGNED(4) static const u8 sReceivedWonderMail[] = _("Received the {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1}!"); +ALIGNED(4) static const u8 sReceivedWonderMail[] = _("Received the {COLOR CYAN_G}Wonder Mail{RESET}!"); ALIGNED(4) static const u8 sOnlyOneMailCanBeHeldSoReplacePrompt[] = _( - "Only {COLOR_1 LIGHT_BLUE}one piece{END_COLOR_TEXT_1} of {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} can be held.\n" - "Is it OK to replace the old {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1}\n" + "Only {COLOR CYAN_G}one piece{RESET} of {COLOR CYAN_G}Wonder Mail{RESET} can be held.\n" + "Is it OK to replace the old {COLOR CYAN_G}Wonder Mail{RESET}\n" "with the new one?"); ALIGNED(4) static const u8 sJobListFullPleaseDelete[] = _( - "Your {COLOR_1 LIGHT_BLUE}Job List{END_COLOR_TEXT_1} is full.\n" + "Your {COLOR CYAN_G}Job List{RESET} is full.\n" "Please select and delete unwanted mail."); ALIGNED(4) static const u8 sNewMail[] = _("New Mail"); diff --git a/src/data/wonder_mail_main_menu.h b/src/data/wonder_mail_main_menu.h index 0e017a94..18a98b92 100644 --- a/src/data/wonder_mail_main_menu.h +++ b/src/data/wonder_mail_main_menu.h @@ -51,21 +51,21 @@ ALIGNED(4) const char gUnknown_80E7A48[] = _("There is no response from your fr ALIGNED(4) const char gUnknown_80E7AC4[] = "What would you like to do?"; ALIGNED(4) const char gUnknown_80E7AE0[] = _("How would you like to send your\n" - "{COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1}?"); + "{COLOR CYAN_G}Wonder Mail{RESET}?"); ALIGNED(4) const char gUnknown_80E7B14[] = _("How would you like to receive the\n" - "{COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1}?"); + "{COLOR CYAN_G}Wonder Mail{RESET}?"); ALIGNED(4) const char gUnknown_80E7B48[] = "Your adventure will be saved."; -ALIGNED(4) const char gUnknown_80E7B68[] = _("Your {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} was sent."); +ALIGNED(4) const char gUnknown_80E7B68[] = _("Your {COLOR CYAN_G}Wonder Mail{RESET} was sent."); -ALIGNED(4) const char gUnknown_80E7B88[] = _("The received {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} was\n" - "added to the {COLOR_1 LIGHT_BLUE}Job List{END_COLOR_TEXT_1}."); +ALIGNED(4) const char gUnknown_80E7B88[] = _("The received {COLOR CYAN_G}Wonder Mail{RESET} was\n" + "added to the {COLOR CYAN_G}Job List{RESET}."); -ALIGNED(4) const char gUnknown_80E7BC8[] = _("The {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} was refused."); +ALIGNED(4) const char gUnknown_80E7BC8[] = _("The {COLOR CYAN_G}Wonder Mail{RESET} was refused."); -ALIGNED(4) const char gUnknown_80E7BEC[] = _("Connect a {COLOR_1 LIGHT_BLUE}Game Link cable{END_COLOR_TEXT_1}.\n" +ALIGNED(4) const char gUnknown_80E7BEC[] = _("Connect a {COLOR CYAN_G}Game Link cable{RESET}.\n" "When you and your friend are ready,\n" "you may communicate. "); @@ -74,7 +74,7 @@ ALIGNED(4) const char gUnknown_80E7C48[] = _("{CENTER_ALIGN}In communication...\ "{CENTER_ALIGN}To cancel, press {B_BUTTON}."); ALIGNED(4) const char gUnknown_80E7C98[] = _("Please enter the\n" - "{COLOR_1 LIGHT_BLUE}Wonder Mail password{END_COLOR_TEXT_1}."); + "{COLOR CYAN_G}Wonder Mail password{RESET}."); ALIGNED(4) const char gUnknown_80E7CC4[] = "This password is incorrect.\n" "Would you like to enter it again?"; diff --git a/src/dungeon.c b/src/dungeon.c index 78b837bf..2a9b81f8 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -106,7 +106,7 @@ void sub_80901D8(DungeonLocation *param_1,DungeonLocation *param_2) void PrintYellowDungeonNametoBuffer(u8 *buffer, DungeonLocation *dungeonLocation) { - sprintfStatic(buffer, gUnknown_8108F10, gDungeonNames[dungeonLocation->id].name1); // {COLOR_2 YELLOW_4}%s{END_COLOR_TEXT_2} (normal floor print (no B) + sprintfStatic(buffer, gUnknown_8108F10, gDungeonNames[dungeonLocation->id].name1); // {color YELLOW_D}%s{reset} (normal floor print (no B) } void PrintDungeonLocationtoBuffer(u8 *buffer, DungeonLocation *dungeonLocation) diff --git a/src/friend_rescue.c b/src/friend_rescue.c index 5ac108e8..29a88787 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -42,53 +42,53 @@ const u8 gUnknown_80E25F4[] = "What would you like to do?"; ALIGNED(4) const u8 gUnknown_80E2610[] = _( "How would you like to send your\n" - "{COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}?"); + "{COLOR CYAN_G}SOS Mail{RESET}?"); ALIGNED(4) const u8 gUnknown_80E2640[] = _( "How would you like to receive your\n" - "friend's {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}?"); + "friend's {COLOR CYAN_G}SOS Mail{RESET}?"); ALIGNED(4) const u8 gUnknown_80E2680[] = _( "How would you like to send your\n" - "{COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}?"); + "{COLOR CYAN_G}A-OK Mail{RESET}?"); ALIGNED(4) const u8 gUnknown_80E26B0[] = _( "How would you like to receive your\n" - "friend's {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}?"); + "friend's {COLOR CYAN_G}A-OK Mail{RESET}?"); ALIGNED(4) const u8 gUnknown_80E26F0[] = _( "How would you like to send your\n" - "{COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?"); + "{COLOR CYAN_G}Thank-You Mail{RESET}?"); ALIGNED(4) const u8 gUnknown_80E2728[] = _( "How would you like to receive your\n" - "friend's {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?"); + "friend's {COLOR CYAN_G}Thank-You Mail{RESET}?"); ALIGNED(4) const u8 gUnknown_80E276C[] = _( "The GBA Game Pak does not have\n" - "an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} on it."); + "an {COLOR CYAN_G}A-OK Mail{RESET} on it."); ALIGNED(4) const u8 gUnknown_80E27A4[] = _( - "If you accept an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}, the\n" - "{COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} you received before\n" + "If you accept an {COLOR CYAN_G}A-OK Mail{RESET}, the\n" + "{COLOR CYAN_G}Thank-You Mail{RESET} you received before\n" "will be overwritten. Is that OK?"); ALIGNED(4) const u8 gUnknown_80E2814[] = _( - "Please enter the {COLOR_1 LIGHT_BLUE}A-OK Mail password{END_COLOR_TEXT_1}."); + "Please enter the {COLOR CYAN_G}A-OK Mail password{RESET}."); ALIGNED(4) const u8 gUnknown_80E2840[] = _( - "The {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} will be received and\n" + "The {COLOR CYAN_G}A-OK Mail{RESET} will be received and\n" "processed."); ALIGNED(4) const u8 gUnknown_80E2874[] = _( - "A {COLOR_1 LIGHT_BLUE}helper Pokémon{END_COLOR_TEXT_1} also arrived!"); + "A {COLOR CYAN_G}helper Pokémon{RESET} also arrived!"); ALIGNED(4) const u8 gUnknown_80E2898[] = _( - "An {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} was received.\n" + "An {COLOR CYAN_G}A-OK Mail{RESET} was received.\n" "Your adventure will be saved."); ALIGNED(4) const u8 gUnknown_80E28D8[] = _( - "Resume your game using {COLOR_1 LIGHT_BLUE}Revive Team{END_COLOR_TEXT_1}."); + "Resume your game using {COLOR CYAN_G}Revive Team{RESET}."); ALIGNED(4) const u8 gUnknown_80E2904[] = _( "Your friend's Mailbox is full.\n" @@ -96,15 +96,15 @@ ALIGNED(4) const u8 gUnknown_80E2904[] = _( "The recipient must delete old mail."); ALIGNED(4) const u8 gUnknown_80E296C[] = _( - "Please choose the {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} you want\n" + "Please choose the {COLOR CYAN_G}SOS Mail{RESET} you want\n" "to send."); ALIGNED(4) const u8 gUnknown_80E29A0[] = _( - "This {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} will be sent.\n" + "This {COLOR CYAN_G}SOS Mail{RESET} will be sent.\n" "Is that OK?"); ALIGNED(4) const u8 gUnknown_80E29D0[] = _( - "Your {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} was sent.\n" + "Your {COLOR CYAN_G}SOS Mail{RESET} was sent.\n" "Your adventure will be saved."); ALIGNED(4) const u8 gUnknown_80E2A0C[] = "Save completed."; @@ -114,27 +114,27 @@ ALIGNED(4) const u8 gUnknown_80E2A1C[] = _( "coming to your rescue."); ALIGNED(4) const u8 gUnknown_80E2A5C[] = _( - "Here is the {COLOR_1 LIGHT_BLUE}SOS Mail password{END_COLOR_TEXT_1}."); + "Here is the {COLOR CYAN_G}SOS Mail password{RESET}."); ALIGNED(4) const u8 gUnknown_80E2A80[] = _( - "Here is the {COLOR_1 LIGHT_BLUE}A-OK Mail password{END_COLOR_TEXT_1}."); + "Here is the {COLOR CYAN_G}A-OK Mail password{RESET}."); ALIGNED(4) const u8 gUnknown_80E2AA8[] = _( "Please give this password to the friend\n" "that you rescued."); ALIGNED(4) const u8 gUnknown_80E2AE4[] = _( -"Please connect a {COLOR_1 LIGHT_BLUE}Link Cable{END_COLOR_TEXT_1}.\n" +"Please connect a {COLOR CYAN_G}Link Cable{RESET}.\n" "When your friend's side is ready, you may\n" "communicate and exchange data."); ALIGNED(4) const u8 gUnknown_80E2B54[] = _( -"Your {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} was sent.\n" +"Your {COLOR CYAN_G}A-OK Mail{RESET} was sent.\n" "Your adventure will be saved."); ALIGNED(4) const u8 gUnknown_80E2B90[] = _( -"Using a {COLOR_1 LIGHT_BLUE}Game Link cable{END_COLOR_TEXT_1},\n" -"you can send a {COLOR_1 LIGHT_BLUE}helper Pokémon{END_COLOR_TEXT_1} to\n" +"Using a {COLOR CYAN_G}Game Link cable{RESET},\n" +"you can send a {COLOR CYAN_G}helper Pokémon{RESET} to\n" "a friend."); extern u8 gUnknown_80E2BE0[]; diff --git a/src/iq_skill_info_menu.c b/src/iq_skill_info_menu.c index 8724f3c5..d3aa47af 100644 --- a/src/iq_skill_info_menu.c +++ b/src/iq_skill_info_menu.c @@ -88,7 +88,7 @@ static void sub_801C6E4(void) sub_80073B8(sIQSkillInfoMenu->unk24); skillName = GetIQSkillName(sIQSkillInfoMenu->chosenIQSkill); strcpy(gFormatItems, skillName); - PrintFormatStringOnWindow(16, 0, sFmtMoveItem0, 0, 0); // {ARG_MOVE_ITEM_0} + PrintFormatStringOnWindow(16, 0, sFmtMoveItem0, 0, 0); // {MOVE_ITEM_0} PrintStringOnWindow(8, 16, GetIQSkillDescription(sIQSkillInfoMenu->chosenIQSkill), sIQSkillInfoMenu->unk24, 0); sub_80073E0(sIQSkillInfoMenu->unk24); sIQSkillInfoMenu->unkC = sub_8097DF0(GetIQSkillDescription(sIQSkillInfoMenu->chosenIQSkill), sIQSkillInfoMenu->unk10); @@ -99,7 +99,7 @@ static void sub_801C6E4(void) sub_80073B8(sIQSkillInfoMenu->unk24); preload = sIQSkillInfoMenu->unk10[sIQSkillInfoMenu->unk8]; strcpy(gAvailablePokemonNames, preload->pokeName); - PrintFormatStringOnWindow(16, 0, sFmtPkmn0, sIQSkillInfoMenu->unk24, 0); // {ARG_POKEMON_0} + PrintFormatStringOnWindow(16, 0, sFmtPkmn0, sIQSkillInfoMenu->unk24, 0); // {POKEMON_0} PrintFormatStringOnWindow(4, 16, sIQSkillInfoMenu->unk10[sIQSkillInfoMenu->unk8]->unk4, sIQSkillInfoMenu->unk24, 0); sub_80073E0(sIQSkillInfoMenu->unk24); break; diff --git a/src/items.c b/src/items.c index 70160aa2..efcb563e 100644 --- a/src/items.c +++ b/src/items.c @@ -23,7 +23,7 @@ extern u16 gGummiStatBoostLUT[]; extern u8 gFormatItems[]; extern u32 gFormatData_202DE30; extern u8* gPtrTypeText; // ptr to "Type\0" -extern u8* gPtrPPD0Text; // ptr to "PP {ARG_VALUE_0} \0" +extern u8* gPtrPPD0Text; // ptr to "PP {VALUE_0} \0" extern u32 gUnknown_81097E8[4]; // some sort of lookup table (16, 18, 20, 22) extern u32 gUnknown_81097F8[4]; // some sort of lookup table (17, 19, 21, 23) extern const char *gUnknown_810AF50[]; diff --git a/src/menu_input.c b/src/menu_input.c index 1219dde1..397d9b54 100644 --- a/src/menu_input.c +++ b/src/menu_input.c @@ -48,7 +48,7 @@ const UnkTextStruct2 gUnknown_80D47C8[4] = { NULL, }; -ALIGNED(4) const u8 gUnknown_80D4828[] = _("{COLOR_1}%c%s"); +ALIGNED(4) const u8 gUnknown_80D4828[] = _("{COLOR}%c%s"); const s32 gUnknown_80D4830[9] = { 1, diff --git a/src/mission_reward.c b/src/mission_reward.c index c357018b..24d8c781 100644 --- a/src/mission_reward.c +++ b/src/mission_reward.c @@ -67,53 +67,53 @@ const UnkTextStruct2 gUnknown_80E041C = { ALIGNED(4) const u8 gUnknown_80E0434[] = _( " Here's your reward!\n" - "{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}!"); + "{COLOR CYAN}{VALUE_0}{RESET} {POKE}!"); ALIGNED(4) const u8 gUnknown_80E045C[] = _( - "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} received\n" - "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}."); + "{CENTER_ALIGN}{COLOR YELLOW_N}{POKEMON_0}{RESET} received\n" + "{CENTER_ALIGN}{COLOR CYAN}{VALUE_0}{RESET} {POKE}."); ALIGNED(4) const u8 gUnknown_80E0484[] = _( - "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}'s team received\n" - "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}."); + "{CENTER_ALIGN}{COLOR YELLOW_N}{POKEMON_0}{RESET}'s team received\n" + "{CENTER_ALIGN}{COLOR CYAN}{VALUE_0}{RESET} {POKE}."); ALIGNED(4) const u8 gUnknown_80E04B4[]= _( " As your reward, you can\n" "now go to the Friend Area\n" - "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}!"); + "{COLOR GREEN}{FRIEND_AREA}{RESET}!"); ALIGNED(4) const u8 gUnknown_80E04F4[] = _( "{CENTER_ALIGN}...Oh, wait, sorry.{EXTRA_MSG}" "{CENTER_ALIGN}You already have the \n" - "{CENTER_ALIGN}{COLOR_1 GREEN}{ARG_FRIEND_AREA} Friend Area{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "{CENTER_ALIGN}{COLOR GREEN}{FRIEND_AREA} Friend Area{RESET}.{EXTRA_MSG}" "{CENTER_ALIGN}I'm sorry that my reward is\n" "{CENTER_ALIGN}something you already have.{EXTRA_MSG}" - "{CENTER_ALIGN}In its place, {COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1},\n" - "{CENTER_ALIGN}you can have {COLOR_1 LIGHT_BLUE}1,000{END_COLOR_TEXT_1} {POKE}."); + "{CENTER_ALIGN}In its place, {COLOR YELLOW_N}{POKEMON_0}{RESET},\n" + "{CENTER_ALIGN}you can have {COLOR CYAN_G}1,000{RESET} {POKE}."); ALIGNED(4) const u8 gUnknown_80E05C0[] = _( - "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} gained access\n" + "{CENTER_ALIGN}{COLOR YELLOW_N}{POKEMON_0}{RESET} gained access\n" "{CENTER_ALIGN}to the Friend Area\n" - "{CENTER_ALIGN}{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}."); + "{CENTER_ALIGN}{COLOR GREEN}{FRIEND_AREA}{RESET}."); ALIGNED(4) const u8 gUnknown_80E05FC[] = _( - "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}'s team gained access\n" + "{CENTER_ALIGN}{COLOR YELLOW_N}{POKEMON_0}{RESET}'s team gained access\n" "{CENTER_ALIGN}to the Friend Area\n" - "{CENTER_ALIGN}{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}."); + "{CENTER_ALIGN}{COLOR GREEN}{FRIEND_AREA}{RESET}."); ALIGNED(4) const u8 gUnknown_80E0640[] = _( " Here's your reward!\n" - "The promised {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1}!"); + "The promised {COLOR GREEN}{MOVE_ITEM_1}{RESET}!"); ALIGNED(4) const u8 gUnknown_80E0670[] = _( - "{CENTER_ALIGN}Rescue Team {COLOR_1 LIGHT_BLUE}$t{END_COLOR_TEXT_1}\n" - "{CENTER_ALIGN}gained {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} rescue points."); + "{CENTER_ALIGN}Rescue Team {COLOR CYAN_G}$t{RESET}\n" + "{CENTER_ALIGN}gained {COLOR CYAN}{VALUE_0}{RESET} rescue points."); ALIGNED(4) const u8 gUnknown_80E06A8[] = _( "{CENTER_ALIGN}Congratulations!{EXTRA_MSG}" - "{CENTER_ALIGN}{COLOR_1 LIGHT_BLUE}$t{END_COLOR_TEXT_1} went up in rank\n" - "{CENTER_ALIGN}from the {ARG_POKEMON_2}\n" - "{CENTER_ALIGN}to the {ARG_POKEMON_3}!"); + "{CENTER_ALIGN}{COLOR CYAN_G}$t{RESET} went up in rank\n" + "{CENTER_ALIGN}from the {POKEMON_2}\n" + "{CENTER_ALIGN}to the {POKEMON_3}!"); void SetRewardSceneState(u32); diff --git a/src/move_actions.c b/src/move_actions.c index 311e039c..8f5bb540 100644 --- a/src/move_actions.c +++ b/src/move_actions.c @@ -486,7 +486,7 @@ bool32 EncoreMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4 bool32 RageMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4) { - // {ARG_POKEMON_0} is enraged + // {POKEMON_0} is enraged SetChargeStatusTarget(pokemon,target,STATUS_ENRAGED,move,gUnknown_80FAC88); return TRUE; } diff --git a/src/pokemon_mid.c b/src/pokemon_mid.c index 9ed0c8b3..cd67fe11 100644 --- a/src/pokemon_mid.c +++ b/src/pokemon_mid.c @@ -331,13 +331,13 @@ void CopyMonsterNametoBuffer(u8 * buffer, s16 index) void CopyYellowMonsterNametoBuffer(u8 *buffer, s16 index) { s32 new_index = index; - sprintfStatic(buffer, gUnknown_8107600, gMonsterParameters[new_index].species); // {COLOR_2 YELLOW}%s{END_COLOR_TEXT_2} + sprintfStatic(buffer, gUnknown_8107600, gMonsterParameters[new_index].species); // {color YELLOW}%s{reset} } void CopyCyanMonsterNametoBuffer(u8 *buffer, s16 index) { s32 new_index = index; - sprintfStatic(buffer, gUnknown_8107608, gMonsterParameters[new_index].species); // {COLOR_2 CYAN}%s{END_COLOR_TEXT_2} + sprintfStatic(buffer, gUnknown_8107608, gMonsterParameters[new_index].species); // {color CYAN}%s{reset} } void sub_808D930(u8 *buffer, s32 index) @@ -371,7 +371,7 @@ void PrintColoredPokeNameToBuffer(u8 *buffer, PokemonStruct1 *pokemon, s32 color if (colorNum == COLOR_WHITE) { colorNum = COLOR_CYAN; } - sprintfStatic(buffer,gUnknown_810763C,colorNum,nameBuffer); // {COLOR_2}%c%s{END_COLOR_TEXT_2} + sprintfStatic(buffer,gUnknown_810763C,colorNum,nameBuffer); // {color}%c%s{reset} } void sub_808D9DC(u8 *buffer, PokemonStruct2 *param_2, s32 colorNum) @@ -382,7 +382,7 @@ void sub_808D9DC(u8 *buffer, PokemonStruct2 *param_2, s32 colorNum) if (colorNum == COLOR_WHITE) { colorNum = COLOR_YELLOW; } - sprintfStatic(buffer,gUnknown_810763C,colorNum,nameBuffer); // {COLOR_2}%c%s{END_COLOR_TEXT_2} + sprintfStatic(buffer,gUnknown_810763C,colorNum,nameBuffer); // {color}%c%s{reset} } void sub_808DA0C(u8 *buffer, PokemonStruct2 *param_2) diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c index 28a97244..aa47b06a 100644 --- a/src/rescue_password_menu.c +++ b/src/rescue_password_menu.c @@ -58,7 +58,7 @@ const MenuItem gUnknown_80E7214[4] = { ALIGNED(4) const u8 CheckAgain_80E7234[] = _("{CENTER_ALIGN}Please check it again."); ALIGNED(4) const u8 IncorrectPassword_80E7250[] = _("{CENTER_ALIGN}Incorrect password!"); -ALIGNED(4) const u8 Error_80E7268[] = _("{CENTER_ALIGN}{COLOR_1 RED}Error!{END_COLOR_TEXT_1} "); +ALIGNED(4) const u8 Error_80E7268[] = _("{CENTER_ALIGN}{COLOR RED}Error!{RESET} "); const UnkTextStruct2 gUnknown_80E7278 = { 0x00, 0x00, 0x00, 0x00, @@ -82,7 +82,7 @@ const MenuItem gUnknown_80E7290[4] = { ALIGNED(4) const u8 DATA_80E72B0[] = " "; ALIGNED(4) const u8 PasswordAccept_80E72B4[] = _("{CENTER_ALIGN}The password has been accepted."); -ALIGNED(4) const u8 Success_80E72D8[] = _("{CENTER_ALIGN}{COLOR_1 LIGHT_BLUE}Success!{END_COLOR_TEXT_1} "); +ALIGNED(4) const u8 Success_80E72D8[] = _("{CENTER_ALIGN}{COLOR CYAN_G}Success!{RESET} "); const UnkTextStruct2 gUnknown_80E72EC = { 0x00, 0x00, 0x00, 0x00, @@ -102,7 +102,7 @@ const MenuItem gUnknown_80E7304[4] = { {NULL, 0xA}, }; -ALIGNED(4) const u8 NotSOSMail_80E7324[] = _("{CENTER_ALIGN}This is not an {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}."); +ALIGNED(4) const u8 NotSOSMail_80E7324[] = _("{CENTER_ALIGN}This is not an {COLOR CYAN_G}SOS Mail{RESET}."); const UnkTextStruct2 gUnknown_80E7344 = { 0x00, 0x00, 0x00, 0x00, @@ -122,7 +122,7 @@ const MenuItem gUnknown_80E735C[4] = { {NULL, 0xA}, }; -ALIGNED(4) const u8 ReceiveSOSMail_80E737C[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} has been received already."); +ALIGNED(4) const u8 ReceiveSOSMail_80E737C[] = _("{CENTER_ALIGN}This {COLOR CYAN_G}SOS Mail{RESET} has been received already."); const UnkTextStruct2 gUnknown_80E73AC = { 0x00, 0x00, 0x00, 0x00, @@ -142,7 +142,7 @@ const MenuItem gUnknown_80E73C4[4] = { {NULL, 0xA}, }; -ALIGNED(4) const u8 sUnknown_80E73E4[] = _("{CENTER_ALIGN}This is not an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}."); +ALIGNED(4) const u8 sUnknown_80E73E4[] = _("{CENTER_ALIGN}This is not an {COLOR CYAN_G}A-OK Mail{RESET}."); const UnkTextStruct2 gUnknown_80E7408 = { 0x00, 0x00, 0x00, 0x00, @@ -162,7 +162,7 @@ const MenuItem gUnknown_80E7420[4] = { {NULL, 0xA}, }; -ALIGNED(4) const u8 sUnknown_80E7440[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} cannot be used."); +ALIGNED(4) const u8 sUnknown_80E7440[] = _("{CENTER_ALIGN}This {COLOR CYAN_G}A-OK Mail{RESET} cannot be used."); const UnkTextStruct2 gUnknown_80E7468 = { 0x00, 0x00, 0x00, 0x00, @@ -181,7 +181,7 @@ const MenuItem gUnknown_80E7480[4] = { {CheckAgain_80E7234, 0xC}, {NULL, 0xA}, }; -ALIGNED(4) const u8 sUnknown_80E74A0[] = _("{CENTER_ALIGN}This is not a {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}."); +ALIGNED(4) const u8 sUnknown_80E74A0[] = _("{CENTER_ALIGN}This is not a {COLOR CYAN_G}Thank-You Mail{RESET}."); const UnkTextStruct2 gUnknown_80E74C8 = { 0x00, 0x00, 0x00, 0x00, @@ -201,7 +201,7 @@ const MenuItem gUnknown_80E74E0[4] = { {NULL, 0xA}, }; -ALIGNED(4) const u8 sUnknown_80E7500[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} cannot be used."); +ALIGNED(4) const u8 sUnknown_80E7500[] = _("{CENTER_ALIGN}This {COLOR CYAN_G}Thank-You Mail{RESET} cannot be used."); const UnkTextStruct2 gUnknown_80E752C = { 0x00, 0x00, 0x00, 0x00, @@ -220,7 +220,7 @@ const MenuItem gUnknown_80E7544[4] = { {CheckAgain_80E7234, 0xC}, {NULL, 0xA}, }; -ALIGNED(4) const u8 sUnknown_80E7564[] = _("{CENTER_ALIGN}This is not a {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1}."); +ALIGNED(4) const u8 sUnknown_80E7564[] = _("{CENTER_ALIGN}This is not a {COLOR CYAN_G}Wonder Mail{RESET}."); const UnkTextStruct2 gUnknown_80E7588 = { 0x00, 0x00, 0x00, 0x00, diff --git a/src/save_menu.c b/src/save_menu.c index afcd7811..2abbf40e 100644 --- a/src/save_menu.c +++ b/src/save_menu.c @@ -44,7 +44,7 @@ const MenuItem gSavingAdventureMenuItems[] = { }; ALIGNED(4) const u8 sUnknown_80E6F70[] = _("{CENTER_ALIGN}Don't turn off the power."); ALIGNED(4) const u8 sUnknown_80E6F90[] = _("{CENTER_ALIGN}Saving your adventure!"); -ALIGNED(4) const u8 sUnknown_80E6FAC[] = _("{CENTER_ALIGN}{COLOR_1 RED}Beware!{END_COLOR_TEXT_1} "); +ALIGNED(4) const u8 sUnknown_80E6FAC[] = _("{CENTER_ALIGN}{COLOR RED}Beware!{RESET} "); extern const u8 sUnknown_80E6FDC[]; extern const u8 sUnknown_80E7008[]; @@ -58,7 +58,7 @@ const MenuItem gAdventureSavedMenuItems[] = { }; ALIGNED(4) const u8 sUnknown_80E6FDC[] = _("{CENTER_ALIGN}has been saved."); ALIGNED(4) const u8 sUnknown_80E6FF0[] = _("{CENTER_ALIGN}Your adventure so far"); -ALIGNED(4) const u8 sUnknown_80E7008[] = _("{CENTER_ALIGN}{COLOR_1 LIGHT_BLUE}Success!{END_COLOR_TEXT_1} "); +ALIGNED(4) const u8 sUnknown_80E7008[] = _("{CENTER_ALIGN}{COLOR CYAN_G}Success!{RESET} "); extern const u8 sUnknown_80E7078[]; extern const u8 sUnknown_80E7050[]; @@ -72,7 +72,7 @@ const MenuItem gAdventureCouldNotBeSavedMenuItems[] = { }; ALIGNED(4) const u8 sUnknown_80E703C[] = _("{CENTER_ALIGN}Please try again."); ALIGNED(4) const u8 sUnknown_80E7050[] = _("{CENTER_ALIGN}Your adventure could not be saved."); -ALIGNED(4) const u8 sUnknown_80E7078[] = _("{CENTER_ALIGN}{COLOR_1 RED}Save failed!{END_COLOR_TEXT_1} "); +ALIGNED(4) const u8 sUnknown_80E7078[] = _("{CENTER_ALIGN}{COLOR RED}Save failed!{RESET} "); extern const u8 DeletingAdventure_80E70B0[]; @@ -108,7 +108,7 @@ const MenuItem gAdventureCouldNotBeDeletedMenuItems[] = { {NULL, 2}, }; ALIGNED(4) const u8 sUnknown_80E7134[] = _("{CENTER_ALIGN}Your adventure could not be deleted."); -ALIGNED(4) const u8 sUnknown_80E715C[] = _("{CENTER_ALIGN}{COLOR_1 RED}Deletion failed!{END_COLOR_TEXT_1} "); +ALIGNED(4) const u8 sUnknown_80E715C[] = _("{CENTER_ALIGN}{COLOR RED}Deletion failed!{RESET} "); ALIGNED(4) const u8 gUnknown_80E7178[] = _("{CENTER_ALIGN}The data could not be written.\n" "{CENTER_ALIGN}Please turn off the power and remove\n" diff --git a/src/status.c b/src/status.c index e1924e11..64711f2f 100644 --- a/src/status.c +++ b/src/status.c @@ -704,7 +704,7 @@ void HealTargetHP(Entity *pokemon, Entity *target, s32 param_3, s32 param_4, boo if (sub_8045888(target)) { r8 = maxHPStat; } - sub_80522F4(pokemon,target,*gUnknown_80FB240); // m0$'s max HP rose by {ARG_VALUE_1} + sub_80522F4(pokemon,target,*gUnknown_80FB240); // m0$'s max HP rose by {VALUE_1} } if (HP != 0) { if (sub_8045888(target)) { @@ -715,7 +715,7 @@ void HealTargetHP(Entity *pokemon, Entity *target, s32 param_3, s32 param_4, boo sub_80522F4(pokemon,target,*gUnknown_80FB1E0); // $m0 was fully healed } else { - sub_80522F4(pokemon,target,*gUnknown_80FB1C4); // $m0 recovered {ARG_VALUE_0} HP + sub_80522F4(pokemon,target,*gUnknown_80FB1C4); // $m0 recovered {VALUE_0} HP } } } diff --git a/src/unk_menu_203B360.c b/src/unk_menu_203B360.c index cc150cd2..3568787e 100644 --- a/src/unk_menu_203B360.c +++ b/src/unk_menu_203B360.c @@ -52,7 +52,7 @@ const MenuItem gUnknown_80E6EAC[4] = { ALIGNED(4) const u8 CheckAgain_80E6ECC[] = _("{CENTER_ALIGN}Please check again."); ALIGNED(4) const u8 StorageEmpty_80E6EE4[] = _("{CENTER_ALIGN}The storage space is empty!"); -ALIGNED(4) const u8 Caution_80E6F04[] = _("{CENTER_ALIGN}{COLOR_1 RED}Caution!{END_COLOR_TEXT_1} "); +ALIGNED(4) const u8 Caution_80E6F04[] = _("{CENTER_ALIGN}{COLOR RED}Caution!{RESET} "); static const u8 fill0[] = "pksdir0"; extern void sub_8038440(); diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c index 3c70cdeb..299a16f1 100644 --- a/src/wonder_mail_2.c +++ b/src/wonder_mail_2.c @@ -64,7 +64,7 @@ ALIGNED(4) const char gRescueTeamNamePlaceholder[] = "????"; ALIGNED(4) const char gUnknown_80DF9F8[] = _( " Oh, hello!\n" "Your rescue mission went well, didn't it?\n" - "I wouldn't expect any less, {COLOR_1 LIGHT_BLUE}%s{END_COLOR_TEXT_1}!{EXTRA_MSG}" + "I wouldn't expect any less, {COLOR CYAN_G}%s{RESET}!{EXTRA_MSG}" " Well, well!\n" "Here is your reward from the Pokémon\n" "Rescue Organization!"); @@ -78,10 +78,10 @@ ALIGNED(4) const char gUnknown_80DFAA8[] = _( ALIGNED(4) const char gUnknown_80DFB14[] = _( " Oh, yes, that's right.\n" - "Please don't forget to send an {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}\n" + "Please don't forget to send an {COLOR CYAN_G}A-OK Mail{RESET}\n" "to the friend you just rescued.{EXTRA_MSG}" " Please give me a shout if\n" - "you would like to send {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}."); + "you would like to send {COLOR CYAN_G}A-OK Mail{RESET}."); s32 sub_802B2D4(void) { diff --git a/src/wonder_mail_6.c b/src/wonder_mail_6.c index c96ce33a..580d9c06 100644 --- a/src/wonder_mail_6.c +++ b/src/wonder_mail_6.c @@ -82,11 +82,11 @@ const UnkTextStruct2 gUnknown_80E09C0 = { ALIGNED(4) const u8 gUnknown_80E09D8[] = _( " ...Uh, no?\n" - "You don't have any {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}."); + "You don't have any {COLOR CYAN_G}SOS Mail{RESET}."); ALIGNED(4) const u8 gUnknown_80E0A0C[] = _( " ...Uh, no?\n" - "You don't have any {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}."); + "You don't have any {COLOR CYAN_G}A-OK Mail{RESET}."); static void sub_8031300(void); static void HandleWonderMail6MainMenu(void); @@ -127,11 +127,11 @@ bool8 sub_8030F58(u32 wonderMailType) switch(wonderMailType) { case WONDER_MAIL_TYPE_SOS_1: - // "You don't have any {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}.\0" + // "You don't have any {COLOR CYAN_G}SOS Mail{RESET}.\0" xxx_info_box_80141B4(gUnknown_80E09D8,0,&gUnknown_203B328->faceFile,0x101); break; case WONDER_MAIL_TYPE_AOK: - // "You don't have any {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.\0" + // "You don't have any {COLOR CYAN_G}A-OK Mail{RESET}.\0" xxx_info_box_80141B4(gUnknown_80E0A0C,0,&gUnknown_203B328->faceFile,0x101); break; }