diff --git a/include/data_script.h b/include/data_script.h index c19726edc..70a8453fc 100644 --- a/include/data_script.h +++ b/include/data_script.h @@ -46,6 +46,7 @@ // 30..39: various text printing #define TEXTBOX_CLEAR { 0x30, 0, 0, 0, 0, NULL } #define TEXTBOX_CLEAR2 { 0x31, 0, 0, 0, 0, NULL } // Used rarely, I don't think there's a functional difference between 0x30 and 0x31. +#define MSG_INSTANT(msg) { 0x32, 0, -1, 0, 0, msg } #define MSG_NPC(id, msg) { 0x34, 0, id, 0, 0, msg } // ID is portrait id of the npc. -1 means no portrait // 3a: yes/no choice (only used for saving) // 3b: uber command (conditional jump) diff --git a/src/data/ground/ground_data_a04p01_station.h b/src/data/ground/ground_data_a04p01_station.h index c8eb93119..51fd96dd7 100644 --- a/src/data/ground/ground_data_a04p01_station.h +++ b/src/data/ground/ground_data_a04p01_station.h @@ -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, _("{CENTER_ALIGN}{NAME_0}'s team received\n{CENTER_ALIGN}the {COLOR GREEN}Teleport Gem{RESET}.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0}'s team received\n{CENTER_ALIGN}the {COLOR GREEN}Teleport Gem{RESET}.")), { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), diff --git a/src/data/ground/ground_data_b01p01a_station.h b/src/data/ground/ground_data_b01p01a_station.h index 658508f8e..3c3b5b625 100644 --- a/src/data/ground/ground_data_b01p01a_station.h +++ b/src/data/ground/ground_data_b01p01a_station.h @@ -525,8 +525,8 @@ 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, _("{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 -") }, + MSG_INSTANT(_("{CENTER_ALIGN}There is a warning tag\n{CENTER_ALIGN}on the side of the Mailbox.")), + MSG_INSTANT(_("{CENTER_ALIGN}- Open the Mailbox at the front -")), JUMP_SCRIPT(END_TALK), EXECUTE_FUNCTION(EVENT_S01E02A_L001), JUMP_SCRIPT(END_TALK), @@ -552,7 +552,7 @@ static const struct ScriptCommand s_gs9_g0_s0_obj2_dlg2[] = { /* 0x819c748 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("\n ← Friend Areas") }, + MSG_INSTANT(_("\n ← Friend Areas")), TEXTBOX_CLEAR, JUMPIF_SCENARIOCHECK(4, /* to label */ 0), LABEL(1), /* = 0x01 */ @@ -1914,9 +1914,9 @@ 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, _("{CENTER_ALIGN}{NAME_1} checked the Mailbox.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} checked the Mailbox.")), FANFARE_PLAY(213), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The Mailbox contained\n{CENTER_ALIGN}a {COLOR CYAN}Rescue Team Starter Set{RESET}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}The Mailbox contained\n{CENTER_ALIGN}a {COLOR CYAN}Rescue Team Starter Set{RESET}!")), { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, { 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, _("{CENTER_ALIGN}{NAME_1} opened\n{CENTER_ALIGN}the {COLOR CYAN}Rescue Team Starter Set{RESET}.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} opened\n{CENTER_ALIGN}the {COLOR CYAN}Rescue Team Starter Set{RESET}.")), FANFARE_PLAY(213), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}There was\n{CENTER_ALIGN}a {COLOR CYAN}Rescue Team Badge{RESET} inside!") }, + MSG_INSTANT(_("{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, _("{CENTER_ALIGN}There was a {COLOR CYAN}Toolbox{RESET} inside!") }, + MSG_INSTANT(_("{CENTER_ALIGN}There was a {COLOR CYAN}Toolbox{RESET} inside!")), { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY(213), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}There was also an issue of\n{CENTER_ALIGN}{COLOR CYAN}Pokémon News{RESET} inside!") }, + MSG_INSTANT(_("{CENTER_ALIGN}There was also an issue of\n{CENTER_ALIGN}{COLOR CYAN}Pokémon News{RESET} inside!")), { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), @@ -1978,8 +1978,8 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ VARIANT_DEFAULT(_(" Anything else?{WAIT_PRESS}\nIs there any other mail...?{WAIT_PRESS}\nMaybe not?")), TEXTBOX_CLEAR, WAIT(10), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_1} checked the Mailbox.") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}But the Mailbox was empty.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} checked the Mailbox.")), + MSG_INSTANT(_("{CENTER_ALIGN}But the Mailbox was empty.")), TEXTBOX_CLEAR, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -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, _("{CENTER_ALIGN}{NAME_0} checked the Mailbox.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} checked the Mailbox.")), TEXTBOX_CLEAR, EXECUTE_STATION(-1, 20, 0), HALT, LABEL(0), /* = 0x00 */ - { 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 -") }, + MSG_INSTANT(_("{CENTER_ALIGN}There is a warning tag\n{CENTER_ALIGN}on the side of the Mailbox.")), + MSG_INSTANT(_("{CENTER_ALIGN}- Open the Mailbox at the front -")), JUMP_SCRIPT(END_TALK), }; @@ -2302,7 +2302,7 @@ static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ VARIANT_DEFAULT(_(" Maybe it's a rescue job\noffer!{WAIT_PRESS}\nWhat does it say?")), TEXTBOX_CLEAR, { 0x8e, 0x1e, 0x0000, 0x00000022, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} read the letter.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} read the letter.")), TEXTBOX_CLEAR, WAIT(30), { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("“BZZ BZZ BZZ!") }, @@ -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, _("{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.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} checked the Mailbox.")), + MSG_INSTANT(_("{CENTER_ALIGN}But there was no mail seeking\n{CENTER_ALIGN}help from the rescue team.")), TEXTBOX_CLEAR, EXECUTE_STATION(-1, 25, 0), HALT, LABEL(0), /* = 0x00 */ - { 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 -") }, + MSG_INSTANT(_("{CENTER_ALIGN}There is a warning tag\n{CENTER_ALIGN}on the side of the Mailbox.")), + MSG_INSTANT(_("{CENTER_ALIGN}- Open the Mailbox at the front -")), JUMP_SCRIPT(END_TALK), }; @@ -3697,7 +3697,7 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ WAIT(45), { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, WAIT(16), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} told {NAME_1}\n{CENTER_ALIGN}about the dreams.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} told {NAME_1}\n{CENTER_ALIGN}about the dreams.")), TEXTBOX_CLEAR, WAIT(16), PORTRAIT_REP(0x0001, 0x00000004), @@ -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, _("{CENTER_ALIGN}{NAME_0} began reading the letter.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} began reading the letter.")), TEXTBOX_CLEAR, { 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...") }, @@ -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, _("{CENTER_ALIGN}{NAME_0}'s team received\n{CENTER_ALIGN}a peeled {COLOR GREEN}Chestnut{RESET} as their reward.") }, + MSG_INSTANT(_("{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 }, TEXTBOX_CLEAR, WAIT(30), @@ -11774,7 +11774,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ LABEL(3), /* = 0x03 */ TEXTBOX_CLEAR, WAIT(10), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} peeled the spiny shell\n{CENTER_ALIGN}and handed the peeled Chestnut over.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} peeled the spiny shell\n{CENTER_ALIGN}and handed the peeled Chestnut over.")), TEXTBOX_CLEAR, WAIT(30), SELECT_ENTITIES(-1, 3), @@ -12763,7 +12763,7 @@ 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, _("{CENTER_ALIGN}{NAME_2} joined the rescue team!") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_2} joined the rescue team!")), { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(10), @@ -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, _("{CENTER_ALIGN}The rescue team gained\n{CENTER_ALIGN}access to the {COLOR YELLOW_D}Meteor Cave{RESET}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}The rescue team gained\n{CENTER_ALIGN}access to the {COLOR YELLOW_D}Meteor Cave{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), @@ -13722,17 +13722,17 @@ static const struct ScriptCommand s_gs9_g85_s0_lives0_dlg0[] = { /* 0x81db740 */ VARIANT_DEFAULT(_(" From now on, {NAME_2}\nis our friend!{WAIT_PRESS}\nGlad to meet you!")), TEXTBOX_CLEAR, WAIT(15), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The latest recruit to\n{CENTER_ALIGN}Team {COLOR CYAN}{TEAM_NAME}{RESET}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}The latest recruit to\n{CENTER_ALIGN}Team {COLOR CYAN}{TEAM_NAME}{RESET}!")), FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2} joined\n{CENTER_ALIGN}the rescue team!") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_2} joined\n{CENTER_ALIGN}the rescue team!")), { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, { 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, _("{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!") }, + MSG_INSTANT(_("{CENTER_ALIGN}And more!")), + MSG_INSTANT(_("{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 }, TEXTBOX_CLEAR2, @@ -13835,7 +13835,7 @@ static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ WAIT(10), BGM_STOP, FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2} can now tag\n{CENTER_ALIGN}along with the rescue team!") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_2} can now tag\n{CENTER_ALIGN}along with the rescue team!")), { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, BGM_SWITCH(1), @@ -14018,7 +14018,7 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ WAIT(10), BGM_STOP, FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2} can now tag\n{CENTER_ALIGN}along with the rescue team!") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_2} can now tag\n{CENTER_ALIGN}along with the rescue team!")), { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, BGM_SWITCH(1), diff --git a/src/data/ground/ground_data_b01p02a_station.h b/src/data/ground/ground_data_b01p02a_station.h index 80959f0bf..5e2eb75f4 100644 --- a/src/data/ground/ground_data_b01p02a_station.h +++ b/src/data/ground/ground_data_b01p02a_station.h @@ -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, _("{CENTER_ALIGN}{NAME_1} received something\n{CENTER_ALIGN}from {NAME_2}.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} received something\n{CENTER_ALIGN}from {NAME_2}.")), { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(10), @@ -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!")), TEXTBOX_CLEAR, WAIT(15), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Team {COLOR CYAN}{TEAM_NAME}{RESET}'s\n{CENTER_ALIGN}rescue rank went up!") }, + MSG_INSTANT(_("{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 }, TEXTBOX_CLEAR2, diff --git a/src/data/ground/ground_data_d07p02_station.h b/src/data/ground/ground_data_d07p02_station.h index 5e97ddd11..4d741b112 100644 --- a/src/data/ground/ground_data_d07p02_station.h +++ b/src/data/ground/ground_data_d07p02_station.h @@ -118,7 +118,7 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * WAIT(30), BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Fiery Field{RESET}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Fiery Field{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), diff --git a/src/data/ground/ground_data_d10p03_station.h b/src/data/ground/ground_data_d10p03_station.h index 41e590073..8ef2687bc 100644 --- a/src/data/ground/ground_data_d10p03_station.h +++ b/src/data/ground/ground_data_d10p03_station.h @@ -283,7 +283,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * WAIT(30), BGM_STOP, FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_3} joined the team!") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_3} joined the team!")), { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, { 0x3b, 0x1a, 0x0000, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d11p03_station.h b/src/data/ground/ground_data_d11p03_station.h index 57cedfbbf..d72b7a5f8 100644 --- a/src/data/ground/ground_data_d11p03_station.h +++ b/src/data/ground/ground_data_d11p03_station.h @@ -174,7 +174,7 @@ 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, _("{CENTER_ALIGN}{NAME_2} received the\n{CENTER_ALIGN}{COLOR GREEN_I}9-Tail Crest{RESET} from {NAME_3}.") }, + MSG_INSTANT(_("{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 }, TEXTBOX_CLEAR, WAIT(30), diff --git a/src/data/ground/ground_data_d15p01_station.h b/src/data/ground/ground_data_d15p01_station.h index 42bb99358..9f0fab930 100644 --- a/src/data/ground/ground_data_d15p01_station.h +++ b/src/data/ground/ground_data_d15p01_station.h @@ -42,9 +42,9 @@ static const struct ScriptCommand s_gs211_g1_s0_lives0_dlg0[] = { /* 0x826425c * MSG_NPC(2, _(" ...Hm?! This...{WAIT_PRESS}\nThis is the {COLOR GREEN_I}Red Wing{RESET}...")), MSG_NPC(2, _(" ............{WAIT_PRESS}You...{WAIT_PRESS}\nStand back!")), TEXTBOX_CLEAR, - { 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!") }, + MSG_INSTANT(_("{CENTER_ALIGN}Raikou's thunderbolt\n{CENTER_ALIGN}electrified the {COLOR GREEN_I}Red Wing{RESET}!")), + MSG_INSTANT(_("{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}!")), + MSG_INSTANT(_("{CENTER_ALIGN}Its subtle gradation of yellow\n{CENTER_ALIGN}to red is a truly beauteous sight!")), TEXTBOX_CLEAR, MSG_NPC(2, _(" Go northeast!")), MSG_NPC(2, _(" To a place called the\n{COLOR YELLOW_D}Northwind Field{RESET}.")), @@ -53,11 +53,11 @@ static const struct ScriptCommand s_gs211_g1_s0_lives0_dlg0[] = { /* 0x826425c * MSG_NPC(2, _(" Perhaps your wish will\ncome true!")), TEXTBOX_CLEAR, FANFARE_PLAY(212), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Sunset Wing{RESET}.") }, + MSG_INSTANT(_("{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, _("{CENTER_ALIGN}And...") }, + MSG_INSTANT(_("{CENTER_ALIGN}And...")), FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Northwind Field{RESET}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Northwind Field{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, { 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 c4b60075e..e349a2d17 100644 --- a/src/data/ground/ground_data_d16p01_station.h +++ b/src/data/ground/ground_data_d16p01_station.h @@ -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, _("{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}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}Entei's fiery blast made\n{CENTER_ALIGN}the {COLOR GREEN_I}Clear Wing{RESET} flare!")), + MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR GREEN_I}Clear Wing{RESET}...{WAIT_PRESS}\n{CENTER_ALIGN}transformed into the {COLOR GREEN_I}Red Wing{RESET}!")), TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(10), @@ -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, _("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Red Wing{RESET}.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Red Wing{RESET}.")), { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(20), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And...") }, + MSG_INSTANT(_("{CENTER_ALIGN}And...")), FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Lightning Field{RESET}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Lightning Field{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), diff --git a/src/data/ground/ground_data_d17p01_station.h b/src/data/ground/ground_data_d17p01_station.h index 1222d4f6f..002693dc0 100644 --- a/src/data/ground/ground_data_d17p01_station.h +++ b/src/data/ground/ground_data_d17p01_station.h @@ -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, _("{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}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}Raikou's thunderbolt\n{CENTER_ALIGN}electrified the {COLOR GREEN_I}Red Wing{RESET}!")), + MSG_INSTANT(_("{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}!")), TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(10), @@ -108,7 +108,7 @@ 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, _("{CENTER_ALIGN}Its subtle gradation of yellow\n{CENTER_ALIGN}to red is a truly beauteous sight!") }, + MSG_INSTANT(_("{CENTER_ALIGN}Its subtle gradation of yellow\n{CENTER_ALIGN}to red is a truly beauteous sight!")), TEXTBOX_CLEAR, WAIT(30), MSG_NPC(2, _(" Go northeast!")), @@ -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, _("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Sunset Wing{RESET}.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Sunset Wing{RESET}.")), { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(20), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And...") }, + MSG_INSTANT(_("{CENTER_ALIGN}And...")), FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Northwind Field{RESET}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Northwind Field{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), diff --git a/src/data/ground/ground_data_d18p01_station.h b/src/data/ground/ground_data_d18p01_station.h index abbb3897e..b6d550cd5 100644 --- a/src/data/ground/ground_data_d18p01_station.h +++ b/src/data/ground/ground_data_d18p01_station.h @@ -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, _("{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}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}The north wind swirled\n{CENTER_ALIGN}around the {COLOR GREEN_I}Sunset Wing{RESET}!")), + MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR GREEN_I}Sunset Wing{RESET}...{WAIT_PRESS}\n{CENTER_ALIGN}transformed into the {COLOR GREEN_I}Rainbow Wing{RESET}!")), TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(10), @@ -110,7 +110,7 @@ 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, _("{CENTER_ALIGN}Glittering in the seven colors\n{CENTER_ALIGN}of the rainbow, this wing is\n{CENTER_ALIGN}beautiful beyond description!") }, + MSG_INSTANT(_("{CENTER_ALIGN}Glittering in the seven colors\n{CENTER_ALIGN}of the rainbow, this wing is\n{CENTER_ALIGN}beautiful beyond description!")), TEXTBOX_CLEAR, WAIT(30), MSG_NPC(2, _(" This {COLOR GREEN_I}Rainbow Wing{RESET}...")), @@ -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, _("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Rainbow Wing{RESET}.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Rainbow Wing{RESET}.")), { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(20), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And...") }, + MSG_INSTANT(_("{CENTER_ALIGN}And...")), FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}{COLOR YELLOW_D}Mt. Faraway{RESET}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}{COLOR YELLOW_D}Mt. Faraway{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), diff --git a/src/data/ground/ground_data_d19p01_station.h b/src/data/ground/ground_data_d19p01_station.h index a35573040..db25ac7e1 100644 --- a/src/data/ground/ground_data_d19p01_station.h +++ b/src/data/ground/ground_data_d19p01_station.h @@ -45,9 +45,9 @@ static const struct ScriptCommand s_gs215_g1_s0_lives0_dlg0[] = { /* 0x82674cc * TEXTBOX_CLEAR, MSG_NPC(2, _(" Kyuuuuuuuuhn!")), TEXTBOX_CLEAR, - { 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!") }, + MSG_INSTANT(_("{CENTER_ALIGN}The north wind swirled\n{CENTER_ALIGN}around the {COLOR GREEN_I}Sunset Wing{RESET}!")), + MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR GREEN_I}Sunset Wing{RESET}...{WAIT_PRESS}\n{CENTER_ALIGN}transformed into the {COLOR GREEN_I}Rainbow Wing{RESET}!")), + MSG_INSTANT(_("{CENTER_ALIGN}Glittering in the seven colors\n{CENTER_ALIGN}of the rainbow, this wing is\n{CENTER_ALIGN}beautiful beyond description!")), TEXTBOX_CLEAR, MSG_NPC(2, _(" This {COLOR GREEN_I}Rainbow Wing{RESET}...")), MSG_NPC(2, _(" It is the key to meeting\nthe mirage Pokémon.")), @@ -56,9 +56,9 @@ static const struct ScriptCommand s_gs215_g1_s0_lives0_dlg0[] = { /* 0x82674cc * MSG_NPC(2, _(" Yes...\nTake it to {COLOR YELLOW_D}Mt. Faraway{RESET}!")), MSG_NPC(2, _(" The mirage Pokémon is at\nits peak!")), TEXTBOX_CLEAR, - { 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}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Rainbow Wing{RESET}.")), + MSG_INSTANT(_("{CENTER_ALIGN}And...")), + MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}{COLOR YELLOW_D}Mt. Faraway{RESET}!")), TEXTBOX_CLEAR, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, diff --git a/src/data/ground/ground_data_d24p01_station.h b/src/data/ground/ground_data_d24p01_station.h index 5d68baf93..12afaec4a 100644 --- a/src/data/ground/ground_data_d24p01_station.h +++ b/src/data/ground/ground_data_d24p01_station.h @@ -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, _("{CENTER_ALIGN}{NAME_2} placed the {COLOR GREEN_I}9-Tail Crest{RESET}\n{CENTER_ALIGN}in the hollow spot.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_2} placed the {COLOR GREEN_I}9-Tail Crest{RESET}\n{CENTER_ALIGN}in the hollow spot.")), TEXTBOX_CLEAR, WAIT(60), BGM_STOP, diff --git a/src/data/ground/ground_data_h29p01_station.h b/src/data/ground/ground_data_h29p01_station.h index a99655304..3b16c7065 100644 --- a/src/data/ground/ground_data_h29p01_station.h +++ b/src/data/ground/ground_data_h29p01_station.h @@ -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, _("{CENTER_ALIGN}Obtained the {COLOR GREEN}Vortex Stone{RESET}.") }, + MSG_INSTANT(_("{CENTER_ALIGN}Obtained the {COLOR GREEN}Vortex Stone{RESET}.")), { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And...") }, + MSG_INSTANT(_("{CENTER_ALIGN}And...")), FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Silver Trench{RESET}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Silver Trench{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_t01p01_station.h b/src/data/ground/ground_data_t01p01_station.h index 155be91eb..96c344a7a 100644 --- a/src/data/ground/ground_data_t01p01_station.h +++ b/src/data/ground/ground_data_t01p01_station.h @@ -390,8 +390,8 @@ 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, _("{CENTER_ALIGN}Welcome!\n{CENTER_ALIGN}The fun and bustling Pokémon Square!") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("Whiscash Pond ↑\n Pelipper Post Office →") }, + MSG_INSTANT(_("{CENTER_ALIGN}Welcome!\n{CENTER_ALIGN}The fun and bustling Pokémon Square!")), + MSG_INSTANT(_("Whiscash Pond ↑\n Pelipper Post Office →")), TEXTBOX_CLEAR, { 0xe4, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, RET, @@ -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, _("{CENTER_ALIGN}↑\n{CENTER_ALIGN}Whiscash Pond") }, + MSG_INSTANT(_("{CENTER_ALIGN}↑\n{CENTER_ALIGN}Whiscash Pond")), TEXTBOX_CLEAR, { 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{CENTER_ALIGN}Pelipper Post Office →") }, + MSG_INSTANT(_("\n{CENTER_ALIGN}Pelipper Post Office →")), TEXTBOX_CLEAR, { 0xe4, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, RET, @@ -1016,7 +1016,7 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(10), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} gave Munchlax\n{CENTER_ALIGN}one {COLOR GREEN_I}{MOVE_ITEM_0}{RESET}.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} gave Munchlax\n{CENTER_ALIGN}one {COLOR GREEN_I}{MOVE_ITEM_0}{RESET}.")), TEXTBOX_CLEAR, WAIT(10), PORTRAIT_REP(0x0001, 0x00000041), @@ -1418,7 +1418,7 @@ static const struct ScriptCommand s_gs1_g5_s4_lives0_dlg0[] = { /* 0x813c7e4 */ TEXTBOX_CLEAR, WAIT(20), FANFARE_PLAY2(333), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} returned\n{CENTER_ALIGN}the {COLOR GREEN_I}Apple{RESET} to Munchlax.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} returned\n{CENTER_ALIGN}the {COLOR GREEN_I}Apple{RESET} to Munchlax.")), TEXTBOX_CLEAR, WAIT(10), PORTRAIT_REP(0x0002, 0x00000044), @@ -2228,7 +2228,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ TEXTBOX_CLEAR, WAIT(30), FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_4} became a team member!") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_4} became a team member!")), { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), @@ -12675,7 +12675,7 @@ static const struct ScriptCommand s_gs1_g39_s0_lives0_dlg2[] = { /* 0x816b7a0 */ COND_EQUAL(1, /* to label */ 2), MSG_NPC(1, _(" Thank you!")), FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_1} \n{CENTER_ALIGN}became a member!") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} \n{CENTER_ALIGN}became a member!")), { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, { 0x3b, 0x1e, 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, _("{CENTER_ALIGN}The cave shunned\n{CENTER_ALIGN}by all out of fear...") }, + MSG_INSTANT(_("{CENTER_ALIGN}The cave shunned\n{CENTER_ALIGN}by all out of fear...")), BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {COLOR YELLOW_D}Western Cave{RESET}\n{CENTER_ALIGN}is now open for exploration!") }, + MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR YELLOW_D}Western Cave{RESET}\n{CENTER_ALIGN}is now open for exploration!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), @@ -14174,11 +14174,11 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ VARIANT_DEFAULT(_(" {NAME_0}.\nWant to look into this?")), TEXTBOX_CLEAR, WAIT(30), - { 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...") }, + MSG_INSTANT(_("{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.")), + MSG_INSTANT(_("{CENTER_ALIGN}The burglar's alleged\n{CENTER_ALIGN}getaway spot...")), BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The {COLOR YELLOW_D}Northern Range{RESET}\n{CENTER_ALIGN}is now open for investigation!") }, + MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR YELLOW_D}Northern Range{RESET}\n{CENTER_ALIGN}is now open for investigation!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -14567,7 +14567,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ WAIT(10), BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Pitfall Valley{RESET}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Pitfall Valley{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -14976,11 +14976,11 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ MSG_NPC(6, _(" Delighted to join!")), TEXTBOX_CLEAR, WAIT(10), - { 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}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}And thus...")), + MSG_INSTANT(_("{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, _("{CENTER_ALIGN}{NAME_5} and {NAME_6}\n{CENTER_ALIGN}became team members!") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_5} and {NAME_6}\n{CENTER_ALIGN}became team members!")), { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, { 0x3b, 0x24, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -15324,9 +15324,9 @@ static const struct ScriptCommand s_gs1_g50_s0_lives3_dlg2[] = { /* 0x817803c */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, JUMPIF_SCENE_GT(SCENARIO_SUB7, 49, 2, /* to label */ 1), WAIT(30), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Leaving aside the disturbing fact that\n{CENTER_ALIGN}{NAME_1} made them compadres...") }, + MSG_INSTANT(_("{CENTER_ALIGN}Leaving aside the disturbing fact that\n{CENTER_ALIGN}{NAME_1} made them compadres...")), FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0}'s team gained\n{CENTER_ALIGN}access to the {COLOR YELLOW_D}Buried Relic{RESET}!") }, + MSG_INSTANT(_("{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 }, TEXTBOX_CLEAR, JUMPIF_SCENE_GT(SCENARIO_SUB7, 49, 2, /* to label */ 1), @@ -15493,7 +15493,7 @@ static const struct ScriptCommand s_gs1_g52_s0_lives0_dlg2[] = { /* 0x8178d0c */ TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY(204), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_1} became the\n{CENTER_ALIGN}rescue team's newest member!") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} became the\n{CENTER_ALIGN}rescue team's newest member!")), { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), diff --git a/src/data/ground/ground_data_t01p02a_station.h b/src/data/ground/ground_data_t01p02a_station.h index e9dd6c509..e05cd51f2 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, _("{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!") }, + MSG_INSTANT(_("{CENTER_ALIGN}The entrance is too narrow.\n{CENTER_ALIGN}There is only room for one.")), + MSG_INSTANT(_("{CENTER_ALIGN}Come alone to enter!")), TEXTBOX_CLEAR, RET, }; @@ -391,11 +391,11 @@ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg2[] = { /* 0x817e834 */ WAIT(20), BGM_STOP, FANFARE_PLAY(205), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Stormy Sea{RESET}!") }, + MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Stormy Sea{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(20), - { 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!") }, + MSG_INSTANT(_("{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!")), TEXTBOX_CLEAR, BGM_SWITCH(8), { 0xaf, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_t01p03_station.h b/src/data/ground/ground_data_t01p03_station.h index 72a5f63b7..a2fd0e7ab 100644 --- a/src/data/ground/ground_data_t01p03_station.h +++ b/src/data/ground/ground_data_t01p03_station.h @@ -855,10 +855,10 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ TEXTBOX_CLEAR, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The place where the Mankey gang\n{CENTER_ALIGN}is wreaking havoc on others...") }, + MSG_INSTANT(_("{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, _("{CENTER_ALIGN}The {COLOR YELLOW_D}Uproar Forest{RESET} is now\n{CENTER_ALIGN}open for exploration!") }, + MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR YELLOW_D}Uproar Forest{RESET} is now\n{CENTER_ALIGN}open for exploration!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -991,7 +991,7 @@ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} read the letter.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} read the letter.")), TEXTBOX_CLEAR, WAIT(20), { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("“Please allow me to introduce myself.\nMy name is Smeargle.") }, @@ -1012,10 +1012,10 @@ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ VARIANT_DEFAULT(_(" I don't really get this...{WAIT_PRESS}\nBut let's go rescue this Smeargle anyway!")), TEXTBOX_CLEAR, WAIT(30), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The forest in which Smeargle\n{CENTER_ALIGN}is thought to have gone missing...") }, + MSG_INSTANT(_("{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, _("{CENTER_ALIGN}The {COLOR YELLOW_D}Howling Forest{RESET}\n{CENTER_ALIGN}is now open for exploration!") }, + MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR YELLOW_D}Howling Forest{RESET}\n{CENTER_ALIGN}is now open for exploration!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -1130,7 +1130,7 @@ static const struct ScriptCommand s_gs4_g7_s0_lives0_dlg0[] = { /* 0x818e464 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} read the SOS Mail\n{CENTER_ALIGN}apparently sent by Medicham.") }, + MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} read the SOS Mail\n{CENTER_ALIGN}apparently sent by Medicham.")), TEXTBOX_CLEAR, WAIT(20), { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("“My name is Medicham.") }, @@ -1141,10 +1141,10 @@ static const struct ScriptCommand s_gs4_g7_s0_lives0_dlg0[] = { /* 0x818e464 */ { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("The reward is a secret〜♪{WAIT_PRESS}\nBut it's really very nice--you can be\nsure of that〜♪”") }, TEXTBOX_CLEAR, WAIT(30), - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The place in which Medicham\n{CENTER_ALIGN}is thought to have gone missing...") }, + MSG_INSTANT(_("{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, _("{CENTER_ALIGN}The {COLOR YELLOW_D}Wish Cave{RESET} is now\n{CENTER_ALIGN}open for exploration!") }, + MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR YELLOW_D}Wish Cave{RESET} is now\n{CENTER_ALIGN}open for exploration!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_t01p05_station.h b/src/data/ground/ground_data_t01p05_station.h index 8f26ab2c8..67e0b2da1 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, _("{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 -") }, + MSG_INSTANT(_("{CENTER_ALIGN}There appears to be no one inside.")), + MSG_INSTANT(_("{CENTER_ALIGN}............!{WAIT_PRESS}\n{CENTER_ALIGN}There is a notice posted in the back.")), + MSG_INSTANT(_("{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 2a39edf77..9071112a3 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, _("{COLOR RED_W}Unregistered dialog script{RESET}") }, + MSG_INSTANT(_("{COLOR RED_W}Unregistered dialog script{RESET}")), JUMP_SCRIPT(END_TALK), }; @@ -75,8 +75,8 @@ 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, _("{NAME_0} checked underfoot.") }, - { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("But there was nothing to be found...") }, + MSG_INSTANT(_("{NAME_0} checked underfoot.")), + MSG_INSTANT(_("But there was nothing to be found...")), JUMP_SCRIPT(END_TALK), }; @@ -557,7 +557,7 @@ static const struct ScriptCommand s_script_DISMISSAL_SALLY_MEMBER_FUNC[] = { /* { 0x3b, 0x09, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), { 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.") }, + MSG_INSTANT(_("{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.")), TEXTBOX_CLEAR, LABEL(0), /* = 0x00 */ RET_DIRECT, @@ -569,7 +569,7 @@ static const struct ScriptCommand s_script_DISMISSAL_SALLY_MEMBER2_FUNC[] = { /* { 0x3b, 0x09, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), { 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.") }, + MSG_INSTANT(_("{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.")), TEXTBOX_CLEAR, LABEL(0), /* = 0x00 */ RET_DIRECT, @@ -581,7 +581,7 @@ static const struct ScriptCommand s_script_DISMISSAL_SALLY_MEMBER3_FUNC[] = { /* { 0x3b, 0x09, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), { 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.") }, + MSG_INSTANT(_("{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.")), TEXTBOX_CLEAR, LABEL(0), /* = 0x00 */ RET_DIRECT, @@ -593,7 +593,7 @@ static const struct ScriptCommand s_script_DISMISSAL_SALLY_MEMBER4_FUNC[] = { /* { 0x3b, 0x09, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), { 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.") }, + MSG_INSTANT(_("{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.")), TEXTBOX_CLEAR, LABEL(0), /* = 0x00 */ RET_DIRECT,