diff --git a/include/data_script.h b/include/data_script.h index b9f0a59ee..6b12390d7 100644 --- a/include/data_script.h +++ b/include/data_script.h @@ -37,7 +37,7 @@ // 22..2f: ??? #define TEXTBOX_AUTO_PRESS(endF, midF) { 0x2b, 0, 0, endF, midF, NULL} // Waits specified number of frames, then automatically does a button press without waiting for player's input. -1 disables it. // 30..39: various text printing -#define MSG_NPC(id, msg) { 0x41, 0, id, 0, 0, msg } // ID is portrait id of the npc. -1 means no portrait +#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) // 3c: unknown textbox-related cjump diff --git a/src/data/ground/ground_data_a01p01_station.h b/src/data/ground/ground_data_a01p01_station.h index 478a88f00..8bc13b460 100644 --- a/src/data/ground/ground_data_a01p01_station.h +++ b/src/data/ground/ground_data_a01p01_station.h @@ -276,7 +276,7 @@ static const struct ScriptCommand s_gs162_g4_s0_lives0_dlg0[] = { /* 0x8210c68 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0f, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm so glad. Finally...{WAIT_PRESS}\nI finally got to meet you...") }, + MSG_NPC(2, _(" 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 }, @@ -285,7 +285,7 @@ static const struct ScriptCommand s_gs162_g4_s0_lives0_dlg0[] = { /* 0x8210c68 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I am your...") }, + MSG_NPC(2, _(" I am your...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -452,23 +452,23 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes...") }, + MSG_NPC(2, _(" Yes...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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...{WAIT_PRESS}\nI must watch over you...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Because that is my role\nnow.") }, + MSG_NPC(2, _(" As an agent of spirits...{WAIT_PRESS}\nI must watch over you...")), + MSG_NPC(2, _(" Because that is my role\nnow.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...An agent of spirits?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I fell under the curse of\nNinetales in the place of a Trainer...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And became a presence\nwithout a physical form like this.") }, + MSG_NPC(2, _(" Yes.")), + MSG_NPC(2, _(" I fell under the curse of\nNinetales in the place of a Trainer...")), + MSG_NPC(2, _(" And became a presence\nwithout a physical form like this.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Trainer...?{WAIT_PRESS}\nYou mean the human that was in the\nlegend about Ninetales?") }, @@ -476,34 +476,34 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(2, _(" Yes.{WAIT_PRESS} My Trainer was\na terrible person.")), + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nI don't hate my Trainer.") }, + MSG_NPC(2, _(" 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?{WAIT_PRESS}\nWhy not?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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...") }, + MSG_NPC(2, _(" Well...{WAIT_PRESS}\nI wonder why myself.\nI don't quite understand...")), + MSG_NPC(2, _(" 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 }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My Trainer had some quirks,\nbut there were good qualities too.") }, + MSG_NPC(2, _(" My Trainer had some quirks,\nbut there were good qualities too.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And, when it happened,\nI was desperate...") }, + MSG_NPC(2, _(" And, when it happened,\nI was desperate...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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...{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.") }, + MSG_NPC(2, _(" Yes.")), + MSG_NPC(2, _(" I protected my Trainer\nfrom Ninetales's curse with my\nentire being.")), + MSG_NPC(2, _(" If the Trainer is facing\ndanger...")), + MSG_NPC(2, _(" It is our duty to protect\nthe Trainer with our lives...{WAIT_PRESS}\nWe {POKEMON_2} are that way.")), + MSG_NPC(2, _(" 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...)") }, @@ -511,20 +511,20 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, I must mention, I don't\nmind the form I have taken.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I live on this way with\npride in the role I have been given.") }, + MSG_NPC(2, _(" Oh, I must mention, I don't\nmind the form I have taken.")), + MSG_NPC(2, _(" I live on this way with\npride in the role I have been given.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...Role?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.") }, - { 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...{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.") }, + MSG_NPC(2, _(" Yes.")), + MSG_NPC(2, _(" All things have a role.\nThey all serve a purpose.")), + MSG_NPC(2, _(" Just as I have my own\nrole to play...")), + MSG_NPC(2, _(" You, too, have a role to\nfill...")), + MSG_NPC(2, _(" You have...{WAIT_PRESS}\ncome here to perform a certain role...")), + MSG_NPC(2, _(" 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...?{WAIT_PRESS}\nWhat are you saying?") }, @@ -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...{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.") }, + MSG_NPC(1, _(" You have...{WAIT_PRESS}\ncome here to perform a certain role...")), + MSG_NPC(1, _(" And, for that role...{WAIT_PRESS}\nyou became a Pokémon.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -748,7 +748,7 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * { 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?{WAIT_PRESS}\nThat you take to that underground dungeon.") }, + MSG_NPC(1, _(" 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.{WAIT_PRESS} They make it sound like one\nterrible place...") }, @@ -756,9 +756,9 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * { 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, {NAME_0}.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You have my support.\nPlease, go with strength.") }, + MSG_NPC(1, _(" You will be fine.")), + MSG_NPC(1, _(" I am certain that you\nwill succeed, {NAME_0}.")), + MSG_NPC(1, _(" You have my support.\nPlease, go with strength.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0000, 0x00000009, 0x00000000, NULL }, @@ -770,15 +770,15 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * { 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...{WAIT_PRESS}\nI can't envision it...") }, + MSG_NPC(1, _(" 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.") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I thought maybe you knew something,\nthe way you said it.") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" No. I only wanted to give\nyou encouragement...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm sorry...") }, + MSG_NPC(1, _(" No. I only wanted to give\nyou encouragement...")), + MSG_NPC(1, _(" I'm sorry...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0000, 0x00000009, 0x00000000, NULL }, @@ -787,25 +787,25 @@ 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...{WAIT_PRESS}\nThere is one thing that I can foresee.") }, + MSG_NPC(1, _(" 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...{WAIT_PRESS}\nis coming to its end, little by little.") }, + MSG_NPC(1, _(" 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...{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...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And that role brought\nyou here.") }, + MSG_NPC(1, _(" You became a Pokémon in\norder to fulfill a certain role...")), + MSG_NPC(1, _(" And that role brought\nyou here.")), { 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...{WAIT_PRESS}\nis finally drawing to its conclusion.") }, + MSG_NPC(1, _(" 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!") }, @@ -813,9 +813,9 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Why did I become a Pokémon?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" When the time comes...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I think I can tell you when\nthis adventure is finished.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Au revoir...") }, + MSG_NPC(1, _(" When the time comes...")), + MSG_NPC(1, _(" I think I can tell you when\nthis adventure is finished.")), + MSG_NPC(1, _(" Au revoir...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -1011,22 +1011,22 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.") }, - { 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, _(" {NAME_0}, you have...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Come to save this world.") }, + MSG_NPC(2, _(" Yes.")), + MSG_NPC(2, _(" The time has arrived.")), + MSG_NPC(2, _(" Why you have come here?")), + MSG_NPC(2, _(" I will tell you all there is\nto tell.")), + MSG_NPC(2, _(" {NAME_0}, you have...")), + MSG_NPC(2, _(" Come to save this world.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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.{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, _(" {NAME_0}...{WAIT_PRESS}\nYou were that human.") }, + MSG_NPC(2, _(" Yes.{WAIT_PRESS} We learned that\nthis world faced extinction.")), + MSG_NPC(2, _(" And so we sought a hero.")), + MSG_NPC(2, _(" But though we searched,\nnowhere could we find our hero.\nWe were becoming discouraged...")), + MSG_NPC(2, _(" When we came across\na human.")), + MSG_NPC(2, _(" {NAME_0}...{WAIT_PRESS}\nYou were that human.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0000, 0x0000000c, 0x00000000, NULL }, @@ -1035,13 +1035,13 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(2, _(" Yes.{WAIT_PRESS} That is also what you\nsaid the first time we met.")), + MSG_NPC(2, _(" You said you were not\nstrong.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But what we sought was\nnot power merely for display...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We sought true courage.") }, + MSG_NPC(2, _(" But what we sought was\nnot power merely for display...")), + MSG_NPC(2, _(" We sought true courage.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1049,33 +1049,33 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That, too, is what\nyou said when we met.") }, + MSG_NPC(2, _(" That, too, is what\nyou said when we met.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It was then that you said\nthis.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" To see if you were worthy\nto be our hero or not...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You asked that we put you\nto the test.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And only if you were found\nto be truly worthy...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Then you were to be told\nthe truth.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" To fulfill your role\nclear of heart and mind, you then chose\nto erase your memory as a human...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And became a Pokémon of\nyour own will to fight alongside your\nfriends.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That is how you came to\nbe in this world.") }, + MSG_NPC(2, _(" It was then that you said\nthis.")), + MSG_NPC(2, _(" To see if you were worthy\nto be our hero or not...")), + MSG_NPC(2, _(" You asked that we put you\nto the test.")), + MSG_NPC(2, _(" And only if you were found\nto be truly worthy...")), + MSG_NPC(2, _(" Then you were to be told\nthe truth.")), + MSG_NPC(2, _(" To fulfill your role\nclear of heart and mind, you then chose\nto erase your memory as a human...")), + MSG_NPC(2, _(" And became a Pokémon of\nyour own will to fight alongside your\nfriends.")), + MSG_NPC(2, _(" That is how you came to\nbe in this world.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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...{WAIT_PRESS}\nIt is soon coming to its end.") }, + MSG_NPC(2, _(" Your courage has been\nproven.")), + MSG_NPC(2, _(" Without question, you bear\nthe role of saving the world.")), + MSG_NPC(2, _(" 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, _("...{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.{WAIT_PRESS}\nAnd when that is accomplished...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You can return to your\nhuman world.") }, + MSG_NPC(2, _(" Yes.{WAIT_PRESS}\nAnd when that is accomplished...")), + MSG_NPC(2, _(" You can return to your\nhuman world.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oh...{WAIT_PRESS}\nSo I can go back to being a human...") }, @@ -1083,23 +1083,23 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * { 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.{WAIT_PRESS} It means...{WAIT_PRESS}\nParting ways with {NAME_1}.") }, + MSG_NPC(2, _(" 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, _("{NAME_1}......{WAIT_PRESS}\nI have to leave?") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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, _(" ...{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, _(" ......{WAIT_PRESS}\nBut...{WAIT_PRESS} We will meet again...{WAIT_PRESS}\nThat is what I believe.") }, + MSG_NPC(2, _(" {NAME_1} feels great\nkinship with you, {NAME_0}.")), + MSG_NPC(2, _(" So, {NAME_0}, if you\nwere to leave...")), + MSG_NPC(2, _(" Your friend would be\nheartbroken.")), + MSG_NPC(2, _(" ...But there can be nothing\ndone.")), + MSG_NPC(2, _(" Because there are\nencounters, there are also farewells...")), + MSG_NPC(2, _(" ...{WAIT_PRESS}I, too, once had\na friend beyond value.")), + MSG_NPC(2, _(" Truly, I cherished our\nfriendship...")), + MSG_NPC(2, _(" But my friend has gone\naway.")), + MSG_NPC(2, _(" It fills me with sadness\nstill, losing my friend...")), + MSG_NPC(2, _(" ......{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), @@ -1111,11 +1111,11 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...!{WAIT_PRESS} W-what was that?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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, _(" ............{WAIT_PRESS}\nIt will be morning soon.{WAIT_PRESS}\nAu revoir.") }, + MSG_NPC(2, _(" ............{WAIT_PRESS}Who was it?{WAIT_PRESS}\nSomeone appears to have been looking\ninto your dream.")), + MSG_NPC(2, _(" But it is fine now.\nWhoever it was ran off.")), + MSG_NPC(2, _(" ...All that remains in this\ndream is a feeling of sadness.")), + MSG_NPC(2, _(" ...That Pokémon...\nI think ran off crying...")), + MSG_NPC(2, _(" ............{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 }, @@ -1253,7 +1253,7 @@ static const struct ScriptCommand s_gs162_g10_s0_lives0_dlg0[] = { /* 0x8215da4 { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You can return to your\nhuman world.") }, + MSG_NPC(2, _(" You can return to your\nhuman world.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, diff --git a/src/data/ground/ground_data_a01p02_station.h b/src/data/ground/ground_data_a01p02_station.h index 0452f363c..53606575a 100644 --- a/src/data/ground/ground_data_a01p02_station.h +++ b/src/data/ground/ground_data_a01p02_station.h @@ -117,8 +117,8 @@ static const struct ScriptCommand s_gs163_g3_s0_lives0_dlg0[] = { /* 0x8216954 * { 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, {NAME_0}!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Don't you dare fool around!\nI'll make you pay for it!") }, + MSG_NPC(2, _(" Gegege!\nHey, {NAME_0}!")), + MSG_NPC(2, _(" 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, _("{CENTER_ALIGN}You have but one chance.{WAIT_PRESS}\n{CENTER_ALIGN}{NAME_0},\n{CENTER_ALIGN}do your best.") }, diff --git a/src/data/ground/ground_data_a02p03_station.h b/src/data/ground/ground_data_a02p03_station.h index 3aa8c45f5..1ad51c83a 100644 --- a/src/data/ground/ground_data_a02p03_station.h +++ b/src/data/ground/ground_data_a02p03_station.h @@ -40,12 +40,12 @@ static const struct ScriptCommand s_gs166_g1_s0_lives0_dlg0[] = { /* 0x8218cb0 * BGM_FADEOUT(60), WAIT(20), { 0x2e, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Gasp... Gasp...") }, + MSG_NPC(1, _(" Gasp... Gasp...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, no! Look!") }, + MSG_NPC(1, _(" Oh, no! Look!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(38), { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, @@ -105,22 +105,22 @@ static const struct ScriptCommand s_gs166_g2_s0_lives0_dlg0[] = { /* 0x821915c * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It... It's a mountain of fire!") }, + MSG_NPC(1, _(" It... It's a mountain of fire!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Look at all that lava\npouring from the crater...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Can we even make it\nthrough there?") }, + MSG_NPC(1, _(" Look at all that lava\npouring from the crater...")), + MSG_NPC(1, _(" Can we even make it\nthrough there?")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But they're catching up to\nus...") }, + MSG_NPC(1, _(" But they're catching up to\nus...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 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{NAME_0}?") }, + MSG_NPC(1, _(" What'll we do,\n{NAME_0}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Look! There they are!") }, @@ -134,8 +134,8 @@ static const struct ScriptCommand s_gs166_g2_s0_lives0_dlg0[] = { /* 0x821915c * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 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, {NAME_0}!") }, + MSG_NPC(1, _(" There's no choice now!")), + MSG_NPC(1, _(" 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 194798bbb..e98ed0371 100644 --- a/src/data/ground/ground_data_a02p04_station.h +++ b/src/data/ground/ground_data_a02p04_station.h @@ -186,10 +186,10 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * { 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...{WAIT_PRESS} Haha...") }, + MSG_NPC(1, _(" Yeah, you're right.\nThere can't be anyone else.\nHahahahaha.")), + MSG_NPC(1, _(" All right!\nWe can say good-bye to living like\nfugitives.")), + MSG_NPC(1, _(" We don't have to keep\nrunning away anymore!\nHahahahaha.")), + MSG_NPC(1, _(" Hahahaha...{WAIT_PRESS} Haha...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a03p01_station.h b/src/data/ground/ground_data_a03p01_station.h index 9578b11e0..a0d384837 100644 --- a/src/data/ground/ground_data_a03p01_station.h +++ b/src/data/ground/ground_data_a03p01_station.h @@ -56,13 +56,13 @@ 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!{WAIT_PRESS}") }, + MSG_NPC(1, _(" ...Brr... It's cold!{WAIT_PRESS}")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(8), FANFARE_PLAY2(480), { 0x2e, 0x02, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hachoo!") }, + MSG_NPC(1, _(" Hachoo!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(8), { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, @@ -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...{WAIT_PRESS}\nMy nose is running, and it's freezing.") }, + MSG_NPC(1, _(" 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 }, @@ -109,7 +109,7 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wh-what's that?!") }, + MSG_NPC(1, _(" Wh-what's that?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(40), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -117,7 +117,7 @@ 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, _(" ...{WAIT_PRESS}What was that?{WAIT_PRESS}\nIt looked like a Pokémon, but...") }, + MSG_NPC(1, _(" ...{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 }, @@ -129,7 +129,7 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder what they were\ndoing in this lonely place?") }, + MSG_NPC(1, _(" I wonder what they were\ndoing in this lonely place?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -252,7 +252,7 @@ static const struct ScriptCommand s_gs168_g2_s0_lives0_dlg0[] = { /* 0x821ca1c * VARIANT_DEFAULT(_(" {NAME_0}! Look!")), { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" See that?{WAIT_PRESS}\nThose trees are frozen!") }, + MSG_NPC(1, _(" 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 08307ff63..ef6230086 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!{WAIT_PRESS}\nThe snow is like frozen powder!") }, + MSG_NPC(1, _(" Wow!{WAIT_PRESS}\nThe snow is like frozen powder!")), { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It looks pretty, but...{WAIT_PRESS}\nIt must be harsh there...") }, + MSG_NPC(1, _(" 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 3ffd29db1..5185c053d 100644 --- a/src/data/ground/ground_data_a03p03_station.h +++ b/src/data/ground/ground_data_a03p03_station.h @@ -288,7 +288,7 @@ 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.{WAIT_PRESS}\nFinally, we get to meet.") }, + MSG_NPC(2, _(" 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 }, @@ -312,23 +312,23 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * WAIT(64), { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, WAIT(16), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I cannot be seen by others.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I am visible only to you.") }, + MSG_NPC(2, _(" I cannot be seen by others.")), + MSG_NPC(2, _(" I am visible only to you.")), { 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 {COLOR YELLOW_D}Mt. Freeze{RESET}.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Inside its peak...{WAIT_PRESS}\nNinetales lives.") }, + MSG_NPC(2, _(" A little farther ahead...")), + MSG_NPC(2, _(" There is a jagged mountain\nrange topped by {COLOR YELLOW_D}Mt. Freeze{RESET}.")), + MSG_NPC(2, _(" Inside its peak...{WAIT_PRESS}\nNinetales lives.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0000, 0x0000000c, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...Ninetales?!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ninetales awaits your\narrival.") }, + MSG_NPC(2, _(" Ninetales awaits your\narrival.")), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Beware...") }, + MSG_NPC(2, _(" Beware...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oh! W-wait...!") }, diff --git a/src/data/ground/ground_data_a04p01_station.h b/src/data/ground/ground_data_a04p01_station.h index 3e1b5ab65..b38e7690d 100644 --- a/src/data/ground/ground_data_a04p01_station.h +++ b/src/data/ground/ground_data_a04p01_station.h @@ -59,9 +59,9 @@ static const struct ScriptCommand s_gs171_g1_s0_lives0_dlg0[] = { /* 0x821fb60 * { 0x3b, 0x38, 0x0000, 0x00000000, 0x00000000, NULL }, { 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...{WAIT_PRESS}\nA giant of a star!") }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" The star, it falls.\nIt falls straight to us.") }, + MSG_NPC(0, _(" From the sky!\nComes a star!")), + MSG_NPC(0, _(" ...It is huge...{WAIT_PRESS}\nA giant of a star!")), + MSG_NPC(0, _(" The star, it falls.\nIt falls straight to us.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -101,16 +101,16 @@ static const struct ScriptCommand s_gs171_g2_s0_lives0_dlg0[] = { /* 0x821fdc4 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x00, 0x0000, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Disasters in nature...\nThere were many...") }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" The balance of the world,\nit has been upset...") }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" All because of the star.\nThe star that slowly comes closer.") }, + MSG_NPC(0, _(" Disasters in nature...\nThere were many...")), + MSG_NPC(0, _(" The balance of the world,\nit has been upset...")), + MSG_NPC(0, _(" All because of the star.\nThe star that slowly comes closer.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 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.{WAIT_PRESS}\nIt shall be terrible.") }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Something must be done...") }, + MSG_NPC(0, _(" ...If it keeps coming...\nIt will crash into this world.{WAIT_PRESS}\nIt shall be terrible.")), + MSG_NPC(0, _(" Something must be done...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -146,13 +146,13 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, 0x00000000, 0x00000002, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ah, good of you to come.") }, + MSG_NPC(2, _(" Ah, good of you to come.")), { 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, _(" Kwaaaaaaaaaah!") }, + MSG_NPC(3, _(" Kwaaaaaaaaaah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -162,21 +162,21 @@ 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-{WAIT_PRESS}what's going on?{WAIT_PRESS}\nWhat is {NAME_3} doing?") }, + MSG_NPC(1, _(" 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.{WAIT_PRESS}\nThe {COLOR GREEN}Teleport Gem{RESET}...") }, + MSG_NPC(2, _(" 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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Teleport Gem?") }, + MSG_NPC(1, _(" Teleport Gem?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Kwaaaaaaaaaah!") }, + MSG_NPC(3, _(" Kwaaaaaaaaaah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(489), @@ -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, _(" .........{WAIT_PRESS}It is made.") }, + MSG_NPC(3, _(" .........{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 {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, {NAME_0}.{WAIT_PRESS}\nAccept!") }, + MSG_NPC(3, _(" This...\nThis is the {COLOR GREEN}Teleport Gem{RESET}.")), + MSG_NPC(3, _(" This will deliver you\nto the world of the sky.")), + MSG_NPC(3, _(" Now, {NAME_0}.{WAIT_PRESS}\nAccept!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x84, 0x00, 0x0100, -0x00000018, -0x00000018, NULL }, @@ -212,32 +212,32 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * { 0x84, 0x00, 0x0100, 0x00000018, 0x00000018, NULL }, { 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, {NAME_2},\nand...{WAIT_PRESS}\nOh?") }, + MSG_NPC(3, _(" That was made using\nthe powers of psychics.")), + MSG_NPC(3, _(" 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 }, WAIT(30), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" A Ghost-type Pokémon.\nWe received help from it.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...Gone away, it seems...") }, + MSG_NPC(3, _(" A Ghost-type Pokémon.\nWe received help from it.")), + MSG_NPC(3, _(" ...Gone away, it seems...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Who could it be?") }, + MSG_NPC(1, _(" Who could it be?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hahaha! It must be bashful.\nLet it be.") }, + MSG_NPC(2, _(" Hahaha! It must be bashful.\nLet it be.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 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?") }, + MSG_NPC(2, _(" Now...{WAIT_PRESS}\nI must ask you this one last time.")), + MSG_NPC(2, _(" 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 }, @@ -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{NAME_1}! {NAME_0}!") }, + MSG_NPC(2, _(" We're counting on you!\n{NAME_1}! {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(500), @@ -604,7 +604,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * WAIT(30), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" .........Hey.") }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...Hey, can you hear...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Snap out of it!") }, + MSG_NPC(2, _(" Snap out of it!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x27, 0x01, 0x0005, 0x0000003c, 0x00ffffff, NULL }, WAIT(60), @@ -618,12 +618,12 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * CALL_LABEL(3), WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("............Urgggh......") }, + MSG_NPC(1, _("............Urgggh......")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _("...Regained consciousness!") }, + MSG_NPC(2, _("...Regained consciousness!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Oooooooohhhhh!") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -636,7 +636,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * WAIT(30), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Maybe...{WAIT_PRESS}\nDid Gengar save {NAME_0} too?") }, + MSG_NPC(1, _(" ...Maybe...{WAIT_PRESS}\nDid Gengar save {NAME_0} too?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), CALL_LABEL(3), @@ -645,27 +645,27 @@ 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!{WAIT_PRESS}\nYou really had all of us worried!") }, + MSG_NPC(4, _(" 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 }, - { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" You were incredible!") }, + MSG_NPC(8, _(" You were incredible!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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!{WAIT_PRESS}\nIt's fantastic!") }, + MSG_NPC(6, _(" 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.{WAIT_PRESS}\nBut...") }, + MSG_NPC(1, _(" 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?!{WAIT_PRESS}\nWhat happened to it?!") }, + MSG_NPC(1, _(" What about the star?!{WAIT_PRESS}\nWhat happened to it?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(474), @@ -682,8 +682,8 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 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...{WAIT_PRESS}\nThe disasters shall soon be calmed.") }, + MSG_NPC(3, _(" Fear not!\nThe star is no more.")), + MSG_NPC(3, _(" 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,20 +696,20 @@ 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 {NAME_8}?!") }, + MSG_NPC(1, _(" 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{NAME_8} is safe.") }, + MSG_NPC(3, _(" 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 {NAME_8} and\n{NAME_9}?!") }, + MSG_NPC(1, _(" 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.") }, + MSG_NPC(3, _(" Be calm.\nBoth are unharmed.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), LABEL(10), /* = 0x0a */ @@ -719,7 +719,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Really!") }, + MSG_NPC(1, _(" Really!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -1097,19 +1097,19 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0007, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" Yippee!\nThis is the greatest!") }, + MSG_NPC(7, _(" Yippee!\nThis is the greatest!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2d, 0x09, 0x0009, 0x00000059, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" This calls for a celebration!") }, + MSG_NPC(9, _(" This calls for a celebration!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2d, 0x09, 0x0009, 0x00000068, 0x00000000, NULL }, { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Let me shoot my Hydro\nPump to kick it off!") }, + MSG_NPC(9, _(" Let me shoot my Hydro\nPump to kick it off!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -1117,20 +1117,20 @@ 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!{WAIT_PRESS}\nFace the other way! The other way!") }, + MSG_NPC(4, _(" 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 }, { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x05, 0x0009, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" No, no!\nLet it loose! Hahaha!") }, + MSG_NPC(9, _(" No, no!\nLet it loose! Hahaha!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_LABEL(2), { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, WAIT(80), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Y-you've gotta be kidding\nme!") }, + MSG_NPC(4, _(" Y-you've gotta be kidding\nme!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -1140,14 +1140,14 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, WAIT(120), { 0x2e, 0x0c, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" I'll secure him so he can't\nget away.") }, + MSG_NPC(8, _(" I'll secure him so he can't\nget away.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0009, 0x00000059, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Oh?{WAIT_PRESS} Not bad!") }, + MSG_NPC(9, _(" Oh?{WAIT_PRESS} Not bad!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_LABEL(2), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -1159,7 +1159,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" What, you're serious?!\nNooooo! Don't!") }, + MSG_NPC(4, _(" What, you're serious?!\nNooooo! Don't!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), CALL_LABEL(2), @@ -1187,12 +1187,12 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * WAIT(10), BGM_SWITCH(42), { 0x2e, 0x03, 0x0005, 0x00000000, 0x00000000, NULL }, - { 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...{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.") }, + MSG_NPC(5, _(" We owe everything to you,\n{NAME_0}, and your friends.")), + MSG_NPC(5, _(" Peace has returned to\nour world.")), + MSG_NPC(5, _(" Thank you for everything.")), + MSG_NPC(5, _(" And now...{WAIT_PRESS}\n{NAME_0}, your role here has ended.")), + MSG_NPC(5, _(" Soon, you must return to\nyour own world.")), + MSG_NPC(5, _(" It is time to bid farewell.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1201,7 +1201,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * WAIT(10), { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(120), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" {NAME_0}...{WAIT_PRESS}\nI am so sorry for this...{WAIT_PRESS}\nTo everyone...{WAIT_PRESS} Please bid farewell...") }, + MSG_NPC(5, _(" {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? {NAME_0}?") }, + MSG_NPC(6, _(" Oh? {NAME_0}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -1251,13 +1251,13 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * WAIT(30), { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0007, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" What?!") }, + MSG_NPC(7, _(" What?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0009, 0x0000004f, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0009, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Wh-what are you saying?!") }, + MSG_NPC(9, _(" Wh-what are you saying?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Everyone...{WAIT_PRESS}\nThank you for everything all this time.") }, @@ -1265,8 +1265,8 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * 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, _(" ...{WAIT_PRESS}Leave...?{WAIT_PRESS}\nWhat do you mean, leave?") }, + MSG_NPC(1, _(" ...Huh?")), + MSG_NPC(1, _(" ...{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.") }, @@ -1275,20 +1275,20 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Unbelievable!") }, + MSG_NPC(2, _(" Unbelievable!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2d, 0x09, 0x0009, 0x0000005a, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0009, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Go back...{WAIT_PRESS}\nTo the human world?!") }, + MSG_NPC(9, _(" 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...?{WAIT_PRESS}\nWhy?!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I don't understand!\nWhy do you have to leave?!") }, + MSG_NPC(1, _(" Huh? W-why...?{WAIT_PRESS}\nWhy?!")), + MSG_NPC(1, _(" I don't understand!\nWhy do you have to leave?!")), { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Didn't we...{WAIT_PRESS}\nAren't we friends?") }, + MSG_NPC(1, _(" Didn't we...{WAIT_PRESS}\nAren't we friends?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -1325,20 +1325,20 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * TEXTBOX_AUTO_PRESS(60, 60), { 0x2d, 0x09, 0x0009, 0x0000004e, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0009, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" {NAME_0}!") }, + MSG_NPC(9, _(" {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, _(" {NAME_0}!") }, + MSG_NPC(9, _(" {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, _(" {NAME_0}!") }, + MSG_NPC(9, _(" {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, _(" {NAME_0}...") }, + MSG_NPC(6, _(" {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 }, TEXTBOX_AUTO_PRESS(180, 180), { 0x2e, 0x03, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!!! Nooooo!!!") }, + MSG_NPC(1, _(" {NAME_0}!!! Nooooo!!!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -2121,39 +2121,39 @@ static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 * WAIT(90), TEXTBOX_AUTO_PRESS(-1, -1), { 0x2e, 0x02, 0x0006, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Snivel... {NAME_0}...{WAIT_PRESS}\nWhy...{WAIT_PRESS} I don't understand...") }, + MSG_NPC(6, _(" 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?{WAIT_PRESS}\nWhy was it necessary to leave us...?") }, + MSG_NPC(9, _(" 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, _(" {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...{WAIT_PRESS}\nBefore I could even say thanks...") }, + MSG_NPC(9, _(" {NAME_0} saved my\nlife...")), + MSG_NPC(9, _(" But I hadn't done anything\nto show my thanks...")), + MSG_NPC(9, _(" Left...{WAIT_PRESS}\nBefore I could even say thanks...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0e, 0x0004, 0x00000043, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, -0x00000002, 0x00000000, NULL }, - { 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...{WAIT_PRESS} Sob...") }, + MSG_NPC(4, _(" You're right...")), + MSG_NPC(4, _(" Just upped and went like\nthat...")), + MSG_NPC(4, _(" Why now?\nWhy when the world's been saved?")), + MSG_NPC(4, _(" 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...{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.") }, + MSG_NPC(3, _(" This was coming...{WAIT_PRESS}\nOur world, it was saved by {NAME_0}.")), + MSG_NPC(3, _(" I look back now...{WAIT_PRESS}\nWhen bound for the sky, {NAME_0}\nseemed...")), + MSG_NPC(3, _(" 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, _(" ............{WAIT_PRESS}\nI think I know...") }, + MSG_NPC(1, _(" ............{WAIT_PRESS}\nI think I know...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), CALL_LABEL(1), @@ -2165,26 +2165,26 @@ static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 * 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...") }, + MSG_NPC(1, _(" And when...{WAIT_PRESS}\nWhen the star was destroyed...")), + MSG_NPC(1, _(" {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...{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?") }, + MSG_NPC(1, _(" Why...{WAIT_PRESS}\nWhy didn't {NAME_0} tell me earlier...?")), + MSG_NPC(1, _(" 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, _(" {NAME_0} must have felt\nthe same pain of leaving.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Try to understand,\n{NAME_1}.") }, + MSG_NPC(2, _(" Those words couldn't be\nspoken.")), + MSG_NPC(2, _(" As much as you are heart-\nbroken now...")), + MSG_NPC(2, _(" {NAME_0} must have felt\nthe same pain of leaving.")), + MSG_NPC(2, _(" 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...{WAIT_PRESS}\n{NAME_0}...") }, + MSG_NPC(1, _(" 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_a04p02_station.h b/src/data/ground/ground_data_a04p02_station.h index f1844e489..5daac788b 100644 --- a/src/data/ground/ground_data_a04p02_station.h +++ b/src/data/ground/ground_data_a04p02_station.h @@ -25,7 +25,7 @@ static const struct ScriptCommand s_gs172_g1_s0_station_sref_script[] = { /* 0x8 { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" It's a huge tower of\nclouds...") }, + MSG_NPC(0, _(" It's a huge tower of\nclouds...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, diff --git a/src/data/ground/ground_data_a04p04_station.h b/src/data/ground/ground_data_a04p04_station.h index 792f59d13..6e48d9dd0 100644 --- a/src/data/ground/ground_data_a04p04_station.h +++ b/src/data/ground/ground_data_a04p04_station.h @@ -63,16 +63,16 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0004, 0x00000000, 0x00000000, NULL }, - { 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?") }, + MSG_NPC(4, _(" Keke! {NAME_0}!{WAIT_PRESS}\nDidn't take much to put you down!{WAIT_PRESS}\nServes you right!")), + MSG_NPC(4, _(" Kekeke!\nNow, what to do with you?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I know!") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I'll drag you into the dark\nworld. That'll do it.") }, + MSG_NPC(4, _(" I know!")), + MSG_NPC(4, _(" I'll drag you into the dark\nworld. That'll do it.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -89,18 +89,18 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(90), { 0x2e, 0x14, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ......") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ............") }, + MSG_NPC(4, _(" ......")), + MSG_NPC(4, _(" ............")), { 0x3b, 0x36, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0034, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ..................{WAIT_PRESS}Hunh?") }, + MSG_NPC(4, _(" ..................{WAIT_PRESS}Hunh?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Darn it...\nI took the wrong path...") }, + MSG_NPC(4, _(" Darn it...\nI took the wrong path...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(......What?)") }, @@ -109,16 +109,16 @@ 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...{WAIT_PRESS}\nI can't tell which way is which...") }, + MSG_NPC(4, _(" 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.{WAIT_PRESS}\nI'll just ditch you here...") }, + MSG_NPC(4, _(" 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.") }, + MSG_NPC(4, _(" That's it. Good-bye to you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_b01p01a_station.h b/src/data/ground/ground_data_b01p01a_station.h index c94cae379..fe591c2b5 100644 --- a/src/data/ground/ground_data_b01p01a_station.h +++ b/src/data/ground/ground_data_b01p01a_station.h @@ -707,7 +707,7 @@ static const struct ScriptCommand s_gs9_g0_s7_lives0_dlg2[] = { /* 0x819cda4 */ CHOICE(/* label */ 1, _("Change level")), CHOICE(/* label */ 2, _("Change type")), CHOICE(/* label */ 3, _("Placement of fixtures")), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("Farewell") }, + MSG_NPC(1, _("Farewell")), JUMP_SCRIPT(END_TALK), LABEL(1), /* = 0x01 */ ASK3( TRUE, /*default*/ 0, /* speaker */ 1, _("The rescue team base's level can\nbe changed.")), @@ -716,15 +716,15 @@ static const struct ScriptCommand s_gs9_g0_s7_lives0_dlg2[] = { /* 0x819cda4 */ CHOICE(/* label */ 6, _("Change to level 3")), JUMP_LABEL(0), LABEL(4), /* = 0x04 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to level 1.") }, + MSG_NPC(1, _("It will be changed to level 1.")), UPDATE_VARINT(CALC_SET, BASE_LEVEL, 0), JUMP_LABEL(7), LABEL(5), /* = 0x05 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to level 2.") }, + MSG_NPC(1, _("It will be changed to level 2.")), UPDATE_VARINT(CALC_SET, BASE_LEVEL, 1), JUMP_LABEL(7), LABEL(6), /* = 0x06 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to level 3.") }, + MSG_NPC(1, _("It will be changed to level 3.")), UPDATE_VARINT(CALC_SET, BASE_LEVEL, 2), JUMP_LABEL(7), LABEL(2), /* = 0x02 */ @@ -738,27 +738,27 @@ static const struct ScriptCommand s_gs9_g0_s7_lives0_dlg2[] = { /* 0x819cda4 */ CHOICE(/* label */ 14, _("Change to rescue team base 6")), JUMP_LABEL(0), LABEL(9), /* = 0x09 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team\nbase 1.") }, + MSG_NPC(1, _("It will be changed to rescue team\nbase 1.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 0), JUMP_LABEL(7), LABEL(10), /* = 0x0a */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team\nbase 2.") }, + MSG_NPC(1, _("It will be changed to rescue team\nbase 2.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 1), JUMP_LABEL(7), LABEL(11), /* = 0x0b */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team\nbase 3.") }, + MSG_NPC(1, _("It will be changed to rescue team\nbase 3.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 2), JUMP_LABEL(7), LABEL(12), /* = 0x0c */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team\nbase 4.") }, + MSG_NPC(1, _("It will be changed to rescue team\nbase 4.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 3), JUMP_LABEL(7), LABEL(13), /* = 0x0d */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team\nbase 5.") }, + MSG_NPC(1, _("It will be changed to rescue team\nbase 5.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 4), JUMP_LABEL(7), LABEL(14), /* = 0x0e */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team\nbase 6.") }, + MSG_NPC(1, _("It will be changed to rescue team\nbase 6.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 5), JUMP_LABEL(7), LABEL(8), /* = 0x08 */ @@ -772,27 +772,27 @@ static const struct ScriptCommand s_gs9_g0_s7_lives0_dlg2[] = { /* 0x819cda4 */ CHOICE(/* label */ 21, _("Change to rescue team base 12")), JUMP_LABEL(0), LABEL(16), /* = 0x10 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team\nbase 7.") }, + MSG_NPC(1, _("It will be changed to rescue team\nbase 7.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 6), JUMP_LABEL(7), LABEL(17), /* = 0x11 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team\nbase 8.") }, + MSG_NPC(1, _("It will be changed to rescue team\nbase 8.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 7), JUMP_LABEL(7), LABEL(18), /* = 0x12 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team\nbase 9.") }, + MSG_NPC(1, _("It will be changed to rescue team\nbase 9.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 8), JUMP_LABEL(7), LABEL(19), /* = 0x13 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team\nbase 10.") }, + MSG_NPC(1, _("It will be changed to rescue team\nbase 10.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 9), JUMP_LABEL(7), LABEL(20), /* = 0x14 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team\nbase 11.") }, + MSG_NPC(1, _("It will be changed to rescue team\nbase 11.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 10), JUMP_LABEL(7), LABEL(21), /* = 0x15 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team\nbase 12.") }, + MSG_NPC(1, _("It will be changed to rescue team\nbase 12.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 11), JUMP_LABEL(7), LABEL(15), /* = 0x0f */ @@ -804,23 +804,23 @@ static const struct ScriptCommand s_gs9_g0_s7_lives0_dlg2[] = { /* 0x819cda4 */ CHOICE(/* label */ 25, _("Change to rescue team base 16")), JUMP_LABEL(0), LABEL(22), /* = 0x16 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team base 13.") }, + MSG_NPC(1, _("It will be changed to rescue team base 13.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 12), JUMP_LABEL(7), LABEL(23), /* = 0x17 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team base 14.") }, + MSG_NPC(1, _("It will be changed to rescue team base 14.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 13), JUMP_LABEL(7), LABEL(24), /* = 0x18 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team base 15.") }, + MSG_NPC(1, _("It will be changed to rescue team base 15.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 14), JUMP_LABEL(7), LABEL(25), /* = 0x19 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("It will be changed to rescue team base 16.") }, + MSG_NPC(1, _("It will be changed to rescue team base 16.")), UPDATE_VARINT(CALC_SET, BASE_KIND, 15), JUMP_LABEL(7), LABEL(3), /* = 0x03 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("Fixtures will be placed.") }, + MSG_NPC(1, _("Fixtures will be placed.")), SET_ARRAYVAL(EVENT_B01P01, 0, 1), SET_ARRAYVAL(EVENT_B01P01, 1, 1), SET_ARRAYVAL(EVENT_B01P01, 2, 1), @@ -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, {NAME_0}.") }, + MSG_NPC(1, _(" Good morning, {NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -1582,7 +1582,7 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - { 0x6b, 0x00, 0x0100, 0x00000007, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Well, this is the place...") }, + MSG_NPC(1, _(" Well, this is the place...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -1859,7 +1859,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, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Hunh?! Oh, no!") }, + MSG_NPC(1, _(" ...Hunh?! Oh, no!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), @@ -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!{WAIT_PRESS}\nMaybe there's something in the Mailbox...") }, + MSG_NPC(1, _(" 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 }, @@ -1922,7 +1922,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, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I knew it'd be there!{WAIT_PRESS}\nIt's the {COLOR CYAN}Rescue Team Starter Set{RESET}!") }, + MSG_NPC(1, _(" 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 }, @@ -1985,7 +1985,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, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" OK, so there isn't any\nmail for us after all...") }, + MSG_NPC(1, _(" OK, so there isn't any\nmail for us after all...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -1993,7 +1993,7 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If there were any rescue\njobs, we would be getting mail, but...") }, + MSG_NPC(1, _(" If there were any rescue\njobs, we would be getting mail, but...")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, @@ -2430,7 +2430,7 @@ 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, {NAME_0}.") }, + MSG_NPC(1, _(" Morning, {NAME_0}.")), { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We sure loused up on\n{NAME_2}'s rescue yesterday.")), @@ -2483,7 +2483,7 @@ 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, _(" {NAME_0}!\nThe dungeon isn't that way.") }, + MSG_NPC(1, _(" {NAME_0}!\nThe dungeon isn't that way.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(10), @@ -2540,7 +2540,7 @@ 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, _(" {NAME_0}!\nThe dungeon isn't that way.") }, + MSG_NPC(1, _(" {NAME_0}!\nThe dungeon isn't that way.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(10), @@ -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, {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!") }, + MSG_NPC(2, _(" Our child, {NAME_3},\nwas kidnapped!")), + MSG_NPC(2, _(" He was taken to {COLOR YELLOW_D}Mt. Steel{RESET}'s\nsummit!")), + MSG_NPC(2, _(" 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 }, @@ -3016,12 +3016,12 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0e, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ohhh...\nI was very scared.") }, + MSG_NPC(2, _(" Ohhh...\nI was very scared.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Maybe because I was\nsomewhere up so high...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My feet feel like they're\nstill walking on air...") }, + MSG_NPC(2, _(" Maybe because I was\nsomewhere up so high...")), + MSG_NPC(2, _(" My feet feel like they're\nstill walking on air...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -3045,7 +3045,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.\nThank you very much.") }, + MSG_NPC(2, _(" Yes.\nThank you very much.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Oh! You've been rescued!\nGreat! Great!") }, @@ -3082,18 +3082,18 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 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!") }, + MSG_NPC(2, _(" Oh! Papa!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" {NAME_2}!\nYou had us worried!\nYou're not hurt?") }, + MSG_NPC(4, _(" {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.{WAIT_PRESS}\nIt's all thanks to {NAME_0}'s team.") }, + MSG_NPC(2, _(" 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 }, @@ -3102,7 +3102,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ WAIT(10), { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Thank you for everything.\nYou're heroes.") }, + MSG_NPC(4, _(" Thank you for everything.\nYou're heroes.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -3122,16 +3122,16 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Oh, how rude of us!\nThank you so much!") }, + MSG_NPC(4, _(" Oh, how rude of us!\nThank you so much!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(3, _(" NO, NO.{WAIT_PRESS}\nIT WAS THE ONLY THING TO DO.{WAIT_PRESS}\nAND...")), + MSG_NPC(3, _(" HOW BOTH OUR EVOLVED\nFORMS ARE JOINED TRIOS...{WAIT_PRESS}\nI FELT A CERTAIN KINSHIP.")), + MSG_NPC(3, _(" AFTER ALL, POKéMON MUST\nHELP EACH OTHER.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I'm impressed.\nSincerely, thank you.") }, + MSG_NPC(4, _(" I'm impressed.\nSincerely, thank you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -3140,22 +3140,22 @@ 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{NAME_0}.") }, + MSG_NPC(4, _(" 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, _(" {NAME_1}.") }, + MSG_NPC(2, _(" {NAME_1}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0b, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Thank you.") }, + MSG_NPC(5, _(" Thank you.")), { 0x2e, 0x0b, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Farewell!") }, + MSG_NPC(4, _(" Farewell!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -3173,7 +3173,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" WE'LL BE ON OUR WAY\nTOO...") }, + MSG_NPC(3, _(" WE'LL BE ON OUR WAY\nTOO...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -3187,7 +3187,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" WHAT IS IT?") }, + MSG_NPC(3, _(" WHAT IS IT?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -3198,12 +3198,12 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" JOIN YOUR TEAM?") }, + MSG_NPC(3, _(" JOIN YOUR TEAM?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yes.{WAIT_PRESS}\nWe couldn't have done the last job\nif you weren't around, {NAME_3}.") }, + MSG_NPC(1, _(" 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.") }, + MSG_NPC(1, _(" I thought we would need\nmore help for doing rescues in the future.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -3304,24 +3304,24 @@ 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...{WAIT_PRESS}\nTHAT SOUNDS FUN! BZZ BZZ BZZ!") }, + MSG_NPC(3, _(" RESCUE TEAM...{WAIT_PRESS}\nTHAT SOUNDS FUN! BZZ BZZ BZZ!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...BUT...IF YOU NEED US\nTO RUSH OVER TO RESCUES...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" WE NEED SOMEWHERE TO\nLIVE CLOSE BY.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" IS THERE ANYWHERE WE\nCAN LIVE IN THIS AREA?") }, + MSG_NPC(3, _(" ...BUT...IF YOU NEED US\nTO RUSH OVER TO RESCUES...")), + MSG_NPC(3, _(" WE NEED SOMEWHERE TO\nLIVE CLOSE BY.")), + MSG_NPC(3, _(" IS THERE ANYWHERE WE\nCAN LIVE IN THIS AREA?")), { 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, _(" ...Ummm...well...") }, + MSG_NPC(1, _(" ...Ummm...well...")), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" OH...\nTHERE ISN'T...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" TOO BAD.{WAIT_PRESS}\nSORRY, BUT WE CAN'T JOIN YOU.{WAIT_PRESS}\nSEE YOU! BZZ BZZ BZZ!") }, + MSG_NPC(3, _(" OH...\nTHERE ISN'T...")), + MSG_NPC(3, _(" 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 }, @@ -3329,7 +3329,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0x91, 0x0c, 0x0001, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That is too bad.") }, + MSG_NPC(1, _(" That is too bad.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -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, {NAME_0}!") }, + MSG_NPC(1, _(" Morning, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -3894,16 +3894,16 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ WAIT(30), BGM_SWITCH(10), { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" There's nothing here.") }, + MSG_NPC(3, _(" There's nothing here.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Depressing, isn't it.") }, + MSG_NPC(4, _(" Depressing, isn't it.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x05, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, 0x00000000, -0x00000003, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keh!\nWho'd run a rescue team from a dump\nlike this? Unbelievable.") }, + MSG_NPC(2, _(" Keh!\nWho'd run a rescue team from a dump\nlike this? Unbelievable.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0004, 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!{WAIT_PRESS}\nOver there. A Mailbox〜♪") }, + MSG_NPC(4, _(" Oh!{WAIT_PRESS}\nOver there. A Mailbox〜♪")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -3933,7 +3933,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh, yeah!\nCheck it out!") }, + MSG_NPC(2, _(" Kekeh, yeah!\nCheck it out!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -3946,16 +3946,16 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yessss!\nRescue job offers!") }, + MSG_NPC(3, _(" Yessss!\nRescue job offers!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0004, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Oo-la-la!\nIsn't that rather tasty〜♪") }, + MSG_NPC(4, _(" Oo-la-la!\nIsn't that rather tasty〜♪")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0f, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We'll have them all.") }, + MSG_NPC(2, _(" We'll have them all.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -3975,35 +3975,35 @@ 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!{WAIT_PRESS}\nIt doesn't matter who does it!") }, + MSG_NPC(2, _(" Keh!{WAIT_PRESS}\nIt doesn't matter who does it!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000043, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We're a rescue team too,\nI'll have you know〜♪") }, + MSG_NPC(4, _(" We're a rescue team too,\nI'll have you know〜♪")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, 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?{WAIT_PRESS}\nIf we have the cover of a rescue team,\nwe can get away with so much more!") }, + MSG_NPC(3, _(" ...But all we ever get up\nto is no good.")), + MSG_NPC(3, _(" 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 }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We have our eyes on\nworld domination〜♪") }, + MSG_NPC(4, _(" We have our eyes on\nworld domination〜♪")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wha...{WAIT_PRESS}\nWorld domination?!") }, + MSG_NPC(1, _(" Wha...{WAIT_PRESS}\nWorld domination?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 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 {COLOR CYAN}Meanies{RESET} is who we are!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" See you around!\nKekeh!") }, + MSG_NPC(2, _(" Kekeh!\nYou heard right!")), + MSG_NPC(2, _(" That's why we're raking in\nthe cash and adding to our gang!")), + MSG_NPC(2, _(" The world will be ours!")), + MSG_NPC(2, _(" The rescue team of evil!\nTeam {COLOR CYAN}Meanies{RESET} is who we are!")), + MSG_NPC(2, _(" See you around!\nKekeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(60), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -4369,7 +4369,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Please!{WAIT_PRESS}\nPlease help my friend!") }, + MSG_NPC(5, _(" Please!{WAIT_PRESS}\nPlease help my friend!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -4379,8 +4379,8 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I was playing with my\nfriend Metapod...") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" But Metapod got lost in the\nwoods...\nHe's still lost out there...") }, + MSG_NPC(5, _(" I was playing with my\nfriend Metapod...")), + MSG_NPC(5, _(" But Metapod got lost in the\nwoods...\nHe's still lost out there...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Oh, I see, I see!\nThat does sound bad!\nKekeke!") }, @@ -4405,7 +4405,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(16), { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Have no fear!\nWe're here to save your chum Metapod.") }, + MSG_NPC(2, _(" Have no fear!\nWe're here to save your chum Metapod.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -4418,7 +4418,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keh!\nYou think you can do this rescue with\nyour amateur-level skills?") }, + MSG_NPC(2, _(" Keh!\nYou think you can do this rescue with\nyour amateur-level skills?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -4430,43 +4430,43 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It doesn't matter who does\nthe rescuing, see?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The guy that does the\nrescuing gets to be the hero.") }, + MSG_NPC(2, _(" It doesn't matter who does\nthe rescuing, see?")), + MSG_NPC(2, _(" The guy that does the\nrescuing gets to be the hero.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 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?") }, + MSG_NPC(2, _(" Listen, {NAME_5}.\nHow about we do this?")), + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nI don't have any money...") }, + MSG_NPC(5, _(" But I...{WAIT_PRESS}\nI don't have any money...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, don't you worry about\nthat, my little friend!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm sure we can persuade\nyour parents to reward us with interest\nafterward, kekeh!") }, + MSG_NPC(2, _(" Oh, don't you worry about\nthat, my little friend!")), + MSG_NPC(2, _(" I'm sure we can persuade\nyour parents to reward us with interest\nafterward, kekeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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.{WAIT_PRESS}\nYou can even join our team.\nThere's an offer you can't refuse.") }, + MSG_NPC(2, _(" 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{NAME_5}, we'll let you be a big wheel\nin Team {COLOR CYAN}Meanies{RESET}, kekekeke!") }, + MSG_NPC(2, _(" 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{NAME_1}.\nThe first to rescue wins!") }, + MSG_NPC(2, _(" 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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Come on, move!\nLet's get this done, already!") }, + MSG_NPC(2, _(" Come on, move!\nLet's get this done, already!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_FADEOUT(60), @@ -4478,7 +4478,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x15, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ...") }, + MSG_NPC(5, _(" ...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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?{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...") }, + MSG_NPC(1, _(" ...What should I do?{WAIT_PRESS}\nI don't have any money, and...")), + MSG_NPC(1, _(" I don't want to join those\n{COLOR CYAN}Meanies{RESET}...")), + MSG_NPC(1, _(" Please, {NAME_0},\nhelp us...")), JUMP_SCRIPT(END_TALK), }; @@ -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, {NAME_3}!") }, + MSG_NPC(2, _(" 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, {NAME_2}!") }, + MSG_NPC(3, _(" 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{NAME_1} and {NAME_0}!") }, + MSG_NPC(2, _(" 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 }, @@ -4777,7 +4777,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But I don't have any money...") }, + MSG_NPC(2, _(" But I don't have any money...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -4796,11 +4796,11 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nCool...") }, + MSG_NPC(2, _(" ............{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!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I want to go on rescues\nwhen I grow up!") }, + MSG_NPC(2, _(" You're even more cool\nthan I thought!")), + MSG_NPC(2, _(" I want to go on rescues\nwhen I grow up!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, @@ -4811,7 +4811,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I have an idea!") }, + MSG_NPC(1, _(" I have an idea!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -4829,18 +4829,18 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That's cool!\nA rescue team base is cool!") }, + MSG_NPC(2, _(" That's cool!\nA rescue team base is cool!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, WAIT(4), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I want to work here when\nI grow up!") }, + MSG_NPC(2, _(" I want to work here when\nI grow up!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Me too! Me too!") }, + MSG_NPC(3, _(" Me too! Me too!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -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, _(" {NAME_0} and\n{NAME_1}, thank you again!") }, + MSG_NPC(3, _(" {NAME_0} and\n{NAME_1}, thank you again!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000009, 0x00000000, NULL }, @@ -4902,7 +4902,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And we got to show\nGengar's team a thing or two, so it's all\ngood!") }, + MSG_NPC(1, _(" And we got to show\nGengar's team a thing or two, so it's all\ngood!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -5083,7 +5083,7 @@ static const struct ScriptCommand s_gs9_g35_s0_lives0_dlg0[] = { /* 0x81b2540 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? Who could that be?") }, + MSG_NPC(1, _(" Huh? Who could that be?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(120), @@ -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{COLOR CYAN}{TEAM_NAME}{RESET} here?") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS} Huh?{WAIT_PRESS}\nWait, aren't you...") }, + MSG_NPC(1, _(" 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, @@ -5174,8 +5174,8 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0002, 0x00000041, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(2, _(" Yes.{WAIT_PRESS}\nBut, {NAME_3}...")), + MSG_NPC(2, _(" He hasn't come back yet\nfrom the rescue mission.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(455), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -5183,24 +5183,24 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ WAIT(30), BGM_SWITCH(9), { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Are you serious?!") }, + MSG_NPC(1, _(" Are you serious?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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.") }, + MSG_NPC(2, _(" Our friend {NAME_2} got\nwedged between some rocks.")), + MSG_NPC(2, _(" We {NAME_2} can go\nanywhere if we can catch a wind, but...")), + MSG_NPC(2, _(" 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), FANFARE_PLAY2(469), { 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?{WAIT_PRESS}\nThat is strange...") }, + MSG_NPC(1, _(" 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, _(" {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...") }, + MSG_NPC(2, _(" {NAME_3}'s leafy fans\ncan whip up powerful winds.")), + MSG_NPC(2, _(" 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), @@ -5233,7 +5233,7 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" R-really?\nThank you!") }, + MSG_NPC(2, _(" R-really?\nThank you!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, @@ -5324,8 +5324,8 @@ 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 {COLOR YELLOW_D}Silent Chasm{RESET}.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I hate to burden you,\nbut you're our only hope...") }, + MSG_NPC(1, _(" My friend is stuck in\na place called {COLOR YELLOW_D}Silent Chasm{RESET}.")), + MSG_NPC(1, _(" I hate to burden you,\nbut you're our only hope...")), JUMP_SCRIPT(END_TALK), }; @@ -5412,13 +5412,13 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yay! Saved!\nI'm so happy!") }, + MSG_NPC(2, _(" Yay! Saved!\nI'm so happy!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But even though I'm safe,\nShiftry is in trouble...") }, + MSG_NPC(3, _(" But even though I'm safe,\nShiftry is in trouble...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -5428,11 +5428,11 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...Yes...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Shiftry whipped up winds\nwith his fans...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" And released me from\nbetween the rocks.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But those winds tore\na thundercloud in two...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" And that was when that\nmonster appeared in the sky.") }, + MSG_NPC(3, _(" ...Yes...")), + MSG_NPC(3, _(" Shiftry whipped up winds\nwith his fans...")), + MSG_NPC(3, _(" And released me from\nbetween the rocks.")), + MSG_NPC(3, _(" But those winds tore\na thundercloud in two...")), + MSG_NPC(3, _(" And that was when that\nmonster appeared in the sky.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -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, _(" {NAME_4}!") }, + MSG_NPC(1, _(" {NAME_4}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -5467,31 +5467,31 @@ 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...{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...") }, + MSG_NPC(4, _(" Zapdos...{WAIT_PRESS}\nIt's one of the legendary bird Pokémon.")), + MSG_NPC(4, _(" I heard it had been\nsleeping for a long time...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" So Shiftry woke it up?") }, + MSG_NPC(1, _(" So Shiftry woke it up?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000000, 0x00000000, NULL }, - { 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.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Shiftry must be saved.") }, + MSG_NPC(4, _(" No.{WAIT_PRESS}\nShiftry's winds were only the trigger.")), + MSG_NPC(4, _(" To begin with, the absence\nof winds there was unnatural.")), + MSG_NPC(4, _(" It must have been caused\nby the rash of natural disasters recently.")), + MSG_NPC(4, _(" Zapdos is enraged from\nhaving been awoken from its sleep.")), + MSG_NPC(4, _(" Shiftry must be saved.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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.{WAIT_PRESS}\nIts electric attacks are wicked nasty.") }, + MSG_NPC(5, _(" 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.{WAIT_PRESS}\nWe will need to be cautious.") }, + MSG_NPC(4, _(" 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?!{WAIT_PRESS}\nThat is dangerous!") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Zapdos is powerful.{WAIT_PRESS}\nIt will be too much for your skill level.") }, + MSG_NPC(4, _(" What?!{WAIT_PRESS}\nThat is dangerous!")), + MSG_NPC(4, _(" 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 }, @@ -5535,7 +5535,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Have you ever been hit\nwith an electric blast?") }, + MSG_NPC(6, _(" Have you ever been hit\nwith an electric blast?")), { 0x2e, 0x15, 0x0006, -0x00000002, 0x00000000, NULL }, ASK3(FALSE, /*default*/ -1, /* speaker */ 6, _(" It'll leave you stunned and\nshaking!")), CHOICE(/* label */ 18, _("No problem!")), @@ -5546,7 +5546,7 @@ 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, _(" Zapdos is wickedly tough!") }, + MSG_NPC(5, _(" Zapdos is wickedly tough!")), ASK3(FALSE, /*default*/ -1, /* speaker */ 5, _(" It might gobble you up for\na snack!\nCan you face that?")), CHOICE(/* label */ 20, _("I'm not scared!")), CHOICE(/* label */ 16, _("Owowow... My stomach!")), @@ -5603,22 +5603,22 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(120), { 0x2e, 0x10, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ......") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Fine.{WAIT_PRESS}\nI see that you have courage.") }, + MSG_NPC(4, _(" ......")), + MSG_NPC(4, _(" Fine.{WAIT_PRESS}\nI see that you have courage.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(455), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yes!") }, + MSG_NPC(1, _(" Yes!")), { 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 {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{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!") }, + MSG_NPC(4, _(" Our two teams should make\nour ways separately through {COLOR YELLOW_D}Mt. Thunder{RESET}.")), + MSG_NPC(4, _(" We will go when we have\ngeared up for battle.")), + MSG_NPC(4, _(" Knowing how strong our\nopponent is, we have no choice but to\nbe cautious.")), + MSG_NPC(4, _(" You should make way for\n{COLOR YELLOW_D}Mt. Thunder{RESET} only when you are fully\nprepared.")), + MSG_NPC(4, _(" Our objective is to rescue\nShiftry!\nLet us find success!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -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...?{WAIT_PRESS}\nLike where the stars and the moon are?\nThat space?") }, + MSG_NPC(1, _(" 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), @@ -6346,7 +6346,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" No way!\nNot a chance!") }, + MSG_NPC(2, _(" No way!\nNot a chance!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -6714,7 +6714,7 @@ 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, {NAME_0}!") }, + MSG_NPC(1, _(" Morning, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -6730,10 +6730,10 @@ 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, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, yeah!") }, + MSG_NPC(1, _(" Oh, yeah!")), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" When I was on the way\nhere, I think there was a commotion at\nPokémon Square.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder if something\nhappened...") }, + MSG_NPC(1, _(" When I was on the way\nhere, I think there was a commotion at\nPokémon Square.")), + MSG_NPC(1, _(" I wonder if something\nhappened...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -6799,11 +6799,11 @@ 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...{WAIT_PRESS}\nWow, that was a real shock!") }, + MSG_NPC(1, _(" 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 }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I never expected everyone\nto attack us like that.") }, + MSG_NPC(1, _(" I never expected everyone\nto attack us like that.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -6850,7 +6850,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ JUMP_LABEL(4), LABEL(3), /* = 0x03 */ { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hah? You're tired?\nWhat are you saying?") }, + MSG_NPC(1, _(" Hah? You're tired?\nWhat are you saying?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -6879,14 +6879,14 @@ 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, _(" ............{WAIT_PRESS}Huh?\nYou had a dream?") }, + MSG_NPC(1, _(" ............{WAIT_PRESS}Huh?\nYou had a dream?")), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And {NAME_7} appeared\nin it?") }, + MSG_NPC(1, _(" 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...") }, + MSG_NPC(1, _(" ...And that made you think\nthat maybe you were that human after\nall...")), { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...So that's what it is.\nThat's what happened...") }, + MSG_NPC(1, _(" ...So that's what it is.\nThat's what happened...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -6917,7 +6917,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh!") }, + MSG_NPC(1, _(" Oh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -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...{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.{WAIT_PRESS}\nWe must get rid of you.") }, + MSG_NPC(2, _(" After that scene in\nPokémon Square...{WAIT_PRESS}\nWe held a town meeting...")), + MSG_NPC(2, _(" On what we must do to\nsave the world...")), + MSG_NPC(2, _(" 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), @@ -6938,9 +6938,9 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ VARIANT_DEFAULT(_(" You're kidding!")), { 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...{WAIT_PRESS}\nIt is unfortunate.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We will...\nDefeat you with all our might!") }, + MSG_NPC(2, _(" I was incredulous too...")), + MSG_NPC(2, _(" I had hoped it would not\ncome to this, but...{WAIT_PRESS}\nIt is unfortunate.")), + MSG_NPC(2, _(" We will...\nDefeat you with all our might!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -6968,38 +6968,38 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ BGM_FADEOUT(90), WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We will give you tonight.") }, + MSG_NPC(2, _(" We will give you tonight.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?") }, + MSG_NPC(1, _(" Huh?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Pack your supplies and get\nout of here.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Come tomorrow, rescue\nteams of all sorts will take up the chase...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And attack you without\nhesitation.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And not just you.") }, + MSG_NPC(2, _(" Pack your supplies and get\nout of here.")), + MSG_NPC(2, _(" Come tomorrow, rescue\nteams of all sorts will take up the chase...")), + MSG_NPC(2, _(" And attack you without\nhesitation.")), + MSG_NPC(2, _(" And not just you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(2, _(" Anyone that goes with\n{NAME_0} will be considered an enemy.")), + MSG_NPC(2, _(" The trackers will attack\nwithout mercy.")), + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nAnd survive.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You must run till you\nuncover the truth.") }, + MSG_NPC(2, _(" Against all odds, you must\nrun.")), + MSG_NPC(2, _(" Run, run...{WAIT_PRESS}\nAnd survive.")), + MSG_NPC(2, _(" 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, _(" {NAME_2}...") }, + MSG_NPC(1, _(" {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.{WAIT_PRESS}\nFarewell.") }, + MSG_NPC(2, _(" 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 }, @@ -7044,7 +7044,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ WAIT(1), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" {NAME_0}.") }, + MSG_NPC(5, _(" {NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -7053,18 +7053,18 @@ 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, _(" {NAME_5}...") }, + MSG_NPC(1, _(" {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, _(" {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, _(" {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}.") }, + MSG_NPC(5, _(" {NAME_0}...\nI made a promise, remember?")), + MSG_NPC(5, _(" That we would make a\nrescue team base here.")), + MSG_NPC(5, _(" That I would join your\nrescue team when I grew up.")), + MSG_NPC(5, _(" {NAME_0}...\nDon't give up.")), + MSG_NPC(5, _(" You're a hero to me,\n{NAME_0}.")), + MSG_NPC(5, _(" I believe in you too,\n{NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -7528,7 +7528,7 @@ static const struct ScriptCommand s_gs9_g50_s3_lives0_dlg0[] = { /* 0x81bf648 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x0b, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?\nAre you ready to leave?") }, + MSG_NPC(1, _(" Huh?\nAre you ready to leave?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, RET, @@ -7632,9 +7632,9 @@ static const struct ScriptCommand s_gs9_g52_s0_lives0_dlg0[] = { /* 0x81bff70 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, 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...{WAIT_PRESS}\nAnd survive.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You must run till you\nuncover the truth.") }, + MSG_NPC(2, _(" Against all odds, you must\nrun.")), + MSG_NPC(2, _(" Run, run...{WAIT_PRESS}\nAnd survive.")), + MSG_NPC(2, _(" You must run till you\nuncover the truth.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, @@ -7743,8 +7743,8 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Caterpie! And Metapod too!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, and even Jumpluff!") }, + MSG_NPC(1, _(" Caterpie! And Metapod too!")), + MSG_NPC(1, _(" Oh, and even Jumpluff!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -7755,13 +7755,13 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wow, I'm glad!\nWe made it!") }, + MSG_NPC(2, _(" Wow, I'm glad!\nWe made it!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 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{NAME_0}.") }, + MSG_NPC(6, _(" 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!") }, @@ -7788,16 +7788,16 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(30), { 0x2e, 0x0d, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Good morning.\nIt's me, Diglett.") }, + MSG_NPC(4, _(" Good morning.\nIt's me, Diglett.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I wanted to send you off\ntoo.") }, + MSG_NPC(4, _(" I wanted to send you off\ntoo.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000008, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Everyone...") }, + MSG_NPC(1, _(" Everyone...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -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{NAME_0}, can you read it?") }, + MSG_NPC(1, _(" 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 }, @@ -7838,28 +7838,28 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _(" - The wandering postal carrier,\n Pelipper -”") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Even Pelipper...") }, + MSG_NPC(1, _(" Even Pelipper...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000008, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sniff...\nEveryone, thank you!") }, + MSG_NPC(1, _(" Sniff...\nEveryone, thank you!")), { 0x30, 0x00, 0x0000, 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, _(" The other Pokémon will\nbe waking up soon.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You have to go!\nHurry!") }, + MSG_NPC(4, _(" The other Pokémon will\nbe waking up soon.")), + MSG_NPC(4, _(" You have to go!\nHurry!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yup.") }, + MSG_NPC(1, _(" Yup.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!\nLet's go! Hit the road!") }, + MSG_NPC(1, _(" {NAME_0}!\nLet's go! Hit the road!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -8003,7 +8003,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives2_dlg0[] = { /* 0x81c1678 */ WAIT(20), TEXTBOX_AUTO_PRESS(60, 60), { 0x2e, 0x0b, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Take care!") }, + MSG_NPC(2, _(" Take care!")), { 0x31, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(-1, -1), { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -8120,7 +8120,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives5_dlg0[] = { /* 0x81c1d74 */ WAIT(110), TEXTBOX_AUTO_PRESS(80, 80), { 0x2e, 0x0b, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" We'll be waiting for both\nof you to return!") }, + MSG_NPC(6, _(" We'll be waiting for both\nof you to return!")), { 0x31, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(-1, -1), { 0xe4, 0x00, 0x0005, 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, {NAME_0}!") }, + MSG_NPC(1, _(" Good morning, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -8471,19 +8471,19 @@ static const struct ScriptCommand s_gs9_g58_s0_lives0_dlg0[] = { /* 0x81c37c8 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We need you at the square!\nEveryone's gathering there.") }, + MSG_NPC(2, _(" We need you at the square!\nEveryone's gathering there.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(469), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Is there something wrong?") }, + MSG_NPC(1, _(" Is there something wrong?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm not really sure...\nShiftry's calling everyone out.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" He's getting the other rescue\nteams to come.") }, + MSG_NPC(2, _(" I'm not really sure...\nShiftry's calling everyone out.")), + MSG_NPC(2, _(" He's getting the other rescue\nteams to come.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, let's go!") }, + MSG_NPC(1, _(" {NAME_0}, let's go!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(5), @@ -8725,7 +8725,7 @@ static const struct ScriptCommand s_gs9_g61_s1_lives0_dlg0[] = { /* 0x81c4db4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?\nAre you ready to leave?") }, + MSG_NPC(1, _(" Huh?\nAre you ready to leave?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, RET, @@ -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, _(" {NAME_0}!") }, + MSG_NPC(2, _(" {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x89, 0x18, 0x0080, 0x00000000, 0x00000000, NULL }, @@ -9590,29 +9590,29 @@ 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, {NAME_2} and\n{NAME_3}.{WAIT_PRESS}\nWhat's the matter?") }, + MSG_NPC(1, _(" 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!{WAIT_PRESS}\nThere's something weird going on!") }, + MSG_NPC(2, _(" 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...?{WAIT_PRESS}\nWeird, how?") }, + MSG_NPC(1, _(" Snubbull is weird...?{WAIT_PRESS}\nWeird, how?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" He looks completely\ndifferent...") }, + MSG_NPC(3, _(" He looks completely\ndifferent...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!\nLet's go to the square!") }, + MSG_NPC(1, _(" {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 }, @@ -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...{WAIT_PRESS}\nI'm Wynaut, and this is...") }, + MSG_NPC(2, _(" Um...{WAIT_PRESS}\nI'm Wynaut, and this is...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -9966,7 +9966,7 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x03, 0x0003, 0x0000006e, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000006e, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -9976,7 +9976,7 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We have a notice on the\nBulletin Board outside the Pelipper Post\nOffice.") }, + MSG_NPC(2, _(" We have a notice on the\nBulletin Board outside the Pelipper Post\nOffice.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -9984,13 +9984,13 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Please look at it for me.\nPlease, please.") }, + MSG_NPC(2, _(" Please look at it for me.\nPlease, please.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -9998,21 +9998,21 @@ 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!!!{WAIT_PRESS}") }, + MSG_NPC(3, _(" 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.{WAIT_PRESS}\nI have to go now.") }, + MSG_NPC(2, _(" Please help me.{WAIT_PRESS}\nI have to go now.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -10201,18 +10201,18 @@ 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, _(" Everyone, thank you for\neverything, really.") }, + MSG_NPC(2, _(" Everyone, thank you for\neverything, really.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes, we're filled with\ngratitude!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This is our thanks.") }, + MSG_NPC(2, _(" Yes, we're filled with\ngratitude!")), + MSG_NPC(2, _(" This is our thanks.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -10226,22 +10226,22 @@ 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, _(" ..................{WAIT_PRESS}\nThis...{WAIT_PRESS}\nA peeled Chestnut?") }, + MSG_NPC(1, _(" ..................{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.{WAIT_PRESS}\nYou see, we...") }, + MSG_NPC(2, _(" 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.") }, + MSG_NPC(2, _(" Don't have any money.")), { 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, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 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.{WAIT_PRESS}\nAre you unhappy?") }, + MSG_NPC(2, _(" 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 }, @@ -10281,11 +10281,11 @@ 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 {NAME_4}\ngang!") }, + MSG_NPC(1, _(" Aww, no, the {NAME_4}\ngang!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet?") }, + MSG_NPC(3, _(" Wobbuffet?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, @@ -10304,23 +10304,23 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" That's right, you!") }, + MSG_NPC(4, _(" That's right, you!")), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x08, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You got lucky!\nYou don't mess with us!") }, + MSG_NPC(4, _(" You got lucky!\nYou don't mess with us!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We're not gonna lose this\ntime!\nWe'll pulverize you!") }, + MSG_NPC(4, _(" We're not gonna lose this\ntime!\nWe'll pulverize you!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Mukkeeeeh!\nCrush them!") }, + MSG_NPC(4, _(" Mukkeeeeh!\nCrush them!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -10332,19 +10332,19 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0x54, 0x00, 0x0029, 0x00000000, 0x00000000, NULL }, BGM_STOP, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Whoa!\nL-look at that!") }, + MSG_NPC(4, _(" Whoa!\nL-look at that!")), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Ch-Chestnut!") }, + MSG_NPC(4, _(" Ch-Chestnut!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" It is!\nIt's a peeled Chestnut!") }, + MSG_NPC(4, _(" It is!\nIt's a peeled Chestnut!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -10361,11 +10361,11 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Whisper, whisper...") }, + MSG_NPC(4, _(" Whisper, whisper...")), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Mutter, mutter...") }, + MSG_NPC(4, _(" Mutter, mutter...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -10374,11 +10374,11 @@ 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...{WAIT_PRESS}\nThey're having a discussion.") }, + MSG_NPC(2, _(" They look like...{WAIT_PRESS}\nThey're having a discussion.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -10394,16 +10394,16 @@ 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.{WAIT_PRESS}\nYou got something we want...") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" That peeled Chestnut you\nhave...{WAIT_PRESS}\nCan we have it?") }, + MSG_NPC(4, _(" ...Uh, listen.{WAIT_PRESS}\nYou got something we want...")), + MSG_NPC(4, _(" 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...{WAIT_PRESS}\nLove peeled Chestnuts!") }, + MSG_NPC(4, _(" We, uh...{WAIT_PRESS}\nLove peeled Chestnuts!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Like, we love them so much,\nwe can't think of a life without Chestnuts!") }, + MSG_NPC(4, _(" Like, we love them so much,\nwe can't think of a life without Chestnuts!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -10411,16 +10411,16 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ VARIANT(/* == */ 1, _(" Why don't you just go get\nChestnuts on your own?")), 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.{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.") }, + MSG_NPC(4, _(" You know how Chestnuts\nhave that spiky shell?")), + MSG_NPC(4, _(" Trying to peel that spiky\nshell... It hurts.{WAIT_PRESS}\nAnd we end up losing our tempers!")), + MSG_NPC(4, _(" 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{NAME_0}, what do you think?") }, + MSG_NPC(1, _(" 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.")), @@ -10432,19 +10432,19 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ WAIT(2), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" What?!\nYou won't give it up for us?!") }, + MSG_NPC(4, _(" What?!\nYou won't give it up for us?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Who do you think you are?!") }, + MSG_NPC(4, _(" Who do you think you are?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Mukkeeeeeh!\nGet them!") }, + MSG_NPC(4, _(" Mukkeeeeeh!\nGet them!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -10489,8 +10489,8 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ WAIT(1), { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Ow, ow, ow...") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ...W-we lost...") }, + MSG_NPC(4, _(" Ow, ow, ow...")), + MSG_NPC(4, _(" ...W-we lost...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -10505,15 +10505,15 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ BGM_FADEIN(30, 1), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ...Maybe we can't do this...") }, + MSG_NPC(4, _(" ...Maybe we can't do this...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You have to understand.\nWe love peeled Chestnuts.") }, + MSG_NPC(4, _(" You have to understand.\nWe love peeled Chestnuts.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Please?\nWe'll do anything you want if you'll just\ngive us your peeled Chestnut...") }, + MSG_NPC(4, _(" Please?\nWe'll do anything you want if you'll just\ngive us your peeled Chestnut...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -10521,8 +10521,8 @@ 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{NAME_0}, what do you think?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The {NAME_4} are saying\nthey'll do anything we want.") }, + MSG_NPC(1, _(" Hmmm...\n{NAME_0}, what do you think?")), + MSG_NPC(1, _(" 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 {NAME_4} gang?")), CHOICE(/* label */ 15, _("Yes.")), @@ -10549,15 +10549,15 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ 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?") }, + MSG_NPC(4, _(" 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...{WAIT_PRESS}\nBut we don't like work.") }, + MSG_NPC(4, _(" 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 }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" But if it's for that\npeeled Chestnut...") }, + MSG_NPC(4, _(" But if it's for that\npeeled Chestnut...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -10570,7 +10570,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ VARIANT_DEFAULT(_(" We were going to make\nour rescue team base something more\nimpressive than this.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Rescue team base?") }, + MSG_NPC(4, _(" Rescue team base?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -10586,41 +10586,41 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Whisper, whisper...") }, + MSG_NPC(4, _(" Whisper, whisper...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Mutter, mutter...") }, + MSG_NPC(4, _(" Mutter, mutter...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" OK.\nWe'll help!") }, + MSG_NPC(4, _(" OK.\nWe'll help!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Really?{WAIT_PRESS}\nYou'll help us?") }, + MSG_NPC(1, _(" 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!") }, + MSG_NPC(4, _(" Yeah.\nLeave it to us!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We'll carry in the materials\nand get the place built. Double-quick!") }, + MSG_NPC(4, _(" We'll carry in the materials\nand get the place built. Double-quick!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ...In return...{WAIT_PRESS}\nHand over that peeled Chestnut.") }, + MSG_NPC(4, _(" ...In return...{WAIT_PRESS}\nHand over that peeled Chestnut.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0007, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" Me too!\nI'll help too!") }, + MSG_NPC(7, _(" Me too!\nI'll help too!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -10628,7 +10628,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ WAIT(1), { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" I'll spit silk for gluing\nthings together!") }, + MSG_NPC(7, _(" I'll spit silk for gluing\nthings together!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe5, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -10638,46 +10638,46 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'll help too!") }, + MSG_NPC(2, _(" I'll help too!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I felt bad because we only\nhad a peeled Chestnut for your reward.") }, + MSG_NPC(2, _(" I felt bad because we only\nhad a peeled Chestnut for your reward.")), { 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, _(" Wobbuffet!!!") }, + MSG_NPC(3, _(" Wobbuffet!!!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sniff...\nThanks, everyone!") }, + MSG_NPC(1, _(" Sniff...\nThanks, everyone!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" OK!{WAIT_PRESS}\nLet's get a move on!") }, + MSG_NPC(4, _(" 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 }, WAIT(30), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" OK!") }, + MSG_NPC(4, _(" OK!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" OK!") }, + MSG_NPC(4, _(" OK!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -11223,23 +11223,23 @@ 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...{WAIT_PRESS}\nOur base is coming along quickly.") }, + MSG_NPC(1, _(" Whew...{WAIT_PRESS}\nOur base is coming along quickly.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000009, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We owe everyone for this.") }, + MSG_NPC(1, _(" We owe everyone for this.")), { 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, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -11250,17 +11250,17 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(80), { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" But there's still lots to do.") }, + MSG_NPC(7, _(" But there's still lots to do.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" We still have difficult\nthings to do.") }, + MSG_NPC(7, _(" We still have difficult\nthings to do.")), { 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, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -11272,7 +11272,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Look!\nOver there!") }, + MSG_NPC(1, _(" Look!\nOver there!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -11302,7 +11302,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" We need to keep working.") }, + MSG_NPC(7, _(" We need to keep working.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -11311,7 +11311,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0b, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Don't wanna.") }, + MSG_NPC(4, _(" Don't wanna.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(455), @@ -11322,25 +11322,25 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(20), { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What?!") }, + MSG_NPC(1, _(" What?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" This work's too boring!{WAIT_PRESS}\nHow do you expect us to keep going?") }, + MSG_NPC(4, _(" 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 }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Yeah, that's right.\nI don't wanna do this anymore.") }, + MSG_NPC(4, _(" Yeah, that's right.\nI don't wanna do this anymore.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We might change our minds\nif you get us more peeled Chestnuts.") }, + MSG_NPC(4, _(" We might change our minds\nif you get us more peeled Chestnuts.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...What is it with these\nguys...?")), VARIANT_DEFAULT(_(" ...What is this about?")), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We just can't be bothered.\nWe need peeled Chestnuts to motivate us.") }, + MSG_NPC(4, _(" We just can't be bothered.\nWe need peeled Chestnuts to motivate us.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -11566,11 +11566,11 @@ static const struct ScriptCommand s_gs9_g77_s0_lives0_dlg2[] = { /* 0x81d1bf4 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_HASITEM(ITEM_CHESTNUT, /* to label */ 0), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hunh?\nDid you bring us a peeled Chestnut?") }, - { 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 {COLOR GREEN_I}Chestnuts{RESET}\nsometimes in {COLOR YELLOW_D}Uproar Forest{RESET}.\nWe want them out of the shell.") }, + MSG_NPC(1, _(" Hunh?\nDid you bring us a peeled Chestnut?")), + MSG_NPC(1, _(" What?!\nYou don't have any?!")), + MSG_NPC(1, _(" Then we can't work!")), + MSG_NPC(1, _(" If you want us to renovate\nyour rescue team base, bring us \na Chestnut. A peeled one!")), + MSG_NPC(1, _(" 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), @@ -11590,11 +11590,11 @@ static const struct ScriptCommand s_gs9_g77_s0_lives1_dlg2[] = { /* 0x81d1e24 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_HASITEM(ITEM_CHESTNUT, /* to label */ 0), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hunh?\nDid you bring us a peeled Chestnut?") }, - { 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 {COLOR GREEN_I}Chestnuts{RESET}\nsometimes in {COLOR YELLOW_D}Uproar Forest{RESET}.\nWe want them out of the shell.") }, + MSG_NPC(1, _(" Hunh?\nDid you bring us a peeled Chestnut?")), + MSG_NPC(1, _(" What?!\nYou don't have any?!")), + MSG_NPC(1, _(" Then we can't work!")), + MSG_NPC(1, _(" If you want us to renovate\nyour rescue team base, bring us \na Chestnut. A peeled one!")), + MSG_NPC(1, _(" 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), @@ -11614,11 +11614,11 @@ static const struct ScriptCommand s_gs9_g77_s0_lives2_dlg2[] = { /* 0x81d1f8c */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_HASITEM(ITEM_CHESTNUT, /* to label */ 0), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hunh?\nDid you bring us a peeled Chestnut?") }, - { 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 {COLOR GREEN_I}Chestnuts{RESET}\nsometimes in {COLOR YELLOW_D}Uproar Forest{RESET}.\nWe want them out of the shell.") }, + MSG_NPC(1, _(" Hunh?\nDid you bring us a peeled Chestnut?")), + MSG_NPC(1, _(" What?!\nYou don't have any?!")), + MSG_NPC(1, _(" Then we can't work!")), + MSG_NPC(1, _(" If you want us to renovate\nyour rescue team base, bring us \na Chestnut. A peeled one!")), + MSG_NPC(1, _(" 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), @@ -11636,7 +11636,7 @@ static const struct ScriptCommand s_gs9_g77_s0_lives3_dlg2[] = { /* 0x81d208c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We're going to work hard!\nWe'll finish the rescue team base!") }, + MSG_NPC(1, _(" We're going to work hard!\nWe'll finish the rescue team base!")), JUMP_SCRIPT(END_TALK), }; @@ -11648,7 +11648,7 @@ static const struct ScriptCommand s_gs9_g77_s0_lives4_dlg2[] = { /* 0x81d2130 */ WAIT(1), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(1, _(" Wobbuffet!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(1), @@ -11709,12 +11709,12 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ { 0xe5, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0b, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Huh?\nDid you bring us a peeled Chestnut?") }, + MSG_NPC(2, _(" Huh?\nDid you bring us a peeled Chestnut?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0e, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh!\nA Chestnut!\nWe want a peeled Chestnut!") }, + MSG_NPC(2, _(" Oh!\nA Chestnut!\nWe want a peeled Chestnut!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0b, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -11728,17 +11728,17 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x0b, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What?!\nYou won't give it up for us?!") }, + MSG_NPC(2, _(" What?!\nYou won't give it up for us?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0e, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Who do you think you are?!") }, + MSG_NPC(2, _(" Who do you think you are?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0b, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Mukkeeeeeh!\nGet them!") }, + MSG_NPC(2, _(" Mukkeeeeeh!\nGet them!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -11758,8 +11758,8 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ { 0x22, 0x00, 0x0028, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0b, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ow, ow, ow...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...W-we lost...") }, + MSG_NPC(2, _(" Ow, ow, ow...")), + MSG_NPC(2, _(" ...W-we lost...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -11784,7 +11784,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0b, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes!\nA peeled Chestnut!") }, + MSG_NPC(2, _(" Yes!\nA peeled Chestnut!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -11794,12 +11794,12 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ { 0xe5, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" All right, you layabouts!\nGet it together! Chop, chop!") }, + MSG_NPC(2, _(" All right, you layabouts!\nGet it together! Chop, chop!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0e, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Why don't you quit lounging\naround yourself?!\nGet moving!") }, + MSG_NPC(2, _(" Why don't you quit lounging\naround yourself?!\nGet moving!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -11809,12 +11809,12 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ { 0xe5, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0b, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We'll get hustling on\nrenovating your rescue team base!") }, + MSG_NPC(2, _(" We'll get hustling on\nrenovating your rescue team base!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, 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!{WAIT_PRESS}\nYou just wait!") }, + MSG_NPC(2, _(" 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), @@ -12113,20 +12113,20 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" We all worked very hard!") }, + MSG_NPC(7, _(" We all worked very hard!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x08, 0x0002, 0x00000001, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It was very hard, but it\nwas worth it!") }, + MSG_NPC(2, _(" It was very hard, but it\nwas worth it!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -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...{WAIT_PRESS}\nThank you!") }, + MSG_NPC(1, _(" 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.{WAIT_PRESS}\nThere's something I want to ask...") }, + MSG_NPC(4, _(" 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 }, @@ -12157,8 +12157,8 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 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...{WAIT_PRESS}\nYou won't bring us peeled Chestnuts\nanymore?") }, + MSG_NPC(4, _(" If this rescue team base is\nfinished...")), + MSG_NPC(4, _(" 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 }, @@ -12179,22 +12179,22 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ WAIT(30), { 0x2e, 0x10, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, -0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ............") }, + MSG_NPC(4, _(" ............")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0c, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ........................") }, + MSG_NPC(4, _(" ........................")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ....................................") }, + MSG_NPC(4, _(" ....................................")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe5, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Ukkeeeeeeeeh!") }, + MSG_NPC(4, _(" Ukkeeeeeeeeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CLEAR_ARRAY(EVENT_LOCAL), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), @@ -12211,7 +12211,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wh-what?!") }, + MSG_NPC(1, _(" Wh-what?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(10), { 0xe5, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -12544,7 +12544,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0e, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Thank you so much.\nYou saved me from great peril.") }, + MSG_NPC(2, _(" Thank you so much.\nYou saved me from great peril.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -12558,9 +12558,9 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That is...") }, + MSG_NPC(2, _(" That is...")), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh!") }, + MSG_NPC(2, _(" Oh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -12571,12 +12571,12 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ WAIT(15), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Look, there he is!") }, + MSG_NPC(3, _(" Look, there he is!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yeah, I see him.\nWe've got to get him back quick!") }, + MSG_NPC(3, _(" Yeah, I see him.\nWe've got to get him back quick!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -12599,7 +12599,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ 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...{WAIT_PRESS}\nMy friends.") }, + MSG_NPC(2, _(" They're...{WAIT_PRESS}\nMy friends.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -12608,23 +12608,23 @@ 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.{WAIT_PRESS}\nThe grown-up ritual is ready for you.") }, + MSG_NPC(3, _(" 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 }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Quit fighting this.\nHave the paw print applied without a fuss.") }, + MSG_NPC(3, _(" Quit fighting this.\nHave the paw print applied without a fuss.")), { 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 }, { 0x2f, 0x00, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" N-no!") }, + MSG_NPC(2, _(" N-no!")), WAIT(20), { 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...{WAIT_PRESS}\nI'd rather not become a grown-up!") }, + MSG_NPC(2, _(" 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), @@ -12638,45 +12638,45 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 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 {POKEMON_2}.") }, + MSG_NPC(3, _(" It is a custom among us {POKEMON_2}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" When we reach a certain age, they\nmark our backs with paw prints to show\nwe are grown-ups.") }, + MSG_NPC(3, _(" When we reach a certain age, they\nmark our backs with paw prints to show\nwe are grown-ups.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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...{WAIT_PRESS}\nand pushing doooooowwnn on the back...") }, + MSG_NPC(3, _(" 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 }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I can't live with anything\nso tasteless.") }, + MSG_NPC(2, _(" I can't live with anything\nso tasteless.")), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I have dreams of creating\ngreat art, so I have certain standards\nfor design that I swear by.") }, + MSG_NPC(2, _(" I have dreams of creating\ngreat art, so I have certain standards\nfor design that I swear by.")), { 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, _(" ...I know!{WAIT_PRESS}\nI have decided!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I shall join {NAME_0}'s\nrescue team!") }, + MSG_NPC(2, _(" ...I know!{WAIT_PRESS}\nI have decided!")), + MSG_NPC(2, _(" I shall join {NAME_0}'s\nrescue team!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I will participate in your\nrescue activities!") }, + MSG_NPC(2, _(" I will participate in your\nrescue activities!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 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!{WAIT_PRESS}\nThis is where I will dedicate myself!") }, + MSG_NPC(2, _(" 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 }, @@ -12697,14 +12697,14 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Is... Is that so?\nThen there is nothing we can do.") }, + MSG_NPC(3, _(" Is... Is that so?\nThen there is nothing we can do.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We will inform our elders of your\ndecision.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We wish you luck in your new career\nas a rescuer.") }, + MSG_NPC(3, _(" We will inform our elders of your\ndecision.")), + MSG_NPC(3, _(" We wish you luck in your new career\nas a rescuer.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -12713,13 +12713,13 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(45), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, wow...\nThat's one pushy way of getting a job.") }, + MSG_NPC(1, _(" Oh, wow...\nThat's one pushy way of getting a job.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But, that's OK.") }, + MSG_NPC(1, _(" But, that's OK.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -12733,16 +12733,16 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes!\nThank you!") }, + MSG_NPC(2, _(" Yes!\nThank you!")), { 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...{WAIT_PRESS}\nLet me see...") }, + MSG_NPC(2, _(" One thing I am good at is\ndrawing and painting.")), + MSG_NPC(2, _(" For example...{WAIT_PRESS}\nLet me see...")), { 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, _(" Ah, how about that?") }, + MSG_NPC(2, _(" Ah, how about that?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -12756,9 +12756,9 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Observe, the design of that\nflag.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I could perhaps redesign\nthe flag?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If you wish to alter the\nflag's design, you must tell me, please.") }, + MSG_NPC(2, _(" Observe, the design of that\nflag.")), + MSG_NPC(2, _(" I could perhaps redesign\nthe flag?")), + MSG_NPC(2, _(" If you wish to alter the\nflag's design, you must tell me, please.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x1d, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(1, /* to label */ 16), @@ -12777,16 +12777,16 @@ 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 {COLOR GREEN}Sky Blue Plains{RESET}.\nUntil then...") }, + MSG_NPC(2, _(" 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...{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.") }, + MSG_NPC(2, _(" ...But wait! I see that\nmy Friend Area is full...{WAIT_PRESS}\nThis is most unfortunate.")), + MSG_NPC(2, _(" I could join your rescue\nteam if there were room for me in the\n{COLOR GREEN}Sky Blue Plains{RESET}...")), + MSG_NPC(2, _(" Please speak with me\nagain then.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -13031,22 +13031,22 @@ static const struct ScriptCommand s_gs9_g80_s0_lives0_dlg2[] = { /* 0x81d829c */ WAIT(1), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Pshehehehehe!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That Lombre... He amuses\nme so!\nPshehehehehe!") }, + MSG_NPC(1, _(" Pshehehehehe!")), + MSG_NPC(1, _(" That Lombre... He amuses\nme so!\nPshehehehehe!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, long time no see.\nYou are well?") }, + MSG_NPC(1, _(" Oh, long time no see.\nYou are well?")), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You see, I have heard about\nLombre's tale.\nIt is too funny.") }, + MSG_NPC(1, _(" You see, I have heard about\nLombre's tale.\nIt is too funny.")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I have heard that Lombre\nalmost drowned at sea!") }, + MSG_NPC(1, _(" I have heard that Lombre\nalmost drowned at sea!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But that Lombre--he lives\nin water! How very pathetic!\nPshehehehehe!") }, + MSG_NPC(1, _(" But that Lombre--he lives\nin water! How very pathetic!\nPshehehehehe!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, JUMPIF_SCENE_GT(SCENARIO_SUB2, 33, 2, /* to label */ 1), @@ -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, {NAME_2}, long time!{WAIT_PRESS}\nYou're here to visit us?") }, + MSG_NPC(1, _(" 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), @@ -13127,21 +13127,21 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, CALL_SCRIPT(SHOCK_FUNC), { 0x2e, 0x0b, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kwaaaaaah!") }, + MSG_NPC(2, _(" Kwaaaaaah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wrong!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Shopping in Pokémon\nSquare is what I came to do.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I come here only because\nit is on the way...\nThis is not very important.") }, + MSG_NPC(2, _(" Wrong!")), + MSG_NPC(2, _(" Shopping in Pokémon\nSquare is what I came to do.")), + MSG_NPC(2, _(" I come here only because\nit is on the way...\nThis is not very important.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(470), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh...\nIs that all...") }, + MSG_NPC(1, _(" Oh...\nIs that all...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Hey, {NAME_2}!") }, @@ -13158,19 +13158,19 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, 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, {NAME_2}.") }, + MSG_NPC(3, _(" Oh, hey!\nThere you are!")), + MSG_NPC(3, _(" 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?") }, + MSG_NPC(2, _(" What is it?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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?") }, + MSG_NPC(3, _(" Well, to the northeast of\n{COLOR YELLOW_D}Mt. Thunder{RESET}...")), + MSG_NPC(3, _(" There's a gigantic cave!")), + MSG_NPC(3, _(" 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 {NAME_2}\nwould know something...") }, + MSG_NPC(3, _(" So, I figured {NAME_2}\nwould know something...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), WAIT(60), @@ -13179,7 +13179,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, CALL_SCRIPT(SHOCK_FUNC), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kwaaaah!") }, + MSG_NPC(2, _(" Kwaaaah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe5, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -13187,16 +13187,16 @@ 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...{WAIT_PRESS}\nThe {COLOR YELLOW_D}Meteor Cave{RESET}.") }, + MSG_NPC(2, _(" 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, _(" {COLOR YELLOW_D}Meteor Cave{RESET}?") }, + MSG_NPC(1, _(" {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...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Its pieces broken, they\nscattered across the skies.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" One tumbled to earth.\nIt fell into a mountain, and made the\ncavern you speak of.") }, + MSG_NPC(2, _(" It was when Rayquaza\ndestroyed the falling star...")), + MSG_NPC(2, _(" Its pieces broken, they\nscattered across the skies.")), + MSG_NPC(2, _(" One tumbled to earth.\nIt fell into a mountain, and made the\ncavern you speak of.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -13209,14 +13209,14 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ 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{COLOR YELLOW_D}Meteor Cave{RESET}?") }, + MSG_NPC(1, _(" 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...{WAIT_PRESS}\nJust a little...") }, + MSG_NPC(3, _(" 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...") }, + MSG_NPC(3, _(" But the place was crawling\nwith these weird things...")), + MSG_NPC(3, _(" It freaked me out.\nI couldn't stay there long...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -13228,12 +13228,12 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 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?!") }, + MSG_NPC(3, _(" What's that?!")), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Hey, you, {NAME_1}.{WAIT_PRESS}\nIf you were to see that dungeon, you'd be\nintimidated too!") }, + MSG_NPC(3, _(" 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.") }, + MSG_NPC(3, _(" I've never seen anything\nlike it before...")), + MSG_NPC(3, _(" There were downright\nbizarre things in there that I'm not\nsure were even Pokémon.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -13243,23 +13243,23 @@ 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, _(" {NAME_2}, do you have\nany idea what are in that place?") }, + MSG_NPC(3, _(" {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.{WAIT_PRESS}\nI do not know...") }, + MSG_NPC(2, _(" ...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...{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.") }, + MSG_NPC(2, _(" However...{WAIT_PRESS}\nThat cavern. The collision that caused \nit had to be enormous.")), + MSG_NPC(2, _(" If there were things that\nsurvived the crash...")), + MSG_NPC(2, _(" Perhaps...\nOf this world they may not be.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" You mean...{WAIT_PRESS}\nThey came from that falling star?") }, + MSG_NPC(3, _(" You mean...{WAIT_PRESS}\nThey came from that falling star?")), { 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, _(" Perhaps that is so...") }, + MSG_NPC(2, _(" Perhaps that is so...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -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, _(" {NAME_2}!{WAIT_PRESS}\nYou're safe! Yesssss!") }, + MSG_NPC(3, _(" {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, {NAME_3}.{WAIT_PRESS}\nThat dungeon--it was too much for me.") }, + MSG_NPC(2, _(" 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.{WAIT_PRESS}\nI appreciate it〜♪") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nMy body--it hurts all over even now...") }, + MSG_NPC(2, _(" 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 }, @@ -13571,23 +13571,23 @@ static const struct ScriptCommand s_gs9_g84_s0_lives0_dlg0[] = { /* 0x81da9c8 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...But that dungeon...\nWhat is it about it?") }, + MSG_NPC(2, _(" ...But that dungeon...\nWhat is it about it?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They say it makes a wish\ncome true. So, I went...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But it was very hard in\nthere--most terribly so!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kiiih!\nI never want to go again!\nSuch a terrible place!") }, + MSG_NPC(2, _(" They say it makes a wish\ncome true. So, I went...")), + MSG_NPC(2, _(" But it was very hard in\nthere--most terribly so!")), + MSG_NPC(2, _(" Kiiih!\nI never want to go again!\nSuch a terrible place!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 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...") }, + MSG_NPC(2, _(" 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.{WAIT_PRESS}\nHere! Your reward for my rescue〜♪") }, + MSG_NPC(2, _(" 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,15 +13600,15 @@ 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 {COLOR YELLOW_D}Wish Cave{RESET}...\nTo its very depths...") }, + MSG_NPC(2, _(" 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!{WAIT_PRESS}\nA wish--it comes true!") }, + MSG_NPC(2, _(" 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?") }, + MSG_NPC(2, _(" You see〜♪\nA rich reward, won't you agree?")), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(2, _(" 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〜♪") }, + MSG_NPC(2, _(" For me, it was impossible.\nBut you must try〜♪")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -13656,11 +13656,11 @@ static const struct ScriptCommand s_gs9_g84_s0_lives1_dlg2[] = { /* 0x81db3d8 */ DEBUGINFO, { 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!{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...{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〜♪") }, + MSG_NPC(1, _(" They say if you take that\nWish Stone to the Wish Cave...\nTo its very depths...")), + MSG_NPC(1, _(" Wonder of wonders!{WAIT_PRESS}\nA wish--it comes true!")), + MSG_NPC(1, _(" You see〜♪\nA rich reward, won't you agree?")), + MSG_NPC(1, _(" However...{WAIT_PRESS}\nIf you lose that {COLOR GREEN_I}Wish Stone{RESET} on\nthe way, the wish cannot come true.")), + MSG_NPC(1, _(" For me, it was impossible.\nBut you must try〜♪")), JUMP_SCRIPT(END_TALK), }; @@ -13691,8 +13691,8 @@ static const struct ScriptCommand s_gs9_g84_s0_lives2_dlg2[] = { /* 0x81db5e8 */ DEBUGINFO, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I give up too.\nI'll live with my weak chin.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Well, just give it a try\nand make that wish come true!") }, + MSG_NPC(1, _(" I give up too.\nI'll live with my weak chin.")), + MSG_NPC(1, _(" Well, just give it a try\nand make that wish come true!")), JUMP_SCRIPT(END_TALK), }; @@ -13793,15 +13793,15 @@ static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 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 {COLOR CYAN}{TEAM_NAME}{RESET}! Kekeke!") }, + MSG_NPC(2, _(" Kekeh!\nLate riser!")), + MSG_NPC(2, _(" 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!{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.") }, + MSG_NPC(2, _(" ...Tchah!{WAIT_PRESS}\nBut that's not what I came here to say.\nNot today.")), + MSG_NPC(2, _(" It irks me to say this, but...{WAIT_PRESS}\nI need your help.")), + MSG_NPC(2, _(" Can you take me up\n{COLOR YELLOW_D}Mt. Freeze{RESET}?")), + MSG_NPC(2, _(" I tried going up over and\nover, but...{WAIT_PRESS} Keh...\nIt's steep and harsh...")), + MSG_NPC(2, _(" Ninetales is up on\n{COLOR YELLOW_D}Mt. Freeze{RESET}.")), + MSG_NPC(2, _(" 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.{WAIT_PRESS}\nTake me up {COLOR YELLOW_D}Mt. Freeze{RESET}.")), CHOICE(/* label */ 2, _("Yes.")), @@ -13812,22 +13812,22 @@ static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ SELECT_ENTITIES(-1, 2), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keke! That's settled!\nYou have my trust!") }, + MSG_NPC(2, _(" Keke! That's settled!\nYou have my trust!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(4), LABEL(3), /* = 0x03 */ { 0x2e, 0x15, 0x0002, 0x00000043, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keh!\nYeah, I saw that coming!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm the fool here for even\nbelieving in you lot.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Who needs your help?\nI'll be seeing you around!") }, + MSG_NPC(2, _(" Keh!\nYeah, I saw that coming!")), + MSG_NPC(2, _(" I'm the fool here for even\nbelieving in you lot.")), + MSG_NPC(2, _(" Who needs your help?\nI'll be seeing you around!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), SELECT_ENTITIES(-1, 3), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(2, _(" ............{WAIT_PRESS}\nI'd like to say that, but I need your help.")), + MSG_NPC(2, _(" 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.{WAIT_PRESS}\nTake me up {COLOR YELLOW_D}Mt. Freeze{RESET}!")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), @@ -13841,9 +13841,9 @@ static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ BGM_SWITCH(1), WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 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 {COLOR YELLOW_D}Mt. Freeze{RESET}. Keke!") }, + MSG_NPC(2, _(" The only place I want to go\nis {COLOR YELLOW_D}Mt. Freeze{RESET}.")), + MSG_NPC(2, _(" I'm not about to tag along\nif you're going to other dungeons.")), + MSG_NPC(2, _(" 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 {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 {COLOR YELLOW_D}Mt. Freeze{RESET}. Keke!") }, + MSG_NPC(1, _(" The only place I want to go\nis {COLOR YELLOW_D}Mt. Freeze{RESET}.")), + MSG_NPC(1, _(" I'm not about to tag along\nif you're going to other dungeons.")), + MSG_NPC(1, _(" I'll only tag along when you\ngo off to {COLOR YELLOW_D}Mt. Freeze{RESET}. Keke!")), JUMP_SCRIPT(END_TALK), }; @@ -13921,9 +13921,9 @@ static const struct ScriptCommand s_gs9_g88_s0_lives0_dlg0[] = { /* 0x81dc6c4 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, 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{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!") }, + MSG_NPC(2, _(" Keke!\nYou did good today.")), + MSG_NPC(2, _(" Next, we go to that\n{COLOR YELLOW_D}Murky Cave{RESET} place...")), + MSG_NPC(2, _(" 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 }, HALT, @@ -13942,11 +13942,11 @@ static const struct ScriptCommand s_gs9_g88_s0_lives1_dlg2[] = { /* 0x81dc878 */ DEBUGINFO, { 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!{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...{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〜♪") }, + MSG_NPC(1, _(" They say, if you take that\nWish Stone to the Wish Cave...\nTo its very depths...")), + MSG_NPC(1, _(" Wonder of wonders!{WAIT_PRESS}\nA wish--it comes true!")), + MSG_NPC(1, _(" You see〜♪\nA rich reward, won't you agree?")), + MSG_NPC(1, _(" However...{WAIT_PRESS}\nIf you lose that {COLOR GREEN_I}Wish Stone{RESET} on\nthe way, the wish cannot come true.")), + MSG_NPC(1, _(" For me, it was impossible.\nBut you must try〜♪")), JUMP_SCRIPT(END_TALK), }; @@ -13976,7 +13976,7 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nLate riser!") }, + MSG_NPC(2, _(" Kekeh!\nLate riser!")), 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.")), @@ -13985,31 +13985,31 @@ 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 {COLOR YELLOW_D}Murky Cave{RESET}!") }, + MSG_NPC(2, _(" 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...") }, + MSG_NPC(2, _(" Gardevoir's physical form...\nThat's where it is.")), + MSG_NPC(2, _(" For my sake, Gardevoir...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 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}!") }, + MSG_NPC(2, _(" ...Nah, that's not important.{WAIT_PRESS}\nI just feel like going! Keke!")), + MSG_NPC(2, _(" ...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 */ { 0x2e, 0x15, 0x0002, 0x00000043, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keh!\nIs that right.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" See you around!\nKeke!") }, + MSG_NPC(2, _(" Keh!\nIs that right.")), + MSG_NPC(2, _(" See you around!\nKeke!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 2), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, - { 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...") }, + MSG_NPC(2, _(" ............{WAIT_PRESS}\nI thought that, but I need your help.")), + MSG_NPC(2, _(" I have to go to the\n{COLOR YELLOW_D}Murky Cave{RESET}.\nI'm prepared to do whatever it takes.")), + MSG_NPC(2, _(" 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.{WAIT_PRESS}\nTake me to the {COLOR YELLOW_D}Murky Cave{RESET}!")), CHOICE(/* label */ 2, _("Yes.")), @@ -14024,9 +14024,9 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ 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 {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 {COLOR YELLOW_D}Murky Cave{RESET}. Keke!") }, + MSG_NPC(2, _(" The only place I want to go\nis the {COLOR YELLOW_D}Murky Cave{RESET}.")), + MSG_NPC(2, _(" I'm not about to tag along\nif you're going to other dungeons.")), + MSG_NPC(2, _(" 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 {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 {COLOR YELLOW_D}Murky Cave{RESET}. Keke!") }, + MSG_NPC(1, _(" The only place I want to go\nis the {COLOR YELLOW_D}Murky Cave{RESET}.")), + MSG_NPC(1, _(" I'm not about to tag along\nif you're going to other dungeons.")), + MSG_NPC(1, _(" I'll only tag along when you\ngo off to the {COLOR YELLOW_D}Murky Cave{RESET}. Keke!")), JUMP_SCRIPT(END_TALK), }; @@ -14109,21 +14109,21 @@ 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...{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.") }, + MSG_NPC(3, _(" Thank you so much...{WAIT_PRESS}\nMy curse has been lifted.")), + MSG_NPC(3, _(" You did this for me, even\nthough I had never met you before...{WAIT_PRESS}\nI have no idea how to thank you...")), + MSG_NPC(3, _(" From the bottom of my\nheart...")), + MSG_NPC(3, _(" 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, _(" ............{WAIT_PRESS}\nGood for you, {NAME_3}.") }, + MSG_NPC(2, _(" ............{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, {NAME_0}.\nThanks for getting me through this.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This is my thanks.") }, + MSG_NPC(2, _(" Hey, {NAME_0}.\nThanks for getting me through this.")), + MSG_NPC(2, _(" This is my thanks.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -14131,32 +14131,32 @@ static const struct ScriptCommand s_gs9_g91_s0_lives0_dlg0[] = { /* 0x81dd410 */ { 0x3c, 0x2c, 0x0000, 0x00000009, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Adios.") }, + MSG_NPC(2, _(" Adios.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), BGM_FADEOUT(60), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh, wait, please!") }, + MSG_NPC(3, _(" Oh, wait, please!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What is it now?") }, + MSG_NPC(2, _(" What is it now?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Your name...{WAIT_PRESS}\nPlease, what is your name?") }, + MSG_NPC(3, _(" Your name...{WAIT_PRESS}\nPlease, what is your name?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keh!") }, + MSG_NPC(2, _(" Keh!")), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The name's {NAME_2}.{WAIT_PRESS}\nGlad to meet you.") }, + MSG_NPC(2, _(" 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 {NAME_3}.{WAIT_PRESS}\nI am also glad to meet you.") }, + MSG_NPC(3, _(" 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 2659c1551..6c24d1352 100644 --- a/src/data/ground/ground_data_b01p02a_station.h +++ b/src/data/ground/ground_data_b01p02a_station.h @@ -502,27 +502,27 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ { 0x2e, 0x0e, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, -0x00000001, 0x00000000, NULL }, { 0x2d, 0x03, 0x0002, 0x00000073, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm named Spinda.") }, + MSG_NPC(2, _(" I'm named Spinda.")), { 0x2d, 0x09, 0x0002, 0x00000073, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I like to travel.") }, + MSG_NPC(2, _(" I like to travel.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I've been traveling all over\nseeing the sights and other Pokémon.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It was on my travels that\nI heard rumors of a mirage Pokémon...") }, + MSG_NPC(2, _(" I've been traveling all over\nseeing the sights and other Pokémon.")), + MSG_NPC(2, _(" It was on my travels that\nI heard rumors of a mirage Pokémon...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" A mirage Pokémon?") }, + MSG_NPC(1, _(" A mirage Pokémon?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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!{WAIT_PRESS}\nIsn't it exciting?") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nFinally, I became dizzy from fatigue...{WAIT_PRESS}\nAnd I must have passed out.") }, + MSG_NPC(2, _(" Ever since then, I've been\ntraveling all over in hopes of seeing\nthe mirage Pokémon...")), + MSG_NPC(2, _(" 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,8 +531,8 @@ 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...{WAIT_PRESS}\nI'm giving up on my quest...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm simply worn out...") }, + MSG_NPC(2, _(" I...{WAIT_PRESS}\nI'm giving up on my quest...")), + MSG_NPC(2, _(" I'm simply worn out...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -545,14 +545,14 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 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...") }, + MSG_NPC(2, _(" But I...{WAIT_PRESS}\nI've reached my physical limit...")), + MSG_NPC(2, _(" 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), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Please, I want you to\nhave this.") }, + MSG_NPC(2, _(" ...Please, I want you to\nhave this.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_STOP, @@ -570,19 +570,19 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What is this?") }, + MSG_NPC(1, _(" What is this?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's a...{WAIT_PRESS}\n{COLOR GREEN_I}Clear Wing{RESET}...") }, + MSG_NPC(2, _(" 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?") }, + MSG_NPC(1, _(" Clear Wing?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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...") }, + MSG_NPC(2, _(" Yes.{WAIT_PRESS}\nI found it on my travels.")), + MSG_NPC(2, _(" 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), @@ -590,13 +590,13 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" See? Depending on the light,\nit takes on many different colors.") }, + MSG_NPC(2, _(" See? Depending on the light,\nit takes on many different colors.")), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, CANCEL_EFFECTS(9, 2), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" At first I thought it\nwas just pretty to look at...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But after checking around,\nit appears to be related to the mirage\nPokémon somehow.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But I couldn't learn anything\nbeyond that.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Sniff...\nIt's very disappointing, but I'm giving up...") }, + MSG_NPC(2, _(" At first I thought it\nwas just pretty to look at...")), + MSG_NPC(2, _(" But after checking around,\nit appears to be related to the mirage\nPokémon somehow.")), + MSG_NPC(2, _(" But I couldn't learn anything\nbeyond that.")), + MSG_NPC(2, _(" ...Sniff...\nIt's very disappointing, but I'm giving up...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -622,7 +622,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ { 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.{WAIT_PRESS}\nBye.") }, + MSG_NPC(2, _(" 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, _(" {COLOR GREEN}Clear Wing{RESET}, huh...{WAIT_PRESS}\nI don't have a clue what this is all about...") }, + MSG_NPC(1, _(" {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 }, @@ -1594,16 +1594,16 @@ static const struct ScriptCommand s_gs12_g20_s0_lives0_dlg0[] = { /* 0x81e8394 * WAIT(30), BGM_FADEIN(60, 1), { 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 {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, {NAME_0}.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_3} was abducted\nby a Pokémon named {NAME_4}.") }, + MSG_NPC(2, _(" Last night, during the\nearthquake...")), + MSG_NPC(2, _(" Our child {NAME_3} was\nattacked...")), + MSG_NPC(2, _(" He was whisked away to\nthe peak of a tall mountain.")), + MSG_NPC(2, _(" We couldn't possibly climb\nsomewhere so high up...")), + MSG_NPC(2, _(" That is why we must call\nupon you for your help, {NAME_0}.")), + MSG_NPC(2, _(" {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!{WAIT_PRESS}\nWe must go!") }, + MSG_NPC(2, _(" It's a vilely vicious ruffian!\nPlease do be careful.")), + MSG_NPC(2, _(" Please, we need your help!{WAIT_PRESS}\nWe must go!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -2354,9 +2354,9 @@ 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, _(" {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!") }, + MSG_NPC(1, _(" {NAME_0}!\nThere's a commotion down at the square!")), + MSG_NPC(1, _(" A lot of Pokémon have\nalready gathered there.")), + MSG_NPC(1, _(" Let's go to the square right\nnow!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(5), @@ -2474,27 +2474,27 @@ 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?{WAIT_PRESS}\nHorrible, isn't it? Keke!") }, + MSG_NPC(1, _(" 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...{WAIT_PRESS}\nDidn't expect that.") }, + MSG_NPC(1, _(" 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!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll expose what's in your\nheart with Dream Eater! Kekeke!") }, + MSG_NPC(1, _(" But who cares?\nSomeone like that's sure to be some\nlowlife. Keke!")), + MSG_NPC(1, _(" I'll expose you yet!")), + MSG_NPC(1, _(" I'll expose what's in your\nheart with Dream Eater! Kekeke!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(90), FANFARE_PLAY2(464), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hm?!{WAIT_PRESS}\nSomething's coming!") }, + MSG_NPC(1, _(" 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?{WAIT_PRESS}\nIt's coming closer?") }, + MSG_NPC(1, _(" 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), diff --git a/src/data/ground/ground_data_d01p01_station.h b/src/data/ground/ground_data_d01p01_station.h index d02eb7325..e730060dd 100644 --- a/src/data/ground/ground_data_d01p01_station.h +++ b/src/data/ground/ground_data_d01p01_station.h @@ -218,26 +218,26 @@ 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 {NAME_3} fell into a cavern!\nMy poor baby!") }, + MSG_NPC(2, _(" 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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What?!") }, + MSG_NPC(1, _(" What?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(12), - { 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!") }, + MSG_NPC(2, _(" A huge fissure opened in\nthe ground, and my {NAME_3} fell in!")), + MSG_NPC(2, _(" He's too young to crawl out\nby himself!")), + MSG_NPC(2, _(" 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?{WAIT_PRESS}\nBy other Pokémon?") }, + MSG_NPC(1, _(" 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...{WAIT_PRESS}\nWhat will become of my baby?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh! What am I to do?!\nOh dear, oh dear...") }, + MSG_NPC(2, _(" They must be enraged by\nthe fissure...and out of control!\nThat's what I think.")), + MSG_NPC(2, _(" I'm not strong enough to\nfend off those wild Pokémon...{WAIT_PRESS}\nWhat will become of my baby?")), + MSG_NPC(2, _(" Oh! What am I to do?!\nOh dear, oh dear...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -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?{WAIT_PRESS}\nHello!") }, + MSG_NPC(0, _(" ...Hello?{WAIT_PRESS}\nHello!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -400,7 +400,7 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - FANFARE_PLAY2(468), WAIT(50), FANFARE_STOP2(468), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, my goodness!\nI'm so glad you came to!") }, + MSG_NPC(2, _(" Oh, my goodness!\nI'm so glad you came to!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x08, 0x0002, 0x00000004, 0x00000000, NULL }, @@ -408,11 +408,11 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wh-where...?") }, + MSG_NPC(1, _(" Wh-where...?")), { 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 {NAME_3}, but...") }, + MSG_NPC(2, _(" In the forest.")), + MSG_NPC(2, _(" 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), @@ -423,12 +423,12 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - { 0x91, 0x08, 0x0001, 0x00000002, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I guess if we're defeated\nin there, we don't get to advance.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's a mysterious dungeon,\nI guess.") }, + MSG_NPC(1, _(" I guess if we're defeated\nin there, we don't get to advance.")), + MSG_NPC(1, _(" It's a mysterious dungeon,\nI guess.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ohh!\nIs my poor {NAME_3} safe?!\nOh dear, oh dear...") }, + MSG_NPC(2, _(" 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 }, @@ -540,7 +540,7 @@ 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...{WAIT_PRESS}\nI'm sorry, I don't know how I could ever\nthank you properly...") }, + MSG_NPC(2, _(" 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 }, @@ -551,7 +551,7 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - VARIANT_DEFAULT(_(" It was great to find your\nlittle boy unharmed.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Please, may I have your\nnames at least?") }, + MSG_NPC(2, _(" Please, may I have your\nnames at least?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -561,13 +561,13 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - 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 {NAME_0}.") }, + MSG_NPC(1, _(" 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, _(" ............{WAIT_PRESS}\nCool...") }, + MSG_NPC(3, _(" ............{WAIT_PRESS}\nCool...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -588,10 +588,10 @@ 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{NAME_1} and {NAME_0}!") }, + MSG_NPC(3, _(" 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.") }, + MSG_NPC(2, _(" I know it isn't really\nenough, but this is a token of our\nthanks. Please accept it.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -606,7 +606,7 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - WAIT(60), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Thank you so much.\nGood-bye.") }, + MSG_NPC(2, _(" Thank you so much.\nGood-bye.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d01p02_station.h b/src/data/ground/ground_data_d01p02_station.h index 801df9aa5..04e9284e8 100644 --- a/src/data/ground/ground_data_d01p02_station.h +++ b/src/data/ground/ground_data_d01p02_station.h @@ -43,29 +43,29 @@ static const struct ScriptCommand s_gs179_g1_s0_lives0_dlg0[] = { /* 0x822fdd0 - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Waaaaah...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Mommy...\nWhere are you...? Sniffle...") }, + MSG_NPC(2, _(" Waaaaah...")), + MSG_NPC(2, _(" Mommy...\nWhere are you...? Sniffle...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We came to rescue you.") }, + MSG_NPC(1, _(" We came to rescue you.")), { 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, _(" Huh?") }, + MSG_NPC(2, _(" Huh?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Your mom's waiting.\nLet's get you out!") }, + MSG_NPC(1, _(" Your mom's waiting.\nLet's get you out!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" OK.") }, + MSG_NPC(2, _(" OK.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, diff --git a/src/data/ground/ground_data_d02p01_station.h b/src/data/ground/ground_data_d02p01_station.h index 49d766f70..c5bac4bf5 100644 --- a/src/data/ground/ground_data_d02p01_station.h +++ b/src/data/ground/ground_data_d02p01_station.h @@ -58,9 +58,9 @@ static const struct ScriptCommand s_gs180_g1_s0_lives0_dlg0[] = { /* 0x823047c * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x0a, 0x0000, 0x00000001, 0x00000000, NULL }, { 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{VALUE_0}F. PLEASE HELP THEM!\nBZBZBZZZT!") }, + MSG_NPC(2, _(" OH, YOU ARE HERE.\nBZBZBZZ!")), + MSG_NPC(2, _(" MY FRIENDS ARE IN THIS\nCAVERN. BZBZBZZ.")), + MSG_NPC(2, _(" 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,7 +173,7 @@ 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 {NAME_2} are in\nthere somewhere.") }, + MSG_NPC(1, _(" 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 }, @@ -264,25 +264,25 @@ static const struct ScriptCommand s_gs180_g3_s0_lives0_dlg0[] = { /* 0x8231020 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" OUR BODIES SEPARATED.\nBZBZBZZ. REJOICE! BZBZBZZT!") }, + MSG_NPC(4, _(" OUR BODIES SEPARATED.\nBZBZBZZ. REJOICE! BZBZBZZT!")), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 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, _(" YAY! BZBZBZZT!") }, + MSG_NPC(5, _(" YAY! BZBZBZZT!")), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" YAY! BZBZBZZT!") }, + MSG_NPC(4, _(" YAY! BZBZBZZT!")), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 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, _(" BE THANKFUL, YOU TWO.") }, + MSG_NPC(3, _(" BE THANKFUL, YOU TWO.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -294,7 +294,7 @@ static const struct ScriptCommand s_gs180_g3_s0_lives0_dlg0[] = { /* 0x8231020 * { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" YOU ARE OUR HERO.\nTHANK YOU. BZBZBZZ!") }, + MSG_NPC(2, _(" YOU ARE OUR HERO.\nTHANK YOU. BZBZBZZ!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x3c, 0x2b, 0x0000, 0x00000003, 0x00000001, NULL }, diff --git a/src/data/ground/ground_data_d03p01_station.h b/src/data/ground/ground_data_d03p01_station.h index cda17c5e2..96c417033 100644 --- a/src/data/ground/ground_data_d03p01_station.h +++ b/src/data/ground/ground_data_d03p01_station.h @@ -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 {VALUE_0}F!\nThank you for helping! Farewell!") }, + MSG_NPC(2, _(" 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 }, @@ -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 {VALUE_0}F!\nThank you for helping! Farewell!") }, + MSG_NPC(2, _(" 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 }, diff --git a/src/data/ground/ground_data_d03p02_station.h b/src/data/ground/ground_data_d03p02_station.h index e0c9f622d..34b11d4a9 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!{WAIT_PRESS}\nI'll flee for now!") }, + MSG_NPC(3, _(" 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 }, @@ -71,7 +71,7 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I can't...\nI'm too scared to move...") }, + MSG_NPC(2, _(" I can't...\nI'm too scared to move...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -82,7 +82,7 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Whoa.") }, + MSG_NPC(1, _(" ...Whoa.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 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, _(" {NAME_0}, what'll\nwe do?\nWe can't get across this.") }, + MSG_NPC(1, _(" {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 }, @@ -109,15 +109,15 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * { 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.{WAIT_PRESS}\nWE CAN RESCUE DIGLETT FROM THE\nSKY. BZBZBZZ!") }, + MSG_NPC(4, _(" 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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" HOLD ON TO US TIGHT.\nBZBZBZZZ!") }, + MSG_NPC(4, _(" HOLD ON TO US TIGHT.\nBZBZBZZZ!")), { 0x2e, 0x0d, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" DON'T BE SCARED.\nWE WON'T MAKE THE MISTAKE OF\nZAPPING YOU. BZBZBZZT!") }, + MSG_NPC(4, _(" DON'T BE SCARED.\nWE WON'T MAKE THE MISTAKE OF\nZAPPING YOU. BZBZBZZT!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d04p02_station.h b/src/data/ground/ground_data_d04p02_station.h index e7535dd88..fa37855c3 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...{WAIT_PRESS}\nYou'll pay for this!\nDon't you forget it!") }, + MSG_NPC(3, _(" 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 }, @@ -77,21 +77,21 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, 0x00000000, -0x00000003, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Did you maybe come looking\nfor me?") }, + MSG_NPC(2, _(" Did you maybe come looking\nfor me?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(16), { 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 {NAME_2}.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Let's get you home.\nCaterpie was worried about you.") }, + MSG_NPC(1, _(" You must be {NAME_2}.")), + MSG_NPC(1, _(" Let's get you home.\nCaterpie was worried about you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(16), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yay!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I was scared, so I kept my\nshell hardened...and waited and waited.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Thank you!") }, + MSG_NPC(2, _(" Yay!")), + MSG_NPC(2, _(" I was scared, so I kept my\nshell hardened...and waited and waited.")), + MSG_NPC(2, _(" Thank you!")), { 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_d05p01_station.h b/src/data/ground/ground_data_d05p01_station.h index e14f8b65f..12e2a093e 100644 --- a/src/data/ground/ground_data_d05p01_station.h +++ b/src/data/ground/ground_data_d05p01_station.h @@ -69,7 +69,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0d, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes...\nI'm sorry to ask, but please help.") }, + MSG_NPC(2, _(" Yes...\nI'm sorry to ask, but please help.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -87,7 +87,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * FANFARE_PLAY2(464), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Wait!") }, + MSG_NPC(2, _(" ...Wait!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, FANFARE_PLAY2(463), @@ -99,34 +99,34 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, 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 {COLOR YELLOW_D}Silent Chasm{RESET}, but...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It's rumored that an amazing\nmonster sleeps here.") }, + MSG_NPC(2, _(" There's something I forgot\nto mention...")), + MSG_NPC(2, _(" This canyon is known as\nthe {COLOR YELLOW_D}Silent Chasm{RESET}, but...")), + MSG_NPC(2, _(" 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...{WAIT_PRESS}monster?!") }, + MSG_NPC(1, _(" 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!{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...") }, + MSG_NPC(2, _(" Yes, but!{WAIT_PRESS}\nIt's only folklore!")), + MSG_NPC(2, _(" It's also true that\nShiftry hasn't returned...")), + MSG_NPC(2, _(" I just thought I should\nlet you know...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Owowow!\nMy stomach! It hurts...") }, + MSG_NPC(1, _(" Owowow!\nMy stomach! It hurts...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh!{WAIT_PRESS}\nWhat's wrong?!") }, + MSG_NPC(2, _(" Oh!{WAIT_PRESS}\nWhat's wrong?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -171,10 +171,10 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 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 {NAME_0}...") }, + MSG_NPC(2, _(" Is that so?")), + MSG_NPC(2, _(" But {NAME_0}...")), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hasn't had anything to\neat yet this morning.") }, + MSG_NPC(2, _(" Hasn't had anything to\neat yet this morning.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), FANFARE_PLAY2(470), @@ -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...{WAIT_PRESS}\nI guess the cramping settled down...") }, + MSG_NPC(1, _(" Owowow...{WAIT_PRESS}\nI guess the cramping settled down...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -193,13 +193,13 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * WAIT(45), CALL_SCRIPT(SMILE_END_FUNC), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hahahahaha...") }, + MSG_NPC(1, _(" Hahahahaha...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(16), LABEL(13), /* = 0x0d */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh...?") }, + MSG_NPC(1, _(" Huh...?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -214,14 +214,14 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * 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, {NAME_1}?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Don't you have a\nstomachache?") }, + MSG_NPC(2, _(" Wh-why this sudden\noutburst, {NAME_1}?")), + MSG_NPC(2, _(" Don't you have a\nstomachache?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?") }, + MSG_NPC(1, _(" Huh?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -236,7 +236,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hahahahaha...") }, + MSG_NPC(1, _(" Hahahahaha...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), LABEL(16), /* = 0x10 */ @@ -253,8 +253,8 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I don't know very much\nat all...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It is an old folktale.\nI wouldn't know if it existed or not.") }, + MSG_NPC(2, _(" I don't know very much\nat all...")), + MSG_NPC(2, _(" It is an old folktale.\nI wouldn't know if it existed or not.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -266,7 +266,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * 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{VALUE_0}F.{WAIT_PRESS}\nPlease take care!") }, + MSG_NPC(2, _(" 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 }, diff --git a/src/data/ground/ground_data_d05p02_station.h b/src/data/ground/ground_data_d05p02_station.h index e65f35ff1..7973637e0 100644 --- a/src/data/ground/ground_data_d05p02_station.h +++ b/src/data/ground/ground_data_d05p02_station.h @@ -59,29 +59,29 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, hey!") }, + MSG_NPC(1, _(" Oh, hey!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0x89, 0x20, 0x0100, 0x00000004, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We came for you!\nAre you all right?") }, + MSG_NPC(1, _(" We came for you!\nAre you all right?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0e, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes...\nI'm fine, but...") }, + MSG_NPC(2, _(" Yes...\nI'm fine, but...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Great!\nYour friend is waiting for you.") }, + MSG_NPC(1, _(" Great!\nYour friend is waiting for you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" {NAME_3} is in the\nback...") }, + MSG_NPC(2, _(" {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? {NAME_3}?") }, + MSG_NPC(1, _(" Huh? {NAME_3}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, WAIT(5), @@ -92,7 +92,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Let's go!") }, + MSG_NPC(1, _(" Let's go!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -108,11 +108,11 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0e, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...Urrrgh.\nForget about me...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Get away from here!") }, + MSG_NPC(3, _(" ...Urrrgh.\nForget about me...")), + MSG_NPC(3, _(" Get away from here!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Get...{WAIT_PRESS}\nGet away?!") }, + MSG_NPC(1, _(" Get...{WAIT_PRESS}\nGet away?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_STOP, FANFARE_PLAY2(502), @@ -131,7 +131,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * WAIT(90), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It's coming!") }, + MSG_NPC(3, _(" It's coming!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(502), { 0x27, 0x01, 0x0005, 0x00000002, 0x00000000, NULL }, @@ -166,7 +166,7 @@ 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-{NAME_3}'s gone!") }, + MSG_NPC(1, _(" Shi-{NAME_3}'s gone!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -175,14 +175,14 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * BGM_SWITCH(9), { 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{NAME_3}, then scale {COLOR YELLOW_D}Mt. Thunder{RESET}!") }, + MSG_NPC(6, _(" 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, _(" {NAME_6}...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" So that's the legendary\nmonster...") }, + MSG_NPC(1, _(" {NAME_6}...")), + MSG_NPC(1, _(" So that's the legendary\nmonster...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d06p01_station.h b/src/data/ground/ground_data_d06p01_station.h index f2cf53417..5b3ad7bc1 100644 --- a/src/data/ground/ground_data_d06p01_station.h +++ b/src/data/ground/ground_data_d06p01_station.h @@ -63,7 +63,7 @@ static const struct ScriptCommand s_gs188_g1_s0_lives0_dlg0[] = { /* 0x82392cc * 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...") }, + MSG_NPC(1, _(" Brr... I'm shaking...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d06p03_station.h b/src/data/ground/ground_data_d06p03_station.h index 03a6dacaf..034285a3d 100644 --- a/src/data/ground/ground_data_d06p03_station.h +++ b/src/data/ground/ground_data_d06p03_station.h @@ -62,7 +62,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _("Gyaoooh!") }, + MSG_NPC(2, _("Gyaoooh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -70,10 +70,10 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wh-what is going on...") }, + MSG_NPC(3, _(" Wh-what is going on...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Urrggh!{WAIT_PRESS}\nUwoah!") }, + MSG_NPC(2, _(" Urrggh!{WAIT_PRESS}\nUwoah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -95,22 +95,22 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You want more?\nI'll take you on!") }, + MSG_NPC(4, _(" You want more?\nI'll take you on!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 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.") }, + MSG_NPC(2, _(" Enough!{WAIT_PRESS}\nThat's enough fighting.")), + MSG_NPC(2, _(" 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...{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!") }, + MSG_NPC(2, _(" You kids...\nYou've impressed me.")), + MSG_NPC(2, _(" But...{WAIT_PRESS}\nThings won't be this easy next time.")), + MSG_NPC(2, _(" I will go all out next time,\nso you'd best be prepared!")), + MSG_NPC(2, _(" Until then, you'd better\nhone your skills!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 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 {NAME_6}!") }, + MSG_NPC(1, _(" Look!\nThere's {NAME_6}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -144,48 +144,48 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, WAIT(16), { 0x2e, 0x0c, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Are you OK?") }, + MSG_NPC(4, _(" Are you OK?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 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...{WAIT_PRESS}\nSomehow, I am...") }, + MSG_NPC(6, _(" 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 }, { 0x2e, 0x03, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm glad you're safe!") }, + MSG_NPC(1, _(" I'm glad you're safe!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 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{NAME_2}.") }, + MSG_NPC(5, _(" But that was an eye-opener.")), + MSG_NPC(5, _(" Driving off that\n{NAME_2}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 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 {POKEMON_0}.") }, + MSG_NPC(4, _(" I agree.")), + MSG_NPC(4, _(" You're awfully strong for\na plain {POKEMON_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(32), { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, WAIT(32), { 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...{WAIT_PRESS}\nYou aren't a Pokémon, are you?") }, + MSG_NPC(3, _(" ......")), + MSG_NPC(3, _(" I sensed it when we first\nmet...")), + MSG_NPC(3, _(" 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 }, { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, { 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{NAME_0} isn't a Pokémon.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0} is a human.") }, + MSG_NPC(1, _(" Wow!\nHow can you tell that?!")), + MSG_NPC(1, _(" But you're right.\n{NAME_0} isn't a Pokémon.")), + MSG_NPC(1, _(" {NAME_0} is a human.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(473), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -193,11 +193,11 @@ 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, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" What?!") }, + MSG_NPC(6, _(" What?!")), { 0x2e, 0x0c, 0x0004, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" A human?!") }, + MSG_NPC(4, _(" A human?!")), { 0x2e, 0x02, 0x0005, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Is that possible?\nCan something like that happen?") }, + MSG_NPC(5, _(" Is that possible?\nCan something like that happen?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -224,29 +224,29 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * 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...{WAIT_PRESS}\nI can't determine that.") }, + MSG_NPC(3, _(" ......")), + MSG_NPC(3, _(" 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...") }, + MSG_NPC(1, _(" Oh...\nI thought you would know...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" However...{WAIT_PRESS}\nThere is a way for unveiling the truth.") }, + MSG_NPC(3, _(" 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?") }, + MSG_NPC(1, _(" Oh, really? How?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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.{WAIT_PRESS}\nHe should shed light on your puzzling\nfriend.") }, + MSG_NPC(3, _(" Make way to the\n{COLOR CYAN}Hill of the Ancients{RESET}.")), + MSG_NPC(3, _(" There, you will find a\nPokémon that stares into the sun all day...")), + MSG_NPC(3, _(" A Pokémon who is said to\nsee into the future.")), + MSG_NPC(3, _(" 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 }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" OK!\nSo we should go see Xatu.") }, + MSG_NPC(1, _(" OK!\nSo we should go see Xatu.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -261,13 +261,13 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 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.{WAIT_PRESS}\nLet's hurry back.") }, + MSG_NPC(1, _(" 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...{WAIT_PRESS}\nI guess we should...") }, + MSG_NPC(6, _(" Uh... Yeah...{WAIT_PRESS}\nI guess we should...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, @@ -306,14 +306,14 @@ 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.{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, _(" ......{WAIT_PRESS}\nYou know something, don't you?") }, + MSG_NPC(4, _(" Alakazam.{WAIT_PRESS}\nI know you.")), + MSG_NPC(4, _(" I don't think you're \ncompletely ignorant about this.")), + MSG_NPC(4, _(" ......{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.{WAIT_PRESS}\nBut it should go unspoken for now.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...For their sake...") }, + MSG_NPC(3, _(" There is something that\nconcerns me.{WAIT_PRESS}\nBut it should go unspoken for now.")), + MSG_NPC(3, _(" ...For their sake...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d07p01_station.h b/src/data/ground/ground_data_d07p01_station.h index 6433a31ec..9b8c4da56 100644 --- a/src/data/ground/ground_data_d07p01_station.h +++ b/src/data/ground/ground_data_d07p01_station.h @@ -44,11 +44,11 @@ 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 {COLOR YELLOW_D}Great Canyon{RESET}...") }, + MSG_NPC(1, _(" 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{COLOR CYAN}Hill of the Ancients{RESET}.") }, + MSG_NPC(1, _(" 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 }, diff --git a/src/data/ground/ground_data_d07p02_station.h b/src/data/ground/ground_data_d07p02_station.h index 8a44899a0..2e134005c 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, _(" ............{WAIT_PRESS}\nWhat is it?{WAIT_PRESS}\nHave you reason to see me?") }, + MSG_NPC(2, _(" ............{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,8 +65,8 @@ 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...{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?") }, + MSG_NPC(2, _(" Hm! This...{WAIT_PRESS}\nThis is a {COLOR GREEN_I}Clear Wing{RESET}...")), + MSG_NPC(2, _(" ...{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 }, @@ -76,13 +76,13 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(60), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" .......{WAIT_PRESS}\nThe mirage Pokémon...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I know...{WAIT_PRESS}\nLittle about it...") }, + MSG_NPC(2, _(" .......{WAIT_PRESS}\nThe mirage Pokémon...")), + MSG_NPC(2, _(" I know...{WAIT_PRESS}\nLittle about it...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ........................") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ....................................\n................................................\n................................................") }, + MSG_NPC(2, _(" ............")), + MSG_NPC(2, _(" ........................")), + MSG_NPC(2, _(" ....................................\n................................................\n................................................")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(470), @@ -92,28 +92,28 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), 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...{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.") }, + MSG_NPC(2, _(" However!")), + MSG_NPC(2, _(" There are Pokémon that\nlive, breathe, and prosper with\nthe very land.")), + MSG_NPC(2, _(" They...{WAIT_PRESS}\nrage with the eruptions of volcanoes...")), + MSG_NPC(2, _(" Roar as one with thunder...")), + MSG_NPC(2, _(" And race with the north\nwind.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They are said to be\nshadows.\nShadows of the mirage Pokémon.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" To the northwest, there lies\na large island.") }, + MSG_NPC(2, _(" They are said to be\nshadows.\nShadows of the mirage Pokémon.")), + MSG_NPC(2, _(" To the northwest, there lies\na large island.")), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(20), { 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 {COLOR YELLOW_D}Fiery Field{RESET}!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" One of the Pokémon...\nA shadow of the mirage...is there.") }, + MSG_NPC(2, _(" An island known as the\n“Three Fields.”")), + MSG_NPC(2, _(" There is one such field.\nThe {COLOR YELLOW_D}Fiery Field{RESET}!")), + MSG_NPC(2, _(" 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 {COLOR YELLOW_D}Fiery Field{RESET}.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The answers you seek...\nPerhaps they await you there.") }, + MSG_NPC(2, _(" Go.\nYou must go to the {COLOR YELLOW_D}Fiery Field{RESET}.")), + MSG_NPC(2, _(" The answers you seek...\nPerhaps they await you there.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), BGM_STOP, @@ -208,7 +208,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Look!\nOver there!") }, + MSG_NPC(1, _(" Look!\nOver there!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0004, 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, _(" {NAME_0}!{WAIT_PRESS}\nIs that {NAME_2} over there?") }, + MSG_NPC(1, _(" {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?{WAIT_PRESS}\nAre you maybe {NAME_2}?") }, + MSG_NPC(1, _(" Excuse me?{WAIT_PRESS}\nAre you maybe {NAME_2}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ......") }, @@ -235,14 +235,14 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hello?") }, + MSG_NPC(1, _(" Hello?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ............") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Maybe he doesn't hear me?\nHello?!") }, + MSG_NPC(1, _(" Maybe he doesn't hear me?\nHello?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ..................") }, @@ -251,7 +251,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hellooooooooooooooo?!") }, + MSG_NPC(1, _(" Hellooooooooooooooo?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ........................") }, @@ -262,8 +262,8 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's useless.\nHe's not responding at all.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Maybe he's sleeping while\non his feet?") }, + MSG_NPC(1, _(" It's useless.\nHe's not responding at all.")), + MSG_NPC(1, _(" 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(_(" {NAME_0}, what should\nwe do?")), @@ -286,7 +286,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(30, 30), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Tickle, tickle, tickle.") }, + MSG_NPC(1, _(" Tickle, tickle, tickle.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(-1, -1), WAIT(30), @@ -296,7 +296,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(10), TEXTBOX_AUTO_PRESS(30, 30), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Tickle, tickle, tickle, tickle,\ntickle, tickle.") }, + MSG_NPC(1, _(" Tickle, tickle, tickle, tickle,\ntickle, tickle.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(-1, -1), WAIT(30), @@ -306,7 +306,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(20), TEXTBOX_AUTO_PRESS(20, 20), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Tickle, tickle, tickle, tickle,\ntickle, tickle, tickle, tickle, tickle, tickle,\ntickle, tickle, tickle, tickle, tickle, tickle.") }, + MSG_NPC(1, _(" Tickle, tickle, tickle, tickle,\ntickle, tickle, tickle, tickle, tickle, tickle,\ntickle, tickle, tickle, tickle, tickle, tickle.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(-1, -1), WAIT(30), @@ -315,13 +315,13 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(30, 30), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Tickle, tickle, tickle......") }, + MSG_NPC(1, _(" Tickle, tickle, tickle......")), TEXTBOX_AUTO_PRESS(-1, -1), WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Gasp, gasp...") }, + MSG_NPC(1, _(" Gasp, gasp...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -340,7 +340,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?") }, + MSG_NPC(1, _(" Huh?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -374,7 +374,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yikes!") }, + MSG_NPC(1, _(" Yikes!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), JUMP_LABEL(4), @@ -392,11 +392,11 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Uh, no!\nNo way!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I mean, he's kind of creepy!") }, + MSG_NPC(1, _(" Uh, no!\nNo way!")), + MSG_NPC(1, _(" I mean, he's kind of creepy!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It'd be scary for\nsure!") }, + MSG_NPC(1, _(" It'd be scary for\nsure!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x03, 0x0001, 0x00000002, 0x00000000, NULL }, @@ -436,7 +436,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0x8b, 0x0a, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yikes!") }, + MSG_NPC(1, _(" Yikes!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), JUMP_LABEL(4), @@ -450,7 +450,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Indeed.") }, { 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...") }, + MSG_NPC(2, _(" 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 }, @@ -459,14 +459,14 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * CALL_SCRIPT(SWEAT_FUNC), WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Guessed your identity?\nThat's a bit much.") }, + MSG_NPC(1, _(" Guessed your identity?\nThat's a bit much.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...No.\nI can tell this.") }, + MSG_NPC(2, _(" ...No.\nI can tell this.")), { 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...{WAIT_PRESS}\nhuman, yes?") }, + MSG_NPC(2, _(" You there.")), + MSG_NPC(2, _(" You are no ordinary\nPokémon.")), + MSG_NPC(2, _(" You are...{WAIT_PRESS}\nhuman, yes?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -475,17 +475,17 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * CALL_SCRIPT(NOTICE_FUNC), WAIT(30), { 0x2e, 0x03, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?!\nHow can you tell that?!") }, + MSG_NPC(1, _(" Huh?!\nHow can you tell that?!")), { 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, _(" All day...\nI stare at the sun unblinking.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It gives me sight for\nall things.") }, + MSG_NPC(2, _(" All day...\nI stare at the sun unblinking.")), + MSG_NPC(2, _(" It gives me sight for\nall things.")), WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The past and the future, too.") }, + MSG_NPC(2, _(" The past and the future, too.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -516,23 +516,23 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * 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, _(" ..................") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The calamities of nature.\nThere have been many in recent times.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They occur because the\nworld's balance is upset.") }, + MSG_NPC(2, _(" ..................")), + MSG_NPC(2, _(" The calamities of nature.\nThere have been many in recent times.")), + MSG_NPC(2, _(" They occur because the\nworld's balance is upset.")), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And your becoming a\nPokémon...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They are tied together.\nInseparably so.") }, + MSG_NPC(2, _(" And your becoming a\nPokémon...")), + MSG_NPC(2, _(" They are tied together.\nInseparably so.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wait. {NAME_0}\nbecoming a Pokémon and...{WAIT_PRESS}the natural\ndisasters...{WAIT_PRESS}are related?!") }, + MSG_NPC(1, _(" 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 {NAME_0}\nhave to do with the natural disasters\nwe've been seeing?") }, + MSG_NPC(1, _(" What do you mean?!")), + MSG_NPC(1, _(" 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, _(" ........................") }, + MSG_NPC(2, _(" ........................")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -546,9 +546,9 @@ 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...{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.") }, + MSG_NPC(2, _(" There are bigger concerns...{WAIT_PRESS}\nI am afraid...")), + MSG_NPC(2, _(" The world's balance...\nIt must be restored.")), + MSG_NPC(2, _(" Or the unthinkable shall\nbefall our world.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -562,33 +562,33 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * 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...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I dread it...") }, + MSG_NPC(2, _(" Every day I see it.\nThe same future every day...")), + MSG_NPC(2, _(" I dread it...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Xa-{NAME_2}...") }, + MSG_NPC(1, _(" Xa-{NAME_2}...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I fear it...{WAIT_PRESS}\nThe world's destruction.") }, + MSG_NPC(2, _(" I fear it...{WAIT_PRESS}\nThe world's destruction.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), SELECT_LIVES(-1, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The world's destruction...?") }, + MSG_NPC(1, _(" The world's destruction...?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(150), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Kekeh!\nIsn't that a surprise!") }, + MSG_NPC(3, _(" Kekeh!\nIsn't that a surprise!")), { 0x2e, 0x02, 0x0003, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That {NAME_0}...\nwas human...") }, + MSG_NPC(3, _(" That {NAME_0}...\nwas human...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That's going to be useful!\nThis should be interesting! Kekeh!") }, + MSG_NPC(3, _(" That's going to be useful!\nThis should be interesting! Kekeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d08p01_station.h b/src/data/ground/ground_data_d08p01_station.h index e4647ca46..e6a513d5f 100644 --- a/src/data/ground/ground_data_d08p01_station.h +++ b/src/data/ground/ground_data_d08p01_station.h @@ -168,14 +168,14 @@ static const struct ScriptCommand s_gs193_g1_s0_lives0_dlg0[] = { /* 0x824313c * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Sorry, I shouldn't complain.\nWe have to get away now, period.") }, + MSG_NPC(1, _(" Sorry, I shouldn't complain.\nWe have to get away now, period.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh? I hear voices...") }, + MSG_NPC(1, _(" Huh? I hear voices...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, WAIT(20), @@ -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...?{WAIT_PRESS}\nIsn't this where we started from?!") }, + MSG_NPC(1, _(" 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 }, diff --git a/src/data/ground/ground_data_d08p02_station.h b/src/data/ground/ground_data_d08p02_station.h index 44060f7e8..42c21e555 100644 --- a/src/data/ground/ground_data_d08p02_station.h +++ b/src/data/ground/ground_data_d08p02_station.h @@ -73,7 +73,7 @@ static const struct ScriptCommand s_gs194_g1_s0_lives0_dlg0[] = { /* 0x8245734 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Whoa! Here they come!\nRun!") }, + MSG_NPC(1, _(" Whoa! Here they come!\nRun!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(5), diff --git a/src/data/ground/ground_data_d09p01_station.h b/src/data/ground/ground_data_d09p01_station.h index 0fae1d1c5..0545b7e76 100644 --- a/src/data/ground/ground_data_d09p01_station.h +++ b/src/data/ground/ground_data_d09p01_station.h @@ -157,9 +157,9 @@ static const struct ScriptCommand s_gs195_g1_s0_station_sref_script[] = { /* 0x8 WAIT(120), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ........................") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...I think...{WAIT_PRESS}\nThey're gone.") }, + MSG_NPC(1, _(" ............")), + MSG_NPC(1, _(" ........................")), + MSG_NPC(1, _(" ...I think...{WAIT_PRESS}\nThey're gone.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(25), { 0x3b, 0x3a, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -215,7 +215,7 @@ static const struct ScriptCommand s_gs195_g1_s0_lives0_dlg0[] = { /* 0x8246544 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We have to get over this\nmountain to get away.") }, + MSG_NPC(1, _(" We have to get over this\nmountain to get away.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -434,7 +434,7 @@ 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!{WAIT_PRESS}\nSomeone's coming.") }, + MSG_NPC(1, _(" Ssh!{WAIT_PRESS}\nSomeone's coming.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x86, 0x00, 0x0200, 0x00000007, 0x00000000, NULL }, @@ -461,8 +461,8 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ........................") }, + MSG_NPC(1, _(" ............")), + MSG_NPC(1, _(" ........................")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(15), @@ -473,7 +473,7 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, WAIT(20), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Whew.") }, + MSG_NPC(1, _(" ...Whew.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -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...?{WAIT_PRESS}\nIsn't this where we started from?!") }, + MSG_NPC(1, _(" 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 }, diff --git a/src/data/ground/ground_data_d09p03_station.h b/src/data/ground/ground_data_d09p03_station.h index b4f009533..33cdc5fd3 100644 --- a/src/data/ground/ground_data_d09p03_station.h +++ b/src/data/ground/ground_data_d09p03_station.h @@ -50,8 +50,8 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _("Urggggh!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm not done!\nI'm not finished yet!") }, + MSG_NPC(2, _("Urggggh!")), + MSG_NPC(2, _(" I'm not done!\nI'm not finished yet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(460), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -89,7 +89,7 @@ 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, _(" ..................{WAIT_PRESS}\nDo you say that sincerely?") }, + MSG_NPC(2, _(" ..................{WAIT_PRESS}\nDo you say that sincerely?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -102,16 +102,16 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * 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, _(" ......") }, + MSG_NPC(2, _(" ......")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............") }, + MSG_NPC(1, _(" ............")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ........................") }, + MSG_NPC(2, _(" ........................")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ....................................") }, + MSG_NPC(1, _(" ....................................")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -133,12 +133,12 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * WAIT(5), CALL_SCRIPT(SPREE_START_FUNC), { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Aiyiyiyi!") }, + MSG_NPC(1, _(" Aiyiyiyi!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(SPREE_END_FUNC), WAIT(15), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Fine.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I trust that you aren't lying.") }, + MSG_NPC(2, _(" ............{WAIT_PRESS}Fine.")), + MSG_NPC(2, _(" I trust that you aren't lying.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -155,11 +155,11 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * VARIANT_DEFAULT(_(" It felt like my knees turned\nto jelly.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, 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...{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.") }, + MSG_NPC(2, _(" You may pass.")), + MSG_NPC(2, _(" Get through Mt. Blaze.")), + MSG_NPC(2, _(" And...{WAIT_PRESS}\nPromise me this.")), + MSG_NPC(2, _(" Promise me that you will\nfind the cause of the calamities that\nwrack our world...")), + MSG_NPC(2, _(" And stop the disasters\nfrom sowing more destruction and\nsuffering.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -206,9 +206,9 @@ 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, _(" ............{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...{WAIT_PRESS}\nthe courage you showed in facing me.") }, + MSG_NPC(2, _(" ............{WAIT_PRESS}\nI will hold you to that promise.")), + MSG_NPC(2, _(" You've made me believe that\nyou will honor that promise.")), + MSG_NPC(2, _(" 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 }, @@ -222,12 +222,12 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * WAIT(15), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waaaah!\nIs...is there anything else?") }, + MSG_NPC(1, _(" Waaaah!\nIs...is there anything else?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(SPREE_END_FUNC), WAIT(15), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" No.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I was only preparing to\ntake off.") }, + MSG_NPC(2, _(" No.")), + MSG_NPC(2, _(" I was only preparing to\ntake off.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(470), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -237,7 +237,7 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh...\n(Does it need to do that?)") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Farewell!") }, + MSG_NPC(2, _(" Farewell!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -257,7 +257,7 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Whew...") }, + MSG_NPC(1, _(" Whew...")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000007, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), diff --git a/src/data/ground/ground_data_d10p01_station.h b/src/data/ground/ground_data_d10p01_station.h index 64a570fc3..0b9e2702f 100644 --- a/src/data/ground/ground_data_d10p01_station.h +++ b/src/data/ground/ground_data_d10p01_station.h @@ -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...?{WAIT_PRESS}\nIsn't this where we started from?!") }, + MSG_NPC(1, _(" 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 }, diff --git a/src/data/ground/ground_data_d10p03_station.h b/src/data/ground/ground_data_d10p03_station.h index 65f870e7a..8c8c816f7 100644 --- a/src/data/ground/ground_data_d10p03_station.h +++ b/src/data/ground/ground_data_d10p03_station.h @@ -65,7 +65,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" No!\nI cannot allow your passage!") }, + MSG_NPC(2, _(" No!\nI cannot allow your passage!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, @@ -75,8 +75,8 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The frigid forest's air...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It has warmed considerably\nin recent times.") }, + MSG_NPC(2, _(" The frigid forest's air...")), + MSG_NPC(2, _(" It has warmed considerably\nin recent times.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000005, 0x00000000, NULL }, @@ -86,14 +86,14 @@ 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.{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.") }, + MSG_NPC(2, _(" The flow of frigid air has\nbeen disturbed in the forest.{WAIT_PRESS}\nSnow has started to melt.")), + MSG_NPC(2, _(" Snow is melting.\nSnow that has never melted before.")), + MSG_NPC(2, _(" This has never happened,\neven once.")), + MSG_NPC(2, _(" Then you appeared in the\nforest.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Is this not your doing?!") }, + MSG_NPC(2, _(" Is this not your doing?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -119,7 +119,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * 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?{WAIT_PRESS}\nYou expect me to believe that?!") }, + MSG_NPC(2, _(" 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), @@ -132,10 +132,10 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(NOTICE_FUNC), { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waaaaaaaah!") }, + MSG_NPC(1, _(" Waaaaaaaah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Enough of your foolish talk!{WAIT_PRESS}\nPrepare for your end!") }, + MSG_NPC(2, _(" 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 }, @@ -168,54 +168,54 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" A-Absol!") }, + MSG_NPC(2, _(" A-Absol!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0003, -0x00000002, 0x00000002, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" There is nothing false in\nwhat they said.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Calamities are indeed\noccurring in nature everywhere.") }, + MSG_NPC(3, _(" There is nothing false in\nwhat they said.")), + MSG_NPC(3, _(" Calamities are indeed\noccurring in nature everywhere.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Is...\nIs that true?") }, + MSG_NPC(2, _(" Is...\nIs that true?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes.") }, + MSG_NPC(3, _(" Yes.")), BGM_FADEIN(150, 114), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I have the ability to sense\nnatural disasters.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" The calamities taking place\nnow are of a special nature.\nI've never experienced such before.") }, + MSG_NPC(3, _(" I have the ability to sense\nnatural disasters.")), + MSG_NPC(3, _(" 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, _(" ............{WAIT_PRESS}\nSo, there are calamities besides this...") }, + MSG_NPC(2, _(" ............{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, _(" ..................{WAIT_PRESS}Fine.{WAIT_PRESS}\nI will choose to believe you.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You may pass.") }, + MSG_NPC(2, _(" ..................{WAIT_PRESS}Fine.{WAIT_PRESS}\nI will choose to believe you.")), + MSG_NPC(2, _(" You may pass.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_2}!") }, + MSG_NPC(1, _(" {NAME_2}!")), { 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, _(" However!") }, + MSG_NPC(2, _(" However!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waah!") }, + MSG_NPC(1, _(" Waah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You must try to prevent\nthe calamities from spreading.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm counting on you!") }, + MSG_NPC(2, _(" You must try to prevent\nthe calamities from spreading.")), + MSG_NPC(2, _(" I'm counting on you!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yup! We promise,\n{NAME_2}!") }, + MSG_NPC(1, _(" Yup! We promise,\n{NAME_2}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -224,41 +224,41 @@ 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, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Whew...\nThat was too close...") }, + MSG_NPC(1, _(" Whew...\nThat was too close...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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.{WAIT_PRESS}\nYou saved us.") }, + MSG_NPC(1, _(" 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 }, WAIT(30), { 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...{WAIT_PRESS}\nMy instinct warns me so.") }, + MSG_NPC(3, _(" ..................")), + MSG_NPC(3, _(" Rather than saying thanks,\nfocus on stopping the calamities before\nthey worsen.")), + MSG_NPC(3, _(" 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 }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Groan...") }, + MSG_NPC(1, _(" Groan...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I sensed the terrible\npower of the natural calamities...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I was led here by my\nfeelings of foreboding...") }, + MSG_NPC(3, _(" I sensed the terrible\npower of the natural calamities...")), + MSG_NPC(3, _(" I was led here by my\nfeelings of foreboding...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nI think it would be best if we combined\nforces...") }, + MSG_NPC(3, _(" ............{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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I will join you.") }, + MSG_NPC(3, _(" I will join you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -266,19 +266,19 @@ 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?{WAIT_PRESS}\nYou will? Really?") }, + MSG_NPC(1, _(" Huh?{WAIT_PRESS}\nYou will? Really?")), { 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, _(" Really.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" To put an end to the\ncalamities, cooperation is vital.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Let me lend you my powers.") }, + MSG_NPC(3, _(" Really.")), + MSG_NPC(3, _(" To put an end to the\ncalamities, cooperation is vital.")), + MSG_NPC(3, _(" Let me lend you my powers.")), { 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, _(" Sniffle...\nThank you, {NAME_3}.") }, + MSG_NPC(1, _(" Sniffle...\nThank you, {NAME_3}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), BGM_STOP, diff --git a/src/data/ground/ground_data_d11p01_station.h b/src/data/ground/ground_data_d11p01_station.h index 00303d763..3f9cdeb2c 100644 --- a/src/data/ground/ground_data_d11p01_station.h +++ b/src/data/ground/ground_data_d11p01_station.h @@ -211,10 +211,10 @@ 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...?{WAIT_PRESS} Well, there was\na time when I had some doubts...{WAIT_PRESS}\nBut now...") }, + MSG_NPC(1, _(" 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?{WAIT_PRESS}\nI really don't know why.") }, + MSG_NPC(1, _(" ...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), @@ -243,7 +243,7 @@ static const struct ScriptCommand s_gs201_g1_s0_lives0_dlg0[] = { /* 0x8252548 * { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Anyway, we'll know the\ntruth when we get to the peak.") }, + MSG_NPC(1, _(" Anyway, we'll know the\ntruth when we get to the peak.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -333,8 +333,8 @@ static const struct ScriptCommand s_gs201_g2_s1_lives0_dlg0[] = { /* 0x8253910 * CHOICE(/* label */ 2, _("All set!")), CHOICE(/* label */ 3, _("Not yet.")), LABEL(3), /* = 0x03 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hmm? Is that so?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" OK.\nLet's go when you're ready.") }, + MSG_NPC(1, _(" Hmm? Is that so?")), + MSG_NPC(1, _(" OK.\nLet's go when you're ready.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), JUMP_SCRIPT(END_TALK), @@ -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...?{WAIT_PRESS}\nIsn't this where we started from?!") }, + MSG_NPC(1, _(" 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 }, @@ -659,8 +659,8 @@ 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 {COLOR YELLOW_D}Mt. Freeze{RESET}?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Don't forget to take me,\nkekeh!") }, + MSG_NPC(2, _(" You're going to {COLOR YELLOW_D}Mt. Freeze{RESET}?")), + MSG_NPC(2, _(" Don't forget to take me,\nkekeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d11p03_station.h b/src/data/ground/ground_data_d11p03_station.h index 2037f2577..c38454619 100644 --- a/src/data/ground/ground_data_d11p03_station.h +++ b/src/data/ground/ground_data_d11p03_station.h @@ -69,12 +69,12 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh! Here at last!\nWe're at the peak!") }, + MSG_NPC(2, _(" Kekeh! Here at last!\nWe're at the peak!")), { 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, Ninetales!{WAIT_PRESS}\nWhere are you?! Come out!") }, + MSG_NPC(2, _(" Hey, Ninetales!{WAIT_PRESS}\nWhere are you?! Come out!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), FANFARE_PLAY2(506), @@ -87,58 +87,58 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nLong time, Ninetales!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Recognize me?") }, + MSG_NPC(2, _(" Kekeh!\nLong time, Ninetales!")), + MSG_NPC(2, _(" Recognize me?")), { 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, _(" ............{WAIT_PRESS}What do you want?") }, + MSG_NPC(3, _(" ............{WAIT_PRESS}What do you want?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(455), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nYou want to know what I want?!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Look at me!\nIsn't it your fault that I look like this?!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What, you can't even begin\nby apologizing?") }, + MSG_NPC(2, _(" Kekeh!\nYou want to know what I want?!")), + MSG_NPC(2, _(" Look at me!\nIsn't it your fault that I look like this?!")), + MSG_NPC(2, _(" What, you can't even begin\nby apologizing?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, 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...{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{POKEMON_2} because you\nabandoned Gardevoir.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It was Gardevoir that bore\nmy curse, not you.") }, + MSG_NPC(3, _(" It is not my fault.")), + MSG_NPC(3, _(" It all arose because you\nfled, isn't that so?")), + MSG_NPC(3, _(" You fled from yourself as\na human...{WAIT_PRESS}\nAnd you fled from Gardevoir.")), + MSG_NPC(3, _(" It was I who cast the curse.")), + MSG_NPC(3, _(" But you became\n{POKEMON_2} because you\nabandoned Gardevoir.")), + MSG_NPC(3, _(" It was Gardevoir that bore\nmy curse, not you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000043, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Keh! You're quibbling!") }, + MSG_NPC(2, _(" Keh! You're quibbling!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Anyway...{WAIT_PRESS}\nAbout that curse...{WAIT_PRESS}\nHow about lifting it already?") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nYou have the nerve to ask that?") }, + MSG_NPC(3, _(" 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!{WAIT_PRESS}\nI'm breaking out in hives at the thought!") }, + MSG_NPC(2, _(" Keh! That's right!")), + MSG_NPC(2, _(" 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!") }, + MSG_NPC(2, _(" Turn me down, and I'll\nKO you!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Well, it won't be me\ndoing the fighting, but those behind me...") }, + MSG_NPC(2, _(" ...Well, it won't be me\ndoing the fighting, but those behind me...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), @@ -147,27 +147,27 @@ 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, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'll see this curse lifted\neven if it means taking you on!") }, + MSG_NPC(2, _(" I'll see this curse lifted\neven if it means taking you on!")), { 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, _(" 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.") }, + MSG_NPC(3, _(" Humph. I regret to inform...{WAIT_PRESS}\nEven if you could defeat me, the curse\nwould remain.")), + MSG_NPC(3, _(" I don't have the power to\nlift curses.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000046, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gegeh!\nWhat are you saying?!") }, + MSG_NPC(2, _(" Gegeh!\nWhat are you saying?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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...{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.") }, + MSG_NPC(3, _(" We {POKEMON_3} are known\nto be vengeful in the extreme.")), + MSG_NPC(3, _(" Once we cast a curse,\nit is final...")), + MSG_NPC(3, _(" Our curse is so powerful,\neven we cannot lift it...{WAIT_PRESS}\nThere may be a way, however...")), + MSG_NPC(3, _(" I became enraged at your\ntreacherous heart...{WAIT_PRESS}\nAnd on it, I laid my curse.")), + MSG_NPC(3, _(" For that reason, depending\non your heart now, the curse may be\nlifted.")), + MSG_NPC(3, _(" Take this with you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -180,20 +180,20 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * 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 {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}.") }, + MSG_NPC(3, _(" Gardevoir's physical form\nis sealed within the {COLOR YELLOW_D}Murky Cave{RESET}.")), + MSG_NPC(3, _(" 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), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 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{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!") }, + MSG_NPC(2, _(" Gotcha!")), + MSG_NPC(2, _(" We just go to this\n{COLOR YELLOW_D}Murky Cave{RESET} and plunk down that rock...")), + MSG_NPC(2, _(" 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!{WAIT_PRESS}\nYou had me scared! Kekeke!") }, + MSG_NPC(2, _(" Kekeh!\nHow do you like that?\nIt's ridiculously simple!")), + MSG_NPC(2, _(" 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 }, @@ -201,7 +201,7 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * { 0x91, 0x0c, 0x000a, 0x00000007, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hey!\nI kept you waiting!\nLet's get home! Kekeh!") }, + MSG_NPC(2, _(" Hey!\nI kept you waiting!\nLet's get home! Kekeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(150), { 0x53, 0x00, 0x0000, 0x0000001f, 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...{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...") }, + MSG_NPC(3, _(" That oaf...{WAIT_PRESS}\nHe has changed in many ways...")), + MSG_NPC(3, _(" But he is wavering...{WAIT_PRESS}\nHis old and new emotions are clashing\nwithin his heart...")), + MSG_NPC(3, _(" 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 }, @@ -359,37 +359,37 @@ 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-{NAME_2}!") }, + MSG_NPC(1, _(" A-{NAME_2}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" It's about time.\nWe finally caught up to you.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Your fugitive act dragged\nus all the way out here...") }, + MSG_NPC(4, _(" It's about time.\nWe finally caught up to you.")), + MSG_NPC(4, _(" Your fugitive act dragged\nus all the way out here...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(3, _(" Pipe down, {NAME_4}.")), + MSG_NPC(3, _(" We can finally settle\nthings here.")), + MSG_NPC(3, _(" I can barely contain myself.\nI'm itching for a fight.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(3, _(" {NAME_1}.{WAIT_PRESS}\nDon't think badly of me.")), + MSG_NPC(3, _(" I don't know how to show\nmercy.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 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...{WAIT_PRESS}\ncrush you with every shred of our power!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Get them!") }, + MSG_NPC(2, _(" {NAME_0}...{WAIT_PRESS}\nI didn't wish for this conclusion...")), + MSG_NPC(2, _(" But this, too, is fate.")), + MSG_NPC(2, _(" The role of a rescue team\nis to help bring peace.")), + MSG_NPC(2, _(" We will...{WAIT_PRESS}\ncrush you with every shred of our power!")), + MSG_NPC(2, _(" Get them!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -686,13 +686,13 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * CALL_SCRIPT(SHOCK_FUNC), { 0x2e, 0x0d, 0x0002, 0x00000041, 0x00000000, NULL }, { 0x2f, 0x00, 0x0002, 0x00000000, 0x00000003, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wuh!") }, + MSG_NPC(2, _(" Wuh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...!{WAIT_PRESS}\n{NAME_5}!") }, + MSG_NPC(2, _(" ...!{WAIT_PRESS}\n{NAME_5}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -702,15 +702,15 @@ 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?!{WAIT_PRESS}\n{NAME_5}?!") }, + MSG_NPC(3, _(" 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 {NAME_5}...") }, + MSG_NPC(1, _(" Th-that's {NAME_5}...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0d, 0x0004, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" The legend...\nIt was real...") }, + MSG_NPC(4, _(" The legend...\nIt was real...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -718,61 +718,61 @@ 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{NAME_2}.") }, + MSG_NPC(5, _(" 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...{WAIT_PRESS}\nmy guests.") }, + MSG_NPC(5, _(" 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, {NAME_5}!") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nI may have no choice but to eliminate\nthem!") }, + MSG_NPC(2, _(" Who was the human that\nappeared in your legend?")), + MSG_NPC(2, _(" No, even before that, was\nthe legend itself a true event?")), + MSG_NPC(2, _(" 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...{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{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{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...{WAIT_PRESS}\nThe human lives on.") }, + MSG_NPC(5, _(" Whether they consider my\ncurse to be a legend or not...")), + MSG_NPC(5, _(" I care not.")), + MSG_NPC(5, _(" However...{WAIT_PRESS}\nIt did happen.")), + MSG_NPC(5, _(" Many years ago, I tried to\nlay a curse on a human.")), + MSG_NPC(5, _(" It was then, however, that\n{NAME_6}, the human's partner, dashed\nin...")), + MSG_NPC(5, _(" It selflessly bore the full\nbrunt of the curse meant for the human.")), + MSG_NPC(5, _(" Then, the human did a\nselfish and cowardly thing.")), + MSG_NPC(5, _(" They abandoned\n{NAME_6} and fled.")), + MSG_NPC(5, _(" The human eventually\nbecame a Pokémon.")), + MSG_NPC(5, _(" 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 }, BGM_FADEOUT(150), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...And that human would be?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Who is the human that you\nspeak of?") }, + MSG_NPC(2, _(" ...And that human would be?")), + MSG_NPC(2, _(" Who is the human that you\nspeak of?")), { 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, _(" {NAME_0}...") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" You may relax.\nIt is not you.") }, + MSG_NPC(5, _(" {NAME_0}...")), + MSG_NPC(5, _(" You may relax.\nIt is not you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(24), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Just now...{WAIT_PRESS}\n...What did you just say?") }, + MSG_NPC(1, _(" ............{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, _(" {NAME_0} is not the\nhuman that appears in the legend.\nThat is what I said.") }, + MSG_NPC(5, _(" {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-{WAIT_PRESS}what...") }, + MSG_NPC(2, _(" ...Wh-{WAIT_PRESS}what...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -785,10 +785,10 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oo-oof...") }, + MSG_NPC(1, _(" Oo-oof...")), { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Oof...") }, + MSG_NPC(1, _(" ...Oof...")), { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -830,10 +830,10 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 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...{WAIT_PRESS}\nIt exists elsewhere.") }, + MSG_NPC(5, _(" I have another thing to say.")), + MSG_NPC(5, _(" It is true that I foretold\nof the world's balance becoming unstable...")), + MSG_NPC(5, _(" However, that human\nbecoming a Pokémon and the world's\nbalance are not linked in any way.")), + MSG_NPC(5, _(" 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 }, @@ -852,16 +852,16 @@ 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...{WAIT_PRESS}\nWe...uh...apologize.") }, + MSG_NPC(2, _(" ...Uh...er...{WAIT_PRESS}\nWe...uh...apologize.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ...We're sorry.\nWe got worked up by that Gengar.") }, + MSG_NPC(4, _(" ...We're sorry.\nWe got worked up by that Gengar.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0003, 0x00000042, 0x00000000, NULL }, - { 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...") }, + MSG_NPC(3, _(" No.{WAIT_PRESS}\nI suspected Gengar right from the start.")), + MSG_NPC(3, _(" {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), @@ -871,9 +871,9 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 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, {NAME_0}.") }, + MSG_NPC(2, _(" But I must say...")), + MSG_NPC(2, _(" You are to be commended\nfor prevailing through this cruel\njourney and discovering the truth.")), + MSG_NPC(2, _(" Impressive, {NAME_0}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -920,19 +920,19 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * WAIT(20), { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waah! The ground's heaving!") }, + MSG_NPC(1, _(" Waah! The ground's heaving!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...Qu...quake?!") }, + MSG_NPC(3, _(" ...Qu...quake?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), 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...{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!") }, + MSG_NPC(5, _(" The world's crust is\nshifting.")), + MSG_NPC(5, _(" The natural calamities are\nworsening.")), + MSG_NPC(5, _(" And...{WAIT_PRESS}\nThe shifting of the ground...")), + MSG_NPC(5, _(" It will awaken the beast\nthat embodies the ground...\nThe beast that slept deep underground...")), + MSG_NPC(5, _(" Groudon will be awakened!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -943,33 +943,33 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(5), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What?!\nGroudon is rising?!") }, + MSG_NPC(2, _(" What?!\nGroudon is rising?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Groudon?!") }, + MSG_NPC(4, _(" Groudon?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 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?{WAIT_PRESS}\nWhat's a Groudon?") }, + MSG_NPC(1, _(" What is that?{WAIT_PRESS}\nWhat's a Groudon?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" A legendary Pokémon that\nhas been spoken of only in myths.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It is the Pokémon that\nraised the land masses and created\ncontinents...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It is said to have taken to\nsleep after catastrophic battles with\nits archenemy Kyogre.") }, + MSG_NPC(2, _(" A legendary Pokémon that\nhas been spoken of only in myths.")), + MSG_NPC(2, _(" It is the Pokémon that\nraised the land masses and created\ncontinents...")), + MSG_NPC(2, _(" It is said to have taken to\nsleep after catastrophic battles with\nits archenemy Kyogre.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" If Groudon were to get\nloose, there would be chaos.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" It must be stopped!") }, + MSG_NPC(5, _(" If Groudon were to get\nloose, there would be chaos.")), + MSG_NPC(5, _(" It must be stopped!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We will go.") }, + MSG_NPC(2, _(" We will go.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -979,22 +979,22 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * VARIANT_DEFAULT(_(" We'll go too!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" No.\nYou must remain behind.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Groudon is far more\npowerful than any Pokémon you have\nfaced.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Leave it to us.") }, + MSG_NPC(2, _(" No.\nYou must remain behind.")), + MSG_NPC(2, _(" Groudon is far more\npowerful than any Pokémon you have\nfaced.")), + MSG_NPC(2, _(" Leave it to us.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That's how it goes.\nYou go back to your rescue team base\nfor a well-earned rest.") }, + MSG_NPC(3, _(" That's how it goes.\nYou go back to your rescue team base\nfor a well-earned rest.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Don't worry about us.\nWe didn't get our Gold Rank the easy way.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We'll get the job done, and\nwe'll be back before you know it.") }, + MSG_NPC(4, _(" Don't worry about us.\nWe didn't get our Gold Rank the easy way.")), + MSG_NPC(4, _(" We'll get the job done, and\nwe'll be back before you know it.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Fine.\nWe're off to quell Groudon!") }, + MSG_NPC(2, _(" Fine.\nWe're off to quell Groudon!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_STOP2(453), diff --git a/src/data/ground/ground_data_d12p04_station.h b/src/data/ground/ground_data_d12p04_station.h index f9e5e7808..694947365 100644 --- a/src/data/ground/ground_data_d12p04_station.h +++ b/src/data/ground/ground_data_d12p04_station.h @@ -85,12 +85,12 @@ 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 {NAME_3}!{WAIT_PRESS}\n{NAME_4} and {NAME_5} too!") }, + MSG_NPC(1, _(" 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 }, { 0x2e, 0x0d, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Urrgggh!") }, + MSG_NPC(5, _(" Urrgggh!")), { 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{NAME_2}?") }, + MSG_NPC(4, _(" 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 }, @@ -115,18 +115,18 @@ static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 * { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x10, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, fine.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We will be fine.\nBut we must get out immediately.") }, + MSG_NPC(3, _(" Yes, fine.")), + MSG_NPC(3, _(" We will be fine.\nBut we must get out immediately.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 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 {NAME_2}?{WAIT_PRESS}\nWill it be OK?") }, + MSG_NPC(1, _(" 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.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It had lost control only\nbecause it was enraged from having its\nsleep disturbed.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It should calm down.") }, + MSG_NPC(3, _(" Your concern is unneeded.\nIt will awaken soon enough.")), + MSG_NPC(3, _(" It had lost control only\nbecause it was enraged from having its\nsleep disturbed.")), + MSG_NPC(3, _(" It should calm down.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(453), { 0x97, 0x00, 0x0002, 0x00000001, 0x00000003, NULL }, @@ -137,10 +137,10 @@ 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...{WAIT_PRESS}\nAnother quake!") }, + MSG_NPC(1, _(" Waah...{WAIT_PRESS}\nAnother quake!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Out! Quickly!") }, + MSG_NPC(3, _(" Out! Quickly!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d13p01_station.h b/src/data/ground/ground_data_d13p01_station.h index b40b6107f..170d38b0c 100644 --- a/src/data/ground/ground_data_d13p01_station.h +++ b/src/data/ground/ground_data_d13p01_station.h @@ -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{NAME_0}, this is cool!{WAIT_PRESS}\nWe're on clouds!") }, + MSG_NPC(1, _(" 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 }, @@ -72,12 +72,12 @@ static const struct ScriptCommand s_gs207_g1_s0_lives0_dlg0[] = { /* 0x826008c * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, wow!") }, + MSG_NPC(1, _(" Oh, wow!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, look up there!") }, + MSG_NPC(1, _(" {NAME_0}, look up there!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d13p03_station.h b/src/data/ground/ground_data_d13p03_station.h index 98f962f80..f23224c75 100644 --- a/src/data/ground/ground_data_d13p03_station.h +++ b/src/data/ground/ground_data_d13p03_station.h @@ -96,7 +96,7 @@ 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!{WAIT_PRESS}\nAnd they're huge!") }, + MSG_NPC(2, _(" These are shock waves!{WAIT_PRESS}\nAnd they're huge!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(465), @@ -262,7 +262,7 @@ static const struct ScriptCommand s_gs209_g2_s0_lives0_dlg0[] = { /* 0x8262f4c * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What is that?!") }, + MSG_NPC(2, _(" What is that?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, @@ -280,7 +280,7 @@ static const struct ScriptCommand s_gs209_g2_s0_lives0_dlg0[] = { /* 0x8262f4c * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...So, that is why...") }, + MSG_NPC(2, _(" ...So, that is why...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -288,10 +288,10 @@ 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, _(" ............{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!") }, + MSG_NPC(2, _(" ............{WAIT_PRESS}Before I try...{WAIT_PRESS}\nI need to know your resolve.")), + MSG_NPC(2, _(" The star has come too close.")), + MSG_NPC(2, _(" If I were to loose my\nHyper Beam here...")), + MSG_NPC(2, _(" You would not escape\nunscathed!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -299,7 +299,7 @@ static const struct ScriptCommand s_gs209_g2_s0_lives0_dlg0[] = { /* 0x8262f4c * 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!") }, + MSG_NPC(2, _(" Well said!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -308,7 +308,7 @@ static const struct ScriptCommand s_gs209_g2_s0_lives0_dlg0[] = { /* 0x8262f4c * FANFARE_PLAY2(664), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Take charge of your destiny!") }, + MSG_NPC(2, _(" Take charge of your destiny!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -421,7 +421,7 @@ static const struct ScriptCommand s_gs209_g3_s0_lives0_dlg0[] = { /* 0x8263a7c * WAIT(30), TEXTBOX_AUTO_PRESS(15, 15), { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waaaaaaaaaaaaaaaaaah!") }, + MSG_NPC(1, _(" Waaaaaaaaaaaaaaaaaah!")), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d15p01_station.h b/src/data/ground/ground_data_d15p01_station.h index baccf205a..2d4e14a3e 100644 --- a/src/data/ground/ground_data_d15p01_station.h +++ b/src/data/ground/ground_data_d15p01_station.h @@ -34,23 +34,23 @@ 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!{WAIT_PRESS}\n...H-how dare you!") }, + MSG_NPC(2, _(" Gwooooooooooh!{WAIT_PRESS}\n...H-how dare you!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(2, _(" How...{WAIT_PRESS}\nHow did this happen...?")), + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nThis is the {COLOR GREEN_I}Red Wing{RESET}...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}You...{WAIT_PRESS}\nStand back!") }, + 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!")), { 0x30, 0x00, 0x0000, 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}!") }, { 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{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!") }, + MSG_NPC(2, _(" Go northeast!")), + MSG_NPC(2, _(" To a place called the\n{COLOR YELLOW_D}Northwind Field{RESET}.")), + MSG_NPC(2, _(" You will find a Pokémon\nthere named Suicune.")), + MSG_NPC(2, _(" If you are lucky enough to\nmeet Suicune...")), + MSG_NPC(2, _(" Perhaps your wish will\ncome true!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY(212), { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Sunset Wing{RESET}.") }, diff --git a/src/data/ground/ground_data_d16p01_station.h b/src/data/ground/ground_data_d16p01_station.h index 4c9ee7001..92fc92e70 100644 --- a/src/data/ground/ground_data_d16p01_station.h +++ b/src/data/ground/ground_data_d16p01_station.h @@ -64,11 +64,11 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gwooooooh!") }, + MSG_NPC(2, _(" Gwooooooh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Urghgh...{WAIT_PRESS}\nI... I lost...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You...{WAIT_PRESS}\nWhat do you wish?") }, + MSG_NPC(2, _(" Urghgh...{WAIT_PRESS}\nI... I lost...")), + MSG_NPC(2, _(" 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 {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.") }, + MSG_NPC(2, _(" ...Wh-what?! This is...\nthe {COLOR GREEN_I}Clear Wing{RESET}...")), + MSG_NPC(2, _(" ...I understand now.{WAIT_PRESS}\nTo meet that Pokémon...")), + MSG_NPC(2, _(" ............{WAIT_PRESS}Stand aside.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, @@ -110,10 +110,10 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * { 0xe2, 0x00, 0x01fb, 0x00000000, 0x00000000, NULL }, 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 {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 {COLOR YELLOW_D}Lightning Field{RESET}!") }, + MSG_NPC(2, _(" Take this and go west!")), + MSG_NPC(2, _(" There, you will find\nthe {COLOR YELLOW_D}Lightning Field{RESET}.")), + MSG_NPC(2, _(" You will know your path\nthere!")), + MSG_NPC(2, _(" Now go!\nTo the {COLOR YELLOW_D}Lightning Field{RESET}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, WAIT(20), diff --git a/src/data/ground/ground_data_d17p01_station.h b/src/data/ground/ground_data_d17p01_station.h index 45562cdac..b148b9d2e 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!{WAIT_PRESS}\n...H-how dare you!") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nHow did this happen...?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But regardless, you have\nwon.{WAIT_PRESS}\nLet me hear your wish.") }, + MSG_NPC(2, _(" How...{WAIT_PRESS}\nHow did this happen...?")), + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nThis is the {COLOR GREEN_I}Red Wing{RESET}...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}You...{WAIT_PRESS}\nStand back!") }, + 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!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, @@ -111,11 +111,11 @@ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 * { 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{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!") }, + MSG_NPC(2, _(" Go northeast!")), + MSG_NPC(2, _(" To a place called the\n{COLOR YELLOW_D}Northwind Field{RESET}.")), + MSG_NPC(2, _(" You will find a Pokémon\nthere named Suicune.")), + MSG_NPC(2, _(" If you are lucky enough to\nmeet Suicune...")), + MSG_NPC(2, _(" Perhaps your wish will\ncome true!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, WAIT(20), diff --git a/src/data/ground/ground_data_d18p01_station.h b/src/data/ground/ground_data_d18p01_station.h index 3e92ab974..bf5747842 100644 --- a/src/data/ground/ground_data_d18p01_station.h +++ b/src/data/ground/ground_data_d18p01_station.h @@ -64,11 +64,11 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gwoooooooh!") }, + MSG_NPC(2, _(" Gwoooooooh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I have lost...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I admit it.\nYou are strong.") }, + MSG_NPC(2, _(" I have lost...")), + MSG_NPC(2, _(" I admit it.\nYou are strong.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, @@ -76,15 +76,15 @@ 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!{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.") }, + MSG_NPC(2, _(" This!{WAIT_PRESS}\nThe {COLOR GREEN_I}Sunset Wing{RESET}!")), + MSG_NPC(2, _(" ...I see.{WAIT_PRESS}\nYou came seeking the mirage Pokémon...")), + MSG_NPC(2, _(" ...{WAIT_PRESS}Step back.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, BGM_FADEOUT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kyuuuuuuuuhn!") }, + MSG_NPC(2, _(" Kyuuuuuuuuhn!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -113,12 +113,12 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * { 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 {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 {COLOR YELLOW_D}Mt. Faraway{RESET}!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The mirage Pokémon is at\nits peak!") }, + MSG_NPC(2, _(" This {COLOR GREEN_I}Rainbow Wing{RESET}...")), + MSG_NPC(2, _(" It is the key to meeting\nthe mirage Pokémon.")), + MSG_NPC(2, _(" Take this wing...")), + MSG_NPC(2, _(" Take it to the mountain so\nhigh that its peak is obscured by clouds.")), + MSG_NPC(2, _(" Yes...\nTake it to {COLOR YELLOW_D}Mt. Faraway{RESET}!")), + MSG_NPC(2, _(" The mirage Pokémon is at\nits peak!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, WAIT(20), diff --git a/src/data/ground/ground_data_d19p01_station.h b/src/data/ground/ground_data_d19p01_station.h index e398ba083..fb8627fa0 100644 --- a/src/data/ground/ground_data_d19p01_station.h +++ b/src/data/ground/ground_data_d19p01_station.h @@ -34,27 +34,27 @@ static const struct ScriptCommand s_gs215_g1_s0_lives0_dlg0[] = { /* 0x82674cc * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gwoooooooh!") }, + MSG_NPC(2, _(" Gwoooooooh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I have lost...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I admit it.\nYou are strong.") }, + MSG_NPC(2, _(" I have lost...")), + MSG_NPC(2, _(" I admit it.\nYou are strong.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(2, _(" This!{WAIT_PRESS}\nThe {COLOR GREEN_I}Sunset Wing{RESET}!")), + MSG_NPC(2, _(" ...I see.{WAIT_PRESS}\nYou came seeking the mirage Pokémon...")), + MSG_NPC(2, _(" ...{WAIT_PRESS}Step back.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kyuuuuuuuuhn!") }, + MSG_NPC(2, _(" Kyuuuuuuuuhn!")), { 0x30, 0x00, 0x0000, 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}!") }, { 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 {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 {COLOR YELLOW_D}Mt. Faraway{RESET}!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The mirage Pokémon is at\nits peak!") }, + MSG_NPC(2, _(" This {COLOR GREEN_I}Rainbow Wing{RESET}...")), + MSG_NPC(2, _(" It is the key to meeting\nthe mirage Pokémon.")), + MSG_NPC(2, _(" Take this wing...")), + MSG_NPC(2, _(" Take it to the mountain so\nhigh that its peak is obscured by clouds.")), + MSG_NPC(2, _(" Yes...\nTake it to {COLOR YELLOW_D}Mt. Faraway{RESET}!")), + MSG_NPC(2, _(" The mirage Pokémon is at\nits peak!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 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...") }, diff --git a/src/data/ground/ground_data_d20p01_station.h b/src/data/ground/ground_data_d20p01_station.h index 65b668678..8f6559533 100644 --- a/src/data/ground/ground_data_d20p01_station.h +++ b/src/data/ground/ground_data_d20p01_station.h @@ -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!{WAIT_PRESS}\nGet a move on!") }, + MSG_NPC(0, _(" 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,53 +63,53 @@ 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...{WAIT_PRESS}\nThis is rough going...") }, + MSG_NPC(1, _(" 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?") }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Let me think--wasn't it you\nwho wanted to explore this place?") }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Saying you'd found a new\ncave and all!") }, + MSG_NPC(0, _(" Heh! What's with you?\nYou're gonna whine about it now?")), + MSG_NPC(0, _(" Let me think--wasn't it you\nwho wanted to explore this place?")), + MSG_NPC(0, _(" Saying you'd found a new\ncave and all!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yeah...{WAIT_PRESS}\nI just happened to be swimming by in\nthe sea when I spotted this cave...") }, + MSG_NPC(1, _(" 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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I didn't expect it to be\na dungeon this rough...\nGasp, gasp...") }, + MSG_NPC(1, _(" 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!{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}!") }, + MSG_NPC(0, _(" Heh!{WAIT_PRESS}\nI thought a different combo would be\na good change of pace...")), + MSG_NPC(0, _(" 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!{WAIT_PRESS}\nCall me pathetic, will you?!") }, + MSG_NPC(1, _(" 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!") }, + MSG_NPC(1, _(" What you've seen of me\nso far is nothing!")), { 0x2e, 0x15, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Never...{WAIT_PRESS}\nunderestimate {NAME_1}!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wroooooooaaaaar!") }, + MSG_NPC(1, _(" Never...{WAIT_PRESS}\nunderestimate {NAME_1}!")), + MSG_NPC(1, _(" Wroooooooaaaaar!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, { 0x2e, 0x15, 0x0000, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Hahaha!{WAIT_PRESS}\nThere! You're still feeling frisky!") }, + MSG_NPC(0, _(" 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!{WAIT_PRESS}\nI think we're getting close.\nLet's keep it going!") }, + MSG_NPC(0, _(" 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, _(" ...!{WAIT_PRESS}\nSo you did that to motivate me...{WAIT_PRESS}\n...Thanks.") }, + MSG_NPC(1, _(" ...!{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!") }, + MSG_NPC(0, _(" Hey, no problem.\nLet's move!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -120,13 +120,13 @@ 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?{WAIT_PRESS} What's wrong?{WAIT_PRESS}\nAre you still wiped out?") }, + MSG_NPC(0, _(" 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.{WAIT_PRESS}\nDid you hear something?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I thought I heard a voice...") }, + MSG_NPC(1, _(" ...No. That's not it.")), + MSG_NPC(1, _(" ...Just now.{WAIT_PRESS}\nDid you hear something?")), + MSG_NPC(1, _(" I thought I heard a voice...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x92, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, @@ -136,7 +136,7 @@ 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?{WAIT_PRESS}\nI don't hear anything.") }, + MSG_NPC(0, _(" ...No?{WAIT_PRESS}\nI don't hear anything.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_SWITCH(35), @@ -155,8 +155,8 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * { 0x92, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, WAIT(30), TEXTBOX_AUTO_PRESS(-1, -1), - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Wh-who's there?!") }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Who are you?!{WAIT_PRESS}\nShow yourself!") }, + MSG_NPC(0, _(" Wh-who's there?!")), + MSG_NPC(0, _(" Who are you?!{WAIT_PRESS}\nShow yourself!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), FANFARE_PLAY2(453), @@ -201,12 +201,12 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * TEXTBOX_AUTO_PRESS(60, 60), { 0x2e, 0x02, 0x0000, 0x00000003, 0x00000000, NULL }, FANFARE_PLAY2(877), - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Gwaaaaaaaaaaaah!") }, + MSG_NPC(0, _(" Gwaaaaaaaaaaaah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x03, 0x0001, 0x00000003, 0x00000000, NULL }, FANFARE_PLAY2(877), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Gyaaaaaaaah!") }, + MSG_NPC(1, _(" Gyaaaaaaaah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(-1, -1), BGM_FADEOUT(60), diff --git a/src/data/ground/ground_data_d21p01_station.h b/src/data/ground/ground_data_d21p01_station.h index 666b2ecb9..4822b3b48 100644 --- a/src/data/ground/ground_data_d21p01_station.h +++ b/src/data/ground/ground_data_d21p01_station.h @@ -44,14 +44,14 @@ static const struct ScriptCommand s_gs217_g1_s0_lives0_dlg0[] = { /* 0x8269878 * { 0xe2, 0x00, 0x01db, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Urghgh...") }, + MSG_NPC(2, _(" Urghgh...")), { 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, _(" ............{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...") }, + MSG_NPC(2, _(" ............{WAIT_PRESS}Please...\nPlease let me go...")), + MSG_NPC(2, _(" I have to go...{WAIT_PRESS}\nThere's somewhere that I have to go...")), + MSG_NPC(2, _(" 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 9b97b896a..bf7d1e5ae 100644 --- a/src/data/ground/ground_data_d22p01_station.h +++ b/src/data/ground/ground_data_d22p01_station.h @@ -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, _(" ............{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.") }, + MSG_NPC(2, _(" ............{WAIT_PRESS}\nYes, I'll be fine.")), + MSG_NPC(2, _(" 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 349eb2035..5253fc487 100644 --- a/src/data/ground/ground_data_d24p01_station.h +++ b/src/data/ground/ground_data_d24p01_station.h @@ -55,15 +55,15 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 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{COLOR YELLOW_D}Murky Cave{RESET}?") }, + MSG_NPC(2, _(" Kekeh!\nWe're here at last!")), + MSG_NPC(2, _(" 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!{WAIT_PRESS}\nThere's a dais!") }, + MSG_NPC(2, _(" Oh, look!{WAIT_PRESS}\nThere's a dais!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -71,7 +71,7 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There's a hollow spot.\nI guess that stone goes in there.") }, + MSG_NPC(2, _(" There's a hollow spot.\nI guess that stone goes in there.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -98,22 +98,22 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0x27, 0x00, 0x0005, 0x0000001e, 0x00ffffff, NULL }, WAIT(120), { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ........................") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ....................................") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nWhat's this about?\nNothing's happening?") }, + MSG_NPC(2, _(" ............")), + MSG_NPC(2, _(" ........................")), + MSG_NPC(2, _(" ....................................")), + MSG_NPC(2, _(" Kekeh!\nWhat's this about?\nNothing's happening?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), FANFARE_PLAY2(463), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............?{WAIT_PRESS}\nHuh? I thought I heard something...") }, + MSG_NPC(2, _(" ............?{WAIT_PRESS}\nHuh? I thought I heard something...")), { 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, _(" Kekeh!\nDid you just say something?") }, + MSG_NPC(2, _(" Kekeh!\nDid you just say something?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(468), @@ -129,7 +129,7 @@ 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, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That's odd...\nI could've sworn I heard something...") }, + MSG_NPC(2, _(" That's odd...\nI could've sworn I heard something...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}...Wel...co...") }, @@ -148,8 +148,8 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0x91, 0x08, 0x0002, 0x00000006, 0x00000000, NULL }, WAIT(10), { 0x91, 0x08, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What? What?!\nWhere is that voice coming from?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Who are you?") }, + MSG_NPC(2, _(" What? What?!\nWhere is that voice coming from?")), + MSG_NPC(2, _(" Who are you?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_SWITCH(6), @@ -160,7 +160,7 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh! Exactly!{WAIT_PRESS}\nPlease lift the curse now!") }, + MSG_NPC(2, _(" Kekeh! Exactly!{WAIT_PRESS}\nPlease lift the curse now!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I cannot allow that right away.") }, @@ -169,8 +169,8 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 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?{WAIT_PRESS}\nYou're going to test me?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What, I have to fight some\nboss creature?") }, + MSG_NPC(2, _(" Kekeh? What?{WAIT_PRESS}\nYou're going to test me?")), + MSG_NPC(2, _(" What, I have to fight some\nboss creature?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Oh, no.\n{CENTER_ALIGN}Nothing so barbaric.") }, @@ -191,7 +191,7 @@ 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...?!{WAIT_PRESS}\nI can't move!") }, + MSG_NPC(2, _(" Gegeh?! What the...?!{WAIT_PRESS}\nI can't move!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, @@ -213,9 +213,9 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * FANFARE_PLAY2(473), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gegegeh!\nWhat are you saying?!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Why is someone else\nspeaking for me?!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let me do it!") }, + MSG_NPC(2, _(" Gegegeh!\nWhat are you saying?!")), + MSG_NPC(2, _(" Why is someone else\nspeaking for me?!")), + MSG_NPC(2, _(" Let me do it!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -224,7 +224,7 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 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?!") }, + MSG_NPC(2, _(" Kekeh?!\nWhat?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} will enter\n{CENTER_ALIGN}{NAME_2}'s heart.") }, @@ -348,13 +348,13 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000043, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" W-wait...") }, + MSG_NPC(2, _(" W-wait...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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!") }, + MSG_NPC(2, _(" Wait!\nWait a minute!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(666), @@ -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...{WAIT_PRESS}\nLet me say something!") }, + MSG_NPC(2, _(" 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 {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...{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}.") }, + MSG_NPC(2, _(" It's true.\nI abandoned {NAME_3} and ran.")), + MSG_NPC(2, _(" I was afraid that the curse\nwould fall on me.")), + MSG_NPC(2, _(" I had to get away, no matter\nwhat...{WAIT_PRESS}\nThat's what I thought.")), + MSG_NPC(2, _(" 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 {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, _(" {NAME_3} kept thinking\nabout someone like me.") }, + MSG_NPC(2, _(" Many long years passed...")), + MSG_NPC(2, _(" But {NAME_3}...{WAIT_PRESS}\nShe never forgot about me.")), + MSG_NPC(2, _(" One night...{WAIT_PRESS}\nIn {NAME_4}'s dream, {NAME_3}\nsaid this...")), + MSG_NPC(2, _(" That she considered me an\nirreplaceable friend, and that she still\nbelieved we would meet again...")), + MSG_NPC(2, _(" {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...{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...{WAIT_PRESS}\nIt was something for the others...{WAIT_PRESS}\nA sense of gratitude.") }, + MSG_NPC(2, _(" But I...\nHow selfish I was.")), + MSG_NPC(2, _(" I lived carefree all this\ntime...{WAIT_PRESS}\nI realize now how selfish I was.")), + MSG_NPC(2, _(" It's not just {NAME_3}.")), + MSG_NPC(2, _(" {COLOR CYAN}Team {TEAM_NAME}{RESET} put up\nwith my selfishness and brought me here.")), + MSG_NPC(2, _(" I finally know what I was\nmissing.")), + MSG_NPC(2, _(" 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, @@ -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-{NAME_3}!") }, + MSG_NPC(2, _(" Ga-{NAME_3}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), BGM_FADEIN(60, 5), @@ -437,35 +437,35 @@ 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, {NAME_2}!") }, + MSG_NPC(5, _(" 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-{NAME_5}!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...But...\nI don't know what you're saying...") }, + MSG_NPC(2, _(" N-{NAME_5}!")), + MSG_NPC(2, _(" ...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...{WAIT_PRESS}\nwas your sense of gratitude.") }, + MSG_NPC(5, _(" The curse has been broken.")), + MSG_NPC(5, _(" I cast my curse, enraged at\nyour twisted heart.")), + MSG_NPC(5, _(" When your heart gained\nwhat it had been missing...\nThe curse was shattered.")), + MSG_NPC(5, _(" 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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Then, Gardevoir...?") }, + MSG_NPC(2, _(" Then, Gardevoir...?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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.") }, + MSG_NPC(5, _(" You may be reassured.\n{NAME_3} has returned.{WAIT_PRESS}\nShe will soon awaken.")), + MSG_NPC(5, _(" However...{WAIT_PRESS}\nThat you were her partner in the past...")), + MSG_NPC(5, _(" {NAME_3} will have no\nrecollection of that.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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...") }, + MSG_NPC(2, _(" ............{WAIT_PRESS}That doesn't matter.")), + MSG_NPC(2, _(" {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 d2cb62c65..e5ab37a5d 100644 --- a/src/data/ground/ground_data_d24p02_station.h +++ b/src/data/ground/ground_data_d24p02_station.h @@ -45,8 +45,8 @@ 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{COLOR YELLOW_D}Murky Cave{RESET}?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Don't forget to take me,\nkekeh!") }, + MSG_NPC(2, _(" You're going to the\n{COLOR YELLOW_D}Murky Cave{RESET}?")), + MSG_NPC(2, _(" Don't forget to take me,\nkekeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_h29p01_station.h b/src/data/ground/ground_data_h29p01_station.h index a07f1a8bf..35673fbc3 100644 --- a/src/data/ground/ground_data_h29p01_station.h +++ b/src/data/ground/ground_data_h29p01_station.h @@ -284,31 +284,31 @@ static const struct ScriptCommand s_gs158_g2_s0_lives0_dlg0[] = { /* 0x820d22c * { 0x2e, 0x0b, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Fire, ice, and electricity...") }, + MSG_NPC(3, _(" Fire, ice, and electricity...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" When the three powers\nmerge as one...") }, + MSG_NPC(1, _(" When the three powers\nmerge as one...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" The guardian of the sea is\nsaid to arise.") }, + MSG_NPC(2, _(" 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{COLOR GREEN_H}Legendary Island{RESET}...") }, + MSG_NPC(3, _(" 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.") }, + MSG_NPC(2, _(" The three of us caused\nthe sea guardian to awaken.")), + MSG_NPC(2, _(" 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{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 {COLOR YELLOW_D}Silver Trench{RESET}.") }, + MSG_NPC(1, _(" I have here the\n{COLOR GREEN}Vortex Stone{RESET}.")), + MSG_NPC(1, _(" Bearing it, you will gain\npassage through the sea's tornadoes...")), + MSG_NPC(1, _(" 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.") }, + MSG_NPC(2, _(" There, you will find the\nguardian of the sea.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Now go.\nThe guardian of the sea awaits you.") }, + MSG_NPC(3, _(" Now go.\nThe guardian of the sea awaits you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x6a, 0x00, 0x0080, 0x00000000, -0x00000010, NULL }, diff --git a/src/data/ground/ground_data_t00p01_station.h b/src/data/ground/ground_data_t00p01_station.h index 440624e30..cead507f9 100644 --- a/src/data/ground/ground_data_t00p01_station.h +++ b/src/data/ground/ground_data_t00p01_station.h @@ -1239,7 +1239,7 @@ static const struct ScriptCommand s_gs0_g1_s0_lives13_dlg2[] = { /* 0x81376f8 */ CHOICE(/* label */ 1, _("Effect 2")), CHOICE(/* label */ 2, _("Effect 3")), CHOICE(/* label */ 3, _("Effect 4")), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Farewell.") }, + MSG_NPC(1, _(" Farewell.")), JUMP_SCRIPT(END_TALK), LABEL(0), /* = 0x00 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_t01p01_station.h b/src/data/ground/ground_data_t01p01_station.h index 892820df9..29e66ca35 100644 --- a/src/data/ground/ground_data_t01p01_station.h +++ b/src/data/ground/ground_data_t01p01_station.h @@ -569,8 +569,8 @@ static const struct ScriptCommand s_gs1_g1_s0_lives6_dlg2[] = { /* 0x8139760 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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.{WAIT_PRESS}\nWe're trying, but...") }, + MSG_NPC(1, _(" What's your rescue rank?\nHow high'd you get it?")), + MSG_NPC(1, _(" We're still Normal Rank.{WAIT_PRESS}\nWe're trying, but...")), JUMP_SCRIPT(END_TALK), }; @@ -579,11 +579,11 @@ static const struct ScriptCommand s_gs1_g1_s0_lives7_dlg2[] = { /* 0x8139840 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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.{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?") }, + MSG_NPC(1, _(" It sounds like the natural\ndisasters were interfering with our ability\nto evolve.")), + MSG_NPC(1, _(" I think the timing's right.{WAIT_PRESS}\nI should think about evolving...")), + MSG_NPC(1, _(" But when I evolve...{WAIT_PRESS}\nI become a {COLOR CYAN_M}Ludicolo{RESET}...")), + MSG_NPC(1, _(" You know? \n{COLOR CYAN_M}Ludicolo{RESET} is a carefree Pokémon.")), + MSG_NPC(1, _(" 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 {POKEMON_2}.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" From now on, I'm living as\n{POKEMON_1}.\nPleased to meet you.") }, + MSG_NPC(1, _(" I've given up on trying to\nturn back into {POKEMON_2}.")), + MSG_NPC(1, _(" From now on, I'm living as\n{POKEMON_1}.\nPleased to meet you.")), JUMP_SCRIPT(END_TALK), }; @@ -603,8 +603,8 @@ static const struct ScriptCommand s_gs1_g1_s0_lives9_dlg2[] = { /* 0x8139b2c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Our team got the Gold Rank,\nbut...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I think the rescue ranks go\nhigher than that.") }, + MSG_NPC(1, _(" Our team got the Gold Rank,\nbut...")), + MSG_NPC(1, _(" I think the rescue ranks go\nhigher than that.")), 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?{WAIT_PRESS}\nI can't imagine it.") }, + MSG_NPC(1, _(" I wonder what's higher than\nthe Gold Rank?{WAIT_PRESS}\nI can't imagine it.")), JUMP_SCRIPT(END_TALK), }; @@ -622,12 +622,12 @@ static const struct ScriptCommand s_gs1_g1_s0_lives11_dlg2[] = { /* 0x8139c9c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, 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...{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.") }, + MSG_NPC(1, _(" For many years, countless\nPokémon have served on rescue teams.")), + MSG_NPC(1, _(" Many have engraved\ntheir names in glory.")), + MSG_NPC(1, _(" But if anyone asks\nabout the greatest of them all...{WAIT_PRESS}\nThere is but one hero.")), + MSG_NPC(1, _(" It's Lucario...{WAIT_PRESS}\nwhose exploits as a rescue leader are the\nstuff of legend.")), + MSG_NPC(1, _(" I aspire to become like\nLucario.")), + MSG_NPC(1, _(" To become even closer to\nLucario's greatness...\nThat is my goal and my dream.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), JUMP_SCRIPT(END_TALK), @@ -638,7 +638,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives12_dlg2[] = { /* 0x8139ef4 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" KEEP UP YOUR RESCUE\nWORK! BZBZBZZZ!") }, + MSG_NPC(1, _(" KEEP UP YOUR RESCUE\nWORK! BZBZBZZZ!")), JUMP_SCRIPT(END_TALK), }; @@ -647,7 +647,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives13_dlg2[] = { /* 0x8139f7c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" YOUR TEAM HAS MY\nSUPPORT! BZBZBZZT!") }, + MSG_NPC(1, _(" YOUR TEAM HAS MY\nSUPPORT! BZBZBZZT!")), JUMP_SCRIPT(END_TALK), }; @@ -808,7 +808,7 @@ static const struct ScriptCommand s_gs1_g4_s0_lives0_dlg2[] = { /* 0x813a8b0 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ....................................") }, + MSG_NPC(1, _(" ....................................")), JUMP_SCRIPT(END_TALK), }; @@ -845,8 +845,8 @@ static const struct ScriptCommand s_gs1_g4_s1_lives0_dlg0[] = { /* 0x813a9b4 */ { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ....................................\n................................................\n................................................") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Belly...rumbling...{WAIT_PRESS}\nHungry...") }, + MSG_NPC(2, _(" ....................................\n................................................\n................................................")), + MSG_NPC(2, _(" ...Belly...rumbling...{WAIT_PRESS}\nHungry...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -997,9 +997,9 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ CHOICE(/* label */ 2, _("No.")), LABEL(1), /* = 0x01 */ { 0x2e, 0x15, 0x0001, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" R-really?!") }, + MSG_NPC(1, _(" R-really?!")), { 0x2e, 0x15, 0x0001, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What kind food?!\nShow Munchlax! Show, show!") }, + MSG_NPC(1, _(" What kind food?!\nShow Munchlax! Show, show!")), { 0x3c, 0x2d, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(-1, /* to label */ 2), JUMP_LABEL(3), @@ -1008,8 +1008,8 @@ 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?{WAIT_PRESS}\nOh... Don't have food...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Munchlax feel sad...{WAIT_PRESS}\nMunchlax go now.") }, + MSG_NPC(1, _(" ...Nnnnn?{WAIT_PRESS}\nOh... Don't have food...")), + MSG_NPC(1, _(" Munchlax feel sad...{WAIT_PRESS}\nMunchlax go now.")), JUMP_SCRIPT(END_TALK), LABEL(3), /* = 0x03 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), @@ -1020,7 +1020,7 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Th-this {COLOR GREEN_I}{MOVE_ITEM_0}{RESET}!{WAIT_PRESS}\nM-Munchlax big favorite!") }, + MSG_NPC(1, _(" 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,21 +1030,21 @@ 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!{WAIT_PRESS}\nDeeeeelicious!") }, + MSG_NPC(1, _(" Nnnnnnnnn!{WAIT_PRESS}\nDeeeeelicious!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000043, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Munchlax satisfied!") }, + MSG_NPC(1, _(" Munchlax satisfied!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nYou, good to Munchlax.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Munchlax say thank you\nwith this.") }, + MSG_NPC(1, _(" ............{WAIT_PRESS}\nYou, good to Munchlax.")), + MSG_NPC(1, _(" Munchlax say thank you\nwith this.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x3c, 0x2c, 0x0000, 0x0000002b, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Munchlax go now.") }, + MSG_NPC(1, _(" Munchlax go now.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 4), RET, @@ -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, _(" ............{WAIT_PRESS}\nYou, good to Munchlax.") }, + MSG_NPC(1, _(" ............{WAIT_PRESS}\nYou, good to Munchlax.")), JUMP_SCRIPT(END_TALK), }; @@ -1121,7 +1121,7 @@ static const struct ScriptCommand s_gs1_g5_s0_lives0_dlg2[] = { /* 0x813baf8 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ........................") }, + MSG_NPC(1, _(" ........................")), JUMP_SCRIPT(END_TALK), }; @@ -1162,7 +1162,7 @@ static const struct ScriptCommand s_gs1_g5_s1_lives0_dlg0[] = { /* 0x813bbf0 */ { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x02, 0x0002, 0x00000045, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ....................................") }, + MSG_NPC(2, _(" ....................................")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -1391,7 +1391,7 @@ static const struct ScriptCommand s_gs1_g5_s3_lives0_dlg2[] = { /* 0x813c738 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ........................") }, + MSG_NPC(1, _(" ........................")), JUMP_SCRIPT(END_TALK), }; @@ -1422,19 +1422,19 @@ static const struct ScriptCommand s_gs1_g5_s4_lives0_dlg0[] = { /* 0x813c7e4 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000044, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" R-really?!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Really, you give food back\nto Munchlax?") }, + MSG_NPC(2, _(" R-really?!")), + MSG_NPC(2, _(" Really, you give food back\nto Munchlax?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Snivel...\nMunchlax feel all squishy inside...") }, + MSG_NPC(2, _(" Snivel...\nMunchlax feel all squishy inside...")), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}\nYou honest and nice.\nMunchlax like.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Munchlax say thank you\nwith this.") }, + MSG_NPC(2, _(" ............{WAIT_PRESS}\nYou honest and nice.\nMunchlax like.")), + MSG_NPC(2, _(" Munchlax say thank you\nwith this.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x3c, 0x2c, 0x0000, 0x0000002b, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Munchlax go now.") }, + MSG_NPC(2, _(" Munchlax go now.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 5), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -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!{WAIT_PRESS}\nNnnnnnnnnnnnnnnnnnnnnnnnnnnnnn!") }, + MSG_NPC(2, _(" 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, _(" ..................{WAIT_PRESS}\nMunchlax sad...") }, + MSG_NPC(2, _(" ..................{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, _(" ..................{WAIT_PRESS}\nMeanie...") }, + MSG_NPC(2, _(" ..................{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, _(" ............{WAIT_PRESS}\nYou, good to Munchlax.") }, + MSG_NPC(1, _(" ............{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, _(" ..................{WAIT_PRESS}\nMeanie...") }, + MSG_NPC(1, _(" ..................{WAIT_PRESS}\nMeanie...")), JUMP_SCRIPT(END_TALK), }; @@ -1619,7 +1619,7 @@ static const struct ScriptCommand s_gs1_g6_s0_lives0_dlg0[] = { /* 0x813d45c */ WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This is Pokémon Square.") }, + MSG_NPC(1, _(" This is Pokémon Square.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -1781,9 +1781,9 @@ static const struct ScriptCommand s_gs1_g7_s0_lives5_dlg2[] = { /* 0x813e354 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I don't know why, but\nthere've been many natural disasters\nlately.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" A lot of Pokémon have gone\nwild and violent because the disasters\nscared them...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's a mean world out there.") }, + MSG_NPC(1, _(" I don't know why, but\nthere've been many natural disasters\nlately.")), + MSG_NPC(1, _(" A lot of Pokémon have gone\nwild and violent because the disasters\nscared them...")), + MSG_NPC(1, _(" It's a mean world out there.")), JUMP_SCRIPT(END_TALK), }; @@ -1799,9 +1799,9 @@ static const struct ScriptCommand s_gs1_g7_s0_lives6_dlg2[] = { /* 0x813e4d4 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There was a forest fire not\nlong ago.\nIt was terrible.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Luckily, Blastoise and\nFeraligatr were able to douse it quickly...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But it could have been much\nworse if they were slower getting\nthere.") }, + MSG_NPC(1, _(" There was a forest fire not\nlong ago.\nIt was terrible.")), + MSG_NPC(1, _(" Luckily, Blastoise and\nFeraligatr were able to douse it quickly...")), + MSG_NPC(1, _(" But it could have been much\nworse if they were slower getting\nthere.")), JUMP_SCRIPT(END_TALK), }; @@ -1810,14 +1810,14 @@ 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 {COLOR CYAN}Pelipper Post Office{RESET}?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The {COLOR CYAN}Pelipper Post Office{RESET}\nwould be...") }, + MSG_NPC(1, _(" Pardon?\nOh, the {COLOR CYAN}Pelipper Post Office{RESET}?")), + MSG_NPC(1, _(" 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.") }, + MSG_NPC(1, _(" Straight down this path.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's out at the cape.\nYou can't miss it.") }, + MSG_NPC(1, _(" It's out at the cape.\nYou can't miss it.")), JUMP_SCRIPT(END_TALK), }; @@ -1850,7 +1850,7 @@ static const struct ScriptCommand s_gs1_g7_s1_lives0_dlg0[] = { /* 0x813e880 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?\nAre you going home already?") }, + MSG_NPC(1, _(" Huh?\nAre you going home already?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(10), @@ -1961,8 +1961,8 @@ static const struct ScriptCommand s_gs1_g8_s0_lives6_dlg2[] = { /* 0x813eea0 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There've been so many\nnatural disasters lately...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" More Pokémon are starting\ntheir own rescue teams.") }, + MSG_NPC(1, _(" There've been so many\nnatural disasters lately...")), + MSG_NPC(1, _(" More Pokémon are starting\ntheir own rescue teams.")), JUMP_SCRIPT(END_TALK), }; @@ -1979,8 +1979,8 @@ static const struct ScriptCommand s_gs1_g8_s0_lives7_dlg2[] = { /* 0x813efbc */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004f, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, my gosh, the forest fire\na while back was simply awful.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I hightailed it out of there!") }, + MSG_NPC(1, _(" Oh, my gosh, the forest fire\na while back was simply awful.")), + MSG_NPC(1, _(" I hightailed it out of there!")), JUMP_SCRIPT(END_TALK), }; @@ -1999,11 +1999,11 @@ static const struct ScriptCommand s_gs1_g8_s1_lives0_dlg0[] = { /* 0x813f0dc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?\nYou want to go home already?") }, + MSG_NPC(1, _(" Huh?\nYou want to go home already?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We're already here.\nLet me show you around a bit more.") }, + MSG_NPC(1, _(" We're already here.\nLet me show you around a bit more.")), { 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 {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!{WAIT_PRESS}\nWigglytuff〜♪ Wigglytuff〜♪{WAIT_PRESS}\nLet's be friends... Taaaaaaah!") }, + MSG_NPC(2, _(" Friends are my treasures!\nWelcome to {NAME_2} Club--a circle\nof friends! ")), + MSG_NPC(2, _(" ...Oh?{WAIT_PRESS}\nIs this your first visit here?")), + MSG_NPC(2, _(" ...Oh, I get it!{WAIT_PRESS}\nYou started a rescue team too, didn't you?")), + MSG_NPC(2, _(" You've come to the right\nplace!{WAIT_PRESS} I sell Friend Areas to add\nmembers to your rescue team.")), + MSG_NPC(2, _(" Since you're here for the\nvery first time, I'll give you two Friend\nAreas for free!")), + MSG_NPC(2, _(" 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!{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?{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.{WAIT_PRESS}\nJust keep trying!") }, + MSG_NPC(2, _(" Congratulations!{WAIT_PRESS}\nYou can go to the {COLOR GREEN_H}Wild Plains{RESET} now.")), + MSG_NPC(2, _(" You can also go to the\n{COLOR GREEN_H}Mist-Rise Forest{RESET}.")), + MSG_NPC(2, _(" Now you can recruit\nPokémon that live in these two Friend\nAreas.")), + MSG_NPC(2, _(" How do you recruit new\nmembers?{WAIT_PRESS} Well, if you're fighting\nPokémon that live in a Friend Area...")), + MSG_NPC(2, _(" Sometimes, they will come\nto admire you as a friend.")), + MSG_NPC(2, _(" 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,19 +2154,19 @@ 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!{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.") }, + MSG_NPC(3, _(" BZBZBZZT!{WAIT_PRESS}\nIF YOU'RE GIVING FRIEND AREAS AWAY...")), + MSG_NPC(3, _(" CAN YOU ALSO GIVE MY\nFRIENDS ACCESS TO THE {COLOR GREEN_H}POWER PLANT{RESET}\nFRIEND AREA?")), + MSG_NPC(3, _(" I ALSO WANT TO JOIN\nTHEIR RESCUE TEAM.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" OK! Gotcha!") }, + MSG_NPC(2, _(" OK! Gotcha!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 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!{WAIT_PRESS}\nWigglytuff〜♪ Wigglytuff〜♪{WAIT_PRESS}\nLet's be friends... Taaaaaaah!") }, + MSG_NPC(2, _(" 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,14 +2175,14 @@ 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!{WAIT_PRESS}\nYou can go to the {COLOR GREEN_H}Power Plant{RESET} now.") }, + MSG_NPC(2, _(" 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 }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0004, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" YES!\nNOW I CAN JOIN THEIR TEAM!") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" YAY! BZBZBZZT!") }, + MSG_NPC(4, _(" YES!\nNOW I CAN JOIN THEIR TEAM!")), + MSG_NPC(4, _(" YAY! BZBZBZZT!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -2194,37 +2194,37 @@ 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.{WAIT_PRESS}\nI KNOW MY FRIEND TURNED DOWN YOUR\nOFFER TO JOIN YOUR TEAM YESTERDAY...") }, + MSG_NPC(3, _(" 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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" BUT AFTER MULLING IT\nOVER ALL LAST NIGHT...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" MY FRIEND DEVELOPED AN\nOVERWHELMING DESIRE TO BECOME YOUR\nTEAM MEMBER.") }, + MSG_NPC(3, _(" BUT AFTER MULLING IT\nOVER ALL LAST NIGHT...")), + MSG_NPC(3, _(" MY FRIEND DEVELOPED AN\nOVERWHELMING DESIRE TO BECOME YOUR\nTEAM MEMBER.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I APOLOGIZE, BUT COULD\nYOU ALLOW MY FRIEND TO JOIN YOUR\nRESCUE TEAM?") }, + MSG_NPC(3, _(" 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!{WAIT_PRESS}\nDon't forget, we were the ones that asked\nyour friend to join us.") }, + MSG_NPC(1, _(" 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!") }, + MSG_NPC(1, _(" So, yes, that'd be awesome!\nGlad to have your friend on board!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ALL RIGHT!\nGOOD ON YOU! BZBZBZZ!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" DO YOUR BEST, AND TRY\nNOT TO HINDER YOUR RESCUE\nTEAMMATES! BZBZBZZT!") }, + MSG_NPC(3, _(" ALL RIGHT!\nGOOD ON YOU! BZBZBZZ!")), + MSG_NPC(3, _(" DO YOUR BEST, AND TRY\nNOT TO HINDER YOUR RESCUE\nTEAMMATES! BZBZBZZT!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" YEAH! I'LL DO MY BEST!") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" YAY, BZBZBZZ!") }, + MSG_NPC(4, _(" YEAH! I'LL DO MY BEST!")), + MSG_NPC(4, _(" YAY, BZBZBZZ!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY(204), @@ -2248,9 +2248,9 @@ 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{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!") }, + MSG_NPC(4, _(" I'LL BE RESTING UP IN THE\n{COLOR GREEN_H}POWER PLANT{RESET} FRIEND AREA.")), + MSG_NPC(4, _(" IF YOU WANT ME ALONG\nFOR A RESCUE, COME GET ME AT THE\n{COLOR GREEN_H}POWER PLANT{RESET}.")), + MSG_NPC(4, _(" OK! BZBZBZZ!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -2259,9 +2259,9 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 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!{WAIT_PRESS} If you want more Friend Areas,\nyou'll have to buy them now.") }, + MSG_NPC(2, _(" You can go to your Friend\nAreas by taking the left path from your\nrescue team base.")), + MSG_NPC(2, _(" There's a sign on the path\nto the left of your rescue team base,\nso you shouldn't have any trouble.")), + MSG_NPC(2, _(" 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?{WAIT_PRESS}\nThere seems to be a commotion.") }, + MSG_NPC(1, _(" 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 }, @@ -2470,14 +2470,14 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0x2e, 0x0f, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Please help my friend!\nPlease, I need help!") }, + MSG_NPC(2, _(" Please help my friend!\nPlease, I need help!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Forget it.\nWe're not about to work for that.") }, + MSG_NPC(3, _(" Forget it.\nWe're not about to work for that.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But my friend needs a gust\nof wind! Please!") }, + MSG_NPC(2, _(" But my friend needs a gust\nof wind! Please!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -2494,13 +2494,13 @@ 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, _(" Huh? That scene there?") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" {NAME_2}'s begging for\na rescue mission, but not finding any luck.") }, + MSG_NPC(4, _(" Huh? That scene there?")), + MSG_NPC(4, _(" {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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" See that guy?") }, + MSG_NPC(4, _(" See that guy?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -2508,8 +2508,8 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 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{POKEMON_3}.\nHe's got his own rescue team.") }, + MSG_NPC(4, _(" There, the one in the middle\nwith the pointy nose.")), + MSG_NPC(4, _(" 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 }, @@ -2517,8 +2517,8 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, { 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, _(" {NAME_2}'s been begging\nfor help, but...{WAIT_PRESS}\nI feel sorry for that poor Pokémon.") }, + MSG_NPC(4, _(" But his team's greedy.\nThey don't work unless they get paid\nroyally.")), + MSG_NPC(4, _(" {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 }, @@ -2544,7 +2544,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! Wh-what do you want?") }, + MSG_NPC(3, _(" Oh! Wh-what do you want?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Oh! It's {NAME_5}!") }, @@ -2557,16 +2557,16 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, { 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 {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.{WAIT_PRESS}\nHelp that Pokémon out.") }, + MSG_NPC(5, _(" Hey. Rather coldhearted,\naren't you?")), + MSG_NPC(5, _(" To save {NAME_2}'s\nfriend, a strong wind is needed.")), + MSG_NPC(5, _(" Your leafy fans can whip up\npowerful winds.")), + MSG_NPC(5, _(" 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...{WAIT_PRESS}\nTch! OK, we'll do it.") }, + MSG_NPC(3, _(" Grr...{WAIT_PRESS}\nTch! OK, we'll do it.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -2595,8 +2595,8 @@ 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 {NAME_5}'s team!") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" They're the most famous\nrescue team around these parts.") }, + MSG_NPC(4, _(" What? You don't know?!\nIt's {NAME_5}'s team!")), + MSG_NPC(4, _(" They're the most famous\nrescue team around these parts.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -2607,32 +2607,32 @@ 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 {NAME_6}.{WAIT_PRESS}\nHis Flamethrower can melt mountains!") }, + MSG_NPC(4, _(" 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 {NAME_7}.{WAIT_PRESS}\nHe takes great pride in his armored\nbody and amazing strength.") }, + MSG_NPC(4, _(" 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{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, _(" {NAME_5} does all the\ncommanding in the team.{WAIT_PRESS}\nHe's clearly in charge.") }, + MSG_NPC(4, _(" And that's the leader,\n{NAME_5}.")), + MSG_NPC(4, _(" {NAME_5} doesn't like\nphysical attacks.\nHe fights with his psychic powers.")), + MSG_NPC(4, _(" He's endowed with an\namazing brain and an IQ of 5,000.")), + MSG_NPC(4, _(" Apparently, he's memorized\neverything that's happened in the world.")), + MSG_NPC(4, _(" {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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Th-thank you.") }, + MSG_NPC(2, _(" Th-thank you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x02, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" No need for thanks.\nIt is only natural that you get help.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" If anyone turns you down\nagain, come see me.\nTake care.") }, + MSG_NPC(5, _(" No need for thanks.\nIt is only natural that you get help.")), + MSG_NPC(5, _(" If anyone turns you down\nagain, come see me.\nTake care.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), WAIT(1), @@ -2658,7 +2658,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x14, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ...!") }, + MSG_NPC(5, _(" ...!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -2669,23 +2669,23 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(24), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Wah! What's wrong?") }, + MSG_NPC(4, _(" Wah! What's wrong?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" What's up?") }, + MSG_NPC(6, _(" What's up?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0f, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ......{WAIT_PRESS}\nIt's fine. Nothing.") }, + MSG_NPC(5, _(" ......{WAIT_PRESS}\nIt's fine. Nothing.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(64), { 0x2e, 0x14, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Let's go.") }, + MSG_NPC(5, _(" Let's go.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -2696,13 +2696,13 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, BGM_FADEIN(60, 7), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Whew!\nThat was scary! Sheesh!") }, + MSG_NPC(4, _(" Whew!\nThat was scary! Sheesh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...C-cool...") }, + MSG_NPC(1, _(" ...C-cool...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -3180,12 +3180,12 @@ static const struct ScriptCommand s_gs1_g11_s0_lives6_dlg2[] = { /* 0x8144320 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004d, 0x00000000, NULL }, 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...{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...{WAIT_PRESS}\nI wonder what's going on.") }, + MSG_NPC(1, _(" Alakazam and his sidekicks\nwere sure cool before.")), + MSG_NPC(1, _(" That's how a real hero has\nto carry himself.")), + MSG_NPC(1, _(" By the way...{WAIT_PRESS}\nApparently, it's been impossible for us to\nevolve lately.")), + MSG_NPC(1, _(" You know how we Pokémon\nevolve if the conditions are right?")), + MSG_NPC(1, _(" But for some reason, we\nhaven't been able to evolve at all.")), + MSG_NPC(1, _(" It's rumored that the natural\ndisasters are to blame, but...{WAIT_PRESS}\nI wonder what's going on.")), JUMP_SCRIPT(END_TALK), }; @@ -3201,17 +3201,17 @@ static const struct ScriptCommand s_gs1_g11_s0_lives7_dlg2[] = { /* 0x81445b8 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, 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...{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.") }, + MSG_NPC(1, _(" Did you know that a new\ntraining gym--I think they called it\na dojo--opened in town?")), + MSG_NPC(1, _(" You know how many rescue\nteams started up? To deal with all\nthe natural disasters?")), + MSG_NPC(1, _(" There was a group of\nconcerned Pokémon...{WAIT_PRESS}\nThey wanted to support rescue teams.")), + MSG_NPC(1, _(" So they got together and\nbuilt the dojo.")), + MSG_NPC(1, _(" You can find the dojo easily.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" From here, it's just straight\ndown this path.") }, + MSG_NPC(1, _(" From here, it's just straight\ndown this path.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you have a rescue team\ntoo, I highly recommend you pay the dojo\na visit.") }, + MSG_NPC(1, _(" If you have a rescue team\ntoo, I highly recommend you pay the dojo\na visit.")), JUMP_SCRIPT(END_TALK), }; @@ -3234,18 +3234,18 @@ static const struct ScriptCommand s_gs1_g11_s0_lives8_dlg2[] = { /* 0x8144938 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Alakazam's team has the\nGold Rank. Isn't that awesome?") }, + MSG_NPC(1, _(" 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?{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...{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!") }, + MSG_NPC(1, _(" I guess that's true.")), + MSG_NPC(1, _(" It might be rude to say it...{WAIT_PRESS}\nbut you obviously look like you really are\nnothing special.")), + MSG_NPC(1, _(" 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, _(" ......{WAIT_PRESS}\nI'm not falling for a lie like that.") }, + MSG_NPC(1, _(" What?!\nYou're Gold Rank too?!")), + MSG_NPC(1, _(" ......{WAIT_PRESS}\nI'm not falling for a lie like that.")), JUMP_SCRIPT(END_TALK), }; @@ -3269,14 +3269,14 @@ static const struct ScriptCommand s_gs1_g12_s0_lives0_dlg0[] = { /* 0x8144c8c */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0000, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" Please help my friend!\nPlease, I need help!") }, + MSG_NPC(0, _(" Please help my friend!\nPlease, I need help!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Forget it.\nWe're not about to work for that.") }, + MSG_NPC(1, _(" Forget it.\nWe're not about to work for that.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0000, 0x00000000, 0x00000000, _(" But my friend needs a gust\nof wind! Please!") }, + MSG_NPC(0, _(" But my friend needs a gust\nof wind! Please!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -3415,8 +3415,8 @@ 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.{WAIT_PRESS}\nShiftry hasn't returned?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder...\nDid Shiftry maybe just run off?") }, + MSG_NPC(1, _(" We heard.{WAIT_PRESS}\nShiftry hasn't returned?")), + MSG_NPC(1, _(" I wonder...\nDid Shiftry maybe just run off?")), JUMP_SCRIPT(END_TALK), }; @@ -3432,9 +3432,9 @@ static const struct ScriptCommand s_gs1_g13_s0_lives7_dlg2[] = { /* 0x8145320 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm afraid Shiftry's team is\nalways about the money.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" They went out on that\nrescue only because Alakazam told them\nto...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I don't think they were\nvery enthusiastic about it.") }, + MSG_NPC(1, _(" I'm afraid Shiftry's team is\nalways about the money.")), + MSG_NPC(1, _(" They went out on that\nrescue only because Alakazam told them\nto...")), + MSG_NPC(1, _(" I don't think they were\nvery enthusiastic about it.")), JUMP_SCRIPT(END_TALK), }; @@ -3512,7 +3512,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives6_dlg2[] = { /* 0x8145714 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Shiftry was abducted?\nThat's shocking news!") }, + MSG_NPC(1, _(" Shiftry was abducted?\nThat's shocking news!")), 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 {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.") }, + MSG_NPC(1, _(" Is that right...\nShiftry was taken away to {COLOR YELLOW_D}Mt. Thunder{RESET}...")), + MSG_NPC(1, _(" I wonder what that place is\nlike?{WAIT_PRESS}\nIt sounds rather horrible.")), + MSG_NPC(1, _(" Oh? Me?{WAIT_PRESS}\nI couldn't possibly go rescue him.")), JUMP_SCRIPT(END_TALK), }; @@ -3548,15 +3548,15 @@ static const struct ScriptCommand s_gs1_g14_s0_lives8_dlg2[] = { /* 0x8145944 */ { 0x2d, 0x09, 0x0003, 0x0000004e, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x03, 0x0003, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm glad to see you're\nback safe.") }, + MSG_NPC(2, _(" I'm glad to see you're\nback safe.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Thank you.\nBut Shiftry is in trouble now...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Shiftry came and rescued\nme...") }, + MSG_NPC(3, _(" Thank you.\nBut Shiftry is in trouble now...")), + MSG_NPC(3, _(" Shiftry came and rescued\nme...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0003, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I hope he is safe...") }, + MSG_NPC(3, _(" I hope he is safe...")), JUMP_SCRIPT(END_TALK), }; @@ -3574,15 +3574,15 @@ static const struct ScriptCommand s_gs1_g14_s0_lives9_dlg2[] = { /* 0x8145b14 */ { 0x2d, 0x09, 0x0003, 0x0000004e, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x03, 0x0003, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm glad to see you're\nback safe.") }, + MSG_NPC(2, _(" I'm glad to see you're\nback safe.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Thank you.\nBut Shiftry is in trouble now...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Shiftry came and rescued\nme...") }, + MSG_NPC(3, _(" Thank you.\nBut Shiftry is in trouble now...")), + MSG_NPC(3, _(" Shiftry came and rescued\nme...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0003, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I hope he is safe...") }, + MSG_NPC(3, _(" I hope he is safe...")), JUMP_SCRIPT(END_TALK), }; @@ -3600,15 +3600,15 @@ static const struct ScriptCommand s_gs1_g14_s0_lives10_dlg2[] = { /* 0x8145c54 * { 0x2d, 0x09, 0x0003, 0x0000004e, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x03, 0x0003, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I'm glad to see you're\nback safe.") }, + MSG_NPC(2, _(" I'm glad to see you're\nback safe.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Thank you.\nBut Shiftry is in trouble now...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Shiftry came and rescued\nme...") }, + MSG_NPC(3, _(" Thank you.\nBut Shiftry is in trouble now...")), + MSG_NPC(3, _(" Shiftry came and rescued\nme...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0003, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I hope he is safe...") }, + MSG_NPC(3, _(" I hope he is safe...")), 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?{WAIT_PRESS} I wouldn't know.{WAIT_PRESS}\nThere's really a Pokémon named that?") }, + MSG_NPC(1, _(" Xatu?{WAIT_PRESS} I wouldn't know.{WAIT_PRESS}\nThere's really a Pokémon named that?")), JUMP_SCRIPT(END_TALK), }; @@ -3704,8 +3704,8 @@ static const struct ScriptCommand s_gs1_g15_s0_lives7_dlg2[] = { /* 0x8146118 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004f, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I must say, I'm very\nimpressed.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Your team is surprisingly\ncourageous. It casts you in a new light!") }, + MSG_NPC(1, _(" I must say, I'm very\nimpressed.")), + MSG_NPC(1, _(" Your team is surprisingly\ncourageous. It casts you in a new light!")), JUMP_SCRIPT(END_TALK), }; @@ -3714,7 +3714,7 @@ static const struct ScriptCommand s_gs1_g15_s0_lives8_dlg2[] = { /* 0x8146204 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm glad that Shiftry is\nsafe.") }, + MSG_NPC(1, _(" I'm glad that Shiftry is\nsafe.")), JUMP_SCRIPT(END_TALK), }; @@ -3723,8 +3723,8 @@ 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, _(" {NAME_0}, your team is\nfantastic!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's shocking to hear that\nyou've beaten Zapdos!") }, + MSG_NPC(1, _(" {NAME_0}, your team is\nfantastic!")), + MSG_NPC(1, _(" It's shocking to hear that\nyou've beaten Zapdos!")), JUMP_SCRIPT(END_TALK), }; @@ -3838,15 +3838,15 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yeah, I'm kind of shocked.") }, + MSG_NPC(2, _(" Yeah, I'm kind of shocked.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I always thought it was\nonly a legend.") }, + MSG_NPC(4, _(" I always thought it was\nonly a legend.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0f, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But could it be true?{WAIT_PRESS}\nI'm having a hard time believing it...") }, + MSG_NPC(3, _(" 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{COLOR GREEN}{NAME_6} legend{RESET}?\nThat old story?") }, + MSG_NPC(2, _(" 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,39 +3871,39 @@ 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 {NAME_6} legend?{WAIT_PRESS}\nWhat's that?") }, + MSG_NPC(1, _(" The {NAME_6} legend?{WAIT_PRESS}\nWhat's that?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What, you don't know?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You know, it's that old\nfairy tale.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" How you'll get cursed if you\never grab one of Ninetales's tails.") }, + MSG_NPC(2, _(" What, you don't know?")), + MSG_NPC(2, _(" You know, it's that old\nfairy tale.")), + MSG_NPC(2, _(" How you'll get cursed if you\never grab one of Ninetales's tails.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" All this time, everyone\nthought it was just a legend.") }, + MSG_NPC(4, _(" All this time, everyone\nthought it was just a legend.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" But lately, it's been rumored\nthat maybe it really happened.") }, + MSG_NPC(4, _(" But lately, it's been rumored\nthat maybe it really happened.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Well, it is still a mere\nrumor.") }, + MSG_NPC(3, _(" Well, it is still a mere\nrumor.")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I wouldn't put too much\nstock in that story if I were you.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Personally, I don't believe\nin rumors of that sort.") }, + MSG_NPC(3, _(" I wouldn't put too much\nstock in that story if I were you.")), + MSG_NPC(3, _(" 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 {NAME_6} legend...") }, + MSG_NPC(2, _(" 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 {NAME_5}.\nHe knows the story well.") }, + MSG_NPC(2, _(" 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, _(" {NAME_5} is uh...{WAIT_PRESS}\nYou know, in his pond.") }, + MSG_NPC(2, _(" {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 }, @@ -3914,7 +3914,7 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, { 0x2e, 0x10, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You should visit him if you\nwant to know more.") }, + MSG_NPC(2, _(" You should visit him if you\nwant to know more.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -4083,8 +4083,8 @@ static const struct ScriptCommand s_gs1_g18_s0_lives6_dlg2[] = { /* 0x814789c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Whiscash is in the pond just\nnorth of here.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You should visit him if you\nwant to chat.") }, + MSG_NPC(1, _(" Whiscash is in the pond just\nnorth of here.")), + MSG_NPC(1, _(" You should visit him if you\nwant to chat.")), JUMP_SCRIPT(END_TALK), }; @@ -4093,8 +4093,8 @@ static const struct ScriptCommand s_gs1_g18_s0_lives7_dlg2[] = { /* 0x8147968 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Well, it is still a mere\nrumor.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I don't put any stock in\nrumors like that...") }, + MSG_NPC(1, _(" Well, it is still a mere\nrumor.")), + MSG_NPC(1, _(" I don't put any stock in\nrumors like that...")), JUMP_SCRIPT(END_TALK), }; @@ -4103,7 +4103,7 @@ static const struct ScriptCommand s_gs1_g18_s0_lives8_dlg2[] = { /* 0x8147a08 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I always thought it was\nonly a legend.") }, + MSG_NPC(1, _(" I always thought it was\nonly a legend.")), JUMP_SCRIPT(END_TALK), }; @@ -4206,22 +4206,22 @@ static const struct ScriptCommand s_gs1_g20_s0_lives0_dlg0[] = { /* 0x8147f8c */ FANFARE_PLAY2(469), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?") }, + MSG_NPC(1, _(" Huh?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x91, 0x05, 0x000a, 0x00000005, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x91, 0x0a, 0x0001, 0x00000002, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The town's atmosphere\nfeels different somehow...") }, + MSG_NPC(1, _(" The town's atmosphere\nfeels different somehow...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 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, _(" {NAME_0}, let's check\nit out!") }, + MSG_NPC(1, _(" Maybe something's happened.")), + MSG_NPC(1, _(" {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!{WAIT_PRESS}\nIt really was true!") }, + MSG_NPC(5, _(" 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), @@ -4322,13 +4322,13 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" The Ninetales legend!") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I never believed the\nrumors, so you can bet I was shocked\nto learn the truth!") }, + MSG_NPC(5, _(" The Ninetales legend!")), + MSG_NPC(5, _(" I never believed the\nrumors, so you can bet I was shocked\nto learn the truth!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_0}, {NAME_1}.") }, + MSG_NPC(3, _(" {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, {NAME_3}!") }, + MSG_NPC(1, _(" Oh, hi, {NAME_3}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -4345,17 +4345,17 @@ 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{NAME_3}?") }, + MSG_NPC(1, _(" Even you came out,\n{NAME_3}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes.") }, + MSG_NPC(3, _(" Yes.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Ssh!{WAIT_PRESS} Quiet.") }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" That guy there's telling us.\nKeep it down.") }, + MSG_NPC(6, _(" Ssh!{WAIT_PRESS} Quiet.")), + MSG_NPC(6, _(" That guy there's telling us.\nKeep it down.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -4365,7 +4365,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ VARIANT_DEFAULT(_(" Huh?{WAIT_PRESS} Who's talking?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I-it's...") }, + MSG_NPC(3, _(" I-it's...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -4390,25 +4390,25 @@ 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-{NAME_2}?!") }, + MSG_NPC(1, _(" 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{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!") }, + MSG_NPC(2, _(" ...So I went up to the\n{COLOR CYAN}Hill of the Ancients{RESET}.")), + MSG_NPC(2, _(" And that's where I saw it!\nIt was shocking stuff, I tell you!\nKekeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Shocking stuff?") }, + MSG_NPC(4, _(" Shocking stuff?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" This certain Pokémon was\ngetting advice from {NAME_7}.") }, + MSG_NPC(2, _(" 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...") }, + MSG_NPC(2, _(" That Pokémon...\nIt looks like an ordinary Pokémon...")), { 0x2e, 0x15, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But get this!{WAIT_PRESS}\nIt was originally a human!") }, + MSG_NPC(2, _(" 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 }, @@ -4420,33 +4420,33 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x05, 0x000a, 0x00000022, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" What?!") }, + MSG_NPC(5, _(" What?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x05, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" It really existed...\nA human that turned into a Pokémon.") }, + MSG_NPC(6, _(" It really existed...\nA human that turned into a Pokémon.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x15, 0x0002, 0x00000004, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(2, _(" There's more.\n{NAME_7} told the human...")), + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nThat's exactly like the Ninetales legend!") }, + MSG_NPC(4, _(" 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 }, { 0x2e, 0x14, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nDon't be too shocked yet.\nThere's more.") }, + MSG_NPC(2, _(" Kekeh!\nDon't be too shocked yet.\nThere's more.")), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 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 {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...") }, + MSG_NPC(2, _(" You all know how there've\nbeen many natural disasters, correct?")), + MSG_NPC(2, _(" According to {NAME_7},\nthose disasters are caused by the world's\nbalance being upset.")), + MSG_NPC(2, _(" 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!") }, + MSG_NPC(2, _(" The unthinkable will happen\nto the world! That's what Xatu said!\nKekeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -4457,14 +4457,14 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ CALL_LABEL(15), FANFARE_PLAY2(473), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Wh-what?") }, + MSG_NPC(4, _(" Wh-what?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0c, 0x0005, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" The world...{WAIT_PRESS}\nThe unthinkable's going to happen?") }, + MSG_NPC(5, _(" 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?!") }, + MSG_NPC(6, _(" What are we to do?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000003, 0x00000000, NULL }, @@ -4474,21 +4474,21 @@ 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, _(" 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!") }, + MSG_NPC(2, _(" Now, now, people.{WAIT_PRESS}\nThere's no need to panic.")), + MSG_NPC(2, _(" 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), { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), WAIT(60), - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Wh-what can we do?") }, + MSG_NPC(6, _(" Wh-what can we do?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, it's quite simple,\nactually.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If the world's balance is\nupset by a human becoming a Pokémon...") }, + MSG_NPC(2, _(" Oh, it's quite simple,\nactually.")), + MSG_NPC(2, _(" If the world's balance is\nupset by a human becoming a Pokémon...")), { 0x2e, 0x15, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Then, if that human is\ngone, then everything should return\nto normal, correct?") }, + MSG_NPC(2, _(" Then, if that human is\ngone, then everything should return\nto normal, correct?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -4498,26 +4498,26 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ WAIT(15), { 0xe5, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Th-that's true!") }, + MSG_NPC(4, _(" Th-that's true!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x04, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" When you put it that way...\nmaybe you're right.") }, + MSG_NPC(6, _(" When you put it that way...\nmaybe you're right.")), { 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 {NAME_8}, correct?") }, + MSG_NPC(2, _(" 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 }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I don't think the human can\ncomplain about anything if we get\nrid of it.") }, + MSG_NPC(2, _(" I don't think the human can\ncomplain about anything if we get\nrid of it.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_STOP, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Isn't that right,\n{NAME_0}?") }, + MSG_NPC(2, _(" Isn't that right,\n{NAME_0}?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -4534,14 +4534,14 @@ 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...{WAIT_PRESS} What?!{WAIT_PRESS}\nIt... It can't be!") }, + MSG_NPC(4, _(" 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...{WAIT_PRESS}\nYou were that human?!") }, + MSG_NPC(5, _(" Y-you...{WAIT_PRESS}\nYou were that human?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Is that true?\nHey!") }, + MSG_NPC(6, _(" Is that true?\nHey!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), @@ -4554,11 +4554,11 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ 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 {NAME_0}!") }, + MSG_NPC(6, _(" 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! {NAME_0}!\nSo what is it?!") }, + MSG_NPC(6, _(" 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,21 +4570,21 @@ 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, _(" {NAME_0}...") }, + MSG_NPC(1, _(" {NAME_0}...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x05, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" {NAME_0}...") }, + MSG_NPC(3, _(" {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, {NAME_0}!") }, + MSG_NPC(2, _(" 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 }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That's how it is, fellow\nPokémon.") }, + MSG_NPC(2, _(" That's how it is, fellow\nPokémon.")), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 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{NAME_0} and regain peace.\nKekekekekeh!") }, + MSG_NPC(2, _(" 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 }, @@ -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, _(" {NAME_0}, forgive me!") }, + MSG_NPC(4, _(" {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!{WAIT_PRESS}\n{NAME_0}, run!") }, + MSG_NPC(1, _(" 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 }, @@ -4666,7 +4666,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ { 0x6a, 0x00, 0x0300, -0x00000078, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Serves them right!\nKekekekeh!") }, + MSG_NPC(2, _(" Serves them right!\nKekekekeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -5644,8 +5644,8 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ FANFARE_PLAY2(472), { 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 {NAME_0}'s team?") }, + MSG_NPC(2, _(" Kekeh!\nYou lot!")), + MSG_NPC(2, _(" 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 }, @@ -5653,16 +5653,16 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x02, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" That's easy for you to say...") }, + MSG_NPC(4, _(" That's easy for you to say...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" It's too much for us...") }, + MSG_NPC(4, _(" It's too much for us...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x03, 0x0005, 0x00000000, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(5, _(" They say {NAME_0}'s\nteam has gone way far out there.")), + MSG_NPC(5, _(" If we went, the best we\ncould hope for is maybe the Lapis Cave.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -5674,38 +5674,38 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0003, -0x00000001, 0x00000000, NULL }, - { 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.{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!") }, + MSG_NPC(3, _(" I joined the chase...")), + MSG_NPC(3, _(" But they fled into Mt. Blaze.")), + MSG_NPC(3, _(" For the life of me, I can't\ngo in there.\nAnd that's where I lost their trail.")), + MSG_NPC(3, _(" I'm a Grass type, see.{WAIT_PRESS}\nFire doesn't agree with me at all.")), + MSG_NPC(3, _(" I don't know what became\nof {NAME_0}'s team after that.")), + MSG_NPC(3, _(" ...But those fugitives...\nTo think they would risk Mt. Blaze...")), + MSG_NPC(3, _(" They've grown up tough!\nI can't keep up!")), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000042, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Hahaha!") }, + MSG_NPC(3, _(" Hahaha!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0b, 0x0002, 0x00000043, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh!\nWhat a spineless lot you are!\nTch!") }, + MSG_NPC(2, _(" Kekeh!\nWhat a spineless lot you are!\nTch!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You're so full of big talk!\nWhat about your team, Gengar?") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You just hang around in the\nsquare and don't do a thing.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Walk the talk.\nYou guys go.") }, + MSG_NPC(4, _(" You're so full of big talk!\nWhat about your team, Gengar?")), + MSG_NPC(4, _(" You just hang around in the\nsquare and don't do a thing.")), + MSG_NPC(4, _(" Walk the talk.\nYou guys go.")), { 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, _(" We're out of that picture.\nKekeh!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Our role is to receive word\nabout {NAME_0}'s demise.\nKekekekekeh!") }, + MSG_NPC(2, _(" We're out of that picture.\nKekeh!")), + MSG_NPC(2, _(" 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 }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Tch!\nJust appointed yourself that...") }, + MSG_NPC(4, _(" Tch!\nJust appointed yourself that...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Oh, my gosh! Oh, my goodness!") }, @@ -5720,30 +5720,30 @@ 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, _(" {NAME_7}, what's\nthe word?") }, + MSG_NPC(2, _(" {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, _(" {NAME_0}...\n{NAME_0} is...") }, + MSG_NPC(7, _(" {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 {NAME_0}!\nKekeh!") }, + MSG_NPC(2, _(" 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!{WAIT_PRESS}\nIt's the opposite!") }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" {NAME_0} is back!") }, + MSG_NPC(7, _(" No!{WAIT_PRESS}\nIt's the opposite!")), + MSG_NPC(7, _(" {NAME_0} is back!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(463), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000046, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Kekeh?!\nWhat did you say?!") }, + MSG_NPC(2, _(" Kekeh?!\nWhat did you say?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, @@ -5767,18 +5767,18 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ WAIT(30), { 0x2e, 0x0d, 0x0003, 0x00000042, 0x00000000, NULL }, { 0x2f, 0x00, 0x0003, 0x00000000, -0x00000001, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" H-hey! Over there...") }, + MSG_NPC(3, _(" H-hey! Over there...")), WAIT(4), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x05, 0x0006, 0x00000042, 0x00000000, NULL }, { 0x2f, 0x00, 0x0006, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" ...{NAME_0}!") }, + MSG_NPC(6, _(" ...{NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x03, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0005, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Th-they're back...") }, + MSG_NPC(5, _(" Th-they're back...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -5793,9 +5793,9 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ WAIT(30), BGM_SWITCH(7), { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hi, everyone!\nWe're back!") }, + MSG_NPC(1, _(" Hi, everyone!\nWe're back!")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Whew!\nWe finally made it back.\nWe've been gone for so long...") }, + MSG_NPC(1, _(" Whew!\nWe finally made it back.\nWe've been gone for so long...")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -5805,13 +5805,13 @@ 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, _(" Hey, {NAME_1}!") }, + MSG_NPC(2, _(" 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{NAME_2}.\nIt's been a while.") }, + MSG_NPC(1, _(" 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?)") }, @@ -5838,13 +5838,13 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x15, 0x0002, 0x00000046, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ugege?!") }, + MSG_NPC(2, _(" Ugege?!")), { 0x2e, 0x05, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Wh-what?!") }, + MSG_NPC(4, _(" Wh-what?!")), { 0x2e, 0x0d, 0x0003, 0x00000042, 0x00000000, NULL }, { 0x2f, 0x00, 0x0003, -0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Is that true?!") }, + MSG_NPC(3, _(" Is that true?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -5858,7 +5858,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ugegegegegegegeh!") }, + MSG_NPC(2, _(" Ugegegegegegegeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -5871,11 +5871,11 @@ 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!{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.") }, + MSG_NPC(2, _(" Kekeh! W-wait a second!{WAIT_PRESS}\nYou can't be trusted yet.")), + MSG_NPC(2, _(" 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 }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" P-proof?") }, + MSG_NPC(1, _(" P-proof?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -5887,11 +5887,11 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, WAIT(45), { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" That's right.\nSome hard evidence! Kekeh!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let's see some proof!\nCome on, out with it!") }, + MSG_NPC(2, _(" That's right.\nSome hard evidence! Kekeh!")), + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nWe don't have any proof...") }, + MSG_NPC(1, _(" 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!{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!") }, + MSG_NPC(2, _(" Kekekekekekeh!{WAIT_PRESS}\nIt's too bad you don't have proof!")), + MSG_NPC(2, _(" 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.{WAIT_PRESS}\nHere's your chance to get rid of\n{NAME_0}! Kekekekekeh!") }, + MSG_NPC(2, _(" 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,16 +5915,16 @@ 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, _(" ............{WAIT_PRESS}Kekeh?!{WAIT_PRESS}\nWhat's wrong, everyone?\nDon't you want to be rid of {NAME_0}?") }, + MSG_NPC(2, _(" ............{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...{WAIT_PRESS}\nI always believed in {NAME_0}!") }, + MSG_NPC(6, _(" 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!") }, + MSG_NPC(6, _(" You don't fool me!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -5932,7 +5932,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, 0x0002, 0x00000046, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ugeh!") }, + MSG_NPC(2, _(" Ugeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -5946,10 +5946,10 @@ 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, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...I...\nI'm out.") }, - { 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 {NAME_0} being bad in any way.") }, + MSG_NPC(3, _(" ...I...\nI'm out.")), + MSG_NPC(3, _(" I was saved by\n{NAME_0}'s team before.")), + MSG_NPC(3, _(" I joined the chase with a\nheavy heart because of your urging...")), + MSG_NPC(3, _(" 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 }, @@ -5957,29 +5957,29 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x14, 0x0002, 0x00000046, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ugegegeh!") }, + MSG_NPC(2, _(" Ugegegeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 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 {NAME_0}!") }, + MSG_NPC(4, _(" 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 }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Yeah, that's right!\nWho needs proof?") }, + MSG_NPC(5, _(" Yeah, that's right!\nWho needs proof?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x0f, 0x0002, 0x00000046, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ugegegegegege!") }, + MSG_NPC(2, _(" Ugegegegegege!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), { 0x2e, 0x15, 0x0001, 0x00000008, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" E-everyone...") }, + MSG_NPC(1, _(" E-everyone...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), SELECT_ENTITIES(-1, 1), @@ -5997,7 +5997,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ WAIT(15), TEXTBOX_AUTO_PRESS(210, 210), { 0x2e, 0x03, 0x0009, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0009, 0x00000000, 0x00000000, _(" Extra! Extra!\nRead all about it!") }, + MSG_NPC(9, _(" Extra! Extra!\nRead all about it!")), { 0x31, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(-1, -1), { 0x91, 0x0a, 0x000a, 0x00000003, 0x00000000, NULL }, @@ -6010,17 +6010,17 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" What?\nWhat is this?") }, + MSG_NPC(8, _(" What?\nWhat is this?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x2e, 0x0c, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" ......{WAIT_PRESS}\nIt looks like a newspaper...\nDoesn't it?") }, + MSG_NPC(7, _(" ......{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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" OK, I'll read it aloud.\nLet's see...") }, + MSG_NPC(4, _(" OK, I'll read it aloud.\nLet's see...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -6039,7 +6039,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ugegegegegegegegegegegeh!") }, + MSG_NPC(2, _(" Ugegegegegegegegegegegeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -6049,14 +6049,14 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x05, 0x0004, 0x00000041, 0x00000000, NULL }, { 0x2f, 0x00, 0x0004, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You rotten...") }, + MSG_NPC(4, _(" You rotten...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(455), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gegegeh!\nR-run!") }, + MSG_NPC(2, _(" Gegegeh!\nR-run!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, @@ -6070,7 +6070,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Stop, you liar!\nYou conned us!") }, + MSG_NPC(3, _(" Stop, you liar!\nYou conned us!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -6085,17 +6085,17 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ { 0x93, 0x08, 0x000b, 0x00000036, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x03, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Welcome back!") }, + MSG_NPC(6, _(" 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!{WAIT_PRESS}\nWe're back like we promised.") }, + MSG_NPC(1, _(" 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...{WAIT_PRESS}\n{NAME_0} isn't suspected anymore...") }, + MSG_NPC(6, _(" ...Sniffle...")), + MSG_NPC(6, _(" 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.") }, + MSG_NPC(1, _(" Yup, I'm glad too.")), + MSG_NPC(1, _(" We won't have to keep\nrunning from everyone anymore.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -6756,10 +6756,10 @@ static const struct ScriptCommand s_gs1_g24_s0_lives0_dlg2[] = { /* 0x8152c74 */ WAIT(1), 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, {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!{WAIT_PRESS}\nI hope you won't say that.") }, + MSG_NPC(1, _(" I'm so sorry.")), + MSG_NPC(1, _(" I was fully convinced of\nyour guilt, {NAME_0}.")), + MSG_NPC(1, _(" But I am glad to hear\nyou are free from that cloud of\nsuspicion〜♪")), + MSG_NPC(1, _(" 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,8 +6787,8 @@ 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.{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.") }, + MSG_NPC(1, _(" I do apologize.{WAIT_PRESS}\nHow could one run a bank without\ntrusting clients?")), + MSG_NPC(1, _(" 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 */ { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -6802,8 +6802,8 @@ static const struct ScriptCommand s_gs1_g24_s0_lives3_dlg2[] = { /* 0x8153034 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_2N, 3, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_2N, 3, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I doubted you too!\nI do so apologize!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you could wipe the slate\nclean, I will do my best to serve your\nlinking needs!") }, + MSG_NPC(1, _(" I doubted you too!\nI do so apologize!")), + MSG_NPC(1, _(" If you could wipe the slate\nclean, I will do my best to serve your\nlinking needs!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -6817,10 +6817,10 @@ static const struct ScriptCommand s_gs1_g24_s0_lives4_dlg2[] = { /* 0x8153174 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_2N, 4, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_2N, 4, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I expected this.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I thought there had to\nbe a mistake.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I mean, look at you.\nYou don't look like the sort who can be\nup to no good.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll keep looking after your\nthings, dears! You can always count on me!") }, + MSG_NPC(1, _(" I expected this.")), + MSG_NPC(1, _(" I thought there had to\nbe a mistake.")), + MSG_NPC(1, _(" I mean, look at you.\nYou don't look like the sort who can be\nup to no good.")), + MSG_NPC(1, _(" I'll keep looking after your\nthings, dears! You can always count on me!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -6834,8 +6834,8 @@ 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{NAME_0}!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Because you're my friend!") }, + MSG_NPC(1, _(" I believed in you,\n{NAME_0}!")), + MSG_NPC(1, _(" Because you're my friend!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -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...{WAIT_PRESS}\nI'm sorry.") }, + MSG_NPC(1, _(" 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.{WAIT_PRESS}\nSorry for suspecting you.") }, + MSG_NPC(1, _(" I'm truly sorry for what\nhappened.{WAIT_PRESS}\nSorry for suspecting you.")), JUMP_SCRIPT(END_TALK), }; @@ -6886,9 +6886,9 @@ static const struct ScriptCommand s_gs1_g24_s0_lives8_dlg2[] = { /* 0x8153620 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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...{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.") }, + MSG_NPC(1, _(" ...So, what became of\nAlakazam's team?\nDid they head underground?")), + MSG_NPC(1, _(" Groudon...{WAIT_PRESS}\nThe mythical Pokémon...")), + MSG_NPC(1, _(" It is rather worrying...{WAIT_PRESS}\nBut I suppose it is Alakazam's team.\nThey should be fine.")), JUMP_SCRIPT(END_TALK), }; @@ -6897,8 +6897,8 @@ static const struct ScriptCommand s_gs1_g24_s0_lives9_dlg2[] = { /* 0x8153768 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Aww. No...\nI thought you were completely guilty.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm sorry you had to go\nthrough such a miserable time.") }, + MSG_NPC(1, _(" Aww. No...\nI thought you were completely guilty.")), + MSG_NPC(1, _(" I'm sorry you had to go\nthrough such a miserable time.")), JUMP_SCRIPT(END_TALK), }; @@ -6918,22 +6918,22 @@ static const struct ScriptCommand s_gs1_g24_s1_lives0_dlg0[] = { /* 0x8153894 */ WAIT(1), { 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{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...") }, + MSG_NPC(3, _(" I am so sorry!")), + MSG_NPC(3, _(" I was convinced that\n{NAME_0} had to be the one.")), + MSG_NPC(3, _(" 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.{WAIT_PRESS}\nI am guilty of the same.") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nSniffle... My brother...") }, + MSG_NPC(3, _(" 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, _(" We both promise, we will\nnot repeat the same mistake.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I will do my best to obtain\neven better Technical Machines and Orbs.\nI hope for your continued patronage!") }, + MSG_NPC(3, _(" We both promise, we will\nnot repeat the same mistake.")), + MSG_NPC(3, _(" I will do my best to obtain\neven better Technical Machines and Orbs.\nI hope for your continued patronage!")), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -6968,10 +6968,10 @@ static const struct ScriptCommand s_gs1_g24_s1_lives2_dlg2[] = { /* 0x8153cd4 */ WAIT(1), 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, {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!{WAIT_PRESS}\nI hope you won't say that.") }, + MSG_NPC(1, _(" I'm so sorry.")), + MSG_NPC(1, _(" I was fully convinced of\nyour guilt, {NAME_0}.")), + MSG_NPC(1, _(" But I am glad to hear\nyou are free from that cloud of\nsuspicion〜♪")), + MSG_NPC(1, _(" 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 }, @@ -7081,8 +7081,8 @@ static const struct ScriptCommand s_gs1_g25_s0_lives6_dlg2[] = { /* 0x81541e0 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That quake was\nsomething else!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It caught me by surprise.\nI almost drowned in the pond!") }, + MSG_NPC(1, _(" That quake was\nsomething else!")), + MSG_NPC(1, _(" It caught me by surprise.\nI almost drowned in the pond!")), JUMP_SCRIPT(END_TALK), }; @@ -7098,8 +7098,8 @@ static const struct ScriptCommand s_gs1_g25_s0_lives7_dlg2[] = { /* 0x81542ec */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, wasn't it shocking?!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That earthquake was\nterrible!") }, + MSG_NPC(1, _(" Oh, wasn't it shocking?!")), + MSG_NPC(1, _(" That earthquake was\nterrible!")), JUMP_SCRIPT(END_TALK), }; @@ -7115,9 +7115,9 @@ static const struct ScriptCommand s_gs1_g25_s0_lives8_dlg2[] = { /* 0x81543dc */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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...{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.") }, + MSG_NPC(1, _(" What's that?\nHas Alakazam's team returned?")), + MSG_NPC(1, _(" I'm not sure...{WAIT_PRESS}\nI haven't seen them around the square.")), + MSG_NPC(1, _(" I don't think Alakazam's\nteam has come back.")), JUMP_SCRIPT(END_TALK), }; @@ -7126,8 +7126,8 @@ static const struct ScriptCommand s_gs1_g25_s0_lives9_dlg2[] = { /* 0x8154500 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That earthquake here\nwas wicked...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If it can happen here,\nwill more serious natural disasters\ncome to the square?") }, + MSG_NPC(1, _(" That earthquake here\nwas wicked...")), + MSG_NPC(1, _(" If it can happen here,\nwill more serious natural disasters\ncome to the square?")), JUMP_SCRIPT(END_TALK), }; @@ -7181,16 +7181,16 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Wow!\nLook at all the Pokémon!") }, + MSG_NPC(1, _(" Wow!\nLook at all the Pokémon!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, WAIT(30), { 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 {NAME_3}...\nI wonder what he's planning to do with\nall these rescue teams?") }, + MSG_NPC(2, _(" Looks like they sent out\nto a lot of rescue teams for help.")), + MSG_NPC(2, _(" I've seen some pretty\nfamous leaders from faraway places.")), + MSG_NPC(2, _(" 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 }, @@ -7202,17 +7202,17 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0003, 0x00000000, -0x00000001, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Can I get everyone's\nattention here?") }, + MSG_NPC(3, _(" Can I get everyone's\nattention here?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I, uh...{WAIT_PRESS}\nIt's not my style to get up in front of\neveryone like this, and...") }, + MSG_NPC(3, _(" 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!") }, + MSG_NPC(3, _(" ...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!{WAIT_PRESS}\n{NAME_8}'s team went underground...") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But they haven't returned!") }, + MSG_NPC(3, _(" There's big trouble!{WAIT_PRESS}\n{NAME_8}'s team went underground...")), + MSG_NPC(3, _(" But they haven't returned!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, @@ -7226,10 +7226,10 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, unfortunately.") }, - { 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...{WAIT_PRESS}\nWe have no idea what became of them.") }, + MSG_NPC(3, _(" Yes, unfortunately.")), + MSG_NPC(3, _(" {NAME_8} led his team\nunderground to quell {NAME_9}...")), + MSG_NPC(3, _(" And that's it.\nWe haven't heard anything from them.")), + MSG_NPC(3, _(" 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), @@ -7258,23 +7258,23 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 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!") }, + MSG_NPC(3, _(" Quiet, please! Be quiet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" There's no denying that\nit is dangerous underground.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" It's not a place where just\nanyone can go.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That's why I asked so many\nrescue teams to gather today.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I propose that a special\nteam be formed by choosing the best of\nthe best.") }, + MSG_NPC(3, _(" There's no denying that\nit is dangerous underground.")), + MSG_NPC(3, _(" It's not a place where just\nanyone can go.")), + MSG_NPC(3, _(" That's why I asked so many\nrescue teams to gather today.")), + MSG_NPC(3, _(" I propose that a special\nteam be formed by choosing the best of\nthe best.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Who will step forward?!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Who among us will be the\nheroes to take on the challenges\nunderground?!") }, + MSG_NPC(3, _(" Who will step forward?!")), + MSG_NPC(3, _(" Who among us will be the\nheroes to take on the challenges\nunderground?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(150), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -7293,7 +7293,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, -0x00000010, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Don't bother, you guys.") }, + MSG_NPC(2, _(" Don't bother, you guys.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -7305,8 +7305,8 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You guys have gotten a lot\ntougher, that's for sure, but...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There's plenty of tougher\nPokémon out there.") }, + MSG_NPC(2, _(" You guys have gotten a lot\ntougher, that's for sure, but...")), + MSG_NPC(2, _(" There's plenty of tougher\nPokémon out there.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -7317,7 +7317,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, _(" Will no one step forward?!") }, + MSG_NPC(3, _(" Will no one step forward?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), @@ -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 {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{NAME_9} down in one shot.") }, + MSG_NPC(4, _(" It's rumored {NAME_9}\nis a Ground type.")), + MSG_NPC(4, _(" I am a Water type.\nStrong against the Ground type.")), + MSG_NPC(4, _(" 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.") }, @@ -7383,7 +7383,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ WAIT(30), { 0x2e, 0x0d, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0005, 0x00000000, -0x00000001, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Darlings, when I see a tough\nPokémon, I want to tangle with them.") }, + MSG_NPC(5, _(" Darlings, when I see a tough\nPokémon, I want to tangle with them.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Say, how about not forgetting about\nme?") }, @@ -7409,8 +7409,8 @@ 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 {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.") }, + MSG_NPC(6, _(" If {NAME_9}'s awakened\nunderground, that suits me fine.")), + MSG_NPC(6, _(" I'll use my Rock Throw to\nkeep it buried underground.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), WAIT(30), @@ -7422,8 +7422,8 @@ 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, {NAME_4}!\n{NAME_5}! And {NAME_6}!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" No one could complain\nabout your selection.") }, + MSG_NPC(3, _(" Oh, {NAME_4}!\n{NAME_5}! And {NAME_6}!")), + MSG_NPC(3, _(" No one could complain\nabout your selection.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -7432,7 +7432,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" We will have these three\nrescuers head underground!") }, + MSG_NPC(3, _(" We will have these three\nrescuers head underground!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Yeah! Good choice!") }, @@ -7444,7 +7444,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Let's go!") }, + MSG_NPC(4, _(" Let's go!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -7471,8 +7471,8 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" See?\nThey look pretty tough, eh?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let them handle things.") }, + MSG_NPC(2, _(" See?\nThey look pretty tough, eh?")), + MSG_NPC(2, _(" Let them handle things.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -8566,8 +8566,8 @@ 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...{WAIT_PRESS}\nBut Blastoise and company are tough.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Don't you worry now.\nThey'll get the job done.") }, + MSG_NPC(1, _(" You bet I'm worried about\nAlakazam's team...{WAIT_PRESS}\nBut Blastoise and company are tough.")), + MSG_NPC(1, _(" 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...{WAIT_PRESS}\nI can't get a decent night's sleep!") }, + MSG_NPC(1, _(" There have been so many\nearthquakes...{WAIT_PRESS}\nI can't get a decent night's sleep!")), JUMP_SCRIPT(END_TALK), }; @@ -8599,7 +8599,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives8_dlg2[] = { /* 0x815a754 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We agreed to let Blastoise's\ncrew handle this situation.\nLet's give them some time.") }, + MSG_NPC(1, _(" We agreed to let Blastoise's\ncrew handle this situation.\nLet's give them some time.")), JUMP_SCRIPT(END_TALK), }; @@ -8608,8 +8608,8 @@ static const struct ScriptCommand s_gs1_g27_s0_lives9_dlg2[] = { /* 0x815a810 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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?{WAIT_PRESS}\nI shudder to think!") }, + MSG_NPC(1, _(" You know how we've had\nso many earthquakes lately?")), + MSG_NPC(1, _(" Are they signs that\nsomething a lot worse is coming?{WAIT_PRESS}\nI shudder to think!")), JUMP_SCRIPT(END_TALK), }; @@ -8672,11 +8672,11 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hey, {NAME_1}.\nW-well...") }, + MSG_NPC(2, _(" Hey, {NAME_1}.\nW-well...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...You should just go see\nfor yourself...") }, + MSG_NPC(2, _(" ...You should just go see\nfor yourself...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -8689,7 +8689,7 @@ 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 {NAME_5}!") }, + MSG_NPC(1, _(" Look!\nIt's {NAME_5}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -8702,16 +8702,16 @@ 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, _(" ............{WAIT_PRESS}\nThey were wiped out...{WAIT_PRESS}\nIn the underground dungeon...") }, + MSG_NPC(3, _(" ............{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), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You're kidding!") }, + MSG_NPC(1, _(" You're kidding!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0005, 0x00000003, 0x00000000, NULL }, { 0x2f, 0x00, 0x0005, 0x00000000, 0x00000001, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Groan... That place...{WAIT_PRESS}\nIt's rough, seriously...") }, + MSG_NPC(5, _(" 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,14 +8719,14 @@ 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 {NAME_9}...") }, + MSG_NPC(6, _(" ...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 }, WAIT(10), { 0x2e, 0x03, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0007, 0x00000000, 0x00000001, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" I don't want to ever go\nback to a place that bad...") }, + MSG_NPC(7, _(" I don't want to ever go\nback to a place that bad...")), { 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...{WAIT_PRESS}\nis far worse than we'd imagined...") }, + MSG_NPC(3, _(" ...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,7 +8754,7 @@ 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.{WAIT_PRESS}\nThat's what you get for trying the\nimpossible.") }, + MSG_NPC(4, _(" 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 }, @@ -8772,12 +8772,12 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), { 0x2e, 0x0e, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Kekeh!\nYou really find thinking hard, don't you?") }, + MSG_NPC(4, _(" Kekeh!\nYou really find thinking hard, don't you?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x13, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Even they look smart\ncompared to you.") }, + MSG_NPC(4, _(" Even they look smart\ncompared to you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, @@ -8802,7 +8802,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x2e, 0x0d, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...E-everyone...") }, + MSG_NPC(1, _(" ...E-everyone...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -8810,12 +8810,12 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), { 0x2e, 0x0e, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You see?\nEven they finally seem to understand\ntheir situation. Kekeh!") }, + MSG_NPC(4, _(" You see?\nEven they finally seem to understand\ntheir situation. Kekeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0d, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I...{WAIT_PRESS}\nMy leafy fans would burn up...") }, + MSG_NPC(3, _(" 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,27 +8826,27 @@ 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 {NAME_3}...") }, + MSG_NPC(1, _(" E-even {NAME_3}...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x13, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Kekeh! Get over it!\nDon't expect to be rewarded just because\nyou tried!") }, + MSG_NPC(4, _(" Kekeh! Get over it!\nDon't expect to be rewarded just because\nyou tried!")), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Sometimes, it's better to\nwise up and give up!") }, + MSG_NPC(4, _(" Sometimes, it's better to\nwise up and give up!")), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0004, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ............Huh?{WAIT_PRESS}\nDid I say something profound?\nKekekekekekekeh!") }, + MSG_NPC(4, _(" ............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 }, WAIT(30), { 0x2e, 0x0d, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Urf...") }, + MSG_NPC(1, _(" Urf...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -8870,7 +8870,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ CHOICE(/* label */ 18, _("Let's go!")), CHOICE(/* label */ 19, _("Let's not.")), LABEL(19), /* = 0x13 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...{WAIT_PRESS}Really...?{WAIT_PRESS}\nYou honestly think we shouldn't go?") }, + MSG_NPC(1, _(" ...{WAIT_PRESS}Really...?{WAIT_PRESS}\nYou honestly think we shouldn't go?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(17), LABEL(18), /* = 0x12 */ @@ -8887,7 +8887,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, BGM_SWITCH(7), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Everyone, listen!") }, + MSG_NPC(1, _(" Everyone, listen!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, @@ -8911,7 +8911,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0004, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Ugegege?!") }, + MSG_NPC(4, _(" Ugegege?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), @@ -8957,18 +8957,18 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x0e, 0x0004, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ............{WAIT_PRESS}Keh.{WAIT_PRESS} Kekekeh!{WAIT_PRESS}\nYou really aren't very bright, are you?") }, + MSG_NPC(4, _(" ............{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 }, { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, { 0x2e, 0x13, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Why don't you do like\neveryone else and wise up?") }, + MSG_NPC(4, _(" Why don't you do like\neveryone else and wise up?")), { 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, _(" ...No.\n{NAME_1} is right.") }, + MSG_NPC(3, _(" ...No.\n{NAME_1} is right.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -8977,7 +8977,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0x93, 0x04, 0x0001, 0x00000055, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0004, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ...Ugeh?") }, + MSG_NPC(4, _(" ...Ugeh?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, @@ -8991,7 +8991,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, 0x13, 0x0004, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ...Ugegegeh?") }, + MSG_NPC(4, _(" ...Ugegegeh?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" We all forgot the most important\nthing. We are rescue teams.") }, @@ -9001,21 +9001,21 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Ugegegegeh!\nHave you lost your senses?!") }, + MSG_NPC(4, _(" Ugegegegeh!\nHave you lost your senses?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Why would you listen to\nthat clown and, worse, be persuaded?") }, + MSG_NPC(4, _(" Why would you listen to\nthat clown and, worse, be persuaded?")), WAIT(15), { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Why go if you're facing\ncertain defeat?!") }, + MSG_NPC(4, _(" Why go if you're facing\ncertain defeat?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x15, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Is that so...?") }, + MSG_NPC(5, _(" Is that so...?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -9026,20 +9026,20 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x0001, 0x00000068, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ...We've only failed once.") }, + MSG_NPC(5, _(" ...We've only failed once.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0e, 0x0001, 0x0000000b, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_5}!") }, + MSG_NPC(1, _(" {NAME_5}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ...This is no time to be\nlying around!") }, + MSG_NPC(5, _(" ...This is no time to be\nlying around!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0004, 0x00000006, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Ugegeh!") }, + MSG_NPC(4, _(" Ugegeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, @@ -9049,7 +9049,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Yes, no more wallowing in\nwoe-is-me self-pity.") }, + MSG_NPC(6, _(" Yes, no more wallowing in\nwoe-is-me self-pity.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, @@ -9059,7 +9059,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" If we give up, that's how\nit ends. Not for me.") }, + MSG_NPC(7, _(" If we give up, that's how\nit ends. Not for me.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -9068,13 +9068,13 @@ 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, _(" {NAME_6}!\nAnd {NAME_7} too!") }, + MSG_NPC(1, _(" {NAME_6}!\nAnd {NAME_7} too!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0004, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Ugegegeh!\nYou lot, that wasn't the tune you\nwere whistling just a little...") }, + MSG_NPC(4, _(" Ugegegeh!\nYou lot, that wasn't the tune you\nwere whistling just a little...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x34, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Aye, that's right!") }, @@ -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!{WAIT_PRESS}\nAre you dreaming?!") }, + MSG_NPC(4, _(" 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 }, @@ -9112,7 +9112,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Don't say I didn't warn you\nwhen you get into a world of pain!\nUgegegegeh!") }, + MSG_NPC(4, _(" Don't say I didn't warn you\nwhen you get into a world of pain!\nUgegegegeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, @@ -9130,17 +9130,17 @@ 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, {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.") }, + MSG_NPC(5, _(" Thank you, {NAME_1}.")), + MSG_NPC(5, _(" You stopped us from\nthrowing away the most important thing\nwe have--pride.")), + MSG_NPC(5, _(" My thanks from all of us.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 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!") }, + MSG_NPC(5, _(" Everyone!{WAIT_PRESS}\nIt's time to get to work!")), + MSG_NPC(5, _(" Let's show them what we\nrescue teams are really about!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, @@ -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{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!{WAIT_PRESS} This, I do for you!{WAIT_PRESS}\nSo...") }, + MSG_NPC(1, _(" Oh, my goodness, yes!\n{NAME_2}'s talk was such an\ninspiration!")), + MSG_NPC(1, _(" It has stoked a raging fire\nin our hearts!")), + MSG_NPC(1, _(" 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?{WAIT_PRESS}\nYour money will be jealously guarded,\nso feel secure on your outings!") }, + MSG_NPC(1, _(" 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,8 +10133,8 @@ 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, _(" {NAME_2}'s words struck\nme deeply.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You can count on me for all\nyour move-linking needs!") }, + MSG_NPC(1, _(" {NAME_2}'s words struck\nme deeply.")), + MSG_NPC(1, _(" You can count on me for all\nyour move-linking needs!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10148,9 +10148,9 @@ static const struct ScriptCommand s_gs1_g29_s0_lives4_dlg2[] = { /* 0x81614e0 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 4, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_8N, 4, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Dear, I wasn't wrong about\nyou at all.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I always thought you weren't\nthe ordinary sort.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll keep your valuables\nunder my watchful eye! You can go out and\nfight without worrying about them!") }, + MSG_NPC(1, _(" Dear, I wasn't wrong about\nyou at all.")), + MSG_NPC(1, _(" I always thought you weren't\nthe ordinary sort.")), + MSG_NPC(1, _(" I'll keep your valuables\nunder my watchful eye! You can go out and\nfight without worrying about them!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10164,8 +10164,8 @@ static const struct ScriptCommand s_gs1_g29_s0_lives5_dlg2[] = { /* 0x816167c */ WAIT(1), 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 {NAME_0}'s team\nare my friends!") }, + MSG_NPC(1, _(" I'll do my best to get more\nFriend Areas!")), + MSG_NPC(1, _(" 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 {COLOR YELLOW_D}Magma Cavern{RESET}.") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nbut that place is special.") }, + MSG_NPC(3, _(" It was teeming with tough\nPokémon, that's for sure.")), + MSG_NPC(3, _(" 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 {COLOR YELLOW_D}Magma Cavern{RESET}.") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nbut that place is special.") }, + MSG_NPC(3, _(" It was teeming with tough\nPokémon, that's for sure.")), + MSG_NPC(3, _(" I'm strong against fire...{WAIT_PRESS}\nbut that place is special.")), JUMP_SCRIPT(END_TALK), }; @@ -10233,12 +10233,12 @@ 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 {COLOR YELLOW_D}Magma Cavern{RESET}...\nAbove all, there were many Fire-type\nPokémon.") }, + MSG_NPC(3, _(" 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...{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!") }, + MSG_NPC(2, _(" Fire-type Pokémon...{WAIT_PRESS}\nI think they would burn me up in no time...")), + MSG_NPC(2, _(" But, no!{WAIT_PRESS}\nI mustn't make excuses for myself!")), + MSG_NPC(2, _(" Now is the time for each\nand every one of us to make a stand!")), JUMP_SCRIPT(END_TALK), }; @@ -10257,12 +10257,12 @@ 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 {COLOR YELLOW_D}Magma Cavern{RESET}...\nAbove all, there were many Fire-type\nPokémon.") }, + MSG_NPC(3, _(" 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...{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!") }, + MSG_NPC(2, _(" Fire-type Pokémon...{WAIT_PRESS}\nI think they would burn me up in no time...")), + MSG_NPC(2, _(" But, no!{WAIT_PRESS}\nI mustn't make excuses for myself!")), + MSG_NPC(2, _(" Now is the time for each\nand every one of us to make a stand!")), JUMP_SCRIPT(END_TALK), }; @@ -10281,11 +10281,11 @@ static const struct ScriptCommand s_gs1_g29_s0_lives10_dlg2[] = { /* 0x8161dcc * WAIT(1), { 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 {COLOR YELLOW_D}Magma Cavern{RESET} is\nalive with flames. You'll be burned up!") }, + MSG_NPC(3, _(" Oi, you lot shouldn't go.")), + MSG_NPC(3, _(" 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!{WAIT_PRESS}\nWe are a rescue team too.\nWe can't stand by idly!") }, + MSG_NPC(2, _(" We can't do that!{WAIT_PRESS}\nWe are a rescue team too.\nWe can't stand by idly!")), JUMP_SCRIPT(END_TALK), }; @@ -10304,11 +10304,11 @@ static const struct ScriptCommand s_gs1_g29_s0_lives11_dlg2[] = { /* 0x8161f8c * WAIT(1), { 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 {COLOR YELLOW_D}Magma Cavern{RESET} is\nalive with flames. You'll be burned up!") }, + MSG_NPC(3, _(" Oi, you lot shouldn't go.")), + MSG_NPC(3, _(" 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!{WAIT_PRESS}\nWe are a rescue team too.\nWe can't stand by idly!") }, + MSG_NPC(2, _(" 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 {COLOR YELLOW_D}Magma Cavern{RESET}.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, you guys take\ncare, too.") }, + MSG_NPC(1, _(" Several rescue teams have\nalready left for the {COLOR YELLOW_D}Magma Cavern{RESET}.")), + MSG_NPC(1, _(" {NAME_0}, you guys take\ncare, too.")), JUMP_SCRIPT(END_TALK), }; @@ -10339,23 +10339,23 @@ 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, _(" {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...") }, + MSG_NPC(3, _(" {NAME_1}'s words\nshook me up with inspiration!")), + MSG_NPC(3, _(" 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.{WAIT_PRESS}\nI am likewise inspired beyond words.") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nSniffle... My brother...") }, + MSG_NPC(3, _(" 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, _(" I will do my best to obtain\neven better Technical Machines and Orbs.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" All with the pride of a\nmerchant!") }, + MSG_NPC(3, _(" I will do my best to obtain\neven better Technical Machines and Orbs.")), + MSG_NPC(3, _(" All with the pride of a\nmerchant!")), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 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{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!{WAIT_PRESS} This, I do for you!{WAIT_PRESS}\nSo...") }, + MSG_NPC(1, _(" Oh, my goodness, yes!\n{NAME_2}'s talk was such an\ninspiration!")), + MSG_NPC(1, _(" It has stoked a raging fire\nin our hearts!")), + MSG_NPC(1, _(" 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{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!{WAIT_PRESS} This, I do for you!{WAIT_PRESS}\nSo...") }, + MSG_NPC(1, _(" Oh, my goodness, yes!\n{NAME_2}'s talk was such an\ninspiration!")), + MSG_NPC(1, _(" It has stoked a raging fire\nin our hearts!")), + MSG_NPC(1, _(" 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?{WAIT_PRESS}\nYour money will be jealously guarded,\nso feel secure on your outings!") }, + MSG_NPC(1, _(" 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,8 +10495,8 @@ 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, _(" {NAME_2}'s words struck\nme deeply.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You can count on me for all\nyour move-linking needs!") }, + MSG_NPC(1, _(" {NAME_2}'s words struck\nme deeply.")), + MSG_NPC(1, _(" You can count on me for all\nyour move-linking needs!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10510,9 +10510,9 @@ static const struct ScriptCommand s_gs1_g30_s0_lives4_dlg2[] = { /* 0x8162b3c */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 4, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E09A_8N, 4, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Dears, I wasn't wrong about\nyou at all.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I always thought you weren't\nthe ordinary sort.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll keep your valuables\nunder my watchful eye! You can go out and\nfight without worrying about them!") }, + MSG_NPC(1, _(" Dears, I wasn't wrong about\nyou at all.")), + MSG_NPC(1, _(" I always thought you weren't\nthe ordinary sort.")), + MSG_NPC(1, _(" I'll keep your valuables\nunder my watchful eye! You can go out and\nfight without worrying about them!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10526,8 +10526,8 @@ static const struct ScriptCommand s_gs1_g30_s0_lives5_dlg2[] = { /* 0x8162c3c */ WAIT(1), 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 {NAME_0}'s team\nare my friends!") }, + MSG_NPC(1, _(" I'll do my best to get more\nFriend Areas!")), + MSG_NPC(1, _(" Because {NAME_0}'s team\nare my friends!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10553,23 +10553,23 @@ 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...{WAIT_PRESS}\nFifteen times now we have been to that\ninfernal {COLOR YELLOW_D}Magma Cavern{RESET}.") }, + MSG_NPC(3, _(" 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?{WAIT_PRESS}\nWe can't be that weak!") }, + MSG_NPC(2, _(" 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.") }, + MSG_NPC(4, _(" 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?{WAIT_PRESS}\nThat's it! This is about willpower!\nI didn't realize!") }, + MSG_NPC(2, _(" 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!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Let's take it down! Groudon!") }, + MSG_NPC(3, _(" Darlings, we will will\nourselves to win, and we will win!")), + MSG_NPC(3, _(" Let's take it down! Groudon!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Hoorah!") }, + MSG_NPC(5, _(" Hoorah!")), JUMP_SCRIPT(END_TALK), }; @@ -10592,23 +10592,23 @@ 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...{WAIT_PRESS}\nFifteen times now we have been to that\ninfernal {COLOR YELLOW_D}Magma Cavern{RESET}.") }, + MSG_NPC(3, _(" 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?{WAIT_PRESS}\nWe can't be that weak!") }, + MSG_NPC(2, _(" 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.") }, + MSG_NPC(4, _(" 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?{WAIT_PRESS}\nThat's it! This is about willpower!\nI didn't realize!") }, + MSG_NPC(2, _(" 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!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Let's take it down! Groudon!") }, + MSG_NPC(3, _(" Darlings, we will will\nourselves to win, and we will win!")), + MSG_NPC(3, _(" Let's take it down! Groudon!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Hoorah!") }, + MSG_NPC(5, _(" Hoorah!")), JUMP_SCRIPT(END_TALK), }; @@ -10631,23 +10631,23 @@ 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...{WAIT_PRESS}\nFifteen times now we have been to that\ninfernal {COLOR YELLOW_D}Magma Cavern{RESET}.") }, + MSG_NPC(3, _(" 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?{WAIT_PRESS}\nWe can't be that weak!") }, + MSG_NPC(2, _(" 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.") }, + MSG_NPC(4, _(" 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?{WAIT_PRESS}\nThat's it! This is about willpower!\nI didn't realize!") }, + MSG_NPC(2, _(" 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!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Let's take it down! Groudon!") }, + MSG_NPC(3, _(" Darlings, we will will\nourselves to win, and we will win!")), + MSG_NPC(3, _(" Let's take it down! Groudon!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Hoorah!") }, + MSG_NPC(5, _(" Hoorah!")), JUMP_SCRIPT(END_TALK), }; @@ -10675,9 +10675,9 @@ 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 {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!") }, + MSG_NPC(1, _(" I ventured into the {COLOR YELLOW_D}Magma\nCavern{RESET}, but...")), + MSG_NPC(1, _(" I got nowhere.{WAIT_PRESS}\nI got KO'd and kicked out as soon as I\nwent in...")), + MSG_NPC(1, _(" But I won't give up!\nNot ever!")), JUMP_SCRIPT(END_TALK), }; @@ -10686,11 +10686,11 @@ static const struct ScriptCommand s_gs1_g30_s0_lives10_dlg2[] = { /* 0x81636d0 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, 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...{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?") }, + MSG_NPC(1, _(" It's tough for us to get\nvery deep in there...")), + MSG_NPC(1, _(" But it helps that other\nrescue teams give us information about\nwhat's underground.")), + MSG_NPC(1, _(" However...{WAIT_PRESS}\nWhatever became of Alakazam?")), + MSG_NPC(1, _(" If he had fallen in\na dungeon, he would've been\nexpelled back here...")), + MSG_NPC(1, _(" Since he hasn't returned,\ndoes it mean he's still in the dungeon?")), JUMP_SCRIPT(END_TALK), }; @@ -10699,9 +10699,9 @@ static const struct ScriptCommand s_gs1_g30_s0_lives11_dlg2[] = { /* 0x81638c0 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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 {COLOR YELLOW_D}Magma\nCavern{RESET} goes very deep.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wonder exactly how deep\nit goes?") }, + MSG_NPC(1, _(" I talked to other rescue\nteams.")), + MSG_NPC(1, _(" They all say the {COLOR YELLOW_D}Magma\nCavern{RESET} goes very deep.")), + MSG_NPC(1, _(" I wonder exactly how deep\nit goes?")), JUMP_SCRIPT(END_TALK), }; @@ -10710,9 +10710,9 @@ static const struct ScriptCommand s_gs1_g30_s0_lives12_dlg2[] = { /* 0x81639bc * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, 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{NAME_0}.") }, + MSG_NPC(1, _(" I overheard some rescue\nteam Pokémon earlier.")), + MSG_NPC(1, _(" They say it's very taxing\nbecause it's so easy to get burns there.")), + MSG_NPC(1, _(" Please be careful of burns,\n{NAME_0}.")), JUMP_SCRIPT(END_TALK), }; @@ -10733,23 +10733,23 @@ 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, _(" {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...") }, + MSG_NPC(3, _(" {NAME_1}'s words\nshook me up with inspiration!")), + MSG_NPC(3, _(" 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.{WAIT_PRESS}\nI am likewise inspired beyond words.") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nSniffle... My brother...") }, + MSG_NPC(3, _(" 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, _(" I will do my best to obtain\neven better Technical Machines and Orbs.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" All with the pride of a\nmerchant!") }, + MSG_NPC(3, _(" I will do my best to obtain\neven better Technical Machines and Orbs.")), + MSG_NPC(3, _(" All with the pride of a\nmerchant!")), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 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{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!{WAIT_PRESS} This, I do for you!{WAIT_PRESS}\nSo...") }, + MSG_NPC(1, _(" Oh, my goodness, yes!\n{NAME_2}'s talk was such an\ninspiration!")), + MSG_NPC(1, _(" It has stoked a raging fire\nin our hearts!")), + MSG_NPC(1, _(" 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 }, @@ -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 {NAME_0}'s team\nalmost here?") }, + MSG_NPC(2, _(" Is {NAME_0}'s team\nalmost here?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -10874,7 +10874,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x10, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0003, -0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Look!\nHere they come!") }, + MSG_NPC(3, _(" Look!\nHere they come!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -10886,10 +10886,10 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" It's true, darlings!") }, + MSG_NPC(6, _(" It's true, darlings!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Let's go!") }, + MSG_NPC(2, _(" Let's go!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -10912,44 +10912,44 @@ 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, {NAME_0}!") }, + MSG_NPC(4, _(" 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?!") }, + MSG_NPC(7, _(" You really took down that\nGroudon?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Darlings, it's fantastic!{WAIT_PRESS}\nYou have won me over!") }, + MSG_NPC(6, _(" 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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Whoa!\nW-wait a second!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" How does everyone know\nabout what happened underground?") }, + MSG_NPC(1, _(" Whoa!\nW-wait a second!")), + MSG_NPC(1, _(" How does everyone know\nabout what happened underground?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0003, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Pelipper spread the word\nwith an extra edition of the Pokémon\nNews.") }, + MSG_NPC(3, _(" Pelipper spread the word\nwith an extra edition of the Pokémon\nNews.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You bunch became stronger\nthan I expected!") }, + MSG_NPC(4, _(" You bunch became stronger\nthan I expected!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" You can be proud of it!") }, + MSG_NPC(7, _(" You can be proud of it!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0d, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" You lot did great!{WAIT_PRESS}\nWhy don't we team up sometime?\nGahahahaha!") }, + MSG_NPC(5, _(" 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 {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}.") }, + MSG_NPC(8, _(" You've earned everyone's\nrespect now.")), + MSG_NPC(8, _(" Your {COLOR CYAN}Team {TEAM_NAME}{RESET}\nis a first-class rescue team.")), + MSG_NPC(8, _(" 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 }, @@ -10965,7 +10965,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ 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?{WAIT_PRESS}\nI didn't think someone that could take down\nGroudon'd be such a crybaby! Gahahahaha!") }, + MSG_NPC(5, _(" 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?{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?") }, + MSG_NPC(2, _(" Huh?{WAIT_PRESS} What was that?")), + MSG_NPC(2, _(" 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 }, @@ -11002,13 +11002,13 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ WAIT(60), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" No. I heard it too.") }, + MSG_NPC(3, _(" No. I heard it too.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Me too.{WAIT_PRESS}\nEven now, I hear it...") }, + MSG_NPC(6, _(" Me too.{WAIT_PRESS}\nEven now, I hear it...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" Someone talking?{WAIT_PRESS}\n...Not sure.") }, + MSG_NPC(7, _(" Someone talking?{WAIT_PRESS}\n...Not sure.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -11039,8 +11039,8 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 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!") }, + MSG_NPC(8, _(" {NAME_9}?{WAIT_PRESS}\nAh, that's it! Telepathy!")), + MSG_NPC(8, _(" {NAME_9} is calling out\nto us using telepathy!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(487), @@ -11049,8 +11049,8 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ WAIT(30), 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!{WAIT_PRESS}\nFrom the sky...{WAIT_PRESS} Falls a star...") }, + MSG_NPC(9, _(" ...To all Pokémon!\nCalling all Pokémon!")), + MSG_NPC(9, _(" 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,8 +11533,8 @@ 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, _(" {NAME_9}.{WAIT_PRESS}\nTell us.") }, - { 0x34, 0x00, 0x0008, 0x00000000, 0x00000000, _(" Can the falling star be\nstopped?") }, + MSG_NPC(8, _(" {NAME_9}.{WAIT_PRESS}\nTell us.")), + MSG_NPC(8, _(" Can the falling star be\nstopped?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2d, 0x09, 0x0007, 0x0000006c, 0x00000000, NULL }, @@ -11543,34 +11543,34 @@ 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, _(" ............{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 {NAME_7}.") }, + MSG_NPC(9, _(" ............{WAIT_PRESS}There is a way.")), + MSG_NPC(9, _(" ...To prevent collision,\nthere is but one solution.")), + MSG_NPC(9, _(" You must ask {NAME_7}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0d, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" {NAME_7}?{WAIT_PRESS}\nWhat might that be?") }, + MSG_NPC(5, _(" {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, _(" {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.") }, + MSG_NPC(9, _(" A Pokémon, living far above\nus in the sky.\nLegendary, it is.")), + MSG_NPC(9, _(" {NAME_7} must be asked\nto destroy the star from the sky.")), + MSG_NPC(9, _(" 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...{WAIT_PRESS}\nHow are we to go there?") }, + MSG_NPC(8, _(" 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, _(" {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...{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...") }, + MSG_NPC(9, _(" {NAME_8} and I\namplify our Teleport together...")), + MSG_NPC(9, _(" And send Pokémon to the\nsky.")), + MSG_NPC(9, _(" However...{WAIT_PRESS}\nThe sky is a world above the clouds.")), + MSG_NPC(9, _(" 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 }, @@ -11582,8 +11582,8 @@ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ 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...{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.") }, + MSG_NPC(8, _(" I also...{WAIT_PRESS}\nI thought there could be none but you...")), + MSG_NPC(8, _(" 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,13 +11601,13 @@ 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, _(" {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.") }, + MSG_NPC(9, _(" {NAME_1}, {NAME_0}.{WAIT_PRESS}\nDo you hear?{WAIT_PRESS} This is {NAME_9}.")), + MSG_NPC(9, _(" Discuss we will,\n{NAME_8} and I, about how our\nTeleport can be amplified.")), + MSG_NPC(9, _(" Departure, it is tomorrow.{WAIT_PRESS}\nRest you should until then.")), + MSG_NPC(9, _(" 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!") }, + MSG_NPC(1, _(" No problem!\nWe'll be fine!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -11849,7 +11849,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives1_dlg2[] = { /* 0x8168208 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_1N, 0, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_1N, 0, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We hope you'll succeed!\nPlease don't give up!") }, + MSG_NPC(1, _(" We hope you'll succeed!\nPlease don't give up!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -11863,7 +11863,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives2_dlg2[] = { /* 0x81682ec */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_1N, 1, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_1N, 1, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I also hope for your\nsuccess. Fight!") }, + MSG_NPC(1, _(" I also hope for your\nsuccess. Fight!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x18, 0x0000, 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, _(" {NAME_0}, you're our\none hope!") }, + MSG_NPC(1, _(" {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, {NAME_0}!") }, + MSG_NPC(1, _(" 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!{WAIT_PRESS}\nI'm sure you'll find success!\nHave confidence in yourselves!") }, + MSG_NPC(1, _(" 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 }, @@ -11919,8 +11919,8 @@ static const struct ScriptCommand s_gs1_g34_s0_lives6_dlg2[] = { /* 0x8168674 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_1N, 5, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_1N, 5, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I don't know what sort of\nPokémon Rayquaza is...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But with you, I know it can\nbecome a friend!") }, + MSG_NPC(1, _(" I don't know what sort of\nPokémon Rayquaza is...")), + MSG_NPC(1, _(" But with you, I know it can\nbecome a friend!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -11932,7 +11932,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives7_dlg2[] = { /* 0x8168798 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Everything depends on you!\nDon't fail!") }, + MSG_NPC(1, _(" Everything depends on you!\nDon't fail!")), JUMP_SCRIPT(END_TALK), }; @@ -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...{WAIT_PRESS}\nThe best of luck!") }, + MSG_NPC(1, _(" Darlings, I can't begin to\nimagine a world above the clouds...{WAIT_PRESS}\nThe best of luck!")), JUMP_SCRIPT(END_TALK), }; @@ -11950,8 +11950,8 @@ static const struct ScriptCommand s_gs1_g34_s0_lives9_dlg2[] = { /* 0x81688dc */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Rayquaza is a legendary\nPokémon, isn't that right?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Getting to it sounds difficult\nenough...\nBut you can't fail!") }, + MSG_NPC(1, _(" Rayquaza is a legendary\nPokémon, isn't that right?")), + MSG_NPC(1, _(" Getting to it sounds difficult\nenough...\nBut you can't fail!")), JUMP_SCRIPT(END_TALK), }; @@ -11960,7 +11960,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives10_dlg2[] = { /* 0x81689c4 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If anyone can do it, it's you!\nKeep your faith!") }, + MSG_NPC(1, _(" If anyone can do it, it's you!\nKeep your faith!")), JUMP_SCRIPT(END_TALK), }; @@ -11969,8 +11969,8 @@ static const struct ScriptCommand s_gs1_g34_s0_lives11_dlg2[] = { /* 0x8168a5c * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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.{WAIT_PRESS}\nWe need you to win!") }, + MSG_NPC(1, _(" This is getting heavy!")), + MSG_NPC(1, _(" But I have this feeling\nthat you can do it.{WAIT_PRESS}\nWe need you to win!")), JUMP_SCRIPT(END_TALK), }; @@ -11979,8 +11979,8 @@ static const struct ScriptCommand s_gs1_g34_s0_lives12_dlg2[] = { /* 0x8168b28 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will wait for you.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}, I'm sure that\nyou will succeed and come back.") }, + MSG_NPC(1, _(" I will wait for you.")), + MSG_NPC(1, _(" {NAME_0}, I'm sure that\nyou will succeed and come back.")), JUMP_SCRIPT(END_TALK), }; @@ -11989,8 +11989,8 @@ static const struct ScriptCommand s_gs1_g34_s0_lives13_dlg2[] = { /* 0x8168be8 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will set out to confer\nwith Xatu.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You leave tomorrow.\nPrepare for your journey before then.") }, + MSG_NPC(1, _(" I will set out to confer\nwith Xatu.")), + MSG_NPC(1, _(" You leave tomorrow.\nPrepare for your journey before then.")), JUMP_SCRIPT(END_TALK), }; @@ -11999,8 +11999,8 @@ 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{COLOR CYAN}Team {TEAM_NAME}{RESET}!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Get out there and save\nthe world!") }, + MSG_NPC(1, _(" I'm throwing in my lot with\n{COLOR CYAN}Team {TEAM_NAME}{RESET}!")), + MSG_NPC(1, _(" 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!{WAIT_PRESS}\nYou can stop the star from falling!") }, + MSG_NPC(1, _(" You can do it!{WAIT_PRESS}\nYou can stop the star from falling!")), JUMP_SCRIPT(END_TALK), }; @@ -12029,7 +12029,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives0_dlg2[] = { /* 0x8168e64 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_3N, 0, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_3N, 0, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I see you're heading out\nsoon.\nThe best of luck!") }, + MSG_NPC(1, _(" I see you're heading out\nsoon.\nThe best of luck!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12043,7 +12043,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives1_dlg2[] = { /* 0x8168f48 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_3N, 1, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_3N, 1, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ah, you're leaving?\nGood luck!") }, + MSG_NPC(1, _(" Ah, you're leaving?\nGood luck!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -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, _(" {NAME_0}, don't let us\ndown!") }, + MSG_NPC(1, _(" {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, {NAME_0}!") }, + MSG_NPC(1, _(" 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 }, @@ -12085,7 +12085,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives4_dlg2[] = { /* 0x81691cc */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_3N, 4, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_3N, 4, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This is it, isn't it?\nMake us proud!") }, + MSG_NPC(1, _(" This is it, isn't it?\nMake us proud!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12099,7 +12099,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives5_dlg2[] = { /* 0x81692a8 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_3N, 5, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_3N, 5, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Are you heading out now?\nDon't give up!") }, + MSG_NPC(1, _(" Are you heading out now?\nDon't give up!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12111,7 +12111,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives6_dlg2[] = { /* 0x8169384 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You're going, hey?\nBuckle down and get it done!") }, + MSG_NPC(1, _(" You're going, hey?\nBuckle down and get it done!")), JUMP_SCRIPT(END_TALK), }; @@ -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, _(" {NAME_0}, take care,\ndarling.") }, + MSG_NPC(1, _(" {NAME_0}, take care,\ndarling.")), JUMP_SCRIPT(END_TALK), }; @@ -12129,7 +12129,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives8_dlg2[] = { /* 0x816949c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I can't even imagine what's\nup in the sky, but be brave!") }, + MSG_NPC(1, _(" I can't even imagine what's\nup in the sky, but be brave!")), JUMP_SCRIPT(END_TALK), }; @@ -12138,7 +12138,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives9_dlg2[] = { /* 0x816953c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Go with care!") }, + MSG_NPC(1, _(" Go with care!")), JUMP_SCRIPT(END_TALK), }; @@ -12147,8 +12147,8 @@ static const struct ScriptCommand s_gs1_g35_s0_lives10_dlg2[] = { /* 0x81695ac * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, yeah. Leaving soon?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Give it your best shot!\nDon't you lose!") }, + MSG_NPC(1, _(" Oh, yeah. Leaving soon?")), + MSG_NPC(1, _(" Give it your best shot!\nDon't you lose!")), JUMP_SCRIPT(END_TALK), }; @@ -12157,8 +12157,8 @@ static const struct ScriptCommand s_gs1_g35_s0_lives11_dlg2[] = { /* 0x8169664 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You guys can do it for sure!\nThere's nothing to worry about!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Go with confidence!") }, + MSG_NPC(1, _(" You guys can do it for sure!\nThere's nothing to worry about!")), + MSG_NPC(1, _(" Go with confidence!")), JUMP_SCRIPT(END_TALK), }; @@ -12167,7 +12167,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives12_dlg2[] = { /* 0x816972c * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Go for it! Take care!") }, + MSG_NPC(1, _(" Go for it! Take care!")), JUMP_SCRIPT(END_TALK), }; @@ -12176,7 +12176,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives13_dlg2[] = { /* 0x81697a4 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" WE CAME TO WISH YOU\nWELL TOO! BZBZBZZZT!") }, + MSG_NPC(1, _(" WE CAME TO WISH YOU\nWELL TOO! BZBZBZZZT!")), JUMP_SCRIPT(END_TALK), }; @@ -12185,7 +12185,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives14_dlg2[] = { /* 0x8169830 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" SAVE THE WORLD!\nBZBZBZZ!") }, + MSG_NPC(1, _(" SAVE THE WORLD!\nBZBZBZZ!")), JUMP_SCRIPT(END_TALK), }; @@ -12205,7 +12205,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives0_dlg2[] = { /* 0x81698f8 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_5N, 0, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_5N, 0, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You still have everything\nto prove!\nThe best of luck!") }, + MSG_NPC(1, _(" You still have everything\nto prove!\nThe best of luck!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -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, _(" {NAME_0}, I'm certain\nthat you will succeed!\nGood luck!") }, + MSG_NPC(1, _(" {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 }, @@ -12233,7 +12233,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives2_dlg2[] = { /* 0x8169ac8 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_5N, 2, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_5N, 2, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It must be difficult, but\ndon't let us down!") }, + MSG_NPC(1, _(" It must be difficult, but\ndon't let us down!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12247,7 +12247,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives3_dlg2[] = { /* 0x8169bac */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_5N, 3, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_5N, 3, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You're not finished yet!\nI hope I can serve you in good stead!") }, + MSG_NPC(1, _(" You're not finished yet!\nI hope I can serve you in good stead!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12261,9 +12261,9 @@ static const struct ScriptCommand s_gs1_g36_s0_lives4_dlg2[] = { /* 0x8169ca0 */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_5N, 4, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_5N, 4, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I know you too well.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You're not about to ever\ngive up!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Your fight's only begun!") }, + MSG_NPC(1, _(" I know you too well.")), + MSG_NPC(1, _(" You're not about to ever\ngive up!")), + MSG_NPC(1, _(" Your fight's only begun!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12277,7 +12277,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives5_dlg2[] = { /* 0x8169dcc */ WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_5N, 5, /* to label */ 0), SET_ARRAYVAL(EVENT_M01E10A_5N, 5, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Everyone hopes you reach\nRayquaza.\nKeep it up!") }, + MSG_NPC(1, _(" Everyone hopes you reach\nRayquaza.\nKeep it up!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12289,7 +12289,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives6_dlg2[] = { /* 0x8169eac */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" From failure comes success.\nKeep your faith!") }, + MSG_NPC(1, _(" From failure comes success.\nKeep your faith!")), JUMP_SCRIPT(END_TALK), }; @@ -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.{WAIT_PRESS}\n{NAME_0}, keep your chin up!") }, + MSG_NPC(1, _(" 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?!{WAIT_PRESS}\nIt exists? Amazing!") }, + MSG_NPC(1, _(" Huh? There's a tower of\nclouds in the sky?!{WAIT_PRESS}\nIt exists? Amazing!")), JUMP_SCRIPT(END_TALK), }; @@ -12316,8 +12316,8 @@ static const struct ScriptCommand s_gs1_g36_s0_lives9_dlg2[] = { /* 0x816a084 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I know exactly how gutsy\nyou are.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This is just a setback!") }, + MSG_NPC(1, _(" I know exactly how gutsy\nyou are.")), + MSG_NPC(1, _(" This is just a setback!")), JUMP_SCRIPT(END_TALK), }; @@ -12326,7 +12326,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives10_dlg2[] = { /* 0x816a134 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Go for it!\nDon't you lose!") }, + MSG_NPC(1, _(" Go for it!\nDon't you lose!")), JUMP_SCRIPT(END_TALK), }; @@ -12335,7 +12335,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives11_dlg2[] = { /* 0x816a1b4 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You'll be fine!\nGo with confidence!") }, + MSG_NPC(1, _(" You'll be fine!\nGo with confidence!")), JUMP_SCRIPT(END_TALK), }; @@ -12344,7 +12344,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives12_dlg2[] = { /* 0x816a23c * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Get it done the next time!\nKeep at it!") }, + MSG_NPC(1, _(" Get it done the next time!\nKeep at it!")), JUMP_SCRIPT(END_TALK), }; @@ -12353,7 +12353,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives13_dlg2[] = { /* 0x816a2c4 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" IT'S NOT OVER YET!\nBZBZBZZ!") }, + MSG_NPC(1, _(" IT'S NOT OVER YET!\nBZBZBZZ!")), JUMP_SCRIPT(END_TALK), }; @@ -12362,7 +12362,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives14_dlg2[] = { /* 0x816a344 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" THE TIME IS NOW!\nSAVE THE WORLD! BZBZBZZ!") }, + MSG_NPC(1, _(" THE TIME IS NOW!\nSAVE THE WORLD! BZBZBZZ!")), JUMP_SCRIPT(END_TALK), }; @@ -12401,9 +12401,9 @@ 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{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!") }, + MSG_NPC(1, _(" Yes! You did it,\n{NAME_0}!")), + MSG_NPC(1, _(" Now that peace has been\nrestored, I can sell my wares with\npeace of mind.")), + MSG_NPC(1, _(" Thank you so much!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x17, 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, {NAME_0}!") }, + MSG_NPC(1, _(" Peace has returned!\nThank you, {NAME_0}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12445,7 +12445,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives3_dlg2[] = { /* 0x816a7b0 */ WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 3, /* to label */ 0), SET_ARRAYVAL(EVENT_M02E01A_2N, 3, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you so much!\nI can keep my shop running, thanks to you!") }, + MSG_NPC(1, _(" Thank you so much!\nI can keep my shop running, thanks to you!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12459,7 +12459,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives4_dlg2[] = { /* 0x816a8a4 */ WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 4, /* to label */ 0), SET_ARRAYVAL(EVENT_M02E01A_2N, 4, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You did it! Good for you!\nThat is so cool!") }, + MSG_NPC(1, _(" You did it! Good for you!\nThat is so cool!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12473,7 +12473,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives5_dlg2[] = { /* 0x816a980 */ WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 5, /* to label */ 0), SET_ARRAYVAL(EVENT_M02E01A_2N, 5, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's peaceful again!\nThank you! I never expected less from\nyou, my friend!") }, + MSG_NPC(1, _(" It's peaceful again!\nThank you! I never expected less from\nyou, my friend!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x1b, 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...{WAIT_PRESS}\nTruly, you've impressed me.") }, + MSG_NPC(1, _(" 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{NAME_0}!\nYou're the greatest! Really!") }, + MSG_NPC(1, _(" You've done it,\n{NAME_0}!\nYou're the greatest! Really!")), JUMP_SCRIPT(END_TALK), }; @@ -12504,8 +12504,8 @@ 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, _(" {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!") }, + MSG_NPC(1, _(" {NAME_0}! {NAME_2}!\nYou both hung in there! Great job!")), + MSG_NPC(1, _(" ...But you're still not up to\nour caliber!")), JUMP_SCRIPT(END_TALK), }; @@ -12514,8 +12514,8 @@ static const struct ScriptCommand s_gs1_g38_s0_lives9_dlg2[] = { /* 0x816ac98 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We're here now because\nyou succeeded! You have my thanks!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...Of course, we did our bit\nto help too!") }, + MSG_NPC(1, _(" We're here now because\nyou succeeded! You have my thanks!")), + MSG_NPC(1, _(" ...Of course, we did our bit\nto help too!")), JUMP_SCRIPT(END_TALK), }; @@ -12524,7 +12524,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives10_dlg2[] = { /* 0x816ad78 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" THANK YOU, BZBZBZZ!") }, + MSG_NPC(1, _(" THANK YOU, BZBZBZZ!")), JUMP_SCRIPT(END_TALK), }; @@ -12533,7 +12533,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives11_dlg2[] = { /* 0x816adf0 * { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" AWESOME! AWESOME!\nBZBZBZZZT!") }, + MSG_NPC(1, _(" AWESOME! AWESOME!\nBZBZBZZZT!")), JUMP_SCRIPT(END_TALK), }; @@ -12543,9 +12543,9 @@ static const struct ScriptCommand s_gs1_g38_s0_lives12_dlg2[] = { /* 0x816ae70 * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, 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, _(" {NAME_0} and\n{NAME_2}, please do take care!") }, + MSG_NPC(1, _(" We will soon be departing\nthe area.")), + MSG_NPC(1, _(" Sincerely, thank you for\nall the help and kindness you've given us.")), + MSG_NPC(1, _(" {NAME_0} and\n{NAME_2}, please do take care!")), JUMP_SCRIPT(END_TALK), }; @@ -12555,10 +12555,10 @@ static const struct ScriptCommand s_gs1_g38_s0_lives13_dlg2[] = { /* 0x816af9c * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, 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, _(" {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.") }, + MSG_NPC(1, _(" We will soon be leaving\nthis area.")), + MSG_NPC(1, _(" We Jumpluff travel the\nworld, carried wherever the winds will\ntake us.")), + MSG_NPC(1, _(" {NAME_0} and\n{NAME_2}, we owe so much to you.")), + MSG_NPC(1, _(" Thank you for everything.{WAIT_PRESS}\nMay we meet again.")), JUMP_SCRIPT(END_TALK), }; @@ -12579,21 +12579,21 @@ static const struct ScriptCommand s_gs1_g38_s1_lives0_dlg0[] = { /* 0x816b150 */ WAIT(1), { 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...{WAIT_PRESS} That made me...{WAIT_PRESS}\nIt left me choked up...") }, + MSG_NPC(3, _(" I'm all shaken up with\nemotion!")), + MSG_NPC(3, _(" 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.{WAIT_PRESS}\nI am likewise overcome with joy.") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nSniffle... My brother...") }, + MSG_NPC(3, _(" 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, _(" {NAME_0} and\n{NAME_1}...{WAIT_PRESS}\nWe only have gratitude for you.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Thank you ever so much!") }, + MSG_NPC(3, _(" {NAME_0} and\n{NAME_1}...{WAIT_PRESS}\nWe only have gratitude for you.")), + MSG_NPC(3, _(" Thank you ever so much!")), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12623,9 +12623,9 @@ 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, {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!") }, + MSG_NPC(1, _(" Oh, my, you've outdone\nyourself, {NAME_0}!")), + MSG_NPC(1, _(" Because peace has been\nrestored, I may go about securely in my\nbusiness.")), + MSG_NPC(1, _(" Thank you ever so much!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12673,7 +12673,7 @@ static const struct ScriptCommand s_gs1_g39_s0_lives0_dlg2[] = { /* 0x816b7a0 */ LABEL(0), /* = 0x00 */ { 0x3b, 0x1d, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(1, /* to label */ 2), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you!") }, + MSG_NPC(1, _(" Thank you!")), FANFARE_PLAY(204), { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_1} \n{CENTER_ALIGN}became a member!") }, { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, @@ -12694,16 +12694,16 @@ static const struct ScriptCommand s_gs1_g39_s0_lives0_dlg2[] = { /* 0x816b7a0 */ { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, 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...{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.") }, + MSG_NPC(1, _(" Yes!\nThank you!")), + MSG_NPC(1, _(" ...But there appears to be\nno room for me in my Friend Area...{WAIT_PRESS}\nHow disappointing...")), + MSG_NPC(1, _(" I would be able to join your\nrescue team if there were less Pokémon\nin {COLOR GREEN}Sky Blue Plains{RESET}...")), + MSG_NPC(1, _(" 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 {COLOR GREEN}Sky Blue Plains{RESET}...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Please let me know then.") }, + MSG_NPC(1, _(" Oh, I see...")), + MSG_NPC(1, _(" There still is no room for\nme in the Friend Area I must go to...\nHow disappointing...")), + MSG_NPC(1, _(" I would be able to join your\nrescue team if there were less Pokémon\nin {COLOR GREEN}Sky Blue Plains{RESET}...")), + MSG_NPC(1, _(" 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?{WAIT_PRESS}\n...Oh, you mean what happened at sea?") }, + MSG_NPC(1, _(" 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!{WAIT_PRESS}\nSheesh, they're making up stories about\nme!") }, + MSG_NPC(1, _(" 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 }, @@ -12735,22 +12735,22 @@ static const struct ScriptCommand s_gs1_g40_s0_lives0_dlg2[] = { /* 0x816bc34 */ CHOICE(/* label */ 3, _("No.")), LABEL(3), /* = 0x03 */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Tch! Fine, then!\nHumph!") }, + MSG_NPC(1, _(" Tch! Fine, then!\nHumph!")), RESET_ARRAY(EVENT_LOCAL), JUMP_SCRIPT(END_TALK), LABEL(2), /* = 0x02 */ 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?{WAIT_PRESS}\nI was trying that Dive thing.") }, + MSG_NPC(1, _(" See, I went out to the sea\nto frolic a while back.")), + MSG_NPC(1, _(" 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...{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!") }, + MSG_NPC(1, _(" So, I was having fun\ngoing underwater...{WAIT_PRESS}\nAnd I got washed out to sea a bit.")), + MSG_NPC(1, _(" All of a sudden, these\nwicked clouds rolled in...")), + MSG_NPC(1, _(" 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!{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!") }, + MSG_NPC(1, _(" There's more!{WAIT_PRESS}\nA dungeon appeared in the sea!")), + MSG_NPC(1, _(" I was shocked witless!\nI got out of there fast!")), + MSG_NPC(1, _(" But who'd've guessed it?\nA dungeon in a stormy sea!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -12760,16 +12760,16 @@ 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?{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...") }, + MSG_NPC(1, _(" Huh?{WAIT_PRESS}\nYou want to know more about that\ndungeon in the sea?")), + MSG_NPC(1, _(" 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 }, WAIT(60), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 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.") }, + MSG_NPC(1, _(" I know!{WAIT_PRESS}\nMaybe Whiscash would know something.")), + MSG_NPC(1, _(" Yeah, that'd be best.\nGo talk to Whiscash.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, RESET_ARRAY(EVENT_LOCAL), JUMPIF_SCENE_GT(SCENARIO_SUB2, 33, 3, /* to label */ 4), @@ -12818,29 +12818,29 @@ static const struct ScriptCommand s_gs1_g41_s0_lives0_dlg2[] = { /* 0x816c540 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I have heard of a weather\nanomaly afflicting a certain sea.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" They say a whirlpool\nstretches from sea to sky in a\ncolossal tornado.") }, + MSG_NPC(1, _(" I have heard of a weather\nanomaly afflicting a certain sea.")), + MSG_NPC(1, _(" They say a whirlpool\nstretches from sea to sky in a\ncolossal tornado.")), { 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, _(" 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.") }, + MSG_NPC(1, _(" It is said to be near the\n{COLOR GREEN}Legendary Island{RESET} Friend Area.")), + MSG_NPC(1, _(" 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 {COLOR GREEN}Legendary Island{RESET}\nbelongs to your team.") }, + MSG_NPC(1, _(" 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?{WAIT_PRESS}\nWe need your help, please.") }, + MSG_NPC(1, _(" 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 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ah, good.\nYou accept the job.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I hope for the best from\nyou.") }, + MSG_NPC(1, _(" Ah, good.\nYou accept the job.")), + MSG_NPC(1, _(" I hope for the best from\nyou.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMPIF_SCENE_GT(SCENARIO_SUB2, 34, 2, /* to label */ 4), SCENARIO_CALC(SCENARIO_SUB2, 34, 2), @@ -12873,9 +12873,9 @@ static const struct ScriptCommand s_gs1_g42_s0_lives0_dlg2[] = { /* 0x816ca38 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004d, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It's cool and all that it's\npeaceful, but...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There's also been no\nexcitement. It's a little sad.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wish there was some\npizzazz to spice things up...") }, + MSG_NPC(1, _(" It's cool and all that it's\npeaceful, but...")), + MSG_NPC(1, _(" There's also been no\nexcitement. It's a little sad.")), + MSG_NPC(1, _(" I wish there was some\npizzazz to spice things up...")), JUMP_SCRIPT(END_TALK), }; @@ -12891,8 +12891,8 @@ static const struct ScriptCommand s_gs1_g42_s0_lives1_dlg2[] = { /* 0x816cba0 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004f, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Good morning.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ahh... Another refreshing\nday...") }, + MSG_NPC(1, _(" Good morning.")), + MSG_NPC(1, _(" Ahh... Another refreshing\nday...")), JUMP_SCRIPT(END_TALK), }; @@ -12978,15 +12978,15 @@ static const struct ScriptCommand s_gs1_g43_s0_lives0_dlg0[] = { /* 0x816cf4c */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x11, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh?") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Who is that? Over there.") }, + MSG_NPC(3, _(" Oh?")), + MSG_NPC(3, _(" Who is that? Over there.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, { 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.{WAIT_PRESS}\nIt's not from around these parts.") }, + MSG_NPC(2, _(" Never seen it before.{WAIT_PRESS}\nIt's not from around these parts.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(120), WAIT(10), @@ -13007,7 +13007,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives0_dlg0[] = { /* 0x816cf4c */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Goodness!{WAIT_PRESS}\nIt needs help!") }, + MSG_NPC(3, _(" 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,9 +13115,9 @@ 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...{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...") }, + MSG_NPC(1, _(" I...{WAIT_PRESS}\nI've given up on ever seeing the mirage\nPokémon...")), + MSG_NPC(1, _(" I...{WAIT_PRESS}\nI've reached the limit of my endurance...")), + MSG_NPC(1, _(" I'm as tired as tired can\nbe...")), JUMP_SCRIPT(END_TALK), }; @@ -13144,23 +13144,23 @@ static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ WAIT(1), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wh-wh-wh-what?!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You've seen the mirage\nPokémon?!") }, + MSG_NPC(2, _(" Wh-wh-wh-what?!")), + MSG_NPC(2, _(" You've seen the mirage\nPokémon?!")), { 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, _(" Wh-wh-what sort of a\nPokémon was it?!") }, + MSG_NPC(2, _(" Wh-wh-what sort of a\nPokémon was it?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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!{WAIT_PRESS}\nTruly!{WAIT_PRESS} Truly, I envy you!") }, + MSG_NPC(2, _(" ...I see.")), + MSG_NPC(2, _(" ............I see, I see.")), + MSG_NPC(2, _(" ...Ah... Understood.\nSo, it is named Ho-Oh...")), + MSG_NPC(2, _(" 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!{WAIT_PRESS} Huh?!{WAIT_PRESS}\nYou are!{WAIT_PRESS} You are the one-and-only Ho-Oh?!") }, + MSG_NPC(2, _(" ...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 */ @@ -13171,23 +13171,23 @@ static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x23, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(2, /* to label */ 2), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wroooooooah!") }, - { 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...") }, + MSG_NPC(2, _(" Wroooooooah!")), + MSG_NPC(2, _(" I...{WAIT_PRESS} You...{WAIT_PRESS}\nYou've made me open my eyes!")), + MSG_NPC(2, _(" 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!{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!") }, + MSG_NPC(2, _(" The lesson is: we mustn't\never give up!")), + MSG_NPC(2, _(" Because if you give up,\nthat's when it ends!")), + MSG_NPC(2, _(" Thank you!{WAIT_PRESS}\nYou have inspired me to resume my\ntravels!")), + MSG_NPC(2, _(" 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...{WAIT_PRESS} Is spinning...{WAIT_PRESS}\nMy head's spinning...{WAIT_PRESS} Waaaaaah!") }, + MSG_NPC(2, _(" Waaaaaaaaaaaah!")), + MSG_NPC(2, _(" 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 }, @@ -13197,16 +13197,16 @@ static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 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...{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!{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...{WAIT_PRESS}\nin a special place deep in my heart!{WAIT_PRESS}\nFarewell!") }, + MSG_NPC(2, _(" I'm so sorry I keeled over\nlike that...")), + MSG_NPC(2, _(" And you even came to my\naid when I was down...{WAIT_PRESS}\nThank you...")), + MSG_NPC(2, _(" But I...{WAIT_PRESS}\nI'm feeling overcome by emotion.")), + MSG_NPC(2, _(" Never...{WAIT_PRESS}\nNever did I expect to meet the mirage\nPokémon...")), + MSG_NPC(2, _(" I feel giddily elated...")), + MSG_NPC(2, _(" The lesson is we mustn't\never give up!")), + MSG_NPC(2, _(" Because if you give up,\nthat's when it ends!")), + MSG_NPC(2, _(" Thank you!{WAIT_PRESS}\nYou have inspired me to resume my\ntravels!")), + MSG_NPC(2, _(" My meeting you...\nIt will be a memory I will cherish\nforever!")), + MSG_NPC(2, _(" 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 }, @@ -13356,43 +13356,43 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0x2e, 0x0c, 0x0005, 0x00000001, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...I've always wondered...") }, + MSG_NPC(3, _(" ...I've always wondered...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Who would be the most\npowerful Pokémon of all?") }, + MSG_NPC(3, _(" Who would be the most\npowerful Pokémon of all?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What, there's someone\nbesides Rayquaza?") }, + MSG_NPC(2, _(" What, there's someone\nbesides Rayquaza?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Is that it?") }, + MSG_NPC(4, _(" Is that it?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Well, sheesh, Rayquaza\ndestroyed a star!") }, + MSG_NPC(2, _(" Well, sheesh, Rayquaza\ndestroyed a star!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(5, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Who else but Rayquaza\nwould be able to do that?") }, + MSG_NPC(2, _(" Who else but Rayquaza\nwould be able to do that?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(5, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -13400,31 +13400,31 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" But there's Groudon.\nIsn't that tough?") }, + MSG_NPC(3, _(" But there's Groudon.\nIsn't that tough?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Is that true?") }, + MSG_NPC(4, _(" Is that true?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Why, even Alakazam's team\ncouldn't defeat it!") }, + MSG_NPC(3, _(" Why, even Alakazam's team\ncouldn't defeat it!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(5, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Legend has it that Groudon\nshaped continents.\nIt's an incredible Pokémon!") }, + MSG_NPC(3, _(" Legend has it that Groudon\nshaped continents.\nIt's an incredible Pokémon!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(5, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -13439,9 +13439,9 @@ 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, _(" 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, _(" {NAME_0}, what do you\nthink?") }, + MSG_NPC(2, _(" Hey, you came along at\nthe right time.")), + MSG_NPC(2, _(" We're having a little\nargument about who the most powerful\nPokémon happens to be.")), + MSG_NPC(2, _(" {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{NAME_0}, you think so too?") }, + MSG_NPC(2, _(" 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!{WAIT_PRESS}\nRayquaza is the toughest!") }, + MSG_NPC(2, _(" Yeah, you bet it is!{WAIT_PRESS}\nRayquaza is the toughest!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(8), LABEL(6), /* = 0x06 */ @@ -13475,11 +13475,11 @@ 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{NAME_0}! Isn't that right!") }, + MSG_NPC(3, _(" 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 }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Groudon is the most\npowerful when all's said and done!") }, + MSG_NPC(3, _(" Groudon is the most\npowerful when all's said and done!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(8), LABEL(7), /* = 0x07 */ @@ -13495,17 +13495,17 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0x2e, 0x15, 0x0003, 0x00000001, 0x00000000, NULL }, { 0x2e, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x11, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _("....................................") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _("...................................") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _("....................................") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _("....................................") }, + MSG_NPC(2, _("....................................")), + MSG_NPC(3, _("...................................")), + MSG_NPC(4, _("....................................")), + MSG_NPC(5, _("....................................")), { 0x35, 0x00, -0x0001, 0x00000000, 0x00000000, _("...............................................................\n...............................................................\n...............................................................") }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...{WAIT_PRESS}Well, uh...{WAIT_PRESS}\nI know you want to become tougher, but...") }, + MSG_NPC(2, _(" ...{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.") }, + MSG_NPC(3, _(" I hope you never give up\nchasing your dreams.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), LABEL(8), /* = 0x08 */ @@ -13517,37 +13517,37 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" ...Um...") }, + MSG_NPC(4, _(" ...Um...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I heard this story...") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Somewhere in the world is\na Pokémon that was made for fighting.") }, + MSG_NPC(4, _(" I heard this story...")), + MSG_NPC(4, _(" 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...{WAIT_PRESS}\nmade for fighting?") }, + MSG_NPC(2, _(" A Pokémon...{WAIT_PRESS}\nmade for fighting?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Yup.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" They say it has so much\nfighting power...") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" All it can think of is\ndefeating anything it meets.") }, + MSG_NPC(4, _(" Yup.")), + MSG_NPC(4, _(" They say it has so much\nfighting power...")), + MSG_NPC(4, _(" All it can think of is\ndefeating anything it meets.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Th-that's rather a savage\nPokémon! I shudder to think...") }, + MSG_NPC(3, _(" Th-that's rather a savage\nPokémon! I shudder to think...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Where might such a horrid\nPokémon be now?") }, + MSG_NPC(3, _(" Where might such a horrid\nPokémon be now?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 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...") }, + MSG_NPC(4, _(" Rumors say...{WAIT_PRESS}\nit is storing its power...")), + MSG_NPC(4, _(" They say it is sleeping in\na dungeon somewhere...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(60), WAIT(30), @@ -13567,23 +13567,23 @@ 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, _(" {NAME_6}...{WAIT_PRESS}\nAnd {NAME_7}...") }, + MSG_NPC(2, _(" {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 }, { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh my gosh!\nWhat happened to you?!") }, + MSG_NPC(3, _(" Oh my gosh!\nWhat happened to you?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" They're hurt bad...{WAIT_PRESS}\nWhat exactly happened?!") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nIt's what that {NAME_4} was saying...") }, - { 0x34, 0x00, 0x0007, 0x00000000, 0x00000000, _(" ...We were wiped out by\nthat Pokémon...") }, + MSG_NPC(7, _(" Urgh...{WAIT_PRESS}\nIt's what that {NAME_4} was saying...")), + MSG_NPC(7, _(" ...We were wiped out by\nthat Pokémon...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(473), @@ -13593,12 +13593,12 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wh-what did you say?!") }, + MSG_NPC(2, _(" Wh-what did you say?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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!") }, + MSG_NPC(6, _(" Grgh... There's no mistake...{WAIT_PRESS}\nIt said it was born to fight...")), + MSG_NPC(6, _(" ...But that Pokémon's\npower...{WAIT_PRESS}\nThere was nothing fake about it...")), + MSG_NPC(6, _(" ...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-{NAME_6}!\nAre you OK?!") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nIt's there...") }, + MSG_NPC(7, _(" 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...{WAIT_PRESS}\nto go back again...{WAIT_PRESS} Gfwoh!") }, + MSG_NPC(7, _(" 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,8 +13629,8 @@ 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!{WAIT_PRESS}\nThey need help now!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I'll go get someone!") }, + MSG_NPC(3, _(" Oh, my gosh!\nBlastoise went down, too!{WAIT_PRESS}\nThey need help now!")), + MSG_NPC(3, _(" I'll go get someone!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -13639,16 +13639,16 @@ 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...{WAIT_PRESS}\nA Pokémon that tough...") }, + MSG_NPC(2, _(" ...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?{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!") }, + MSG_NPC(2, _(" ...But, you know?{WAIT_PRESS}\nSo we now know that Pokémon is in the\n{COLOR YELLOW_D}Western Cave{RESET}...")), + MSG_NPC(2, _(" I still don't feel like going\nout there...")), + MSG_NPC(2, _(" Going anywhere like that'd\nbe too scary by half!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" I'm scared too...") }, + MSG_NPC(4, _(" I'm scared too...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -13656,7 +13656,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0005, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(5, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -14062,7 +14062,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Aiyiyi...\nI do not deserve this! I am outraged!") }, + MSG_NPC(2, _(" Aiyiyi...\nI do not deserve this! I am outraged!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -14081,32 +14081,32 @@ 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, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Up? Up? Up?!\nHow could it be up, I ask you!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My beautiful shop...\nMy fine wares were stolen from me!") }, + MSG_NPC(2, _(" Up? Up? Up?!\nHow could it be up, I ask you!")), + MSG_NPC(2, _(" My beautiful shop...\nMy fine wares were stolen from me!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), { 0x56, 0x00, 0x0000, 0x00000146, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Many, many TMs are simply\ngone! Spirited away!\nDark clouds fill my heart!") }, + MSG_NPC(2, _(" Many, many TMs are simply\ngone! Spirited away!\nDark clouds fill my heart!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 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...{WAIT_PRESS}\nThese are frightening times.") }, + MSG_NPC(4, _(" 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 }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Is the storage OK?") }, + MSG_NPC(1, _(" Is the storage OK?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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.{WAIT_PRESS}\nNothing gets stolen from under my eye.") }, + MSG_NPC(5, _(" 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!") }, + MSG_NPC(5, _(" This mama's not about to\nmake a stupid mistake like that! Kakakah!")), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -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...{WAIT_PRESS}\nthat we were robbed for being careless?!") }, + MSG_NPC(2, _(" 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 }, @@ -14125,46 +14125,46 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Now wait.") }, + MSG_NPC(6, _(" Now wait.")), WAIT(10), - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Tell me, Kecleon.{WAIT_PRESS}\nYou saw...this thief?") }, + MSG_NPC(6, _(" 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...?{WAIT_PRESS}\nNo, not very clearly, I didn't.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" When I saw it, it had\nalready taken off...") }, + MSG_NPC(2, _(" Hmm...?{WAIT_PRESS}\nNo, not very clearly, I didn't.")), + MSG_NPC(2, _(" 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?{WAIT_PRESS}\nYou mean it flew away?") }, + MSG_NPC(6, _(" Taken off?{WAIT_PRESS}\nYou mean it flew away?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yes.") }, + MSG_NPC(2, _(" Yes.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x11, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It flew off in yonder\ndirection, yes.") }, + MSG_NPC(2, _(" It flew off in yonder\ndirection, yes.")), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0c, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" At tremendous speed\ntoo.") }, + MSG_NPC(2, _(" At tremendous speed\ntoo.")), { 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, _(" The yonder direction...{WAIT_PRESS}\nThat would be the Northern Range...") }, + MSG_NPC(6, _(" 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 }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" It's impossible to determine\nwhat the thief is...") }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" So we'll need to investigate\nthis matter properly.") }, + MSG_NPC(6, _(" It's impossible to determine\nwhat the thief is...")), + MSG_NPC(6, _(" 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.{WAIT_PRESS}\nMy business faces ruination.") }, + MSG_NPC(2, _(" 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 }, @@ -14364,14 +14364,14 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ WAIT(30), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Look! He's waking up!") }, + MSG_NPC(1, _(" Look! He's waking up!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0e, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0005, -0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" ...Wh-where...?") }, + MSG_NPC(5, _(" ...Wh-where...?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -14384,8 +14384,8 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You! How dare you steal\nmy fine selection of quality merchandise!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" You had better be prepared\nfor harsh justice!") }, + MSG_NPC(2, _(" You! How dare you steal\nmy fine selection of quality merchandise!")), + MSG_NPC(2, _(" You had better be prepared\nfor harsh justice!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 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.{WAIT_PRESS}\nThere must be a good reason for this.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" We should at least hear\nthat.") }, + MSG_NPC(4, _(" Now wait.{WAIT_PRESS}\nThere must be a good reason for this.")), + MSG_NPC(4, _(" 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, _(" ...!{WAIT_PRESS} That's right!\nI have to get my sister...") }, + MSG_NPC(5, _(" ...!{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 }, @@ -14410,27 +14410,27 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Ggh! This wound!") }, + MSG_NPC(5, _(" Ggh! This wound!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" You're injured.\nYou can't fly for now.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Tell me, how do you justify\nwhat you've done?") }, + MSG_NPC(4, _(" You're injured.\nYou can't fly for now.")), + MSG_NPC(4, _(" Tell me, how do you justify\nwhat you've done?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, 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...{WAIT_PRESS}\nCrashed somewhere in the {COLOR YELLOW_D}Pitfall Valley{RESET}...") }, + MSG_NPC(5, _(" I have a younger sister.\nHer name is Latias.")), + MSG_NPC(5, _(" 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?!{WAIT_PRESS}\nThe {COLOR YELLOW_D}Pitfall Valley{RESET}?!") }, + MSG_NPC(4, _(" What?!{WAIT_PRESS}\nThe {COLOR YELLOW_D}Pitfall Valley{RESET}?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -14443,41 +14443,41 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 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.") }, + MSG_NPC(2, _(" It is near the {COLOR YELLOW_D}Northern\nRange{RESET}.")), + MSG_NPC(2, _(" 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 {COLOR YELLOW_D}Pitfall Valley{RESET}...") }, + MSG_NPC(5, _(" Latias and I were flying\nover the Northern Range.")), + MSG_NPC(5, _(" When suddenly, what\nappeared to be a meteorite struck\nLatias on the wing...")), + MSG_NPC(5, _(" 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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" A meteorite?!") }, + MSG_NPC(1, _(" A meteorite?!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" {NAME_0}!{WAIT_PRESS}\nDo you think maybe that it's a chunk of\nthe blown-up meteor?") }, + MSG_NPC(1, _(" {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 {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...") }, + MSG_NPC(5, _(" I went to the {COLOR YELLOW_D}Pitfall Valley{RESET}\nin hopes of rescuing my sister, but...")), + MSG_NPC(5, _(" I made little headway...\nI wasn't up to the task...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" So that drove you to steal\nTechnical Machines...") }, + MSG_NPC(4, _(" So that drove you to steal\nTechnical Machines...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Yes.{WAIT_PRESS}\nI intended to make amends after I saved\nmy sister...") }, + MSG_NPC(5, _(" 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.{WAIT_PRESS}\nIt was wrong, and I'm sorry.") }, + MSG_NPC(5, _(" 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,8 +14487,8 @@ 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!{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.") }, + MSG_NPC(2, _(" Oh... Oh, my!{WAIT_PRESS}\nIt is not a problem! Not a problem at all!")), + MSG_NPC(2, _(" For a reason so compelling,\nit can't be helped. Hahaha.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -14496,21 +14496,21 @@ 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...{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{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?") }, + MSG_NPC(4, _(" However...{WAIT_PRESS}\nEven if you were to plumb the depths of\n{COLOR YELLOW_D}Pitfall Valley{RESET}...")), + MSG_NPC(4, _(" What would you do then?")), + MSG_NPC(4, _(" The nether regions of the\n{COLOR YELLOW_D}Pitfall Valley{RESET} are a void...")), + MSG_NPC(4, _(" 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, _(" ............{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...{WAIT_PRESS}\nTwo would be better than one.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Latias wouldn't have to\nbe so alone...") }, + MSG_NPC(5, _(" ............{WAIT_PRESS}\nSo much time has passed since my sister\ncrashed.")), + MSG_NPC(5, _(" Latias hasn't been able to\nclimb out of the depths.\nShe is all alone down there.")), + MSG_NPC(5, _(" Even if I end up like her,\nunable to escape...{WAIT_PRESS}\nTwo would be better than one.")), + MSG_NPC(5, _(" Latias wouldn't have to\nbe so alone...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" How foolish...{WAIT_PRESS}\nDo you think Latias wishes for that?") }, + MSG_NPC(4, _(" 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 }, @@ -14521,7 +14521,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ 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...{WAIT_PRESS} There is...{WAIT_PRESS}\nThere is but one possible way...") }, + MSG_NPC(4, _(" 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,25 +14532,25 @@ 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?!{WAIT_PRESS}\nHow?!") }, + MSG_NPC(1, _(" 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 {COLOR GREEN_I}Teleport Gem{RESET}.{WAIT_PRESS}\nUse that.") }, + MSG_NPC(4, _(" You already have the means\nin your possession.")), + MSG_NPC(4, _(" 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 {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.") }, + MSG_NPC(1, _(" The {COLOR GREEN_I}Teleport Gem{RESET}?{WAIT_PRESS}\nThe one we used to get up to the sky\nwhere Rayquaza lives?")), + MSG_NPC(1, _(" 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{COLOR GREEN_I}Teleport Gem{RESET} from deep within the {COLOR YELLOW_D}Pitfall\nValley{RESET}...") }, + MSG_NPC(4, _(" While it is unlikely to\ncarry you to the sky again, it should\nbe able to carry you a shorter distance.")), + MSG_NPC(4, _(" 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!{WAIT_PRESS}\nIf we did that, we could escape with\nLatias!") }, + MSG_NPC(1, _(" 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 }, @@ -14789,31 +14789,31 @@ 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, _(" {NAME_6}!") }, + MSG_NPC(5, _(" {NAME_6}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Latios!") }, + MSG_NPC(6, _(" Latios!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0005, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" You're safe!\nThis is incredible...") }, + MSG_NPC(5, _(" You're safe!\nThis is incredible...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" I'm sorry...\nI caused you so much worry...") }, + MSG_NPC(6, _(" I'm sorry...\nI caused you so much worry...")), { 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, 0x0c, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Oh, this is great...\nIt's so touching... Sniffle...") }, + MSG_NPC(2, _(" Oh, this is great...\nIt's so touching... Sniffle...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -14823,11 +14823,11 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, { 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...{WAIT_PRESS}\nIt's happiness beyond words...") }, + MSG_NPC(5, _(" My sister is safe, all\nthanks to you.")), + MSG_NPC(5, _(" To be honest, I came close\nto giving up...")), + MSG_NPC(5, _(" 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!") }, + MSG_NPC(5, _(" We owe you so much\ngratitude! Thank you!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -14839,27 +14839,27 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 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...{WAIT_PRESS}\nMay we join your rescue team?") }, + MSG_NPC(5, _(" However...\nWe have no money or any other way of\nrepaying your kindness.")), + MSG_NPC(5, _(" 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 }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh...?") }, + MSG_NPC(1, _(" Huh...?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 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 {COLOR CYAN}Team\n{TEAM_NAME}{RESET} and help with your rescue\nwork.") }, + MSG_NPC(6, _(" 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?{WAIT_PRESS}\nWould you be willing to accept us on\nyour rescue team?") }, + MSG_NPC(5, _(" 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 }, @@ -14884,7 +14884,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?\nYou're really sure about that?!") }, + MSG_NPC(1, _(" Huh?\nYou're really sure about that?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x02, 0x0001, 0x00000005, 0x00000000, NULL }, @@ -14903,8 +14903,8 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x0d, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" It is you who decides.\nThe outcome is of no concern to me.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" However...") }, + MSG_NPC(4, _(" It is you who decides.\nThe outcome is of no concern to me.")), + MSG_NPC(4, _(" However...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, @@ -14912,10 +14912,10 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 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...{WAIT_PRESS}\nEven if you would never see them again,\nyou will still not accept them?") }, + MSG_NPC(4, _(" Latios and Latias are\nPokémon so rarely seen that they are\nconsidered mythical.")), + MSG_NPC(4, _(" If you part ways with them\nnow, you may never see them again.")), + MSG_NPC(4, _(" Strike that.\nYou will never again see them.")), + MSG_NPC(4, _(" 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 }, @@ -14966,14 +14966,14 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, { 0x2e, 0x15, 0x0005, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" Thanks for having us!") }, + MSG_NPC(5, _(" Thanks for having us!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0006, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" Delighted to join!") }, + MSG_NPC(6, _(" Delighted to join!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x32, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}And thus...") }, @@ -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 {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?{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.") }, + MSG_NPC(1, _(" Hey, have you heard?\nAbout the {COLOR YELLOW_D}Buried Relic{RESET}.")), + MSG_NPC(1, _(" They're rumoring that there\nare treasures in there.")), + MSG_NPC(1, _(" And they say the treasures\naren't just lying around on the ground.")), + MSG_NPC(1, _(" Know what they're saying?{WAIT_PRESS}\nThey're saying that treasures are even\nembedded in the walls!")), + MSG_NPC(1, _(" If you knock down the walls,\nthere might be treasures galore!{WAIT_PRESS}\nSounds really enticing, eh?")), + MSG_NPC(1, _(" 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{COLOR YELLOW_D}Buried Relic{RESET}.") }, + MSG_NPC(1, _(" I heard rumors that\nPokémon from ancient times live in the\n{COLOR YELLOW_D}Buried Relic{RESET}.")), JUMP_SCRIPT(END_TALK), }; @@ -15289,9 +15289,9 @@ 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.{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.") }, + MSG_NPC(1, _(" I've heard that there are\ntreasures to be found in the relic.{WAIT_PRESS}\nI wonder how much is true?")), + MSG_NPC(1, _(" But, I must admit...{WAIT_PRESS}\nI do get a certain thrill from it!")), + MSG_NPC(1, _(" I guess there's a sense of\ndrama and adventure about it.")), JUMP_SCRIPT(END_TALK), }; @@ -15315,11 +15315,11 @@ 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 {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?") }, + MSG_NPC(1, _(" What's that?\nWhere is the {COLOR YELLOW_D}Buried Relic{RESET}?")), + MSG_NPC(1, _(" The {COLOR YELLOW_D}Buried Relic{RESET} is deep\nin the jungle to the southeast.")), + MSG_NPC(1, _(" Are you dreaming about\nthe treasures too?")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Kukukuh...{WAIT_PRESS} Me too!{WAIT_PRESS}\nBest of luck, compadre!") }, + MSG_NPC(1, _(" 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), @@ -15361,9 +15361,9 @@ static const struct ScriptCommand s_gs1_g50_s0_lives4_dlg2[] = { /* 0x8178410 */ WAIT(1), JUMPIF_ARRAY(EVENT_S07E01, 5, /* to label */ 0), SET_ARRAYVAL(EVENT_S07E01, 5, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It seems talk of the relic\nis on everyone's lips today!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you find any\ntreasures, please do sell them to me.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And now...") }, + MSG_NPC(1, _(" It seems talk of the relic\nis on everyone's lips today!")), + MSG_NPC(1, _(" If you find any\ntreasures, please do sell them to me.")), + MSG_NPC(1, _(" And now...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -15378,8 +15378,8 @@ 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?{WAIT_PRESS}\nWhy, I wouldn't mind closing up the shop\nso I could go treasure hunting!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And now...") }, + MSG_NPC(1, _(" Oh, isn't it exciting?{WAIT_PRESS}\nWhy, I wouldn't mind closing up the shop\nso I could go treasure hunting!")), + MSG_NPC(1, _(" And now...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -15394,7 +15394,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives6_dlg2[] = { /* 0x8178690 */ WAIT(1), JUMPIF_ARRAY(EVENT_S07E01, 7, /* to label */ 0), SET_ARRAYVAL(EVENT_S07E01, 7, 1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you find a fortune in the\nrelic, save it here with me!") }, + MSG_NPC(1, _(" If you find a fortune in the\nrelic, save it here with me!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -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 {COLOR YELLOW_D}Buried Relic{RESET}?") }, + MSG_NPC(1, _(" 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,9 +15424,9 @@ 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 {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...") }, + MSG_NPC(1, _(" You're going too, aren't you?\nTo the {COLOR YELLOW_D}Buried Relic{RESET}.")), + MSG_NPC(1, _(" This mama's behind you all\nthe way! Go for it!")), + MSG_NPC(1, _(" OK...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -15441,8 +15441,8 @@ 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 {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.") }, + MSG_NPC(1, _(" What treasures can be\nfound in the {COLOR YELLOW_D}Buried Relic{RESET}, I wonder?")), + MSG_NPC(1, _(" It makes me drool thinking\nwhat I could swallow in a place like that.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -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 {COLOR YELLOW_D}Mt. Freeze{RESET}.") }, + MSG_NPC(1, _(" 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.{WAIT_PRESS}\nWill he be OK?") }, + MSG_NPC(1, _(" 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), }; @@ -15468,8 +15468,8 @@ static const struct ScriptCommand s_gs1_g51_s0_lives1_dlg2[] = { /* 0x8178c10 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Gengar wants to meet with\nNinetales. That's what I think.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What he means to do when\nhe does meet...I don't know.") }, + MSG_NPC(1, _(" Gengar wants to meet with\nNinetales. That's what I think.")), + MSG_NPC(1, _(" What he means to do when\nhe does meet...I don't know.")), SCENARIO_CALC(SCENARIO_SUB9, 53, 4), JUMP_SCRIPT(END_TALK), }; @@ -15480,8 +15480,8 @@ static const struct ScriptCommand s_gs1_g52_s0_lives0_dlg2[] = { /* 0x8178d0c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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 {COLOR CYAN}Team \n{TEAM_NAME}{RESET} and help on rescues.") }, + MSG_NPC(1, _(" I have done a lot of\nthinking...")), + MSG_NPC(1, _(" 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,7 +15489,7 @@ 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!{WAIT_PRESS}\nI promise to do my best for the team!") }, + MSG_NPC(1, _(" Thank you!{WAIT_PRESS}\nI promise to do my best for the team!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY(204), @@ -15514,16 +15514,16 @@ static const struct ScriptCommand s_gs1_g52_s0_lives0_dlg2[] = { /* 0x8178d0c */ JUMP_SCRIPT(END_TALK), LABEL(4), /* = 0x04 */ { 0x2e, 0x02, 0x0001, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Yes!\nThank you!") }, + MSG_NPC(1, _(" 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...{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.") }, + MSG_NPC(1, _(" ...However, there seems to\nbe no space for me in my Friend Area...{WAIT_PRESS}\nThis is disappointing...")), + MSG_NPC(1, _(" I could join your rescue\nteam if there were less Pokémon in\n{COLOR GREEN}Sky Blue Plains{RESET}...")), + MSG_NPC(1, _(" 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.{WAIT_PRESS}\nThis is disappointing...") }, + MSG_NPC(1, _(" ...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 5ac12a2be..0623fd923 100644 --- a/src/data/ground/ground_data_t01p02a_station.h +++ b/src/data/ground/ground_data_t01p02a_station.h @@ -243,15 +243,15 @@ 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...{WAIT_PRESS}\nI couldn't evolve into Butterfree.") }, + MSG_NPC(3, _(" 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.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I bet you weren't high\nenough in level, Metapod.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If you train and raise your\nlevel, I think you'll be able to evolve.") }, + MSG_NPC(2, _(" That's too bad, Metapod.")), + MSG_NPC(2, _(" I bet you weren't high\nenough in level, Metapod.")), + MSG_NPC(2, _(" 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!{WAIT_PRESS}\nI get it! I'll work at leveling up!") }, + MSG_NPC(3, _(" Oh, so it's my level!{WAIT_PRESS}\nI get it! I'll work at leveling up!")), JUMP_SCRIPT(END_TALK), }; @@ -271,15 +271,15 @@ 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...{WAIT_PRESS}\nI couldn't evolve into Butterfree.") }, + MSG_NPC(3, _(" 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.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I bet you weren't high\nenough in level, Metapod.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" If you train and raise your\nlevel, I think you'll be able to evolve.") }, + MSG_NPC(2, _(" That's too bad, Metapod.")), + MSG_NPC(2, _(" I bet you weren't high\nenough in level, Metapod.")), + MSG_NPC(2, _(" 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!{WAIT_PRESS}\nI get it! I'll work at leveling up!") }, + MSG_NPC(3, _(" Oh, so it's my level!{WAIT_PRESS}\nI get it! I'll work at leveling up!")), JUMP_SCRIPT(END_TALK), }; @@ -295,8 +295,8 @@ static const struct ScriptCommand s_gs2_g1_s0_lives2_dlg2[] = { /* 0x817e520 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" The Jumpluff appear to\nhave left on the winds.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I shall miss them...") }, + MSG_NPC(1, _(" The Jumpluff appear to\nhave left on the winds.")), + MSG_NPC(1, _(" I shall miss them...")), JUMP_SCRIPT(END_TALK), }; @@ -357,36 +357,36 @@ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg2[] = { /* 0x817e834 */ FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Ah, so you wish to know\nabout the dungeon in the sea?") }, - { 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 {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.") }, + MSG_NPC(1, _(" Ah, so you wish to know\nabout the dungeon in the sea?")), + MSG_NPC(1, _(" I, too, have heard of it.")), + MSG_NPC(1, _(" I have heard of a place that\nis far off our coast...")), + MSG_NPC(1, _(" It is a sea churned by\ntorrential storms and violent waves.")), + MSG_NPC(1, _(" It is a place appropriately\nnamed the {COLOR YELLOW_D}Stormy Sea{RESET}.")), + MSG_NPC(1, _(" There, one will find a\ndungeon that leads to the bottom of\nthe sea.")), + MSG_NPC(1, _(" The sea is infinitely dark,\nand its depth unimaginable.\nThat is what I have heard.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho!{WAIT_PRESS}\nYou look eager to go.") }, + MSG_NPC(1, _(" 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...{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}.") }, + MSG_NPC(1, _(" However...{WAIT_PRESS}\nTo go beneath the sea, a Hidden Machine\nnamed {COLOR GREEN_I}Dive{RESET} is needed.")), + MSG_NPC(1, _(" 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.{WAIT_PRESS}\nYou may have this.") }, + MSG_NPC(1, _(" Hohoho! Your face tells me\nyou are desperate to go.")), + MSG_NPC(1, _(" 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 {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 {COLOR GREEN_I}Dive{RESET}...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You would be able to enter\nthe {COLOR YELLOW_D}Stormy Sea{RESET}.") }, + MSG_NPC(1, _(" I understand that it is\na very rare item that was found in a place\ncalled the {COLOR YELLOW_D}Solar Cave{RESET}.")), + MSG_NPC(1, _(" If you were to carry that\nHidden Machine as an item...")), + MSG_NPC(1, _(" Or if any team member\nwishing to enter the dungeon used that\nHidden Machine to learn {COLOR GREEN_I}Dive{RESET}...")), + MSG_NPC(1, _(" You would be able to enter\nthe {COLOR YELLOW_D}Stormy Sea{RESET}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), BGM_STOP, @@ -402,18 +402,18 @@ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg2[] = { /* 0x817e834 */ 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 {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.") }, + MSG_NPC(1, _(" If you were to carry the\nHidden Machine {COLOR GREEN_I}Dive{RESET} as an item...")), + MSG_NPC(1, _(" Or if any team member\nwishing to enter the dungeon used that\nHidden Machine to learn {COLOR GREEN_I}Dive{RESET}...")), + MSG_NPC(1, _(" You would be able to enter\nthe {COLOR YELLOW_D}Stormy Sea{RESET}.")), + MSG_NPC(1, _(" Oh?{WAIT_PRESS}\nWhat happens if you lose the\nHidden Machine {COLOR GREEN_I}Dive{RESET}?")), + MSG_NPC(1, _(" All I had was the one\nI gave you...{WAIT_PRESS}\nHmm... What should one do?")), + MSG_NPC(1, _(" The Hidden Machine {COLOR GREEN_I}Dive{RESET}\nwas apparently found in the {COLOR YELLOW_D}Solar Cave{RESET}.")), + MSG_NPC(1, _(" 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.{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.") }, + MSG_NPC(1, _(" Hohoho.{WAIT_PRESS}\nAdventures keep you young.")), + MSG_NPC(1, _(" 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 }, JUMP_SCRIPT(END_TALK), @@ -473,11 +473,11 @@ 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.{WAIT_PRESS}\nThere is an old saying about the {COLOR YELLOW_D}Buried\nRelic{RESET}.") }, + MSG_NPC(1, _(" 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...{WAIT_PRESS}\nA mirage shall appear to the bearer...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...What this actually means,\nthere is no telling now. Hohoho.") }, + MSG_NPC(1, _(" Three parts there are,\nguarded by three disciples.")), + MSG_NPC(1, _(" When the three parts\nare gathered in hand...{WAIT_PRESS}\nA mirage shall appear to the bearer...")), + MSG_NPC(1, _(" ...What this actually means,\nthere is no telling now. Hohoho.")), JUMP_SCRIPT(END_TALK), }; @@ -553,26 +553,26 @@ 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, _(" ........................") }, + MSG_NPC(2, _(" ........................")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ........................") }, + MSG_NPC(3, _(" ........................")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...We've found it at last!") }, + MSG_NPC(2, _(" ...We've found it at last!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yesss! Find it we did!") }, + MSG_NPC(3, _(" Yesss! Find it we did!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 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!{WAIT_PRESS}\nPshehehe!") }, + MSG_NPC(2, _(" My wish...\nIt will finally come true!{WAIT_PRESS}\nPshehehe!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Hey, now, don't forget about\nmy wish!") }, + MSG_NPC(3, _(" Hey, now, don't forget about\nmy wish!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 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, {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.") }, + MSG_NPC(2, _(" Listen, {NAME_3}.{WAIT_PRESS}\nWe must keep this a secret just between\nthe two of us.")), + MSG_NPC(2, _(" 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!") }, + MSG_NPC(3, _(" 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...{WAIT_PRESS} First...") }, + MSG_NPC(2, _(" 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), @@ -606,17 +606,17 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ FANFARE_PLAY2(473), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Aiyeeeeeeeeeeeh!") }, + MSG_NPC(2, _(" Aiyeeeeeeeeeeeh!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I...{WAIT_PRESS}\nI don't know anything!") }, + MSG_NPC(2, _(" 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!{WAIT_PRESS}\nI know nothing!") }, + MSG_NPC(3, _(" Me too!\nI don't know a thing!")), + MSG_NPC(3, _(" 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,31 +765,31 @@ 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, _(" {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...") }, + MSG_NPC(2, _(" {NAME_3}, listen.{WAIT_PRESS}\nI'm thinking it is best if only we go\ninto the dungeon.")), + MSG_NPC(2, _(" 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.{WAIT_PRESS}\nThe other one can still go make wishes!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" That's smart, {NAME_2}!") }, + MSG_NPC(3, _(" Oh, I get it.{WAIT_PRESS}\nThe other one can still go make wishes!")), + MSG_NPC(3, _(" That's smart, {NAME_2}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But of course.\nI can't wait until our wishes\ncome true〜♪") }, + MSG_NPC(2, _(" But of course.\nI can't wait until our wishes\ncome true〜♪")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" My wish is for a broader\nlower jaw.") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I want bigger jaws so I can\nswallow bigger things whole.") }, + MSG_NPC(3, _(" My wish is for a broader\nlower jaw.")), + MSG_NPC(3, _(" I want bigger jaws so I can\nswallow bigger things whole.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" My wish is for a place\nwhere I can meditate in peace〜♪") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" With no one to bother me...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" It would be magnificent\nif I could meditate for a year without\nfood〜♪") }, + MSG_NPC(2, _(" My wish is for a place\nwhere I can meditate in peace〜♪")), + MSG_NPC(2, _(" With no one to bother me...")), + MSG_NPC(2, _(" It would be magnificent\nif I could meditate for a year without\nfood〜♪")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), FANFARE_PLAY2(465), @@ -808,17 +808,17 @@ static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ FANFARE_PLAY2(473), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Giyaaaaaaaaaaaaaaaaah!") }, + MSG_NPC(2, _(" Giyaaaaaaaaaaaaaaaaah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I...{WAIT_PRESS}\nI don't know anything!") }, + MSG_NPC(2, _(" 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!{WAIT_PRESS}\nI know nothing!") }, + MSG_NPC(3, _(" Me too!\nI don't know a thing!")), + MSG_NPC(3, _(" 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 }, @@ -951,8 +951,8 @@ static const struct ScriptCommand s_gs2_g9_s1_lives0_dlg0[] = { /* 0x818131c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...I got KO'd in that\ndungeon, but what about Medicham?\nHope she's OK...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I hope she gets to the end\nand gets my wish to come true...") }, + MSG_NPC(2, _(" ...I got KO'd in that\ndungeon, but what about Medicham?\nHope she's OK...")), + MSG_NPC(2, _(" I hope she gets to the end\nand gets my wish to come true...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -960,19 +960,19 @@ static const struct ScriptCommand s_gs2_g9_s1_lives0_dlg0[] = { /* 0x818131c */ FANFARE_PLAY2(473), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Giyah!") }, + MSG_NPC(2, _(" Giyah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Wh-what are you staring\nat, you?!") }, + MSG_NPC(2, _(" 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!{WAIT_PRESS}\nGet lost!") }, + MSG_NPC(2, _(" 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 }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Hunh? Wait a second...\nMaybe I shouldn't be wishing for\na bigger lower jaw...?") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I wonder if it'd be better\nif I could coil myself tighter...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Hmm...\nMutter...") }, + MSG_NPC(2, _(" ...Hunh? Wait a second...\nMaybe I shouldn't be wishing for\na bigger lower jaw...?")), + MSG_NPC(2, _(" I wonder if it'd be better\nif I could coil myself tighter...")), + MSG_NPC(2, _(" ...Hmm...\nMutter...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xa1, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -1037,8 +1037,8 @@ static const struct ScriptCommand s_gs2_g10_s0_lives0_dlg2[] = { /* 0x81818ec */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I've heard fissures have\nopened up in the ground here and there.\nThey're trouble for everyone.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It worries me to no\nend, thinking that children will fall\ndown into them...") }, + MSG_NPC(1, _(" I've heard fissures have\nopened up in the ground here and there.\nThey're trouble for everyone.")), + MSG_NPC(1, _(" It worries me to no\nend, thinking that children will fall\ndown into them...")), JUMP_SCRIPT(END_TALK), }; @@ -1068,8 +1068,8 @@ static const struct ScriptCommand s_gs2_g11_s0_lives0_dlg2[] = { /* 0x8181acc */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I've lived in this pond for\nmany long years...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" But never have I seen such\nfrequent natural disasters...") }, + MSG_NPC(1, _(" I've lived in this pond for\nmany long years...")), + MSG_NPC(1, _(" But never have I seen such\nfrequent natural disasters...")), JUMP_SCRIPT(END_TALK), }; @@ -1099,8 +1099,8 @@ static const struct ScriptCommand s_gs2_g12_s0_lives0_dlg2[] = { /* 0x8181c58 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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...{WAIT_PRESS}\nI was tiny...{WAIT_PRESS}\nHohoho.") }, + MSG_NPC(1, _(" Seeing the innocence of\nchildren at play is a good thing.\nHohoho.")), + MSG_NPC(1, _(" 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! {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 {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!") }, + MSG_NPC(1, _(" Oh! {NAME_0} and\n{NAME_2}! Long time no see!")), + MSG_NPC(1, _(" I have a new friend!")), + MSG_NPC(1, _(" His name is {NAME_3}.")), + MSG_NPC(1, _(" 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,8 +1145,8 @@ 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 {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...") }, + MSG_NPC(1, _(" I've not seen {NAME_2}\nor other children lately.\nI wonder how they are keeping.")), + MSG_NPC(1, _(" Not seeing the children\ngives me a twinge of sadness...")), JUMP_SCRIPT(END_TALK), }; @@ -1177,17 +1177,17 @@ static const struct ScriptCommand s_gs2_g14_s0_lives0_dlg2[] = { /* 0x81820f0 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, 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.{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.") }, + MSG_NPC(1, _(" It's good to see the\nyoungsters back.")), + MSG_NPC(1, _(" I heard you saved them.{WAIT_PRESS}\nGetting through the dungeon must have\nbeen very taxing on you.")), + MSG_NPC(1, _(" I'm also grateful for what\nyou've done. Thank you.")), { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 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 {COLOR YELLOW_D}Ultimate Dungeon{RESET}...") }, + MSG_NPC(1, _(" Incidentally...{WAIT_PRESS}\nI have heard of a particularly challenging\ndungeon somewhere in our world.")), + MSG_NPC(1, _(" It starts your level at one...{WAIT_PRESS}\nclears all your gained stats...{WAIT_PRESS}\nand empties your Toolbox at the start.")), + MSG_NPC(1, _(" In other words, it forces\none to enter in a completely clean state.")), + MSG_NPC(1, _(" It has never been conquered\nby any rescue team...")), + MSG_NPC(1, _(" 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!") }, + MSG_NPC(1, _(" Perhaps your team will take\non that challenge one day? Hohoho!")), JUMP_SCRIPT(END_TALK), }; @@ -1203,8 +1203,8 @@ 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 {NAME_2}\nagain!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Thank you!") }, + MSG_NPC(1, _(" I can play with {NAME_2}\nagain!")), + MSG_NPC(1, _(" 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, _(" {NAME_0} and\n{NAME_2}, thank you!") }, + MSG_NPC(1, _(" {NAME_0} and\n{NAME_2}, thank you!")), JUMP_SCRIPT(END_TALK), }; @@ -1239,7 +1239,7 @@ static const struct ScriptCommand s_gs2_g15_s0_lives0_dlg2[] = { /* 0x8182664 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x00, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Seeing children at play is\nwhat I most enjoy now.") }, + MSG_NPC(1, _(" Seeing children at play is\nwhat I most enjoy now.")), JUMP_SCRIPT(END_TALK), }; @@ -1264,12 +1264,12 @@ 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, {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!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ahahaha!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Ahahaha!") }, + MSG_NPC(2, _(" Yay, {NAME_3}!\nWhat'll we do next?")), + MSG_NPC(3, _(" Let's play battle!")), + MSG_NPC(2, _(" OK, I use String Shot!")), + MSG_NPC(3, _(" Then, I use Harden!")), + MSG_NPC(2, _(" Ahahaha!")), + MSG_NPC(3, _(" Ahahaha!")), JUMP_SCRIPT(END_TALK), }; @@ -1288,12 +1288,12 @@ 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, {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!") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ahahaha!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Ahahaha!") }, + MSG_NPC(2, _(" Yay, {NAME_3}!\nWhat'll we do next?")), + MSG_NPC(3, _(" Let's play battle!")), + MSG_NPC(2, _(" OK, I use String Shot!")), + MSG_NPC(3, _(" Then, I use Harden!")), + MSG_NPC(2, _(" Ahahaha!")), + MSG_NPC(3, _(" Ahahaha!")), JUMP_SCRIPT(END_TALK), }; @@ -1318,7 +1318,7 @@ static const struct ScriptCommand s_gs2_g16_s0_lives0_dlg2[] = { /* 0x8182a70 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000063, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho.\nYou wish to hear me tell old folklore?") }, + MSG_NPC(1, _(" 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 {COLOR GREEN}{NAME_2} legend{RESET}?")), @@ -1326,13 +1326,13 @@ static const struct ScriptCommand s_gs2_g16_s0_lives0_dlg2[] = { /* 0x8182a70 */ CHOICE(/* label */ 2, _("No.")), LABEL(1), /* = 0x01 */ BGM_FADEOUT(90), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho. Fine, then.{WAIT_PRESS}\nLet me recount the tale.") }, + MSG_NPC(1, _(" Hohoho. Fine, then.{WAIT_PRESS}\nLet me recount the tale.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, EXECUTE_STATION(-1, 16, 1), HALT, LABEL(2), /* = 0x02 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I see.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you feel the urge to hear\nmy tale, come see me anytime. Hohoho.") }, + MSG_NPC(1, _(" I see.")), + MSG_NPC(1, _(" If you feel the urge to hear\nmy tale, come see me anytime. Hohoho.")), JUMP_SCRIPT(END_TALK), }; @@ -1349,8 +1349,8 @@ 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, _(" {NAME_2} told us\nfolklore from long ago.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It was fun.") }, + MSG_NPC(1, _(" {NAME_2} told us\nfolklore from long ago.")), + MSG_NPC(1, _(" 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.{WAIT_PRESS}\n{NAME_2} is very wise.") }, + MSG_NPC(1, _(" The folklore was fun and\ninteresting.{WAIT_PRESS}\n{NAME_2} is very wise.")), JUMP_SCRIPT(END_TALK), }; @@ -1395,29 +1395,29 @@ 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 {NAME_2}.") }, + MSG_NPC(1, _(" There once lived a Pokémon\nby the name of {NAME_2}.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 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.{WAIT_PRESS}\nAnd it was a human.") }, + MSG_NPC(1, _(" Now, {NAME_2} had\nmany tails, all of them imbued with\npsychic power...")), + MSG_NPC(1, _(" It was said that anyone so\nfoolish as to touch a tail would be cursed\nfor a thousand years.")), + MSG_NPC(1, _(" 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 }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" A human?") }, + MSG_NPC(3, _(" A human?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, 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{NAME_4} shielded the human...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And sacrificed herself to\nabsorb the curse.") }, + MSG_NPC(1, _(" Yes, a human.")), + MSG_NPC(1, _(" As one might expect, the\nhuman that grabbed the tail was subjected\nto a thousand-year curse.")), + MSG_NPC(1, _(" However, just when the\ncurse was cast, a Pokémon named\n{NAME_4} shielded the human...")), + MSG_NPC(1, _(" And sacrificed herself to\nabsorb the curse.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Why?") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Why would that Pokémon,\nGardevoir, take the human's place?") }, + MSG_NPC(3, _(" Why?")), + MSG_NPC(3, _(" 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 {NAME_4}, that human\nwas her partner.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" There exist strong bonds\nbetween humans and Pokémon.") }, + MSG_NPC(1, _(" To {NAME_4}, that human\nwas her partner.")), + MSG_NPC(1, _(" There exist strong bonds\nbetween humans and Pokémon.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0003, 0x00000004, 0x00000000, NULL }, @@ -1426,20 +1426,20 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ 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 {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...”") }, + MSG_NPC(1, _(" Correct.")), + MSG_NPC(1, _(" Taking pity on {NAME_4},\n{NAME_2} asked the human this...")), + MSG_NPC(1, _(" “Do you wish to save\n{NAME_4}?” it asked...")), + MSG_NPC(1, _(" But the human had already\nabandoned {NAME_4} and fled.")), + MSG_NPC(1, _(" {NAME_2} became\ndisillusioned with the human...")), + MSG_NPC(1, _(" And it made this prediction...")), + MSG_NPC(1, _(" “That human will one day\nbe reborn as a Pokémon...”")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(466), CALL_SCRIPT(SHOCK_FUNC), { 0x2e, 0x03, 0x0003, 0x0000000c, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" What?!{WAIT_PRESS}\nA human turn into a Pokémon?!") }, + MSG_NPC(3, _(" What?!{WAIT_PRESS}\nA human turn into a Pokémon?!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -1448,26 +1448,26 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ CALL_SCRIPT(SWEAT_FUNC), WAIT(60), { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" “And when the human \nbecomes a Pokémon...”") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" “The world's balance will\nbe upset...”") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ...And that is how the legend\nends.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Well?\nDid you find it interesting?") }, + MSG_NPC(1, _(" “And when the human \nbecomes a Pokémon...”")), + MSG_NPC(1, _(" “The world's balance will\nbe upset...”")), + MSG_NPC(1, _(" ...And that is how the legend\nends.")), + MSG_NPC(1, _(" Well?\nDid you find it interesting?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(120), WAIT(80), { 0x2e, 0x03, 0x0003, 0x00000005, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ........................") }, + MSG_NPC(3, _(" ........................")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 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.") }, + MSG_NPC(1, _(" Ah-hah!{WAIT_PRESS}\nYou found it so interesting, you're at\na loss for words? Hohoho.")), + MSG_NPC(1, _(" There's no need to wear\nsuch a serious expression.")), + MSG_NPC(1, _(" Certainly some rumors say\nthat the legend may actually be true...")), + MSG_NPC(1, _(" But it is only ancient\nfolklore, nothing more.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you feel the urge to hear\nmy tale again, come see me. Hohoho.") }, + MSG_NPC(1, _(" If you feel the urge to hear\nmy tale again, come see me. Hohoho.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -1517,19 +1517,19 @@ static const struct ScriptCommand s_gs2_g16_s1_lives2_dlg2[] = { /* 0x8183d24 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000063, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hohoho.\nYou wish to hear me tell old folklore?") }, + MSG_NPC(1, _(" 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 {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.{WAIT_PRESS}\nLet me recount the tale.") }, + MSG_NPC(1, _(" Hohoho. Fine, then.{WAIT_PRESS}\nLet me recount the tale.")), EXECUTE_STATION(-1, 16, 1), HALT, LABEL(2), /* = 0x02 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I see.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you feel the urge to hear\nmy tale again, come see me anytime.\nHohoho.") }, + MSG_NPC(1, _(" I see.")), + MSG_NPC(1, _(" If you feel the urge to hear\nmy tale again, come see me anytime.\nHohoho.")), JUMP_SCRIPT(END_TALK), }; @@ -1565,19 +1565,19 @@ static const struct ScriptCommand s_gs2_g18_s0_lives0_dlg0[] = { /* 0x8183f98 */ { 0x2d, 0x09, 0x0003, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, 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{NAME_3} shielded the human...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" And sacrificed herself to\nabsorb the curse.") }, + MSG_NPC(2, _(" Yes, a human.")), + MSG_NPC(2, _(" As one might expect, the\nhuman that grabbed the tail was subjected\nto a curse of a thousand years.")), + MSG_NPC(2, _(" However, just when the\ncurse was cast, a Pokémon named\n{NAME_3} shielded the human...")), + MSG_NPC(2, _(" And sacrificed herself to\nabsorb the curse.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x03, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Why?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Why would that Pokémon,\nGardevoir, take the human's place?") }, + MSG_NPC(1, _(" Why?")), + MSG_NPC(1, _(" 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 {NAME_3}, that human\nwas her partner.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" There exist strong bonds\nbetween humans and Pokémon.") }, + MSG_NPC(2, _(" To {NAME_3}, that human\nwas her partner.")), + MSG_NPC(2, _(" There exist strong bonds\nbetween humans and Pokémon.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, @@ -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...{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...") }, + MSG_NPC(1, _(" I regret this...{WAIT_PRESS}\nHow some old folklore I told...{WAIT_PRESS}\ncould cause such an uproar...")), + MSG_NPC(1, _(" 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 {NAME_0}\nisn't under suspicion anymore.") }, + MSG_NPC(1, _(" I'm so glad {NAME_0}\nisn't under suspicion anymore.")), JUMP_SCRIPT(END_TALK), }; @@ -1678,8 +1678,8 @@ 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 {NAME_0}\ncouldn't be evil.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I hope you keep doing good\nwith your rescue work!") }, + MSG_NPC(1, _(" I just knew {NAME_0}\ncouldn't be evil.")), + MSG_NPC(1, _(" I hope you keep doing good\nwith your rescue work!")), JUMP_SCRIPT(END_TALK), }; @@ -1704,9 +1704,9 @@ static const struct ScriptCommand s_gs2_g21_s0_lives0_dlg2[] = { /* 0x8184754 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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...{WAIT_PRESS}\nThey tell me of coming earthquakes.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And many quakes are indeed\ncoming.") }, + MSG_NPC(1, _(" Wroooar!\nI can't relax!")), + MSG_NPC(1, _(" My whiskers...{WAIT_PRESS}\nThey tell me of coming earthquakes.")), + MSG_NPC(1, _(" And many quakes are indeed\ncoming.")), JUMP_SCRIPT(END_TALK), }; @@ -1731,8 +1731,8 @@ static const struct ScriptCommand s_gs2_g21_s0_lives1_dlg2[] = { /* 0x81848ec */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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...{WAIT_PRESS}\nIt was a mess for everyone...") }, + MSG_NPC(1, _(" That earthquake really\nfrightened me...")), + MSG_NPC(1, _(" I was so scared, I spat silk\nall over the place...{WAIT_PRESS}\nIt was a mess for everyone...")), JUMP_SCRIPT(END_TALK), }; @@ -1741,9 +1741,9 @@ static const struct ScriptCommand s_gs2_g21_s0_lives2_dlg2[] = { /* 0x81849e0 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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...{WAIT_PRESS}\nI was just shaking inside my shell...") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Waaah!\nThinking about it is scary!") }, + MSG_NPC(1, _(" I hardened when the quake\nhit...")), + MSG_NPC(1, _(" I couldn't take a step...{WAIT_PRESS}\nI was just shaking inside my shell...")), + MSG_NPC(1, _(" Waaah!\nThinking about it is scary!")), JUMP_SCRIPT(END_TALK), }; @@ -1768,9 +1768,9 @@ static const struct ScriptCommand s_gs2_g22_s0_lives0_dlg2[] = { /* 0x8184b7c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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...{WAIT_PRESS}\nThey tell me of coming earthquakes.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" And many quakes are indeed\ncoming.") }, + MSG_NPC(1, _(" Wroooar!\nI can't relax!")), + MSG_NPC(1, _(" My whiskers...{WAIT_PRESS}\nThey tell me of coming earthquakes.")), + MSG_NPC(1, _(" And many quakes are indeed\ncoming.")), JUMP_SCRIPT(END_TALK), }; @@ -1795,7 +1795,7 @@ static const struct ScriptCommand s_gs2_g22_s0_lives1_dlg2[] = { /* 0x8184c9c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'm terrified of all the\nearthquakes...") }, + MSG_NPC(1, _(" I'm terrified of all the\nearthquakes...")), JUMP_SCRIPT(END_TALK), }; @@ -1804,7 +1804,7 @@ static const struct ScriptCommand s_gs2_g22_s0_lives2_dlg2[] = { /* 0x8184d28 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I haven't relaxed from\nhardening at all...") }, + MSG_NPC(1, _(" I haven't relaxed from\nhardening at all...")), JUMP_SCRIPT(END_TALK), }; @@ -1829,9 +1829,9 @@ static const struct ScriptCommand s_gs2_g23_s0_lives0_dlg2[] = { /* 0x8184e44 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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.{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.") }, + MSG_NPC(1, _(" Your words in the square\nstruck me to my heart.")), + MSG_NPC(1, _(" I shouldn't be panicking.{WAIT_PRESS}\nI have the ability to sense quakes.\nI must remain calm.")), + MSG_NPC(1, _(" It appears I've learned\nsomething from you youngsters.")), JUMP_SCRIPT(END_TALK), }; @@ -1857,8 +1857,8 @@ 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, _(" {NAME_0}!\nPlease take care!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We'll be OK.\nWe'll try not to be scared of the quakes!") }, + MSG_NPC(1, _(" {NAME_0}!\nPlease take care!")), + MSG_NPC(1, _(" We'll be OK.\nWe'll try not to be scared of the quakes!")), JUMP_SCRIPT(END_TALK), }; @@ -1867,7 +1867,7 @@ static const struct ScriptCommand s_gs2_g23_s0_lives2_dlg2[] = { /* 0x8185100 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I'll do my best to harden\nmyself!") }, + MSG_NPC(1, _(" I'll do my best to harden\nmyself!")), JUMP_SCRIPT(END_TALK), }; @@ -1892,9 +1892,9 @@ static const struct ScriptCommand s_gs2_g24_s0_lives0_dlg2[] = { /* 0x8185214 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, 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...{WAIT_PRESS}\nThe same feeling...from everyone.\nSniffle...") }, + MSG_NPC(1, _(" Sniffle...\nThis is so inspiring...")), + MSG_NPC(1, _(" Pokémon have united in\ntheir efforts to rescue Alakazam's team...")), + MSG_NPC(1, _(" 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 {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...{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.") }, + MSG_NPC(1, _(" My mom has joined other\nPokémon to fight in the {COLOR YELLOW_D}Magma Cavern{RESET}.")), + MSG_NPC(1, _(" Mom is weak to fire, so it\nisn't easy for her...")), + MSG_NPC(1, _(" But she is doing her best.")), + MSG_NPC(1, _(" Mom also told me...{WAIT_PRESS}\nIt is hard going because there are so many\nmonster houses.")), + MSG_NPC(1, _(" If my information helps\neven a little, {NAME_0}, I'm happy.")), JUMP_SCRIPT(END_TALK), }; @@ -1932,7 +1932,7 @@ static const struct ScriptCommand s_gs2_g24_s0_lives2_dlg2[] = { /* 0x81855b8 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I've hardened quite a lot!\nNo earthquake can touch me now!") }, + MSG_NPC(1, _(" I've hardened quite a lot!\nNo earthquake can touch me now!")), 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...{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.") }, + MSG_NPC(1, _(" A shooting star is on\na collision course...{WAIT_PRESS}\nThis is indeed a desperate time.")), + MSG_NPC(1, _(" But there is nothing that\nI can do.{WAIT_PRESS}\nAll our hopes ride with you.")), + MSG_NPC(1, _(" 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{NAME_0}'s team to come back!") }, + MSG_NPC(1, _(" I'll use Harden and wait for\n{NAME_0}'s team to come back!")), JUMP_SCRIPT(END_TALK), }; @@ -1998,8 +1998,8 @@ static const struct ScriptCommand s_gs2_g26_s0_lives0_dlg2[] = { /* 0x818599c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I see...\nYou are finally off.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" This journey promises to be\nharsh.\nI count on your perseverance.") }, + MSG_NPC(1, _(" I see...\nYou are finally off.")), + MSG_NPC(1, _(" This journey promises to be\nharsh.\nI count on your perseverance.")), JUMP_SCRIPT(END_TALK), }; @@ -2015,9 +2015,9 @@ static const struct ScriptCommand s_gs2_g26_s0_lives1_dlg2[] = { /* 0x8185aa0 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 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 {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.") }, + MSG_NPC(1, _(" You're soon going...")), + MSG_NPC(1, _(" But this is {NAME_0}\nand {NAME_2}.{WAIT_PRESS}\nYou can't fail.")), + MSG_NPC(1, _(" I believe in you.\nSo I'll be waiting for you.")), JUMP_SCRIPT(END_TALK), }; @@ -2026,8 +2026,8 @@ static const struct ScriptCommand s_gs2_g26_s0_lives2_dlg2[] = { /* 0x8185bac */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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.{WAIT_PRESS}\nPlease do your best. And please be careful!") }, + MSG_NPC(1, _(" Hello, I am Caterpie's\nmother. It's been a while.")), + MSG_NPC(1, _(" 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{NAME_0}'s team to come back!") }, + MSG_NPC(1, _(" I'll use Harden and wait for\n{NAME_0}'s team to come back!")), JUMP_SCRIPT(END_TALK), }; @@ -2061,9 +2061,9 @@ 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...{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...") }, + MSG_NPC(1, _(" Ah...{WAIT_PRESS} The {COLOR YELLOW_D}Sky Tower{RESET},\nyou say...")), + MSG_NPC(1, _(" In all my long years, I'd\nnot known of any world above the clouds.")), + MSG_NPC(1, _(" The world remains a vast\nmystery...")), JUMP_SCRIPT(END_TALK), }; @@ -2079,8 +2079,8 @@ 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 {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.") }, + MSG_NPC(1, _(" This is {NAME_0}\nand {NAME_2} after all.{WAIT_PRESS}\nYou can't fail.")), + MSG_NPC(1, _(" 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{NAME_0}, don't let us down!") }, + MSG_NPC(1, _(" I believe too.\n{NAME_0}, don't let us down!")), JUMP_SCRIPT(END_TALK), }; @@ -2098,8 +2098,8 @@ static const struct ScriptCommand s_gs2_g27_s0_lives3_dlg2[] = { /* 0x818601c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, is that right?\nYou can climb above the clouds?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I wish I could use Harden\nup on the clouds...") }, + MSG_NPC(1, _(" Oh, is that right?\nYou can climb above the clouds?")), + MSG_NPC(1, _(" I wish I could use Harden\nup on the clouds...")), 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, {NAME_4}!") }, + MSG_NPC(1, _(" Hi, {NAME_4}!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -2210,32 +2210,32 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x0f, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0005, 0x00000002, 0x00000003, NULL }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I'm Snubbull.") }, + MSG_NPC(5, _(" I'm Snubbull.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x0000000c, 0x00000000, NULL }, - { 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!") }, + MSG_NPC(1, _(" Whaaaat?!{WAIT_PRESS}\nYou're Snubbull?")), + MSG_NPC(1, _(" But you don't look anything\nlike the way you did before!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I don't really understand,\neither.") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" I went into the cave there,\nand all of a sudden...") }, + MSG_NPC(5, _(" I don't really understand,\neither.")), + MSG_NPC(5, _(" I went into the cave there,\nand all of a sudden...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" What cave?") }, + MSG_NPC(1, _(" What cave?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x0d, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x2f, 0x00, 0x0006, 0x00000000, -0x00000001, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" It appeared without me\nnoticing.") }, + MSG_NPC(6, _(" It appeared without me\nnoticing.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0006, 0x00000000, 0x00000000, _(" See?\nRight there.") }, + MSG_NPC(6, _(" See?\nRight there.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -2252,7 +2252,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" So you went in there...") }, + MSG_NPC(1, _(" So you went in there...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -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.{WAIT_PRESS}\nAnd I came out looking like this...") }, + MSG_NPC(5, _(" 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.”{WAIT_PRESS}\nHe evolved.") }, + MSG_NPC(4, _(" 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 }, @@ -2287,8 +2287,8 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ 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.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" When a Pokémon undergoes\nevolution, its appearance changes.") }, + MSG_NPC(4, _(" Pokémon, upon satisfying\ncertain conditions, may evolve.")), + MSG_NPC(4, _(" When a Pokémon undergoes\nevolution, its appearance changes.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(465), @@ -2298,39 +2298,39 @@ 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!{WAIT_PRESS}\nYour own appearance...{WAIT_PRESS}\nThat can change?!") }, + MSG_NPC(1, _(" 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...{WAIT_PRESS}\nThe world's balance has been restored...") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" And perhaps that cave\nbecame unsealed.") }, + MSG_NPC(4, _(" I suspect that cave is where\nevolution can take place.")), + MSG_NPC(4, _(" This is merely a guess...")), + MSG_NPC(4, _(" Perhaps evolution could\nnot take place before because the world's\nbalance was askew.")), + MSG_NPC(4, _(" However, now that the star\nhas been destroyed...{WAIT_PRESS}\nThe world's balance has been restored...")), + MSG_NPC(4, _(" And perhaps that cave\nbecame unsealed.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 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 {NAME_3}?!") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nI want to be Butterfree quickly...") }, + MSG_NPC(3, _(" 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.{WAIT_PRESS}\nI don't know if I like this or not...") }, - { 0x34, 0x00, 0x0005, 0x00000000, 0x00000000, _(" My cute little face turned\nall craggy...") }, + MSG_NPC(5, _(" W-wait a second.{WAIT_PRESS}\nI don't know if I like this or not...")), + MSG_NPC(5, _(" My cute little face turned\nall craggy...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Evolution is not a bad\nthing.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" Appearance isn't the only\nthing that changes through evolution.") }, - { 0x34, 0x00, 0x0004, 0x00000000, 0x00000000, _(" One's power and abilities\nmay be enhanced, for example.") }, + MSG_NPC(4, _(" Evolution is not a bad\nthing.")), + MSG_NPC(4, _(" Appearance isn't the only\nthing that changes through evolution.")), + MSG_NPC(4, _(" One's power and abilities\nmay be enhanced, for example.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(465), @@ -2339,17 +2339,17 @@ 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?!{WAIT_PRESS}\nI...{WAIT_PRESS} I might be stronger?!") }, + MSG_NPC(5, _(" 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!") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" I wish I could be Butterfree\nsoon...") }, + MSG_NPC(3, _(" That makes me want to\nevolve even more!")), + MSG_NPC(3, _(" I wish I could be Butterfree\nsoon...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0002, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" M-me too!") }, + MSG_NPC(2, _(" M-me too!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -2365,7 +2365,7 @@ 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.{WAIT_PRESS}\nBut it would depend on the conditions.") }, + MSG_NPC(4, _(" Yes.{WAIT_PRESS}\nBut it would depend on the conditions.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -2612,7 +2612,7 @@ static const struct ScriptCommand s_gs2_g30_s0_lives0_dlg2[] = { /* 0x81883b4 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" First I have to evolve like\nMetapod!") }, + MSG_NPC(1, _(" First I have to evolve like\nMetapod!")), JUMP_SCRIPT(END_TALK), }; @@ -2621,7 +2621,7 @@ static const struct ScriptCommand s_gs2_g30_s0_lives1_dlg2[] = { /* 0x818843c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, I hope I can be\nButterfree soon...") }, + MSG_NPC(1, _(" Oh, I hope I can be\nButterfree soon...")), JUMP_SCRIPT(END_TALK), }; @@ -2630,8 +2630,8 @@ static const struct ScriptCommand s_gs2_g30_s0_lives2_dlg2[] = { /* 0x81884c8 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I suspect that cave is where\nevolution can take place.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You should enter that cave\nif you wish to evolve.") }, + MSG_NPC(1, _(" I suspect that cave is where\nevolution can take place.")), + MSG_NPC(1, _(" You should enter that cave\nif you wish to evolve.")), JUMP_SCRIPT(END_TALK), }; @@ -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!{WAIT_PRESS}\nOoh, it's exciting...") }, + MSG_NPC(1, _(" I might become\nstronger!{WAIT_PRESS}\nOoh, it's exciting...")), JUMP_SCRIPT(END_TALK), }; @@ -2656,8 +2656,8 @@ static const struct ScriptCommand s_gs2_g30_s0_lives4_dlg2[] = { /* 0x8188644 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" That cave's entrance\nappears rather narrow.\nOnly one may enter at a time, it seems.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If you wish to enter the\ncave, you must come alone.") }, + MSG_NPC(1, _(" That cave's entrance\nappears rather narrow.\nOnly one may enter at a time, it seems.")), + MSG_NPC(1, _(" If you wish to enter the\ncave, you must come alone.")), 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 178ba5931..7b2389997 100644 --- a/src/data/ground/ground_data_t01p03_station.h +++ b/src/data/ground/ground_data_t01p03_station.h @@ -339,8 +339,8 @@ 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 {COLOR CYAN}Team Hydro{RESET} is Bronze\nRank.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" We need to do better.") }, + MSG_NPC(1, _(" My {COLOR CYAN}Team Hydro{RESET} is Bronze\nRank.")), + MSG_NPC(1, _(" 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 {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...") }, + MSG_NPC(1, _(" Our {COLOR CYAN}Team Rumblerock{RESET}\nis famous for savagery...")), + MSG_NPC(1, _(" But we're actually only\nNormal Rank.{WAIT_PRESS}\nIt's an embarrassment...")), JUMP_SCRIPT(END_TALK), }; @@ -360,15 +360,15 @@ static const struct ScriptCommand s_gs4_g1_s0_lives3_dlg2[] = { /* 0x818ab0c */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), 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!{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!") }, + MSG_NPC(1, _(" Darlings, did you know?")), + MSG_NPC(1, _(" Every so often, there are\nrescue jobs that reward you with a new\nFriend Area...")), + MSG_NPC(1, _(" Well, lately there've been\nrumors about a new Friend Area!{WAIT_PRESS}\nThe {COLOR GREEN_H}Sky Blue Plains{RESET}, they say!")), + MSG_NPC(1, _(" Just maybe, getting that\nFriend Area could be the start of\nsomething enchanting.")), + MSG_NPC(1, _(" 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 {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.") }, + MSG_NPC(1, _(" Darlings, I'll have you know\nthat my {COLOR CYAN}Team Constrictor{RESET} is actually\nSilver Rank.")), + MSG_NPC(1, _(" Not too bad, is it?{WAIT_PRESS}\nWe surprise people with our excellence.")), JUMP_SCRIPT(END_TALK), }; @@ -395,33 +395,33 @@ static const struct ScriptCommand s_gs4_g1_s0_lives4_dlg2[] = { /* 0x818aecc */ { 0x3b, 0x35, 0x0000, 0x00000000, 0x00000000, NULL }, 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...{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?") }, + MSG_NPC(1, _(" Oh, hello!\nDid you know?")), + MSG_NPC(1, _(" Somewhere in the world\nthere is an extremely rare Pokémon...{WAIT_PRESS}\nnamed Chansey.")), + MSG_NPC(1, _(" This is what they say about\nChansey...{WAIT_PRESS} If you are lucky enough to\nmeet one, you will be filled with happiness.")), + MSG_NPC(1, _(" 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, _(" ............{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...") }, + MSG_NPC(1, _(" ............{WAIT_PRESS}Oh-oh-oh?!{WAIT_PRESS}\nYou've met Chansey?")), + MSG_NPC(1, _(" That is so lucky!\nWhat are the chances of that?")), + MSG_NPC(1, _(" Oh, my gosh!\nHow wonderful for you!\nHow I envy you!")), + MSG_NPC(1, _(" 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...{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...") }, + MSG_NPC(1, _(" Oh, hello!\nDid you know?")), + MSG_NPC(1, _(" Somewhere in the world\nthere is an extremely rare Pokémon...{WAIT_PRESS}\nnamed Chansey.")), + MSG_NPC(1, _(" This is what they say about\nChansey.{WAIT_PRESS} If you are lucky enough to meet\none, you will be filled with happiness.")), + MSG_NPC(1, _(" 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...{WAIT_PRESS}\nMaybe...{WAIT_PRESS} Chansey?!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You are! You really are!{WAIT_PRESS}\nI'm so lucky!") }, + MSG_NPC(1, _(" Waaaaaaaaaaaaaaaaaaaah!")), + MSG_NPC(1, _(" You're...{WAIT_PRESS}\nMaybe...{WAIT_PRESS} Chansey?!")), + MSG_NPC(1, _(" 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!{WAIT_PRESS}\nOh, I am so lucky!") }, + MSG_NPC(1, _(" Oh, my gosh...\nI've finally met you...")), + MSG_NPC(1, _(" I'm bursting with happiness!{WAIT_PRESS}\nOh, I am so lucky!")), JUMP_SCRIPT(END_TALK), }; @@ -484,7 +484,7 @@ static const struct ScriptCommand s_gs4_g1_s1_lives0_dlg0[] = { /* 0x818b710 */ FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ...Oh!{WAIT_PRESS}\nThat voice!") }, + MSG_NPC(3, _(" ...Oh!{WAIT_PRESS}\nThat voice!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -497,41 +497,41 @@ static const struct ScriptCommand s_gs4_g1_s1_lives0_dlg0[] = { /* 0x818b710 */ WAIT(60), { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Get set!") }, + MSG_NPC(2, _(" Get set!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(0, 0), WAIT(10), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ha!") }, + MSG_NPC(2, _(" Ha!")), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ha!") }, + MSG_NPC(2, _(" Ha!")), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ha!") }, + MSG_NPC(2, _(" Ha!")), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ha!") }, + MSG_NPC(2, _(" Ha!")), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Ha!") }, + MSG_NPC(2, _(" Ha!")), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -544,32 +544,32 @@ static const struct ScriptCommand s_gs4_g1_s1_lives0_dlg0[] = { /* 0x818b710 */ WAIT(30), TEXTBOX_AUTO_PRESS(-1, -1), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa!") }, + MSG_NPC(3, _(" Papa!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Our son, we're sorry for\ncausing you anxiety.") }, + MSG_NPC(2, _(" Our son, we're sorry for\ncausing you anxiety.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa.{WAIT_PRESS}\nWhere were you?") }, + MSG_NPC(3, _(" Papa.{WAIT_PRESS}\nWhere were you?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We were traveling the\nworld.") }, + MSG_NPC(2, _(" We were traveling the\nworld.")), { 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, _(" The world is vast.{WAIT_PRESS}\nThere are countless Pokémon around the\nworld that are unknown in these areas.") }, + MSG_NPC(2, _(" 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...{WAIT_PRESS}\nPapa, did you see all the Pokémon that\naren't known in these areas?") }, + MSG_NPC(3, _(" 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, _(" ..................{WAIT_PRESS}\nOf course.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you take us for?") }, + MSG_NPC(2, _(" ..................{WAIT_PRESS}\nOf course.")), + MSG_NPC(2, _(" What do you take us for?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! Of course!{WAIT_PRESS}\nPapa, you're so special!") }, + MSG_NPC(3, _(" 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?!{WAIT_PRESS}\n...Uh, er... Um, yes.") }, + MSG_NPC(1, _(" What do you take us for?!{WAIT_PRESS}\n...Uh, er... Um, yes.")), JUMP_SCRIPT(END_TALK), }; @@ -727,7 +727,7 @@ static const struct ScriptCommand s_gs4_g1_s2_lives1_dlg2[] = { /* 0x818c7f0 */ DEBUGINFO, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" My papa is so special!") }, + MSG_NPC(1, _(" My papa is so special!")), JUMP_SCRIPT(END_TALK), }; @@ -787,13 +787,13 @@ 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{COLOR YELLOW_N}Mankey{RESET}.”") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Did you two put up that job?") }, + MSG_NPC(1, _(" There was a job posted on\nthe Bulletin Board which said, “Punish bad\n{COLOR YELLOW_N}Mankey{RESET}.”")), + MSG_NPC(1, _(" Did you two put up that job?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Yup, yup!") }, + MSG_NPC(2, _(" Yup, yup!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, @@ -801,34 +801,34 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x15, 0x0003, 0x00000041, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" A bad Mankey gang is going\nwild in our forest.\nEveryone is upset.") }, + MSG_NPC(2, _(" A bad Mankey gang is going\nwild in our forest.\nEveryone is upset.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" We don't know why they\nrampage around...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" But they are always angry\nand attack anyone they see!") }, + MSG_NPC(2, _(" We don't know why they\nrampage around...")), + MSG_NPC(2, _(" But they are always angry\nand attack anyone they see!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -844,14 +844,14 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ 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!") }, + MSG_NPC(2, _(" Thank you!\nWe're counting on you!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Wobbuffet!") }, + MSG_NPC(3, _(" Wobbuffet!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -1066,12 +1066,12 @@ static const struct ScriptCommand s_gs4_g6_s0_lives0_dlg2[] = { /* 0x818e0a4 */ WAIT(1), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, no...\nMedicham went down...\nWhat should I do...?") }, + MSG_NPC(1, _(" Oh, no...\nMedicham went down...\nWhat should I do...?")), { 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, _(" If I went, I'd only last a\nlittle while... Oh, no...") }, + MSG_NPC(1, _(" If I went, I'd only last a\nlittle while... Oh, no...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -1246,54 +1246,54 @@ 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?{WAIT_PRESS}\n...Wh-where?") }, + MSG_NPC(2, _(" 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, _(" ..................{WAIT_PRESS}\nOh, you're just joking.") }, + MSG_NPC(2, _(" ..................{WAIT_PRESS}\nOh, you're just joking.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(3), /* = 0x03 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), { 0x2e, 0x15, 0x0002, 0x00000046, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" ...Oh, OK.") }, + MSG_NPC(2, _(" ...Oh, OK.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x93, 0x04, 0x000a, 0x0000005c, 0x00000000, NULL }, { 0x2e, 0x03, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Something seems to be\nwrong with Gengar lately.") }, + MSG_NPC(3, _(" Something seems to be\nwrong with Gengar lately.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" He won't do anything wicked\nwith us anymore...") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" I wonder what's wrong with\nhim?") }, + MSG_NPC(2, _(" He won't do anything wicked\nwith us anymore...")), + MSG_NPC(2, _(" I wonder what's wrong with\nhim?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yeah... He looks like he has\na lot on his mind...") }, + MSG_NPC(3, _(" Yeah... He looks like he has\na lot on his mind...")), { 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 }, { 0x2e, 0x15, 0x0002, 0x00000000, 0x00000000, NULL }, - { 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?") }, + MSG_NPC(2, _(" You think so?{WAIT_PRESS}\nHis expression...\nIt looks the same as usual, no?")), + MSG_NPC(2, _(" 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.{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.") }, + MSG_NPC(3, _(" No, it's different.{WAIT_PRESS}\nI can tell.")), + MSG_NPC(3, _(" 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...{WAIT_PRESS}\nPerhaps that is so.") }, + MSG_NPC(2, _(" ...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, {COLOR CYAN}Team Meanies{RESET} can't operate.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Such a vexing problem!") }, + MSG_NPC(2, _(" Anyway, without Gengar\naround, {COLOR CYAN}Team Meanies{RESET} can't operate.")), + MSG_NPC(2, _(" Such a vexing problem!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, @@ -1368,8 +1368,8 @@ 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, {COLOR CYAN}Team Meanies{RESET} can't operate.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Such a vexing problem!") }, + MSG_NPC(1, _(" Anyway, without Gengar\naround, {COLOR CYAN}Team Meanies{RESET} can't operate.")), + MSG_NPC(1, _(" Such a vexing problem!")), JUMP_SCRIPT(END_TALK), }; @@ -1378,7 +1378,7 @@ static const struct ScriptCommand s_gs4_g10_s0_lives1_dlg2[] = { /* 0x818f564 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Something seems to be\nwrong with Gengar lately.") }, + MSG_NPC(1, _(" Something seems to be\nwrong with Gengar lately.")), JUMP_SCRIPT(END_TALK), }; @@ -1560,7 +1560,7 @@ static const struct ScriptCommand s_gs4_g12_s0_lives0_dlg0[] = { /* 0x818fcdc */ { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x8b, 0x14, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" It lists rescue jobs.\nCheck it out?") }, + MSG_NPC(1, _(" It lists rescue jobs.\nCheck it out?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3c, 0x20, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, @@ -1700,8 +1700,8 @@ static const struct ScriptCommand s_gs4_g16_s0_lives0_dlg2[] = { /* 0x8190dbc */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Did you know that you get\na reward if you complete a rescue job?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Some Pokémon run rescue\nteams because they want the rewards.") }, + MSG_NPC(1, _(" Did you know that you get\na reward if you complete a rescue job?")), + MSG_NPC(1, _(" Some Pokémon run rescue\nteams because they want the rewards.")), JUMP_SCRIPT(END_TALK), }; @@ -1746,24 +1746,24 @@ static const struct ScriptCommand s_gs4_g16_s1_lives0_dlg0[] = { /* 0x8190fcc */ { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you think, our son?\nIsn't the sea vast?") }, + MSG_NPC(2, _(" What do you think, our son?\nIsn't the sea vast?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, Papa.") }, + MSG_NPC(3, _(" Yes, Papa.")), { 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?{WAIT_PRESS}\nPapa, have you ever gone out to sea?") }, + MSG_NPC(3, _(" 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, _(" ..................{WAIT_PRESS}\nOf course.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you take us for?") }, + MSG_NPC(2, _(" ..................{WAIT_PRESS}\nOf course.")), + MSG_NPC(2, _(" What do you take us for?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! You have!{WAIT_PRESS}\nPapa, you're so special!") }, + MSG_NPC(3, _(" 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 }, @@ -1859,24 +1859,24 @@ static const struct ScriptCommand s_gs4_g17_s1_lives0_dlg0[] = { /* 0x819154c */ { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you think, our son?\nIsn't the sea vast?") }, + MSG_NPC(2, _(" What do you think, our son?\nIsn't the sea vast?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, Papa.") }, + MSG_NPC(3, _(" Yes, Papa.")), { 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?{WAIT_PRESS}\nPapa, have you ever gone out to sea?") }, + MSG_NPC(3, _(" 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, _(" ..................{WAIT_PRESS}\nOf course.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you take us for?") }, + MSG_NPC(2, _(" ..................{WAIT_PRESS}\nOf course.")), + MSG_NPC(2, _(" What do you take us for?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! You have!{WAIT_PRESS}\nPapa, you're so special!") }, + MSG_NPC(3, _(" 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 }, @@ -1944,7 +1944,7 @@ static const struct ScriptCommand s_gs4_g18_s0_lives0_dlg2[] = { /* 0x8191968 */ { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ............Papa said they've\ngone to sea before...") }, + MSG_NPC(3, _(" ............Papa said they've\ngone to sea before...")), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" .........(Does that mean Papa\ncan swim...?)") }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -1952,15 +1952,15 @@ static const struct ScriptCommand s_gs4_g18_s0_lives0_dlg2[] = { /* 0x8191968 */ CHOICE(/* label */ 0, _("Yes.")), CHOICE(/* label */ 1, _("No.")), LABEL(0), /* = 0x00 */ - { 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!") }, + MSG_NPC(3, _(" Oh.\nSo you can swim too, {NAME_0}...")), + MSG_NPC(3, _(" 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, {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!") }, + MSG_NPC(3, _(" Oh.\nSo you can't swim either, {NAME_0}...")), + MSG_NPC(3, _(" But that's natural.\nSwimming isn't very easy.")), + MSG_NPC(3, _(" My papa is special!\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), @@ -1984,21 +1984,21 @@ static const struct ScriptCommand s_gs4_g18_s1_lives0_dlg2[] = { /* 0x8191d1c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You know what?\nThe jobs on the Bulletin Board...") }, + MSG_NPC(1, _(" You know what?\nThe jobs on the Bulletin Board...")), ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" You can do several rescue\njobs at the same time.\nDid you know that?")), CHOICE(/* label */ 0, _("Yes.")), CHOICE(/* label */ 1, _("No.")), LABEL(0), /* = 0x00 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh, you already knew?{WAIT_PRESS}\nThat's OK, then.") }, + MSG_NPC(1, _(" 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 {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 {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?{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.") }, + MSG_NPC(1, _(" If you choose jobs in the\nsame dungeon on the {COLOR CYAN}Job List{RESET}, you can\ndo them at the same time.")), + MSG_NPC(1, _(" For example, say there are\ntwo rescue jobs in the same dungeon, but\none on 5F and one on 10F.")), + MSG_NPC(1, _(" You can accept these two\njobs, then select {COLOR YELLOW}Take Job{RESET} on both of them\nbefore heading into that dungeon.")), + MSG_NPC(1, _(" You can complete the first\nrescue on 5F. Then, instead of exiting,\ngo on to the job on 10F.")), + MSG_NPC(1, _(" That way, you can do two\nrescue jobs in one outing.")), + MSG_NPC(1, _(" See?{WAIT_PRESS} If you do that, you\ncan take care of rescue jobs efficiently.")), + MSG_NPC(1, _(" ...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), }; @@ -2051,22 +2051,22 @@ static const struct ScriptCommand s_gs4_g19_s1_lives0_dlg0[] = { /* 0x81922f8 */ { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you think, Son?\nIsn't the sea wonderful?") }, + MSG_NPC(2, _(" What do you think, Son?\nIsn't the sea wonderful?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, Papa.") }, + MSG_NPC(3, _(" Yes, Papa.")), { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Papa?{WAIT_PRESS}\nPapa, can you swim?") }, + MSG_NPC(3, _(" 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, _(" ..................{WAIT_PRESS}\nOf course.") }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" What do you take us for?") }, + MSG_NPC(2, _(" ..................{WAIT_PRESS}\nOf course.")), + MSG_NPC(2, _(" What do you take us for?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Oh! So you can swim!{WAIT_PRESS}\nPapa, you're so special!") }, + MSG_NPC(3, _(" 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 }, @@ -2191,27 +2191,27 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Well, Son, doesn't it feel\ngood to look out over the sea?") }, + MSG_NPC(2, _(" Well, Son, doesn't it feel\ngood to look out over the sea?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, Papa.") }, + MSG_NPC(3, _(" Yes, Papa.")), { 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?{WAIT_PRESS}\nPapa, how do you swim in the sea?") }, + MSG_NPC(3, _(" 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, _(" ..................{WAIT_PRESS}\nWell, Son...{WAIT_PRESS}\nThe three of us cooperate, and...") }, + MSG_NPC(2, _(" ..................{WAIT_PRESS}\nWell, Son...{WAIT_PRESS}\nThe three of us cooperate, and...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), TEXTBOX_AUTO_PRESS(0, 0), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hah!") }, + MSG_NPC(2, _(" Hah!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, @@ -2219,7 +2219,7 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hah!") }, + MSG_NPC(2, _(" Hah!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, @@ -2227,7 +2227,7 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hah!") }, + MSG_NPC(2, _(" Hah!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, @@ -2240,17 +2240,17 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(30, 30), { 0x2e, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hah!") }, + MSG_NPC(2, _(" Hah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(-1, -1), { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, - { 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...") }, + MSG_NPC(2, _(" ...And that's sort of how\nwe swim!{WAIT_PRESS}\nGasp, gasp...")), + MSG_NPC(2, _(" 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!{WAIT_PRESS}\nPapa, you're so special!") }, + MSG_NPC(3, _(" 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 }, @@ -2448,29 +2448,29 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Well, our son!\nTell me, do the earthquakes frighten you?") }, + MSG_NPC(2, _(" 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.{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.") }, + MSG_NPC(3, _(" Yes, Papa.{WAIT_PRESS}\nThey are very scary.")), + MSG_NPC(3, _(" 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?{WAIT_PRESS}\nPapa, aren't you afraid of earthquakes?") }, + MSG_NPC(3, _(" 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, _(" ........................{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!") }, + MSG_NPC(2, _(" ........................{WAIT_PRESS}\nOf course they don't scare us.")), + MSG_NPC(2, _(" What do you...{WAIT_PRESS}\nTake us for?!")), + MSG_NPC(2, _(" If we were in charge...{WAIT_PRESS}\nThis is what we'd do to any earthquake!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(0, 0), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hah!") }, + MSG_NPC(2, _(" Hah!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, @@ -2479,7 +2479,7 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x08, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x03, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hah!") }, + MSG_NPC(2, _(" Hah!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, @@ -2487,7 +2487,7 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hah!") }, + MSG_NPC(2, _(" Hah!")), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, @@ -2499,16 +2499,16 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(30, 30), { 0x2e, 0x08, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hah!") }, + MSG_NPC(2, _(" Hah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(-1, -1), { 0x2e, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Gasp, gasp...") }, + MSG_NPC(2, _(" Gasp, gasp...")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" OK!{WAIT_PRESS}\nPapa, you're so special!") }, + MSG_NPC(3, _(" 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 }, @@ -2704,34 +2704,34 @@ static const struct ScriptCommand s_gs4_g22_s1_lives0_dlg0[] = { /* 0x81947b4 */ { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Well, my son?\nDoes Groudon frighten you?") }, + MSG_NPC(2, _(" Well, my son?\nDoes Groudon frighten you?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" Yes, Papa.{WAIT_PRESS}\nIt frightens me so much I don't know\nwhat to think.") }, + MSG_NPC(3, _(" 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?{WAIT_PRESS}\nAre you going to the {COLOR YELLOW_D}Magma Cavern{RESET} too,\nPapa?") }, + MSG_NPC(3, _(" 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, _(" ........................{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...{WAIT_PRESS}\nThis is what we'd do to the {COLOR YELLOW_D}Magma\nCavern{RESET}!{WAIT_PRESS} Hah!") }, + MSG_NPC(2, _(" ........................{WAIT_PRESS}\nOf course.")), + MSG_NPC(2, _(" What do you take us for?!")), + MSG_NPC(2, _(" 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), TEXTBOX_AUTO_PRESS(10, 10), - { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" Hah!") }, + MSG_NPC(2, _(" Hah!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(486), { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(-1, -1), - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ............") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ........................") }, - { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" ....................................{WAIT_PRESS}Huh?{WAIT_PRESS}\nPapa?{WAIT_PRESS} Where did you go, Papa?") }, + MSG_NPC(3, _(" ............")), + MSG_NPC(3, _(" ........................")), + MSG_NPC(3, _(" ....................................{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 }, @@ -2804,7 +2804,7 @@ static const struct ScriptCommand s_gs4_g22_s2_lives1_dlg2[] = { /* 0x8194ecc */ DEBUGINFO, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" ?") }, + MSG_NPC(1, _(" ?")), JUMP_SCRIPT(END_TALK), }; @@ -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...{WAIT_PRESS}\nI wonder where they went?") }, + MSG_NPC(1, _(" 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!{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...{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!") }, + MSG_NPC(1, _(" Oh!{WAIT_PRESS} Maybe they've already\ngone to the {COLOR YELLOW_D}Magma Cavern{RESET}...")), + MSG_NPC(1, _(" And maybe they're already\nfighting Groudon.")), + MSG_NPC(1, _(" And, maybe, maybe...{WAIT_PRESS}\nMaybe they've already won.{WAIT_PRESS}\nMaybe they've already beaten Groudon!")), + MSG_NPC(1, _(" Oh, wow! That's amazing!{WAIT_PRESS}\nMaybe Papa is special!")), JUMP_SCRIPT(END_TALK), }; @@ -2871,14 +2871,14 @@ static const struct ScriptCommand s_gs4_g24_s0_lives0_dlg2[] = { /* 0x81952bc */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Papa hasn't come back yet...\nI wonder what happened to them?") }, + MSG_NPC(1, _(" Papa hasn't come back yet...\nI wonder what happened to them?")), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 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...?") }, + MSG_NPC(1, _(" Oh!{WAIT_PRESS}\nMaybe they've already gone to the sky...")), + MSG_NPC(1, _(" And maybe they've already\nmet Rayquaza...")), + MSG_NPC(1, _(" ...That's not possible.\nEven Papa can't fly.")), + MSG_NPC(1, _(" Sigh...\nWhere did Papa go...?")), JUMP_SCRIPT(END_TALK), }; @@ -2898,8 +2898,8 @@ static const struct ScriptCommand s_gs4_g24_s0_lives1_dlg2[] = { /* 0x8195504 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" If that shooting star\ncrashes, it's going to be terrible!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You're our only hope!\nGo for it!") }, + MSG_NPC(1, _(" If that shooting star\ncrashes, it's going to be terrible!")), + MSG_NPC(1, _(" You're our only hope!\nGo for it!")), JUMP_SCRIPT(END_TALK), }; @@ -2908,8 +2908,8 @@ static const struct ScriptCommand s_gs4_g24_s0_lives2_dlg2[] = { /* 0x81955d8 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 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, {NAME_0}!\nPlease don't let us down!") }, + MSG_NPC(1, _(" Oh my, isn't this awful!")), + MSG_NPC(1, _(" But I get the feeling that\nyou can make a difference, {NAME_0}!\nPlease don't let us down!")), JUMP_SCRIPT(END_TALK), }; @@ -2934,14 +2934,14 @@ static const struct ScriptCommand s_gs4_g25_s0_lives0_dlg2[] = { /* 0x8195750 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Papa hasn't come back yet...\nI wonder what happened to them?") }, + MSG_NPC(1, _(" Papa hasn't come back yet...\nI wonder what happened to them?")), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 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...?") }, + MSG_NPC(1, _(" Oh!{WAIT_PRESS}\nMaybe they've already gone to the sky...")), + MSG_NPC(1, _(" And maybe they've already\nmet Rayquaza...")), + MSG_NPC(1, _(" ...That's not possible.\nEven Papa can't fly.")), + MSG_NPC(1, _(" Sigh...\nWhere did Papa go...?")), JUMP_SCRIPT(END_TALK), }; @@ -2961,7 +2961,7 @@ static const struct ScriptCommand s_gs4_g25_s0_lives1_dlg2[] = { /* 0x81958a0 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You're going, aren't you?\nGo for it!") }, + MSG_NPC(1, _(" You're going, aren't you?\nGo for it!")), JUMP_SCRIPT(END_TALK), }; @@ -2970,8 +2970,8 @@ static const struct ScriptCommand s_gs4_g25_s0_lives2_dlg2[] = { /* 0x819592c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Oh my, it's time to go?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Please take care.") }, + MSG_NPC(1, _(" Oh my, it's time to go?")), + MSG_NPC(1, _(" Please take care.")), JUMP_SCRIPT(END_TALK), }; @@ -2996,14 +2996,14 @@ static const struct ScriptCommand s_gs4_g26_s0_lives0_dlg2[] = { /* 0x8195a5c */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Papa hasn't come back yet...\nI wonder what happened to them?") }, + MSG_NPC(1, _(" Papa hasn't come back yet...\nI wonder what happened to them?")), FANFARE_PLAY2(465), { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 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...?") }, + MSG_NPC(1, _(" Oh!{WAIT_PRESS}\nMaybe they've already gone to the sky...")), + MSG_NPC(1, _(" And maybe they've already\nmet Rayquaza...")), + MSG_NPC(1, _(" ...That's not possible.\nEven Papa can't fly.")), + MSG_NPC(1, _(" Sigh...\nWhere did Papa go...?")), JUMP_SCRIPT(END_TALK), }; @@ -3023,7 +3023,7 @@ static const struct ScriptCommand s_gs4_g26_s0_lives1_dlg2[] = { /* 0x8195bac */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You'll get it done next time!\nGo for it!") }, + MSG_NPC(1, _(" You'll get it done next time!\nGo for it!")), JUMP_SCRIPT(END_TALK), }; @@ -3032,8 +3032,8 @@ static const struct ScriptCommand s_gs4_g26_s0_lives2_dlg2[] = { /* 0x8195c38 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You must make another\nchallenge.") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You have my support!\nPlease don't fail us!") }, + MSG_NPC(1, _(" You must make another\nchallenge.")), + MSG_NPC(1, _(" You have my support!\nPlease don't fail us!")), JUMP_SCRIPT(END_TALK), }; @@ -3081,15 +3081,15 @@ static const struct ScriptCommand s_gs4_g28_s0_lives0_dlg2[] = { /* 0x8195e54 */ { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" (Everything returned to\npeace...)") }, { 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...{WAIT_PRESS}\nWhere did my papa go?") }, + MSG_NPC(1, _(" But Papa still hasn't come\nback...")), + MSG_NPC(1, _(" 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!{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, _(" ......{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...?") }, + MSG_NPC(1, _(" Oh!{WAIT_PRESS}\nMaybe they got left behind in the sky...")), + MSG_NPC(1, _(" And maybe Rayquaza is\nhaving them as a meal...")), + MSG_NPC(1, _(" ......{WAIT_PRESS}That's not possible.{WAIT_PRESS}\nPapa can't fly in the first place.")), + MSG_NPC(1, _(" Sigh...\nWhere did Papa go...?")), JUMP_SCRIPT(END_TALK), }; @@ -3112,8 +3112,8 @@ 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{NAME_0}!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I can go on living again\nwithout fear. Thank you!") }, + MSG_NPC(1, _(" Oh, how marvelous,\n{NAME_0}!")), + MSG_NPC(1, _(" I can go on living again\nwithout fear. Thank you!")), JUMP_SCRIPT(END_TALK), }; @@ -3122,8 +3122,8 @@ static const struct ScriptCommand s_gs4_g28_s0_lives2_dlg2[] = { /* 0x8196210 */ { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" You were flat-out\nincredible!") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Seriously, consider teaming\nup with me! Gahahaha!") }, + MSG_NPC(1, _(" You were flat-out\nincredible!")), + MSG_NPC(1, _(" Seriously, consider teaming\nup with me! Gahahaha!")), 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, {NAME_0}!") }, + MSG_NPC(1, _(" 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?{WAIT_PRESS} I can't even imagine\nthat. Sounds kind of wow!{WAIT_PRESS} Ayup!") }, + MSG_NPC(1, _(" 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 ea74365de..674c4a7ae 100644 --- a/src/data/ground/ground_data_t01p04_station.h +++ b/src/data/ground/ground_data_t01p04_station.h @@ -196,17 +196,17 @@ 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!{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!") }, + MSG_NPC(2, _(" Oh! Welcome back!{WAIT_PRESS}\nThe rescue...{WAIT_PRESS}went badly, I see...")), + MSG_NPC(2, _(" But that wasn't the final\nchance! Don't give up!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, RET, LABEL(0), /* = 0x00 */ - { 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.") }, + MSG_NPC(2, _(" Oh! Welcome back!{WAIT_PRESS}\nThe rescue...{WAIT_PRESS}went badly, I see...")), + MSG_NPC(2, _(" I'm terribly sorry, but you\nmay not go on that rescue again...")), + MSG_NPC(2, _(" Please inform your friend\nthat, regrettably, the friend rescue\nmission ended in failure.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -249,17 +249,17 @@ 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!{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!") }, + MSG_NPC(2, _(" Oh! Welcome back!{WAIT_PRESS}\nThe rescue...{WAIT_PRESS}went badly, I see...")), + MSG_NPC(2, _(" But that wasn't the final\nchance! Don't give up!")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, RET, LABEL(0), /* = 0x00 */ - { 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.") }, + MSG_NPC(2, _(" Oh! Welcome back!{WAIT_PRESS}\nThe rescue...{WAIT_PRESS}went badly, I see...")), + MSG_NPC(2, _(" I'm terribly sorry, but you\nmay not go on that rescue again...")), + MSG_NPC(2, _(" Please inform your friend\nthat, regrettably, the friend rescue\nmission ended in failure.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_event_data.h b/src/data/ground/ground_event_data.h index 4cd77f954..3676e74c0 100644 --- a/src/data/ground/ground_event_data.h +++ b/src/data/ground/ground_event_data.h @@ -92,7 +92,7 @@ static const struct ScriptCommand s_script_UNIT_TALK[] = { /* 0x811f188 */ WAIT(1), { 0x2e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x00, 0x0001, -0x00000002, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("Let's go.") }, + MSG_NPC(1, _("Let's go.")), JUMP_SCRIPT(END_TALK), }; @@ -111,7 +111,7 @@ static const struct ScriptCommand s_script_HABITAT_TALK[] = { /* 0x811f214 */ { 0x3b, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, RET, LABEL(0), /* = 0x00 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _("Pleased to meet you.") }, + MSG_NPC(1, _("Pleased to meet you.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, RET, @@ -127,27 +127,27 @@ static const struct ScriptCommand s_script_HABITAT_TALK_S01E02A[] = { /* 0x811f3 { 0x2e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, JUMPIF_EQUAL(FLAG_KIND_CHANGE_REQUEST, 0, /* to label */ 0), - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" I will dedicate myself to\ncreating a fantastic new design.\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.") }, + MSG_NPC(1, _(" I will dedicate myself to\ncreating a fantastic new design.\nPlease check the rescue team flag later!")), + MSG_NPC(1, _(" If my design fails to\nimpress you, please let me know.")), + MSG_NPC(1, _(" If so, I will change the\ndesign to one perhaps more to your liking.")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, RET, LABEL(0), /* = 0x00 */ - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Hello!") }, + MSG_NPC(1, _(" Hello!")), 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.{WAIT_PRESS} If you would like the\nflag's design changed, please tell me.") }, + MSG_NPC(1, _(" 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!{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.") }, + MSG_NPC(1, _(" Ah, very well!{WAIT_PRESS}\nI may be unknown, but nonetheless, I am\nan artist.")), + MSG_NPC(1, _(" I will do my best to create\na splendid design for you!\nPlease check the rescue team flag later!")), + MSG_NPC(1, _(" If my design fails to\nimpress you, please let me know.")), + MSG_NPC(1, _(" If so, I will change the\ndesign to one perhaps more to your liking.")), UPDATE_VARINT(CALC_SET, FLAG_KIND_CHANGE_REQUEST, 1), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1772,22 +1772,22 @@ static const struct ScriptCommand s_script_EVENT_DIVIDE_WARP_LOCK_FUNC[] = { /* RET_DIRECT, LABEL(1), /* = 0x01 */ { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?\nYou want to go home already?") }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?\nAre you ready to leave?") }, + MSG_NPC(1, _(" Huh?\nYou want to go home already?")), + MSG_NPC(1, _(" Huh?\nAre you ready to leave?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, RET_DIRECT, LABEL(2), /* = 0x02 */ { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?\nAre you ready to leave?") }, + MSG_NPC(1, _(" Huh?\nAre you ready to leave?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, RET_DIRECT, LABEL(3), /* = 0x03 */ { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?\nAre you ready to leave?") }, + MSG_NPC(1, _(" Huh?\nAre you ready to leave?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, RET_DIRECT, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, - { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" Huh?\nAre you ready to leave?") }, + MSG_NPC(1, _(" Huh?\nAre you ready to leave?")), { 0x30, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, RET_DIRECT, };