diff --git a/include/dungeon_portrait_placement.h b/include/dungeon_portrait_placement.h index 3ce345cec..14fe6ef10 100644 --- a/include/dungeon_portrait_placement.h +++ b/include/dungeon_portrait_placement.h @@ -3,6 +3,7 @@ #include "portrait_placement.h" -const struct PortraitPlacementInfo *GetPortraitPlacementInfo(u8 id); +// See enum "PortraitPlacementID" +const PortraitPlacementInfo *GetPortraitPlacementInfo(u8 id); -#endif +#endif // GUARD_DUNGEON_PORTRAIT_PLACEMENT_H diff --git a/include/portrait_placement.h b/include/portrait_placement.h index 09e281def..80732466e 100644 --- a/include/portrait_placement.h +++ b/include/portrait_placement.h @@ -1,41 +1,41 @@ #ifndef GUARD_PORTRAIT_PLACEMENT_H #define GUARD_PORTRAIT_PLACEMENT_H -// Note: There are two the same, duplicated tables for dungeon and scripts. - #include "structs/str_position.h" -struct PortraitPlacementInfo +// Size: R=0x8 | B=0x5 +typedef struct PortraitPlacementInfo { - DungeonPos pos; - bool8 flip; -}; + /* 0x0 */ DungeonPos pos; + /* 0x4 */ bool8 flip; +} PortraitPlacementInfo; -// Sets of x, y pos and flips. Instead of passing positions for each portrait, a set id is passed and positions are taken from the table. -enum PortraitPlacements +// These are named like `PLACEMENT_X_Y` and `PLACEMENT_X_Y_FLIP` +enum PortraitPlacementID { - PLACEMENT_LEFT, - PLACEMENT_MIDDLE_TOP, - PLACEMENT_LEFT_, // Same as PLACEMENT_LEFT - PLACEMENT_RIGHT, - PLACEMENT_MIDDLE_LEFT, - PLACEMENT_MIDDLE_RIGHT, - PLACEMENT_MIDDLE_TOP_FLIP, - PLACEMENT_LEFT_FLIP, - PLACEMENT_RIGHT_FLIP, - PLACEMENT_MIDDLE_LEFT_FLIP, - PLACEMENT_MIDDLE_RIGHT_FLIP, - PLACEMENT_TOP, - PLACEMENT_TOP_LEFT, - PLACEMENT_TOP_RIGHT, - PLACEMENT_MIDDLE_TOP_LEFT, - PLACEMENT_MIDDLE_TOP_RIGHT, - PLACEMENT_TOP_FLIP, - PLACEMENT_TOP_LEFT_FLIP, - PLACEMENT_TOP_RIGHT_FLIP, - PLACEMENT_MIDDLE_TOP_LEFT_FLIP, - PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, + PLACEMENT_LEFT_BOTTOM_1, + PLACEMENT_CENTERLEFT_CENTER, + PLACEMENT_LEFT_BOTTOM_2, // Same as PLACEMENT_LEFT_BOTTOM_1 + PLACEMENT_RIGHT_BOTTOM_FLIP, + PLACEMENT_MIDLEFT_BOTTOM, + PLACEMENT_MIDRIGHT_BOTTOM_FLIP, + PLACEMENT_CENTERRIGHT_CENTER_FLIP, + PLACEMENT_LEFT_BOTTOM_FLIP, + PLACEMENT_RIGHT_BOTTOM, + PLACEMENT_MIDLEFT_BOTTOM_FLIP, + PLACEMENT_MIDRIGHT_BOTTOM, + PLACEMENT_CENTERLEFT_TOP, + PLACEMENT_LEFT_MIDTOP, + PLACEMENT_RIGHT_MIDTOP_FLIP, + PLACEMENT_MIDLEFT_TOP, + PLACEMENT_MIDRIGHT_TOP_FLIP, + PLACEMENT_CENTERRIGHT_TOP_FLIP, + PLACEMENT_LEFT_MIDTOP_FLIP, + PLACEMENT_RIGHT_MIDTOP, + PLACEMENT_MIDLEFT_TOP_FLIP, + PLACEMENT_MIDRIGHT_TOP, + PLACEMENT_COUNT }; -#endif +#endif // GUARD_PORTRAIT_PLACEMENT_H diff --git a/include/structs/str_mon_portrait.h b/include/structs/str_mon_portrait.h index 99518235a..059c1e66e 100644 --- a/include/structs/str_mon_portrait.h +++ b/include/structs/str_mon_portrait.h @@ -19,7 +19,7 @@ typedef struct PortraitGfx /* 0x0 */ PortraitGfxSub sprites[13]; } PortraitGfx; -// size: 0x10 +// Size: R=0x10 | B=0xF typedef struct MonPortraitMsg { /* 0x0 */ OpenedFile *faceFile; diff --git a/src/data/ground/ground_data_a01p01_station.h b/src/data/ground/ground_data_a01p01_station.h index b7561ff52..f94e1c18e 100644 --- a/src/data/ground/ground_data_a01p01_station.h +++ b/src/data/ground/ground_data_a01p01_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs162_g1_s0_lives0_dlg0[] = { /* 0x820fe54 * WAIT(30), MSG_QUIET(0, _("...Oh?{WAIT_PRESS} There's someone here.")), MSG_QUIET(0, _("Who is it...?{WAIT_PRESS} Someone I know...?")), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000004), MSG_QUIET(0, _("......{WAIT_PRESS}Hmm... I can't remember.")), MSG_QUIET(0, _("............")), TEXTBOX_CLEAR, @@ -104,7 +104,7 @@ static const struct ScriptCommand s_gs162_g2_s0_lives0_dlg0[] = { /* 0x8210190 * WAIT(30), MSG_QUIET(0, _("Huh? It's shaking.{WAIT_PRESS} An earthquake...?")), { 0x97, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x0000000c), MSG_QUIET(0, _("Whoa! It's getting worse.")), PORTRAIT_REP(0x0000, 0x00000000), MSG_QUIET(0, _("For a dream, this feels strangely\nreal, but...")), @@ -152,7 +152,7 @@ static const struct ScriptCommand s_gs162_g3_s0_lives0_dlg0[] = { /* 0x8210568 * MSG_QUIET(0, _("...What?{WAIT_PRESS} Human?{WAIT_PRESS} My role?")), TEXTBOX_CLEAR, ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000007), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000007), MSG_QUIET(0, _("W-wait.\nPlease, tell me more.")), MSG_QUIET(0, _("......{WAIT_PRESS}\nI can't... Drifting off...")), MSG_QUIET(0, _("............")), @@ -271,11 +271,11 @@ static const struct ScriptCommand s_gs162_g4_s0_lives0_dlg0[] = { /* 0x8210c68 * MSG_NPC(-1, _(" I am {NAME_2}.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x0000000c), MSG_QUIET(0, _("Ga-{NAME_2}...?!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000041), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000041), MSG_NPC(2, _(" I'm so glad. Finally...{WAIT_PRESS}\nI finally got to meet you...")), TEXTBOX_CLEAR, WAIT(10), @@ -399,7 +399,7 @@ static const struct ScriptCommand s_gs162_g5_s0_lives0_dlg0[] = { /* 0x82116b8 * MSG_NPC(-1, _(" I've been waiting for you.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x0000000c), MSG_QUIET(0, _("Ga...{WAIT_PRESS}{NAME_2}!")), TEXTBOX_CLEAR, WAIT(10), @@ -451,7 +451,7 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * ALERT_CUE(7), AWAIT_CUE(5), WAIT(60), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Yes...")), TEXTBOX_CLEAR, WAIT(10), @@ -532,7 +532,7 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * FANFARE_PLAY2(453), { 0x97, 0x00, 0x0002, 0x00000001, 0x00000003, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x0000000c), MSG_QUIET(0, _("Wah!\nE-earthquake?!")), TEXTBOX_CLEAR, WAIT(30), @@ -692,7 +692,7 @@ static const struct ScriptCommand s_gs162_g7_s0_lives0_dlg0[] = { /* 0x8212e70 * { 0x2d, 0x09, 0x0001, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), 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.")), TEXTBOX_CLEAR, @@ -747,7 +747,7 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * ALERT_CUE(6), AWAIT_CUE(5), WAIT(60), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" It's tomorrow, isn't it?{WAIT_PRESS}\nThat you take to that underground dungeon.")), TEXTBOX_CLEAR, WAIT(10), @@ -761,7 +761,7 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * MSG_NPC(1, _(" You have my support.\nPlease, go with strength.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000009), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000009), MSG_QUIET(0, _("I will. Thank you.")), MSG_QUIET(0, _("I'm feeling a little braver now.\nI will go for it.")), PORTRAIT_REP(0x0000, 0x00000000), @@ -998,7 +998,7 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * { 0x2d, 0x09, 0x0002, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), MSG_QUIET(0, _("............{WAIT_PRESS}Gardevoir...?")), TEXTBOX_CLEAR, WAIT(30), @@ -1010,7 +1010,7 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * MSG_QUIET(0, _("Who or what I am...?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Yes.")), MSG_NPC(2, _(" The time has arrived.")), MSG_NPC(2, _(" Why you have come here?")), @@ -1252,7 +1252,7 @@ static const struct ScriptCommand s_gs162_g10_s0_lives0_dlg0[] = { /* 0x8215da4 { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" You can return to your\nhuman world.")), TEXTBOX_CLEAR, ALERT_CUE(3), diff --git a/src/data/ground/ground_data_a01p02_station.h b/src/data/ground/ground_data_a01p02_station.h index b64992f37..5b276b732 100644 --- a/src/data/ground/ground_data_a01p02_station.h +++ b/src/data/ground/ground_data_a01p02_station.h @@ -20,7 +20,7 @@ static const struct ScriptCommand s_gs163_g1_s0_station_sref_script[] = { /* 0x8 BGM_STOP, SELECT_MAP(MAP_PERSONALITY_TEST_PURPLE), { 0x2d, 0x09, 0x0000, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000002), MSG_QUIET(0, _("......")), MSG_QUIET(0, _("............")), MSG_QUIET(0, _("...Urgggh...{WAIT_PRESS} I feel horrible...")), @@ -44,7 +44,7 @@ static const struct ScriptCommand s_gs163_g1_s0_lives0_dlg0[] = { /* 0x8216594 * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000002), MSG_QUIET(0, _("This is a dream...{WAIT_PRESS} Isn't it...?")), MSG_QUIET(0, _("...But why...?{WAIT_PRESS}\nWhy do I feel this terrible...?")), MSG_QUIET(0, _("This is...{WAIT_PRESS} The first time...")), @@ -75,7 +75,7 @@ static const struct ScriptCommand s_gs163_g2_s0_lives0_dlg0[] = { /* 0x8216758 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), BGM_FADEOUT(120), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), MSG_QUIET(0, _("..................")), MSG_QUIET(0, _("......The pain......")), MSG_QUIET(0, _("......It's going away............")), @@ -116,7 +116,7 @@ static const struct ScriptCommand s_gs163_g3_s0_lives0_dlg0[] = { /* 0x8216954 * FANFARE_PLAY2(465), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000046), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000046), MSG_NPC(2, _(" Gegege!\nHey, {NAME_0}!")), MSG_NPC(2, _(" Don't you dare fool around!\nI'll make you pay for it!")), TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_a02p01_station.h b/src/data/ground/ground_data_a02p01_station.h index 4c2ec43b6..d153a0abc 100644 --- a/src/data/ground/ground_data_a02p01_station.h +++ b/src/data/ground/ground_data_a02p01_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs164_g1_s0_lives0_dlg0[] = { /* 0x821833c * ALERT_CUE(6), CAMERA_PAN(256, 0), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Whoa!\nThese cracks go down deep!")), VARIANT_DEFAULT(_(" Wow!\nAren't these fissures amazing?!")), diff --git a/src/data/ground/ground_data_a02p02_station.h b/src/data/ground/ground_data_a02p02_station.h index 1d2ffddbe..d9285d081 100644 --- a/src/data/ground/ground_data_a02p02_station.h +++ b/src/data/ground/ground_data_a02p02_station.h @@ -57,7 +57,7 @@ static const struct ScriptCommand s_gs165_g1_s0_lives0_dlg0[] = { /* 0x8218834 * ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Nature's gone savage\nhere too...")), VARIANT(/* == */ 1, _(" The forest fires are still\nburning out of control...")), diff --git a/src/data/ground/ground_data_a02p03_station.h b/src/data/ground/ground_data_a02p03_station.h index 82af64648..caf998c55 100644 --- a/src/data/ground/ground_data_a02p03_station.h +++ b/src/data/ground/ground_data_a02p03_station.h @@ -39,7 +39,7 @@ static const struct ScriptCommand s_gs166_g1_s0_lives0_dlg0[] = { /* 0x8218cb0 * ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), BGM_FADEOUT(60), WAIT(20), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_NPC(1, _(" Gasp... Gasp...")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -104,7 +104,7 @@ static const struct ScriptCommand s_gs166_g2_s0_lives0_dlg0[] = { /* 0x821915c * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_NPC(1, _(" It... It's a mountain of fire!")), TEXTBOX_CLEAR, WAIT(20), diff --git a/src/data/ground/ground_data_a02p04_station.h b/src/data/ground/ground_data_a02p04_station.h index a53fd324c..d3e30e71a 100644 --- a/src/data/ground/ground_data_a02p04_station.h +++ b/src/data/ground/ground_data_a02p04_station.h @@ -92,7 +92,7 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * WAIT(80), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Gasp, gasp...\nWe've done a lot of walking.")), VARIANT(/* == */ 1, _(" I'm beat.\nLet's get some rest.")), @@ -161,7 +161,7 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * FANFARE_PLAY2(455), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What?{WAIT_PRESS} There are others?")), VARIANT(/* == */ 1, _(" Who might they be?")), @@ -179,7 +179,7 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * JUMP_LABEL(4), LABEL(3), /* = 0x03 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000b), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I knew it!\nI knew you'd say that too, {NAME_0}!")), VARIANT_DEFAULT(_(" I thought so!\nYou think so too, {NAME_0}, right?!")), diff --git a/src/data/ground/ground_data_a03p01_station.h b/src/data/ground/ground_data_a03p01_station.h index bfba10c1e..0f7a430d7 100644 --- a/src/data/ground/ground_data_a03p01_station.h +++ b/src/data/ground/ground_data_a03p01_station.h @@ -55,13 +55,13 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * AWAIT_CUE(5), { 0x3b, 0x36, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(2), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_NPC(1, _(" ...Brr... It's cold!{WAIT_PRESS}")), TEXTBOX_CLEAR, ALERT_CUE(6), WAIT(8), FANFARE_PLAY2(480), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000007), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000007), MSG_NPC(1, _(" Hachoo!")), TEXTBOX_CLEAR, WAIT(8), @@ -70,7 +70,7 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * ALERT_CUE(6), AWAIT_CUE(5), SELECT_ANIMATION(2), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000005), MSG_NPC(1, _(" Yuck...{WAIT_PRESS}\nMy nose is running, and it's freezing.")), TEXTBOX_CLEAR, WAIT(30), @@ -79,7 +79,7 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * SELECT_ANIMATION(5), ALERT_CUE(6), WAIT(60), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ..................")), VARIANT(/* == */ 1, _(" This is one barren place...")), @@ -108,7 +108,7 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Wh-what's that?!")), TEXTBOX_CLEAR, WAIT(40), @@ -116,7 +116,7 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * WAIT(90), ALERT_CUE(4), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_NPC(1, _(" ...{WAIT_PRESS}What was that?{WAIT_PRESS}\nIt looked like a Pokémon, but...")), TEXTBOX_CLEAR, WAIT(10), @@ -134,7 +134,7 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * WAIT(30), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Well, thinking about it\nisn't going to help.{WAIT_PRESS}\nLet's keep moving.")), VARIANT_DEFAULT(_(" I guess thinking about it\nwon't help us.{WAIT_PRESS}\nWe should keep moving.")), @@ -238,7 +238,7 @@ static const struct ScriptCommand s_gs168_g2_s0_lives0_dlg0[] = { /* 0x821ca1c * SELECT_ANIMATION(2), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000b), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wow!")), VARIANT_DEFAULT(_(" Oh!")), diff --git a/src/data/ground/ground_data_a03p02_station.h b/src/data/ground/ground_data_a03p02_station.h index 941acb819..e7de50f63 100644 --- a/src/data/ground/ground_data_a03p02_station.h +++ b/src/data/ground/ground_data_a03p02_station.h @@ -35,7 +35,7 @@ static const struct ScriptCommand s_gs169_g1_s0_lives0_dlg0[] = { /* 0x821cfa4 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), WAIT(90), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000b), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000b), MSG_NPC(1, _(" Wow!{WAIT_PRESS}\nThe snow is like frozen powder!")), PORTRAIT_REP(0x0001, 0x00000005), MSG_NPC(1, _(" It looks pretty, but...{WAIT_PRESS}\nIt must be harsh there...")), diff --git a/src/data/ground/ground_data_a03p03_station.h b/src/data/ground/ground_data_a03p03_station.h index 517d39098..69d357f44 100644 --- a/src/data/ground/ground_data_a03p03_station.h +++ b/src/data/ground/ground_data_a03p03_station.h @@ -37,7 +37,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), WAIT(120), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), MSG_QUIET(0, _("(This icy mountain path seems to go\non forever...)")), MSG_QUIET(0, _("(We've walked a long way here...)")), MSG_QUIET(0, _("({NAME_1} looks exhausted, too...)")), @@ -46,7 +46,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * MSG_QUIET(0, _("(Are we really doing the right thing?)")), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP, 0x0001, 0x00000002), PORTRAIT_POS(1, 0, 2), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Brr... It's too cold!{WAIT_PRESS}\nThere's only snow around us now.")), @@ -85,7 +85,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * SELECT_ANIMATION(2), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), PORTRAIT_POS(1, 0, 2), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nYeah, you're right.")), @@ -119,7 +119,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * SELECT_ANIMATION(2), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), PORTRAIT_POS(1, 0, 2), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" .........{WAIT_PRESS}Sorry.{WAIT_PRESS}\nI shouldn't have said that.\nIt doesn't help scaring you like that.")), @@ -287,17 +287,17 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), ALERT_CUE(7), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" I am so glad.{WAIT_PRESS}\nFinally, we get to meet.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), MSG_QUIET(0, _("...You're...{WAIT_PRESS} What...")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000004), PORTRAIT_POS(1, 0, 2), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nWhat's up with you?")), diff --git a/src/data/ground/ground_data_a04p01_station.h b/src/data/ground/ground_data_a04p01_station.h index a7fdd7c3f..235d2106c 100644 --- a/src/data/ground/ground_data_a04p01_station.h +++ b/src/data/ground/ground_data_a04p01_station.h @@ -108,7 +108,7 @@ static const struct ScriptCommand s_gs171_g2_s0_lives0_dlg0[] = { /* 0x821fdc4 * ALERT_CUE(4), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), 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...")), TEXTBOX_CLEAR, @@ -144,14 +144,14 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * WAIT(10), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), PORTRAIT_POS(2, 0, 2), MSG_NPC(2, _(" Ah, good of you to come.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Kwaaaaaaaaaah!")), TEXTBOX_CLEAR, FANFARE_PLAY2(465), @@ -161,7 +161,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * ALERT_CUE(6), AWAIT_CUE(5), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_NPC(1, _(" Wh-{WAIT_PRESS}what's going on?{WAIT_PRESS}\nWhat is {NAME_3} doing?")), TEXTBOX_CLEAR, WAIT(10), @@ -256,7 +256,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * VARIANT_DEFAULT(_(" That's my wish.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0000, 0x00000000), MSG_QUIET(0, _("(...Yes...{WAIT_PRESS}\nAnd when that wish comes true...)")), MSG_QUIET(0, _("(Gardevoir said...)")), TEXTBOX_CLEAR, @@ -398,7 +398,7 @@ static const struct ScriptCommand s_gs171_g4_s0_lives0_dlg0[] = { /* 0x82213fc * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0000, 0x00000000), MSG_QUIET(0, _("(............)")), MSG_QUIET(0, _("(This will be my last adventure...{WAIT_PRESS}\nWith {NAME_1}...)")), TEXTBOX_CLEAR, @@ -417,7 +417,7 @@ static const struct ScriptCommand s_gs171_g4_s0_lives0_dlg0[] = { /* 0x82213fc * WAIT(60), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), PORTRAIT_POS(2, 0, 2), MSG_NPC(2, _(" We're counting on you!\n{NAME_1}! {NAME_0}!")), TEXTBOX_CLEAR, @@ -608,7 +608,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * TEXTBOX_CLEAR, { 0x27, 0x01, 0x0005, 0x0000003c, 0x00ffffff, NULL }, WAIT(60), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), MSG_QUIET(0, _("(...{WAIT_PRESS}Huh...?{WAIT_PRESS} This place...)")), TEXTBOX_CLEAR, { 0x3b, 0x39, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -617,12 +617,12 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * FANFARE_PLAY2(465), CALL_LABEL(3), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000002), MSG_NPC(1, _("............Urgggh......")), TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _("...Regained consciousness!")), // Alakazam is 2 TEXTBOX_CLEAR, MSG_NPC(-1, _(" Oooooooohhhhh!")), @@ -643,18 +643,18 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * WAIT(30), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000042), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000042), PORTRAIT_POS(4, -3, 0), MSG_NPC(4, _(" Awesome, you're alive!{WAIT_PRESS}\nYou really had all of us worried!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0008, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0008, 0x00000000), MSG_NPC(8, _(" You were incredible!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0006, 0x00000042), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0006, 0x00000042), MSG_NPC(6, _(" Snivel...\nI'm so glad you're safe!{WAIT_PRESS}\nIt's fantastic!")), TEXTBOX_CLEAR, WAIT(10), @@ -681,7 +681,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * WAIT(30), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000000), 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.")), TEXTBOX_CLEAR, @@ -1095,34 +1095,34 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * WAIT(30), ALERT_CUE(12), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0007, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0007, 0x00000000), PORTRAIT_POS(7, 3, 0), MSG_NPC(7, _(" Yippee!\nThis is the greatest!")), TEXTBOX_CLEAR, WAIT(10), { 0x2d, 0x09, 0x0009, 0x00000059, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0009, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0009, 0x00000000), MSG_NPC(9, _(" This calls for a celebration!")), TEXTBOX_CLEAR, WAIT(10), { 0x2d, 0x09, 0x0009, 0x00000068, 0x00000000, NULL }, ALERT_CUE(14), WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0009, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0009, 0x00000000), MSG_NPC(9, _(" Let me shoot my Hydro\nPump to kick it off!")), TEXTBOX_CLEAR, ALERT_CUE(14), WAIT(10), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000000), PORTRAIT_POS(4, -3, 0), MSG_NPC(4, _(" Whoa, hold on there!\nDon't you point those things at me!{WAIT_PRESS}\nFace the other way! The other way!")), TEXTBOX_CLEAR, WAIT(10), { 0x2d, 0x09, 0x0009, 0x00000055, 0x00000000, NULL }, ALERT_CUE(15), - PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0009, 0x00000042), + PORTRAIT(PLACEMENT_MIDRIGHT_BOTTOM_FLIP, 0x0009, 0x00000042), MSG_NPC(9, _(" No, no!\nLet it loose! Hahaha!")), TEXTBOX_CLEAR, CALL_LABEL(2), @@ -1139,14 +1139,14 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(120), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0008, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0008, 0x00000000), MSG_NPC(8, _(" I'll secure him so he can't\nget away.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(16), AWAIT_CUE(5), { 0x2d, 0x09, 0x0009, 0x00000059, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0009, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0009, 0x00000000), MSG_NPC(9, _(" Oh?{WAIT_PRESS} Not bad!")), TEXTBOX_CLEAR, CALL_LABEL(2), @@ -1157,7 +1157,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * ALERT_CUE(9), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0004, 0x00000000), PORTRAIT_POS(4, 0, 0), MSG_NPC(4, _(" What, you're serious?!\nNooooo! Don't!")), TEXTBOX_CLEAR, @@ -1186,7 +1186,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * TEXTBOX_CLEAR, WAIT(10), BGM_SWITCH(MUS_FAREWELL), - PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000000), // Gardevoir is 5 + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0005, 0x00000000), // Gardevoir is 5 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.")), @@ -1195,7 +1195,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * MSG_NPC(5, _(" It is time to bid farewell.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), MSG_QUIET(0, _("(It's finally come...{WAIT_PRESS}\nThis time has finally arrived...)")), TEXTBOX_CLEAR, WAIT(10), @@ -1215,7 +1215,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * ALERT_CUE(11), ALERT_CUE(4), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0006, 0x00000000), // Caterpie is 6 + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0006, 0x00000000), // Caterpie is 6 MSG_NPC(6, _(" Oh? {NAME_0}?")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -1225,7 +1225,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * WAIT(45), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x0000000c), // Partner is 1 + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x0000000c), // Partner is 1 PORTRAIT_POS(1, 0, 3), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...!{WAIT_PRESS} {NAME_0}...!{WAIT_PRESS}\nYour body...{WAIT_PRESS} What's happening?")), @@ -1250,13 +1250,13 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * ALERT_CUE(6), WAIT(30), ALERT_CUE(12), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0007, 0x00000041), // Snubbull is 7 + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0007, 0x00000041), // Snubbull is 7 MSG_NPC(7, _(" What?!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(18), { 0x2d, 0x09, 0x0009, 0x0000004f, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0009, 0x00000041), // Bellsprout is 9 + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0009, 0x00000041), // Bellsprout is 9 MSG_NPC(9, _(" Wh-what are you saying?!")), TEXTBOX_CLEAR, WAIT(60), @@ -1274,12 +1274,12 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(7), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), // Alakazam is 2 + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), // Alakazam is 2 MSG_NPC(2, _(" Unbelievable!")), TEXTBOX_CLEAR, WAIT(10), { 0x2d, 0x09, 0x0009, 0x0000005a, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0009, 0x00000041), // Tyranitar is 9 + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0009, 0x00000041), // Tyranitar is 9 MSG_NPC(9, _(" Go back...{WAIT_PRESS}\nTo the human world?!")), TEXTBOX_CLEAR, WAIT(30), @@ -1324,19 +1324,19 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * WAIT(30), TEXTBOX_AUTO_PRESS(60, 60), { 0x2d, 0x09, 0x0009, 0x0000004e, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0009, 0x00000041), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0009, 0x00000041), MSG_NPC(9, _(" {NAME_0}!")), TEXTBOX_CLEAR, { 0x2d, 0x09, 0x0009, 0x00000059, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0009, 0x00000041), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0009, 0x00000041), MSG_NPC(9, _(" {NAME_0}!")), TEXTBOX_CLEAR, { 0x2d, 0x09, 0x0009, 0x0000004f, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0009, 0x00000041), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0009, 0x00000041), PORTRAIT_POS(9, -3, 0), MSG_NPC(9, _(" {NAME_0}!")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0006, 0x00000042), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0006, 0x00000042), PORTRAIT_POS(6, -1, 2), MSG_NPC(6, _(" {NAME_0}...")), TEXTBOX_CLEAR, @@ -1345,7 +1345,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0x59, 0x00, 0x0000, -0x000000c8, 0x00000000, NULL }, AWAIT_CUE(5), TEXTBOX_AUTO_PRESS(180, 180), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000006), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000006), MSG_NPC(1, _(" {NAME_0}!!! Nooooo!!!")), TEXTBOX_CLEAR, WAIT(30), @@ -2120,23 +2120,23 @@ static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(90), TEXTBOX_AUTO_PRESS(-1, -1), - PORTRAIT(PLACEMENT_LEFT_, 0x0006, 0x00000042), // Caterpie is 6 + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0006, 0x00000042), // Caterpie is 6 MSG_NPC(6, _(" Snivel... {NAME_0}...{WAIT_PRESS}\nWhy...{WAIT_PRESS} I don't understand...")), TEXTBOX_CLEAR, WAIT(10), { 0x2d, 0x09, 0x0009, 0x00000059, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0009, 0x00000044), // Charizard is 9 + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0009, 0x00000044), // Charizard is 9 MSG_NPC(9, _(" Why?{WAIT_PRESS}\nWhy was it necessary to leave us...?")), TEXTBOX_CLEAR, WAIT(10), { 0x2d, 0x09, 0x0009, 0x00000055, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0009, 0x00000043), // Now Shiftry is 9 + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0009, 0x00000043), // Now Shiftry is 9 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...")), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000043), // Lombre is 4 + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000043), // Lombre is 4 PORTRAIT_POS(4, -2, 0), MSG_NPC(4, _(" You're right...")), MSG_NPC(4, _(" Just upped and went like\nthat...")), @@ -2146,13 +2146,13 @@ static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 * WAIT(10), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), // Xatu is 3 + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000000), // Xatu is 3 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.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000005), // Partner is 1 + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000005), // Partner is 1 MSG_NPC(1, _(" ............{WAIT_PRESS}\nI think I know...")), TEXTBOX_CLEAR, WAIT(10), @@ -2175,7 +2175,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 * MSG_NPC(1, _(" If this was coming...{WAIT_PRESS}\nWhy didn't {NAME_0} tell me?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), // Alakazam is 2 + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), // Alakazam is 2 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.")), diff --git a/src/data/ground/ground_data_a04p04_station.h b/src/data/ground/ground_data_a04p04_station.h index 7e3fca6bf..86053cb03 100644 --- a/src/data/ground/ground_data_a04p04_station.h +++ b/src/data/ground/ground_data_a04p04_station.h @@ -62,7 +62,7 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * WAIT(10), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0004, 0x00000000), 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?")), TEXTBOX_CLEAR, @@ -79,7 +79,7 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * AWAIT_CUE(5), SELECT_ANIMATION(51), { 0x3b, 0x36, 0x0004, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000005), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000005), MSG_QUIET(0, _("(............)")), MSG_QUIET(0, _("(Gengar is dragging me...)")), MSG_QUIET(0, _("(...{WAIT_PRESS}Gengar said...)")), @@ -88,7 +88,7 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * MSG_QUIET(0, _("(Am I going to be abandoned in a world\nI don't know?)")), TEXTBOX_CLEAR, WAIT(90), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP, 0x0004, 0x00000000), MSG_NPC(4, _(" ......")), MSG_NPC(4, _(" ............")), { 0x3b, 0x36, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -115,7 +115,7 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * ALERT_CUE(9), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0004, 0x00000044), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0004, 0x00000044), MSG_NPC(4, _(" Keh! To heck with this.{WAIT_PRESS}\nI'll just ditch you here...")), PORTRAIT_REP(0x0004, 0x00000000), MSG_NPC(4, _(" That's it. Good-bye to you.")), diff --git a/src/data/ground/ground_data_b01p01a_station.h b/src/data/ground/ground_data_b01p01a_station.h index 698e63230..b11c756d6 100644 --- a/src/data/ground/ground_data_b01p01a_station.h +++ b/src/data/ground/ground_data_b01p01a_station.h @@ -322,7 +322,7 @@ static const struct ScriptCommand s_gs9_g0_s0_evt1_sref_script[] = { /* 0x819bf5 JUMPIF(JUDGE_LE, FRIEND_SUM, 2, /* to label */ 2), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0000, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0000, 0x00000004), MSG_QUIET(0, _("This will be a dangerous journey.")), MSG_QUIET(0, _("I'd better leave without telling\nthe others.")), TEXTBOX_CLEAR, @@ -427,7 +427,7 @@ static const struct ScriptCommand s_gs9_g0_s0_obj2_dlg2[] = { /* 0x819c748 */ JUMPIF(JUDGE_LE, FRIEND_SUM, 2, /* to label */ 1), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0000, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0000, 0x00000004), MSG_QUIET(0, _("This will be a dangerous journey.")), MSG_QUIET(0, _("I'd better leave without telling\nthe others.")), TEXTBOX_CLEAR, @@ -1123,8 +1123,8 @@ static const struct ScriptCommand s_gs9_g6_s1_lives0_dlg0[] = { /* 0x819f3a8 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We did good today.{WAIT_PRESS}\nLet's knock off and call it a night.")), VARIANT(/* == */ 1, _(" See you tomorrow!")), @@ -1148,7 +1148,7 @@ static const struct ScriptCommand s_gs9_g6_s2_lives0_dlg0[] = { /* 0x819f594 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), MSG_QUIET(0, _("That was good work today.\nI should get some rest.")), TEXTBOX_CLEAR, ALERT_CUE(3), @@ -1437,7 +1437,7 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - DEBUGINFO_O(1578), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), WALK_GRID(256, 7), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(30), @@ -1485,7 +1485,7 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - ALERT_CUE(6), AWAIT_CUE(5), ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is your {COLOR CYAN}Mailbox{RESET}.{WAIT_PRESS}\nThis is where you'll get mail from\nother Pokémon.")), VARIANT_DEFAULT(_(" This is your {COLOR CYAN}Mailbox{RESET}.{WAIT_PRESS}\nThey deliver mail from Pokémon here.")), @@ -1612,7 +1612,7 @@ static const struct ScriptCommand s_gs9_g17_s0_lives1_dlg0[] = { /* 0x81a1e94 - DEBUGINFO_O(1753), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), WALK_GRID(256, 8), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), @@ -1649,7 +1649,7 @@ static const struct ScriptCommand s_gs9_g17_s2_lives0_dlg0[] = { /* 0x81a20f0 - BGM_FADEOUT(5), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), WAIT(10), CALL_SCRIPT(JUMP_HAPPY_FUNC), FANFARE_PLAY2(473), @@ -1663,7 +1663,7 @@ static const struct ScriptCommand s_gs9_g17_s3_lives0_dlg0[] = { /* 0x81a21b0 - DEBUGINFO_O(1804), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(6), @@ -1717,7 +1717,7 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ WAIT(1), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_NPC(1, _(" ...Hunh?! Oh, no!")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -2079,7 +2079,7 @@ static const struct ScriptCommand s_gs9_g19_s1_lives0_dlg0[] = { /* 0x81a43f8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}, aren't\nyou going to check the Mailbox?")), VARIANT_DEFAULT(_(" {NAME_0}, please check\nthe Mailbox.")), @@ -2155,7 +2155,7 @@ static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ AWAIT_CUE(5), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x0000000b), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Maybe it's a rescue job\nrequest?!{WAIT_PRESS}\nCome on, what's it say?")), VARIANT_DEFAULT(_(" Maybe it's a rescue job\noffer!{WAIT_PRESS}\nWhat does it say?")), @@ -2173,7 +2173,7 @@ static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ MSG_LETTER(_(" PLEASE. WE NEED HELP. BZZ BZZ BZZ.\n\n FROM MAGNEMITE'S FRIEND”")), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" What do you think?\nShould we go for it?")), VARIANT_DEFAULT(_(" What do you think?\nDo you think we should go?")), @@ -2188,7 +2188,7 @@ static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ WAIT(30), BGM_SWITCH(MUS_RESCUE_TEAM_BASE), WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah? Why?")), VARIANT_DEFAULT(_(" Huh? Why?")), @@ -2203,7 +2203,7 @@ static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ WAIT(4), SELECT_ENTITIES(-1, 2), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's what I want to hear!\nLet's do this right!")), VARIANT_DEFAULT(_(" That's the spirit!\nLet's do our best!")), @@ -2288,7 +2288,7 @@ static const struct ScriptCommand s_gs9_g21_s0_lives0_dlg0[] = { /* 0x81a5378 */ ALERT_CUE(6), AWAIT_CUE(5), WAIT(15), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_NPC(1, _(" Morning, {NAME_0}.")), PORTRAIT_REP(0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -2341,7 +2341,7 @@ static const struct ScriptCommand s_gs9_g22_s1_lives0_dlg0[] = { /* 0x81a56b4 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_NPC(1, _(" {NAME_0}!\nThe dungeon isn't that way.")), TEXTBOX_CLEAR, CMD_UNK_93(8, DIR_TRANS_10, 4), @@ -2398,7 +2398,7 @@ static const struct ScriptCommand s_gs9_g22_s2_lives0_dlg0[] = { /* 0x81a5a7c */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), WAIT(1), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" {NAME_0}!\nThe dungeon isn't that way.")), TEXTBOX_CLEAR, CMD_UNK_93(8, DIR_TRANS_10, 4), @@ -2462,7 +2462,7 @@ static const struct ScriptCommand s_gs9_g23_s0_lives0_dlg0[] = { /* 0x81a5dd8 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Boy, I'm sure glad our\nrescue went well today.")), VARIANT(/* == */ 3, _(" I'm so glad our rescue\nmission went so well today.")), @@ -2587,7 +2587,7 @@ static const struct ScriptCommand s_gs9_g25_s0_lives0_dlg0[] = { /* 0x81a6700 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nYou're up early.")), VARIANT_DEFAULT(_(" Good morning, {NAME_0}!\nAren't you up early?")), @@ -2700,7 +2700,7 @@ static const struct ScriptCommand s_gs9_g26_s0_lives0_dlg0[] = { /* 0x81a7140 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!")), VARIANT_DEFAULT(_(" Good morning, {NAME_0}!")), @@ -2722,7 +2722,7 @@ static const struct ScriptCommand s_gs9_g26_s0_lives0_dlg0[] = { /* 0x81a7140 */ CALL_SCRIPT(SHOCK_FUNC), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000004, NULL }, WAIT(60), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), 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!")), @@ -2874,7 +2874,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Ohhh...\nI was very scared.")), ALERT_CUE(6), ALERT_CUE(8), @@ -2888,11 +2888,11 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_NPC(1, _(" (Feet...?)")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" (HE HAS THEM? FEET?)")), TEXTBOX_CLEAR, WAIT(45), @@ -2944,7 +2944,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ MSG_NPC(2, _(" Oh! Papa!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), ALERT_CUE(9), AWAIT_CUE(5), MSG_NPC(4, _(" {NAME_2}!\nYou had us worried!\nYou're not hurt?")), @@ -2960,7 +2960,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ ALERT_CUE(9), WAIT(10), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Thank you for everything.\nYou're heroes.")), TEXTBOX_CLEAR, WAIT(10), @@ -2980,7 +2980,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ ALERT_CUE(8), ALERT_CUE(9), WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" Oh, how rude of us!\nThank you so much!")), TEXTBOX_CLEAR, WAIT(10), @@ -2998,7 +2998,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ ALERT_CUE(6), ALERT_CUE(8), WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" We must be going.\n{NAME_0}.")), TEXTBOX_CLEAR, WAIT(10), @@ -3011,9 +3011,9 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ ALERT_CUE(9), ALERT_CUE(7), WAIT(10), - PORTRAIT(PLACEMENT_TOP, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0005, 0x00000000), MSG_NPC(5, _(" Thank you.")), - PORTRAIT(PLACEMENT_TOP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0004, 0x00000000), MSG_NPC(4, _(" Farewell!")), TEXTBOX_CLEAR, WAIT(10), @@ -3031,13 +3031,13 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0003, 0x00000000), MSG_NPC(3, _(" WE'LL BE ON OUR WAY\nTOO...")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wait a sec!\nHold on!")), VARIANT_DEFAULT(_(" Oh, wait!\nDon't go away!")), @@ -3068,7 +3068,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ ALERT_CUE(6), CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0001, 0x00000000), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nYou think so too, right?")), VARIANT_DEFAULT(_(" {NAME_0}, don't you\nthink so too?")), @@ -3089,7 +3089,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ LABEL(29), /* = 0x1d */ TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Sheesh!\nDon't joke around like that!\nIt's not funny!")), VARIANT_DEFAULT(_(" Aww, sheesh.\nDon't joke around.\nIt's not funny.")), @@ -3139,7 +3139,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ WAIT(30), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What the...?\nWhat, you were just joshing me?!\nSheesh!")), VARIANT(/* == */ 3, _(" Now, look here!\nWere you just making fun of me?!")), @@ -3151,7 +3151,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000009), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" So, come on! How about it?")), VARIANT(/* == */ 1, _(" Join our rescue team!\nWhat do you say?")), @@ -3533,13 +3533,13 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ ALERT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000009), MSG_NPC(1, _(" Morning, {NAME_0}!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Ahaha!\nWhat's with that dazed and confused look?\nYou look half asleep!")), VARIANT_DEFAULT(_(" Ahaha!\nWhat's the matter?\nYou haven't woken up yet?")), @@ -3579,7 +3579,7 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ VARIANT_DEFAULT(_(" Do you want to turn back\ninto a human?")), TEXTBOX_CLEAR, WAIT(16), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0000, 0x00000004), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0000, 0x00000004), MSG_QUIET(0, _("(...It's true...)")), MSG_QUIET(0, _("(I haven't thought about it much, but...)")), ASK2(FALSE, /*default*/ -1, /* speaker */ 0, _("(Do I want to become a human again?)")), @@ -3737,7 +3737,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ ALERT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning!\nLet's keep up our good work today!")), VARIANT_DEFAULT(_(" Good morning!\nLet's do good again today!")), @@ -3752,15 +3752,15 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ AWAIT_CUE(5), WAIT(30), BGM_SWITCH(MUS_THERES_TROUBLE), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" There's nothing here.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" Depressing, isn't it.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), PORTRAIT_POS(2, 0, -3), MSG_NPC(2, _(" Keh!\nWho'd run a rescue team from a dump\nlike this? Unbelievable.")), TEXTBOX_CLEAR, @@ -3771,14 +3771,14 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ ALERT_CUE(9), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What's with you?")), VARIANT_DEFAULT(_(" Who are you people?")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(9), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000041), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000041), MSG_NPC(4, _(" Oh!{WAIT_PRESS}\nOver there. A Mailbox〜♪")), TEXTBOX_CLEAR, WAIT(30), @@ -3791,35 +3791,35 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ WAIT(30), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000041), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000041), MSG_NPC(2, _(" Kekeh, yeah!\nCheck it out!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Whoa, hey!\nWhat do you think you're doing?")), VARIANT_DEFAULT(_(" Now wait a second!\nWhat do you think you're doing?!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(8), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000041), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000041), MSG_NPC(3, _(" Yessss!\nRescue job offers!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(9), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000041), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000041), MSG_NPC(4, _(" Oo-la-la!\nIsn't that rather tasty〜♪")), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000041), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000041), MSG_NPC(2, _(" We'll have them all.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey!{WAIT_PRESS}\nThose rescue jobs were meant for us!")), VARIANT(/* == */ 1, _(" Don't butt in!")), @@ -3833,31 +3833,31 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ ALERT_CUE(8), ALERT_CUE(9), WAIT(20), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Keh!{WAIT_PRESS}\nIt doesn't matter who does it!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000043), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000043), MSG_NPC(4, _(" We're a rescue team too,\nI'll have you know〜♪")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000042), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000042), 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!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000043), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000043), MSG_NPC(4, _(" We have our eyes on\nworld domination〜♪")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Wha...{WAIT_PRESS}\nWorld domination?!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), 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!")), @@ -3892,7 +3892,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ WAIT(60), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000006), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000006), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wah!\nThis is empty!")), VARIANT_DEFAULT(_(" Oh, no!\nIt is empty!")), @@ -3926,7 +3926,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We lucked out!\nPelipper's brought us some more mail!")), VARIANT(/* == */ 1, _(" We can go back to rescuing.")), @@ -4191,7 +4191,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ ALERT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nLet's keep up our good work today!")), VARIANT_DEFAULT(_("")), @@ -4202,7 +4202,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hunh? Who's that?")), VARIANT_DEFAULT(_(" Huh?\nWho was that?")), @@ -4219,7 +4219,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ WAIT(10), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, ALERT_CUE(6), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, if it isn't {NAME_5}!\nLong time no see!")), VARIANT_DEFAULT(_(" Oh, {NAME_5}?\nHow have you been?")), @@ -4227,7 +4227,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ WAIT(10), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" Please!{WAIT_PRESS}\nPlease help my friend!")), TEXTBOX_CLEAR, WAIT(10), @@ -4263,7 +4263,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ AWAIT_CUE(5), ALERT_CUE(10), WAIT(16), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Have no fear!\nWe're here to save your chum Metapod.")), TEXTBOX_CLEAR, WAIT(10), @@ -4298,7 +4298,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ MSG_NPC(2, _(" How about you give the\nreward to the team that brings back your\nchum first?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" But I...{WAIT_PRESS}\nI don't have any money...")), TEXTBOX_CLEAR, WAIT(30), @@ -4614,13 +4614,13 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ WAIT(30), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000042), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000042), MSG_NPC(2, _(" This is great!\nWelcome back, {NAME_3}!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Thank you, {NAME_2}!")), TEXTBOX_CLEAR, WAIT(16), @@ -4641,7 +4641,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ WAIT(30), ALERT_CUE(6), ALERT_CUE(7), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" It's OK, OK!\nWe don't need a reward.")), VARIANT_DEFAULT(_(" Oh, no, no.\nWe don't need a reward.")), @@ -4930,7 +4930,7 @@ static const struct ScriptCommand s_gs9_g35_s0_lives0_dlg0[] = { /* 0x81b2540 */ CALL_SCRIPT(LOOK_AROUND_FUNC), SELECT_ENTITIES(-1, 1), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, morning!\nLet's keep up our good work today!")), VARIANT_DEFAULT(_(" {NAME_0}, good morning!\nLet's do good again today!")), @@ -4949,10 +4949,10 @@ static const struct ScriptCommand s_gs9_g35_s0_lives0_dlg0[] = { /* 0x81b2540 */ SELECT_ENTITIES(-1, 2), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), MSG_NPC(2, _(" Umm... Is rescue team\n{COLOR CYAN}{TEAM_NAME}{RESET} here?")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" That's right...{WAIT_PRESS} Huh?{WAIT_PRESS}\nWait, aren't you...")), TEXTBOX_CLEAR, ALERT_CUE(3), @@ -5022,7 +5022,7 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ FANFARE_PLAY2(465), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I remember now!{WAIT_PRESS}\nYou're the {NAME_2} in Pokémon\nSquare.")), VARIANT(/* == */ 1, _(" We saw {NAME_3}'s\nteam accepting your rescue job.")), @@ -5032,7 +5032,7 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ VARIANT_DEFAULT(_(" We watched {NAME_3}\nagreeing to take on your rescue job.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000041), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000041), MSG_NPC(2, _(" Yes.{WAIT_PRESS}\nBut, {NAME_3}...")), MSG_NPC(2, _(" He hasn't come back yet\nfrom the rescue mission.")), TEXTBOX_CLEAR, @@ -5212,7 +5212,7 @@ static const struct ScriptCommand s_gs9_g38_s0_lives0_dlg0[] = { /* 0x81b3acc */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning!{WAIT_PRESS}\nLet's try to get things right today!")), VARIANT_DEFAULT(_(" Good morning!{WAIT_PRESS}\nLet's do our best like always!")), @@ -5270,17 +5270,17 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ WAIT(30), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Yay! Saved!\nI'm so happy!")), TEXTBOX_CLEAR, WAIT(45), ALERT_CUE(8), ALERT_CUE(7), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000041), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000041), MSG_NPC(3, _(" But even though I'm safe,\nShiftry is in trouble...")), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Tell us.\nWhat went down, exactly?")), VARIANT_DEFAULT(_(" Please tell us.\nExactly what happened?")), @@ -5294,7 +5294,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ MSG_NPC(3, _(" And that was when that\nmonster appeared in the sky.")), TEXTBOX_CLEAR, WAIT(20), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That monster...{WAIT_PRESS}\nIt said it was Zapdos or something.")), VARIANT_DEFAULT(_(" That monster...{WAIT_PRESS}\nIt said it was Zapdos...")), @@ -5313,7 +5313,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ FANFARE_PLAY2(466), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0001, 0x0000000c), MSG_NPC(1, _(" {NAME_4}!")), TEXTBOX_CLEAR, ALERT_CUE(4), @@ -5325,11 +5325,11 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), - PORTRAIT(PLACEMENT_TOP_FLIP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_CENTERRIGHT_TOP_FLIP, 0x0004, 0x00000000), 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...")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_NPC(1, _(" So Shiftry woke it up?")), TEXTBOX_CLEAR, WAIT(10), @@ -5344,18 +5344,18 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ WAIT(10), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" But Zapdos won't be easy.{WAIT_PRESS}\nIts electric attacks are wicked nasty.")), TEXTBOX_CLEAR, ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0004, 0x00000000), MSG_NPC(4, _(" I know that.{WAIT_PRESS}\nWe will need to be cautious.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We'll go too!\nWe'll go help Shiftry!")), VARIANT(/* == */ 3, _(" We'll go too!\nWe'll go help Shiftry!")), @@ -5365,7 +5365,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ ALERT_CUE(10), ALERT_CUE(11), WAIT(20), - PORTRAIT(PLACEMENT_TOP_FLIP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_CENTERRIGHT_TOP_FLIP, 0x0004, 0x00000000), 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.")), TEXTBOX_CLEAR, @@ -5393,7 +5393,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ WAIT(30), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0006, 0x00000000), 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!")), @@ -5404,7 +5404,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ WAIT(30), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0005, 0x00000000), 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!")), @@ -5461,7 +5461,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ ALERT_CUE(7), ALERT_CUE(8), WAIT(120), - PORTRAIT(PLACEMENT_TOP_FLIP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_CENTERRIGHT_TOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" ......")), MSG_NPC(4, _(" Fine.{WAIT_PRESS}\nI see that you have courage.")), TEXTBOX_CLEAR, @@ -5472,7 +5472,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ MSG_NPC(1, _(" Yes!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_FLIP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_CENTERRIGHT_TOP_FLIP, 0x0004, 0x00000000), 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.")), @@ -5702,7 +5702,7 @@ static const struct ScriptCommand s_gs9_g40_s0_lives0_dlg0[] = { /* 0x81b603c */ { 0x2d, 0x09, 0x0002, 0x00000055, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nGet a good night's sleep?")), VARIANT_DEFAULT(_(" Good morning, {NAME_0}!\nDid you sleep well?")), @@ -5767,7 +5767,7 @@ static const struct ScriptCommand s_gs9_g42_s0_lives0_dlg0[] = { /* 0x81b6630 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning!{WAIT_PRESS}\nLet's keep giving it our best!")), VARIANT_DEFAULT(_(" Good morning!{WAIT_PRESS}\nLet's do our best like always!")), @@ -5840,14 +5840,14 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ ALERT_CUE(6), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" Huh? What's up with you?")), VARIANT_DEFAULT(_(" Huh? What's the matter?")), CHOICE(/* label */ 1, _("Listen, {NAME_1}.")), CHOICE(/* label */ 2, _("It's OK, it's nothing.")), LABEL(1), /* = 0x01 */ - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Huh?")), VARIANT_DEFAULT(_(" Huh?")), @@ -5862,7 +5862,7 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ VARIANT_DEFAULT(_(" Huh?")), VARIANT_DEFAULT(_(" Weren't you about to ask\nme something?")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" So what's the matter?\nGet it off your chest.")), VARIANT(/* == */ 3, _(" What's wrong?\nDon't you want to talk about it?")), @@ -5870,21 +5870,21 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ CHOICE(/* label */ 4, _("Why do you try so hard?")), CHOICE(/* label */ 4, _("Why are you so happy?")), LABEL(3), /* = 0x03 */ - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" What's that?")), VARIANT_DEFAULT(_(" Huh?")), CHOICE(/* label */ 4, _("Why do you try so hard?")), CHOICE(/* label */ 4, _("Why are you so happy?")), LABEL(4), /* = 0x04 */ - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 3, _(" Why...?{WAIT_PRESS}\nYou need to ask me that?")), VARIANT_DEFAULT(_(" Why...?{WAIT_PRESS}\nWhat, you need to ask?")), CHOICE(/* label */ 6, _("It's not for you...")), CHOICE(/* label */ 7, _("It's for someone else...")), LABEL(6), /* = 0x06 */ - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Well, sure.")), VARIANT(/* == */ 1, _(" It lets me try harder to do\nmy best because it's not about me.")), @@ -5896,7 +5896,7 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ VARIANT_DEFAULT(_(" It lets me try harder to do\nmy best because it's not about me.")), VARIANT_DEFAULT(_(" We're friends, aren't we,\n{NAME_0}?")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I want to do my best\nbecause it's for you, {NAME_0}.")), VARIANT(/* == */ 3, _(" I want to do my best\nbecause it's for you, {NAME_0}.")), @@ -5904,7 +5904,7 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ TEXTBOX_CLEAR, JUMP_LABEL(8), LABEL(7), /* = 0x07 */ - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" For someone else?\nNow that's cold.")), VARIANT(/* == */ 1, _(" You and me--we're friends,\nright, {NAME_0}?")), @@ -5913,7 +5913,7 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ VARIANT_DEFAULT(_(" Someone else?\nCome on, what do you think I am?")), VARIANT_DEFAULT(_(" We're friends, aren't we,\n{NAME_0}?")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I want to do my best\nbecause it's for you, {NAME_0}.")), VARIANT(/* == */ 3, _(" I want to do my best\nbecause it's for you, {NAME_0}.")), @@ -6041,7 +6041,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ VARIANT_DEFAULT(_(" Good morning, {NAME_0}!")), VARIANT_DEFAULT(_(" Let's keep on doing good...{WAIT_PRESS}\nActually, I want to ask you something.")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" Remember what\n{NAME_3} said yesterday?{WAIT_PRESS}\nDoes it bother you?")), VARIANT_DEFAULT(_(" What do you think about\nwhat {NAME_3} said yesterday?{WAIT_PRESS}\nDoes it bother you?")), @@ -6052,7 +6052,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Yeah, I guess so.\nIt would bother you too, {NAME_0}.")), VARIANT(/* == */ 1, _(" He said that there is a link\nbetween the world's balance being upset\nand how you became a Pokémon...")), @@ -6069,7 +6069,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah?!\nIt doesn't have anything to do with you?!")), VARIANT(/* == */ 1, _(" {NAME_0}!\nThat's not funny!")), @@ -6082,7 +6082,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh!\n...I get it.")), VARIANT(/* == */ 1, _(" On second thought, you must\nbe more worried than I am,\n{NAME_0}...")), @@ -6098,14 +6098,14 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ VARIANT_DEFAULT(_(" I'm sorry, {NAME_0}.\nI should have realized...")), TEXTBOX_CLEAR, WAIT(60), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_3} said the world\nwill be destroyed if nothing's done...")), VARIANT_DEFAULT(_(" {NAME_3} said that the\nworld will be ruined if nothing is done...")), TEXTBOX_CLEAR, JUMP_LABEL(2), LABEL(2), /* = 0x02 */ - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I want to do something...{WAIT_PRESS}\nBut I don't really get it...")), VARIANT(/* == */ 1, _(" Tell me.\nThe world's balance...{WAIT_PRESS}\nWhat is that?")), @@ -6122,7 +6122,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, really?!{WAIT_PRESS}\n{NAME_0}, you know?!")), VARIANT_DEFAULT(_(" Oh, really?!{WAIT_PRESS}\n{NAME_0}, you know?!")), @@ -6143,7 +6143,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ ALERT_CUE(6), MSG_NPC(1, _(" In space...?{WAIT_PRESS}\nLike where the stars and the moon are?\nThat space?")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmm...\nI'm getting even more confused here...")), VARIANT_DEFAULT(_(" Hmm...\nI'm getting even more confused...")), @@ -6159,13 +6159,13 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah?!{WAIT_PRESS}\nGo out to space?!")), VARIANT_DEFAULT(_(" Huh?!{WAIT_PRESS}\nGo out to space?!")), TEXTBOX_CLEAR, CLEAR_ARRAY(EVENT_LOCAL), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" How are we supposed to do\nthat?!")), VARIANT_DEFAULT(_(" And how do we go out to\nspace?!")), @@ -6175,7 +6175,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah?!\nNo way! I can't fly!")), VARIANT(/* == */ 3, _(" Huh?!\nHow am I supposed to fly?!")), @@ -6194,7 +6194,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ ALERT_CUE(6), AWAIT_CUE(5), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey! {NAME_2}!")), VARIANT(/* == */ 1, _(" You came at the right time!{WAIT_PRESS}\nWe want you to carry us out to space...")), @@ -6213,7 +6213,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ ALERT_CUE(6), AWAIT_CUE(5), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000003), ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" ........................")), CHOICE(/* label */ 10, _("It appears to be impossible...")), CHOICE(/* label */ 10, _("It's impossible, after all...")), @@ -6224,7 +6224,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ AWAIT_CUE(5), WAIT(60), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What is it with you?!\nGoofing around like that!")), VARIANT(/* == */ 1, _(" Think a little more before\nyou say anything!")), @@ -6233,7 +6233,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ TEXTBOX_CLEAR, WAIT(60), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" So, you don't know anything\nat all, {NAME_0}...")), VARIANT_DEFAULT(_(" So, you don't know either,\n{NAME_0}...")), @@ -6247,7 +6247,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ WAIT(100), SELECT_ANIMATION(2), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What do you mean, guts?!")), VARIANT(/* == */ 1, _(" If that's all it took, we\nwouldn't be talking about it!")), @@ -6256,7 +6256,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ TEXTBOX_CLEAR, WAIT(60), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" So, you don't know anything\nat all, {NAME_0}...")), VARIANT_DEFAULT(_(" So, you don't know either,\n{NAME_0}...")), @@ -6267,7 +6267,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What?!\nThat's really lame!")), VARIANT(/* == */ 1, _(" Cut it out!")), @@ -6276,7 +6276,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ TEXTBOX_CLEAR, WAIT(60), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...But, yeah, I guess it's\nimpossible to tell what it is...")), VARIANT_DEFAULT(_(" ...But I guess it isn't\npossible to know what it is...")), @@ -6286,20 +6286,20 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...OK.{WAIT_PRESS}\nYeah, I guess so.\nIt'd be impossible to know.")), VARIANT_DEFAULT(_(" ...OK.{WAIT_PRESS}\nI guess so. You wouldn't know.")), TEXTBOX_CLEAR, LABEL(11), /* = 0x0b */ - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I don't have a clue what\nthe world's balance is about...")), VARIANT(/* == */ 1, _(" Honest, I don't know what\nto do...")), VARIANT_DEFAULT(_(" I can't imagine what the\nworld's balance is about...")), VARIANT_DEFAULT(_(" To be honest, I don't know\nwhat we should do...")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I guess we'll just have to\ndo what we can.")), VARIANT(/* == */ 1, _(" One thing at a time...")), @@ -6455,7 +6455,7 @@ static const struct ScriptCommand s_gs9_g46_s0_lives0_dlg0[] = { /* 0x81ba664 */ { 0x2d, 0x09, 0x0002, 0x00000061, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I'm sorry.\nSorry for wanting to go home before\ngetting the job done.")), VARIANT(/* == */ 1, _(" But I just can't get into it.")), @@ -6478,7 +6478,7 @@ static const struct ScriptCommand s_gs9_g46_s0_lives0_dlg0[] = { /* 0x81ba664 */ WAIT(45), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0001, 0x00000007), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0001, 0x00000007), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nSorry!")), VARIANT(/* == */ 3, _(" {NAME_0}!\nSorry!")), @@ -6572,15 +6572,15 @@ static const struct ScriptCommand s_gs9_g47_s0_lives0_dlg0[] = { /* 0x81bb154 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000009), MSG_NPC(1, _(" Morning, {NAME_0}!")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...Huh?{WAIT_PRESS}\nYou look pale.\nWhat's up with you?")), VARIANT_DEFAULT(_(" ...Oh?{WAIT_PRESS}\nYou look pale.\nIs something the matter?")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Well, anyway.\nLet's give it our best like always!")), VARIANT_DEFAULT(_(" Well, anyway.\nAs always, let's try to do our best!")), @@ -6588,7 +6588,7 @@ static const struct ScriptCommand s_gs9_g47_s0_lives0_dlg0[] = { /* 0x81bb154 */ FANFARE_PLAY2(465), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_NPC(1, _(" Oh, yeah!")), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" When I was on the way\nhere, I think there was a commotion at\nPokémon Square.")), @@ -6657,7 +6657,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ WALK_RELATIVE(768, -160, 0), AWAIT_CUE(5), BGM_FADEOUT(150), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Gasp, gasp...{WAIT_PRESS}\nWow, that was a real shock!")), SELECT_ANIMATION(2), CMD_UNK_93(5, DIR_TRANS_SPINLEFT1, 34), @@ -6666,7 +6666,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But, hey, {NAME_0}.")), VARIANT_DEFAULT(_(" But listen, {NAME_0}.")), @@ -6775,7 +6775,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ WAIT(90), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Oh!")), TEXTBOX_CLEAR, ALERT_CUE(4), @@ -6783,7 +6783,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ CMD_UNK_E5(6, 0), CMD_UNK_E5(7, 0), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), 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.")), @@ -6810,7 +6810,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ ALERT_CUE(6), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x0000000c), MSG_NPC(1, _(" (W-we're fighting here...?)")), TEXTBOX_CLEAR, CMD_UNK_E5(6, 0), @@ -6873,7 +6873,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ ALERT_CUE(4), WAIT(60), CMD_UNK_93(10, DIR_TRANS_10, 34), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}...")), VARIANT(/* == */ 1, _(" In their own way,\n{NAME_2}'s team believes in you too.")), @@ -6902,7 +6902,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ SELECT_ENTITIES(-1, 2), WAIT(1), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" {NAME_0}.")), TEXTBOX_CLEAR, WAIT(4), @@ -6911,7 +6911,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ CALL_SCRIPT(NOTICE_FUNC), CMD_UNK_93(10, DIR_TRANS_10, 54), WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x00000005), MSG_NPC(1, _(" {NAME_5}...")), TEXTBOX_CLEAR, WAIT(4), @@ -6928,7 +6928,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ ALERT_CUE(10), WAIT(30), ALERT_CUE(6), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" So, what do you say,\n{NAME_0}?")), CHOICE(/* label */ 18, _("OK! I won't give up!")), CHOICE(/* label */ 18, _("I'm over it! No giving up!")), @@ -7214,7 +7214,7 @@ static const struct ScriptCommand s_gs9_g49_s0_lives0_dlg0[] = { /* 0x81bea68 */ CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nIt's early, but I guessed you would be up!")), VARIANT_DEFAULT(_(" Morning, {NAME_0}!{WAIT_PRESS}\nIt's early, but of course you'd be up by\nnow!")), @@ -7274,14 +7274,14 @@ static const struct ScriptCommand s_gs9_g50_s0_lives0_dlg2[] = { /* 0x81beef8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" Hey!\nYou all ready to go?")), VARIANT_DEFAULT(_(" Oh!\nAre you ready to go?")), CHOICE(/* label */ 1, _("All set!")), CHOICE(/* label */ 2, _("*Not yet.")), LABEL(2), /* = 0x02 */ - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" All right. I'll wait while\nyou get ready.")), VARIANT(/* == */ 1, _(" Tell me when you're set.{WAIT_PRESS}\nWe'll roll out then.")), @@ -7322,7 +7322,7 @@ static const struct ScriptCommand s_gs9_g50_s2_lives0_dlg0[] = { /* 0x81bf188 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, CMD_UNK_93(4, DIR_TRANS_10, 34), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Are you going to the\nsquare?")), VARIANT(/* == */ 1, _(" Be careful if you are.\nThere are other Pokémon in the square.")), @@ -7386,7 +7386,7 @@ static const struct ScriptCommand s_gs9_g50_s3_lives0_dlg0[] = { /* 0x81bf648 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), WAIT(1), - PORTRAIT(PLACEMENT_TOP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0001, 0x00000000), MSG_NPC(1, _(" Huh?\nAre you ready to leave?")), TEXTBOX_CLEAR, ALERT_CUE(3), @@ -7421,7 +7421,7 @@ static const struct ScriptCommand s_gs9_g51_s0_lives0_dlg0[] = { /* 0x81bf7d4 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(4), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Yep!\nLooks like we're all set.")), VARIANT(/* == */ 1, _(" From now on, we're\nfugitives.")), @@ -7451,7 +7451,7 @@ static const struct ScriptCommand s_gs9_g51_s0_lives0_dlg0[] = { /* 0x81bf7d4 */ TEXTBOX_CLEAR, WAIT(30), BGM_SWITCH(MUS_THE_ESCAPE), - PORTRAIT(PLACEMENT_RIGHT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0000, 0x00000000), MSG_QUIET(0, _("(...Yes. We have to escape.)")), MSG_QUIET(0, _("(Like {NAME_2} said that time...)")), TEXTBOX_CLEAR, @@ -7490,7 +7490,7 @@ static const struct ScriptCommand s_gs9_g52_s0_lives0_dlg0[] = { /* 0x81bff70 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), 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.")), @@ -7570,13 +7570,13 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0000, 0x00000000), MSG_QUIET(0, _("(Yes...\nWho am I?)")), MSG_QUIET(0, _("(Until I discover that truth, I have to\nrun and survive.)")), MSG_QUIET(0, _("(Even if it means going to the edge\nof this world...)")), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" OK!\nLet's roll out!")), VARIANT_DEFAULT(_(" OK!\nLet's get going!")), @@ -7601,7 +7601,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ WAIT(15), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000b), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x0000000b), MSG_NPC(1, _(" Caterpie! And Metapod too!")), MSG_NPC(1, _(" Oh, and even Jumpluff!")), TEXTBOX_CLEAR, @@ -7613,13 +7613,13 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ AWAIT_CUE(5), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Wow, I'm glad!\nWe made it!")), TEXTBOX_CLEAR, WAIT(15), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0006, 0x00000000), MSG_NPC(6, _(" We wanted to see you off,\n{NAME_0}.")), TEXTBOX_CLEAR, WAIT(15), @@ -7646,7 +7646,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(30), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Good morning.\nIt's me, Diglett.")), TEXTBOX_CLEAR, ALERT_CUE(9), @@ -7696,7 +7696,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ MSG_LETTER(_(" I'll always be waiting.")), MSG_LETTER(_(" - The wandering postal carrier,\n Pelipper -”")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x0000000b), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x0000000b), MSG_NPC(1, _(" Even Pelipper...")), TEXTBOX_CLEAR, PORTRAIT_REP(0x0001, 0x00000008), @@ -7711,13 +7711,13 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x00000000), MSG_NPC(1, _(" Yup.")), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" {NAME_0}!\nLet's go! Hit the road!")), TEXTBOX_CLEAR, WAIT(30), @@ -7735,7 +7735,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ AWAIT_CUE(5), WAIT(30), TEXTBOX_AUTO_PRESS(-1, -1), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" OK! Thanks!")), VARIANT(/* == */ 1, _(" We'll be back!\nCount on it!")), @@ -7861,7 +7861,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives2_dlg0[] = { /* 0x81c1678 */ ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), WAIT(20), TEXTBOX_AUTO_PRESS(60, 60), - PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Take care!")), TEXTBOX_CLEAR2, TEXTBOX_AUTO_PRESS(-1, -1), @@ -7978,7 +7978,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives5_dlg0[] = { /* 0x81c1d74 */ ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), WAIT(110), TEXTBOX_AUTO_PRESS(80, 80), - PORTRAIT(PLACEMENT_TOP, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0006, 0x00000000), MSG_NPC(6, _(" We'll be waiting for both\nof you to return!")), TEXTBOX_CLEAR2, TEXTBOX_AUTO_PRESS(-1, -1), @@ -8065,7 +8065,7 @@ static const struct ScriptCommand s_gs9_g55_s0_lives0_dlg0[] = { /* 0x81c23c0 */ CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}.\nGet a good night's sleep?")), VARIANT_DEFAULT(_(" Good morning, {NAME_0}.\nDid you sleep well?")), @@ -8195,7 +8195,7 @@ static const struct ScriptCommand s_gs9_g57_s0_lives0_dlg0[] = { /* 0x81c2c50 */ { 0x2d, 0x09, 0x0002, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_NPC(1, _(" Good morning, {NAME_0}!")), TEXTBOX_CLEAR, FANFARE_PLAY2(468), @@ -8295,7 +8295,7 @@ static const struct ScriptCommand s_gs9_g58_s0_lives0_dlg0[] = { /* 0x81c37c8 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, already awake,\n{NAME_0}?")), VARIANT(/* == */ 1, _(" There was another\nearthquake earlier, right?")), @@ -8322,14 +8322,14 @@ static const struct ScriptCommand s_gs9_g58_s0_lives0_dlg0[] = { /* 0x81c37c8 */ ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_2}.{WAIT_PRESS}\nWhat's up?")), VARIANT_DEFAULT(_(" Oh, {NAME_2}.{WAIT_PRESS}\nWhat's the matter?")), TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" We need you at the square!\nEveryone's gathering there.")), TEXTBOX_CLEAR, FANFARE_PLAY2(469), @@ -8583,7 +8583,7 @@ static const struct ScriptCommand s_gs9_g61_s1_lives0_dlg0[] = { /* 0x81c4db4 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), WAIT(1), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" Huh?\nAre you ready to leave?")), TEXTBOX_CLEAR, ALERT_CUE(3), @@ -8641,7 +8641,7 @@ static const struct ScriptCommand s_gs9_g62_s0_lives0_dlg0[] = { /* 0x81c5060 */ { 0x2d, 0x09, 0x0003, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nGet a good night's sleep?")), VARIANT_DEFAULT(_(" Good morning, {NAME_0}!\nDid you sleep well?")), @@ -8657,7 +8657,7 @@ static const struct ScriptCommand s_gs9_g62_s0_lives0_dlg0[] = { /* 0x81c5060 */ WAIT(10), { 0x89, 0x40, 0x0100, 0x00000000, 0x00000000, NULL }, WAIT(45), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0000, 0x00000000), MSG_QUIET(0, _("(Gardevoir said...)")), MSG_QUIET(0, _("(She will tell me everything when this\nadventure is over...)")), MSG_QUIET(0, _("(Is going underground the adventure\nshe meant...?)")), @@ -8727,7 +8727,7 @@ static const struct ScriptCommand s_gs9_g63_s0_lives0_dlg0[] = { /* 0x81c56b4 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nWe didn't do well, did we?")), VARIANT_DEFAULT(_(" ............{WAIT_PRESS}\nWe didn't do very well, did we?")), @@ -8779,7 +8779,7 @@ static const struct ScriptCommand s_gs9_g64_s1_lives0_dlg0[] = { /* 0x81c5b3c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), MSG_QUIET(0, _("Whoops.\nI'd better get packed to leave.")), TEXTBOX_CLEAR, ALERT_CUE(3), @@ -9448,14 +9448,14 @@ static const struct ScriptCommand s_gs9_g69_s0_lives0_dlg0[] = { /* 0x81c817c */ ALERT_CUE(8), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" Oh, hi, {NAME_2} and\n{NAME_3}.{WAIT_PRESS}\nWhat's the matter?")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), MSG_NPC(2, _(" It's Snubbull!{WAIT_PRESS}\nThere's something weird going on!")), TEXTBOX_CLEAR, WAIT(10), @@ -9463,7 +9463,7 @@ static const struct ScriptCommand s_gs9_g69_s0_lives0_dlg0[] = { /* 0x81c817c */ MSG_NPC(1, _(" Snubbull is weird...?{WAIT_PRESS}\nWeird, how?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" He looks completely\ndifferent...")), TEXTBOX_CLEAR, WAIT(10), @@ -9796,10 +9796,10 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), MSG_NPC(-1, _(" Uh...{WAIT_PRESS} Um...")), TEXTBOX_CLEAR, FANFARE_PLAY2(465), @@ -9824,7 +9824,7 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(5), { 0x2d, 0x03, 0x0003, 0x0000006e, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000041), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000041), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, { 0x2d, 0x09, 0x0003, 0x0000006e, 0x00000000, NULL }, @@ -9834,7 +9834,7 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ AWAIT_CUE(5), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" We have a notice on the\nBulletin Board outside the Pelipper Post\nOffice.")), TEXTBOX_CLEAR, WAIT(10), @@ -9842,7 +9842,7 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000041), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000041), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, ALERT_CUE(8), @@ -10044,13 +10044,13 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), PORTRAIT_POS(2, 2, 0), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0003, 0x00000000), PORTRAIT_POS(3, -2, 0), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), PORTRAIT_REP(0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Just like we promised,\nwe punished that gang of {NAME_4}.")), @@ -10138,7 +10138,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ BGM_FADEOUT(90), AWAIT_CUE(5), WAIT(15), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x0000000c), PORTRAIT_POS(1, 2, 0), MSG_NPC(1, _(" Aww, no, the {NAME_4}\ngang!")), TEXTBOX_CLEAR, @@ -10162,7 +10162,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ AWAIT_CUE(5), ALERT_CUE(7), ALERT_CUE(8), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" That's right, you!")), ALERT_CUE(9), ALERT_CUE(6), @@ -10172,13 +10172,13 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ WAIT(10), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" We're not gonna lose this\ntime!\nWe'll pulverize you!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" Mukkeeeeh!\nCrush them!")), TEXTBOX_CLEAR, ALERT_CUE(9), @@ -10192,7 +10192,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ BGM_STOP, AWAIT_CUE(5), MSG_NPC(4, _(" Whoa!\nL-look at that!")), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(11), @@ -10202,14 +10202,14 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ WAIT(10), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" It is!\nIt's a peeled Chestnut!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), WAIT(1), SELECT_ANIMATION(2), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), PORTRAIT_POS(1, -1, -4), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wh-what?")), @@ -10221,7 +10221,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ ALERT_CUE(11), AWAIT_CUE(5), MSG_NPC(4, _(" Whisper, whisper...")), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(4, _(" Mutter, mutter...")), @@ -10252,16 +10252,16 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(5), WAIT(20), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), 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?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" We, uh...{WAIT_PRESS}\nLove peeled Chestnuts!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" Like, we love them so much,\nwe can't think of a life without Chestnuts!")), TEXTBOX_CLEAR, WAIT(10), @@ -10296,13 +10296,13 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ WAIT(10), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Who do you think you are?!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" Mukkeeeeeh!\nGet them!")), TEXTBOX_CLEAR, CMD_UNK_E5(6, 0), @@ -10367,18 +10367,18 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ MSG_NPC(4, _(" ...Maybe we can't do this...")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" You have to understand.\nWe love peeled Chestnuts.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" Please?\nWe'll do anything you want if you'll just\ngive us your peeled Chestnut...")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), PORTRAIT_POS(1, -1, -4), 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.")), @@ -10392,14 +10392,14 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ SET_DIR_WAIT(DIRECTION_SOUTH, 1), SELECT_ENTITIES(-1, 2), WAIT(2), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), PORTRAIT_POS(1, -1, -4), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), PORTRAIT_POS(2, 2, 0), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0003, 0x00000000), PORTRAIT_POS(3, -2, 0), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), WAIT(30), ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x0000000b), @@ -10411,11 +10411,11 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ MSG_NPC(4, _(" Physical labor?\nYou mean muscle work?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" We have muscles...{WAIT_PRESS}\nBut we don't like work.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" But if it's for that\npeeled Chestnut...")), TEXTBOX_CLEAR, WAIT(10), @@ -10448,14 +10448,14 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ MSG_NPC(4, _(" Whisper, whisper...")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Mutter, mutter...")), TEXTBOX_CLEAR, ALERT_CUE(9), ALERT_CUE(10), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" OK.\nWe'll help!")), TEXTBOX_CLEAR, WAIT(10), @@ -10468,17 +10468,17 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ MSG_NPC(4, _(" Yeah.\nLeave it to us!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" We'll carry in the materials\nand get the place built. Double-quick!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" ...In return...{WAIT_PRESS}\nHand over that peeled Chestnut.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(12), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0007, 0x00000041), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0007, 0x00000041), MSG_NPC(7, _(" Me too!\nI'll help too!")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -10520,7 +10520,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000b), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000b), MSG_NPC(1, _(" Sniff...\nThanks, everyone!")), TEXTBOX_CLEAR, WAIT(30), @@ -10529,13 +10529,13 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ ALERT_CUE(10), ALERT_CUE(12), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" OK!")), TEXTBOX_CLEAR, ALERT_CUE(11), AWAIT_CUE(5), WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" OK!")), TEXTBOX_CLEAR, ALERT_CUE(9), @@ -11073,15 +11073,15 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ AWAIT_CUE(5), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0003, 0x00000000), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0007, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0007, 0x00000000), WAIT(10), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_NPC(1, _(" Whew...{WAIT_PRESS}\nOur base is coming along quickly.")), TEXTBOX_CLEAR, WAIT(10), @@ -11150,11 +11150,11 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ { 0x52, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, ALERT_CUE(4), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0007, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0007, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What's up with you guys?")), VARIANT_DEFAULT(_(" What's the matter?")), @@ -11168,7 +11168,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ ALERT_CUE(10), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0004, 0x00000000), PORTRAIT_POS(4, -2, 0), MSG_NPC(4, _(" Don't wanna.")), TEXTBOX_CLEAR, @@ -11187,11 +11187,11 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ MSG_NPC(4, _(" This work's too boring!{WAIT_PRESS}\nHow do you expect us to keep going?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0004, 0x00000000), MSG_NPC(4, _(" Yeah, that's right.\nI don't wanna do this anymore.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" We might change our minds\nif you get us more peeled Chestnuts.")), TEXTBOX_CLEAR, WAIT(30), @@ -11503,7 +11503,7 @@ static const struct ScriptCommand s_gs9_g77_s0_lives4_dlg2[] = { /* 0x81d2130 */ DEBUGINFO_O(11644), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000041), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000041), WAIT(1), ALERT_CUE(6), AWAIT_CUE(5), @@ -11558,25 +11558,25 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), JUMPIF_EQUAL(PARTNER1_KIND, 0, /* to label */ 1), CMD_UNK_E5(6, 0), LABEL(1), /* = 0x01 */ CMD_UNK_E5(7, 0), CMD_UNK_E5(8, 0), CMD_UNK_E5(9, 0), - PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Huh?\nDid you bring us a peeled Chestnut?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), PORTRAIT_POS(2, 1, 0), MSG_NPC(2, _(" Oh!\nA Chestnut!\nWe want a peeled Chestnut!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0002, 0x00000000), ASK3( TRUE, /*default*/ -1, /* speaker */ 2, _(" Come on, give it to us!\nWe'll work hard for it.")), CHOICE(/* label */ 3, _("Give.")), CHOICE(/* label */ 4, _("Don't give.")), @@ -11586,16 +11586,16 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ WAIT(2), AWAIT_CUE(5), WAIT(20), - PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" What?!\nYou won't give it up for us?!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), PORTRAIT_POS(2, 1, 0), MSG_NPC(2, _(" Who do you think you are?!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0002, 0x00000000), PORTRAIT_POS(2, -2, 0), MSG_NPC(2, _(" Mukkeeeeeh!\nGet them!")), TEXTBOX_CLEAR, @@ -11616,7 +11616,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ CMD_UNK_E5(9, 0), { 0x22, 0x00, 0x0028, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Ow, ow, ow...")), MSG_NPC(2, _(" ...W-we lost...")), TEXTBOX_CLEAR, @@ -11638,11 +11638,11 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ WAIT(30), SELECT_ENTITIES(-1, 3), WAIT(1), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000001), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0002, 0x00000001), MSG_NPC(2, _(" Yes!\nA peeled Chestnut!")), TEXTBOX_CLEAR, ALERT_CUE(7), @@ -11656,7 +11656,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ MSG_NPC(2, _(" All right, you layabouts!\nGet it together! Chop, chop!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), PORTRAIT_POS(2, 1, 0), MSG_NPC(2, _(" Why don't you quit lounging\naround yourself?!\nGet moving!")), TEXTBOX_CLEAR, @@ -11667,11 +11667,11 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ CMD_UNK_E5(7, 0), CMD_UNK_E5(8, 0), CMD_UNK_E5(9, 0), - PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" We'll get hustling on\nrenovating your rescue team base!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0002, 0x00000000), PORTRAIT_POS(2, -2, 0), MSG_NPC(2, _(" We'll carry in the materials\nand get the place built. Double-quick!{WAIT_PRESS}\nYou just wait!")), TEXTBOX_CLEAR, @@ -11924,12 +11924,12 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ AWAIT_CUE(5), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0007, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0007, 0x00000000), ALERT_CUE(6), AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000b), @@ -12006,7 +12006,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ ALERT_CUE(10), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0004, 0x00000000), PORTRAIT_POS(4, -3, 0), MSG_NPC(4, _(" Say, there.{WAIT_PRESS}\nThere's something I want to ask...")), TEXTBOX_CLEAR, @@ -12036,16 +12036,16 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ ALERT_CUE(11), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_TOP_FLIP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_CENTERRIGHT_TOP_FLIP, 0x0004, 0x00000000), PORTRAIT_POS(4, -3, 0), MSG_NPC(4, _(" ............")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0004, 0x00000000), MSG_NPC(4, _(" ........................")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" ....................................")), TEXTBOX_CLEAR, WAIT(10), @@ -12069,7 +12069,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(5), WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_NPC(1, _(" Wh-what?!")), TEXTBOX_CLEAR, BGM_SWITCH(MUS_THERES_TROUBLE), @@ -12402,13 +12402,13 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Thank you so much.\nYou saved me from great peril.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's cool, {NAME_2}.{WAIT_PRESS}\nBut why'd you run away?")), VARIANT(/* == */ 1, _(" Your letter said something\nabout not wanting to be a grown-up, but...")), @@ -12429,12 +12429,12 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ AWAIT_CUE(5), WAIT(15), ALERT_CUE(8), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0003, 0x00000000), MSG_NPC(3, _(" Look, there he is!")), TEXTBOX_CLEAR, WAIT(20), ALERT_CUE(9), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Yeah, I see him.\nWe've got to get him back quick!")), TEXTBOX_CLEAR, WAIT(20), @@ -12444,7 +12444,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), PORTRAIT_POS(1, -1, -4), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" More {NAME_2}?{WAIT_PRESS}\nTwo of them, even...")), @@ -12466,17 +12466,17 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), MSG_NPC(3, _(" Now, come with us.{WAIT_PRESS}\nThe grown-up ritual is ready for you.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Quit fighting this.\nHave the paw print applied without a fuss.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0002, 0x00000000), PORTRAIT_POS(2, 3, 0), MSG_NPC(2, _(" N-no!")), WAIT(20), @@ -12496,20 +12496,20 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ WAIT(10), ALERT_CUE(8), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), MSG_NPC(3, _(" It is a custom among us {POKEMON_2}.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), ALERT_CUE(9), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" When we reach a certain age, they\nmark our backs with paw prints to show\nwe are grown-ups.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), MSG_NPC(3, _(" They do that by taking the\nfront paw...{WAIT_PRESS}\nand pushing doooooowwnn on the back...")), TEXTBOX_CLEAR, WAIT(20), @@ -12555,13 +12555,13 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ ALERT_CUE(8), ALERT_CUE(7), WAIT(15), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), MSG_NPC(3, _(" Is... Is that so?\nThen there is nothing we can do.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(9), ALERT_CUE(7), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), 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.")), TEXTBOX_CLEAR, @@ -12591,7 +12591,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(7), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), MSG_NPC(2, _(" Yes!\nThank you!")), TEXTBOX_CLEAR, WAIT(10), @@ -12964,7 +12964,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" Hi, {NAME_2}, long time!{WAIT_PRESS}\nYou're here to visit us?")), TEXTBOX_CLEAR, WAIT(30), @@ -12985,7 +12985,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ ALERT_CUE(6), CMD_UNK_93(4, DIR_TRANS_10, 97), CALL_SCRIPT(SHOCK_FUNC), - PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Kwaaaaaah!")), TEXTBOX_CLEAR, CMD_UNK_E5(7, 0), @@ -13016,7 +13016,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ ALERT_CUE(7), CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Oh, hey!\nThere you are!")), MSG_NPC(3, _(" Didn't know you'd be here.\nYou had me looking, {NAME_2}.")), TEXTBOX_CLEAR, @@ -13049,7 +13049,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ MSG_NPC(2, _(" I shall call it...{WAIT_PRESS}\nThe {COLOR YELLOW_D}Meteor Cave{RESET}.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0001, 0x00000004), MSG_NPC(1, _(" {COLOR YELLOW_D}Meteor Cave{RESET}?")), TEXTBOX_CLEAR, WAIT(10), @@ -13060,7 +13060,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ WAIT(60), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Say, {NAME_3}.")), VARIANT_DEFAULT(_(" Um, {NAME_3}.")), @@ -13071,9 +13071,9 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ MSG_NPC(1, _(" Did you explore inside the\n{COLOR YELLOW_D}Meteor Cave{RESET}?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Uh, yeah...{WAIT_PRESS}\nJust a little...")), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000003), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000003), 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...")), TEXTBOX_CLEAR, @@ -13101,7 +13101,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ ALERT_CUE(6), ALERT_CUE(7), CMD_UNK_93(4, DIR_TRANS_10, 97), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" {NAME_2}, do you have\nany idea what are in that place?")), TEXTBOX_CLEAR, WAIT(10), @@ -13124,7 +13124,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ ALERT_CUE(6), CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}.\nWe should go investigate.{WAIT_PRESS}\nThe {COLOR YELLOW_D}Meteor Cave{RESET}.")), VARIANT_DEFAULT(_(" {NAME_0}.\nWant to go investigate?{WAIT_PRESS}\nThe {COLOR YELLOW_D}Meteor Cave{RESET}.")), @@ -13321,7 +13321,7 @@ static const struct ScriptCommand s_gs9_g83_s0_lives0_dlg0[] = { /* 0x81da3bc */ WALK_RELATIVE(512, 0, 80), WAIT(60), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x0000000c), MSG_QUIET(0, _("...This sound...")), MSG_QUIET(0, _("...Something's coming closer?!")), TEXTBOX_CLEAR, @@ -13349,14 +13349,14 @@ static const struct ScriptCommand s_gs9_g83_s0_lives0_dlg0[] = { /* 0x81da3bc */ ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0000, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_FLIP, 0x0000, 0x00000004), MSG_QUIET(0, _("Wh-what was that...?{WAIT_PRESS}\nWhat just happened?")), MSG_QUIET(0, _("Something huge flew by at an incredible\nspeed...")), MSG_QUIET(0, _("It seemed to be going...\nToward the mountain range in the north?")), TEXTBOX_CLEAR, WAIT(30), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), MSG_QUIET(0, _("............{WAIT_PRESS}\nYawwwwwn...\nStill sleepy...")), MSG_QUIET(0, _("It's still early.\nI'll catch a little more sleep...")), TEXTBOX_CLEAR, @@ -13404,12 +13404,12 @@ static const struct ScriptCommand s_gs9_g84_s0_lives0_dlg0[] = { /* 0x81da9c8 */ ALERT_CUE(8), AWAIT_CUE(5), ALERT_CUE(7), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000002), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000002), PORTRAIT_POS(3, 2, 0), MSG_NPC(3, _(" {NAME_2}!{WAIT_PRESS}\nYou're safe! Yesssss!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000006), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000006), PORTRAIT_POS(2, -2, 0), MSG_NPC(2, _(" I'm so sorry, {NAME_3}.{WAIT_PRESS}\nThat dungeon--it was too much for me.")), TEXTBOX_CLEAR, @@ -13779,7 +13779,7 @@ static const struct ScriptCommand s_gs9_g88_s0_lives0_dlg0[] = { /* 0x81dc6c4 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), 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!")), @@ -13834,7 +13834,7 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), 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.")), @@ -13967,14 +13967,14 @@ static const struct ScriptCommand s_gs9_g91_s0_lives0_dlg0[] = { /* 0x81dd410 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0003, 0x00000000), 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.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000044), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000044), MSG_NPC(2, _(" ............{WAIT_PRESS}\nGood for you, {NAME_3}.")), TEXTBOX_CLEAR, WAIT(45), diff --git a/src/data/ground/ground_data_b01p02a_station.h b/src/data/ground/ground_data_b01p02a_station.h index feec82c66..eb2d6f28f 100644 --- a/src/data/ground/ground_data_b01p02a_station.h +++ b/src/data/ground/ground_data_b01p02a_station.h @@ -467,7 +467,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ AWAIT_CUE(5), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" It's {NAME_0}'s house.")), VARIANT(/* == */ 1, _(" It also happens to be our\nrescue team's base.")), @@ -489,7 +489,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ MSG_NPC(-1, _(" Th-thank you...")), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000009), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hahaha, don't worry about it.\nNo need for thanks.")), VARIANT(/* == */ 1, _(" But forget that...{WAIT_PRESS}\nWhat happened to you?")), @@ -499,7 +499,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ WAIT(10), ALERT_CUE(7), MSG_NPC(-1, _(" Y-yes...")), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), PORTRAIT_POS(2, -1, 0), { 0x2d, 0x03, 0x0002, 0x00000073, 0x00000000, NULL }, MSG_NPC(2, _(" I'm named Spinda.")), @@ -512,7 +512,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(6), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_NPC(1, _(" A mirage Pokémon?")), TEXTBOX_CLEAR, WAIT(10), @@ -537,7 +537,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hold up a second!{WAIT_PRESS}\nAre you sure you want to give up that\neasily?")), VARIANT_DEFAULT(_(" Wait a second!{WAIT_PRESS}\nAre you sure you won't regret giving up\nthat easily?")), @@ -569,7 +569,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ SELECT_EFFECTS(9, 1), WAIT(30), ALERT_CUE(6), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_NPC(1, _(" What is this?")), TEXTBOX_CLEAR, WAIT(10), @@ -613,7 +613,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ AWAIT_CUE(5), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, are you OK?{WAIT_PRESS}\nYou still look wobbly on your feet.")), VARIANT_DEFAULT(_(" Wait, are you OK?{WAIT_PRESS}\nYou're still unsteady on your feet.")), @@ -621,7 +621,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ WAIT(10), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), MSG_NPC(2, _(" Oh, no.\nWhen I walk, I always totter.{WAIT_PRESS}\nBye.")), TEXTBOX_CLEAR, WAIT(20), @@ -631,13 +631,13 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_NPC(1, _(" {COLOR GREEN}Clear Wing{RESET}, huh...{WAIT_PRESS}\nI don't have a clue what this is all about...")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But you are interested in\nthe mirage Pokémon, right?")), VARIANT(/* == */ 1, _(" For something like this,\nXatu'd be the one to ask.")), @@ -893,7 +893,7 @@ static const struct ScriptCommand s_gs12_g10_s0_lives0_dlg0[] = { /* 0x81e507c * CALL_SCRIPT(LOOK_AROUND_FUNC), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x0000000c), MSG_QUIET(0, _("Wha...{WAIT_PRESS} What is it?!")), MSG_QUIET(0, _("What...{WAIT_PRESS}\nWhat's happening outside?!")), TEXTBOX_CLEAR, @@ -1320,13 +1320,13 @@ static const struct ScriptCommand s_gs12_g15_s0_lives0_dlg0[] = { /* 0x81e7560 - { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), MSG_QUIET(0, _("...I'm still the same.")), MSG_QUIET(0, _("The way I look...\nI'm still {POKEMON_0}.")), MSG_QUIET(0, _("But why would I be transformed\ninto a Pokémon?")), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000004), MSG_QUIET(0, _("............{WAIT_PRESS}\nHmm... I don't understand this at all...")), MSG_QUIET(0, _("........................")), MSG_QUIET(0, _("............{WAIT_PRESS}\nI feel groggy and sleepy...")), @@ -1434,7 +1434,7 @@ static const struct ScriptCommand s_gs12_g17_s0_lives0_dlg0[] = { /* 0x81e7be8 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), MSG_QUIET(0, _("..................")), MSG_QUIET(0, _("Oof...{WAIT_PRESS}\nI'm feeling refreshed!")), MSG_QUIET(0, _("I still look like a Pokémon, but...")), @@ -2240,7 +2240,7 @@ static const struct ScriptCommand s_gs12_g37_s0_lives0_dlg0[] = { /* 0x81eab48 * WAIT(30), FANFARE_PLAY2(466), MSG_QUIET(0, _("{NAME_2} knows!{WAIT_PRESS}\nShe knows why I became a Pokémon.")), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000004), MSG_QUIET(0, _("She also said something about a role...{WAIT_PRESS}\nWhat did she mean by that?")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -2285,7 +2285,7 @@ static const struct ScriptCommand s_gs12_g38_s0_lives0_dlg0[] = { /* 0x81eaddc * { 0x97, 0x00, 0x0002, 0x00000001, 0x00000003, NULL }, WAIT(30), CALL_SCRIPT(SHOCK_FUNC), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x0000000c), MSG_QUIET(0, _("Oh, wow, another earthquake...")), TEXTBOX_CLEAR, WAIT(120), @@ -2335,7 +2335,7 @@ static const struct ScriptCommand s_gs12_g39_s0_lives0_dlg0[] = { /* 0x81eb100 * { 0x97, 0x00, 0x0002, 0x00000001, 0x00000003, NULL }, WAIT(30), CALL_SCRIPT(SHOCK_FUNC), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x0000000c), MSG_QUIET(0, _("Oh? Another earthquake...")), TEXTBOX_CLEAR, WAIT(120), @@ -2353,7 +2353,7 @@ static const struct ScriptCommand s_gs12_g39_s0_lives0_dlg0[] = { /* 0x81eb100 * AWAIT_CUE(5), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), 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!")), @@ -2475,7 +2475,7 @@ static const struct ScriptCommand s_gs12_g42_s0_lives0_dlg0[] = { /* 0x81eb95c * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), MSG_NPC(1, _(" How do you like Dream\nEater?{WAIT_PRESS}\nHorrible, isn't it? Keke!")), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000044), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000044), MSG_NPC(1, _(" But who would've thought\nyou were also human before...{WAIT_PRESS}\nDidn't expect that.")), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" But who cares?\nSomeone like that's sure to be some\nlowlife. Keke!")), diff --git a/src/data/ground/ground_data_d01p01_station.h b/src/data/ground/ground_data_d01p01_station.h index ebdb71269..7123ad279 100644 --- a/src/data/ground/ground_data_d01p01_station.h +++ b/src/data/ground/ground_data_d01p01_station.h @@ -77,8 +77,8 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), CALL_SCRIPT(WAKEUP_FUNC), ALERT_CUE(6), AWAIT_CUE(5), @@ -104,7 +104,7 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - VARIANT_DEFAULT(_(" You were passed out here.\nI'm glad to see you awake!")), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I'm {NAME_1}.\nGlad to meet you!")), VARIANT(/* == */ 3, _(" I'm {NAME_1}.\nHappy to meet you!")), @@ -217,7 +217,7 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - BGM_SWITCH(MUS_THERES_TROUBLE), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" It's horrible!\nMy {NAME_3} fell into a cavern!\nMy poor baby!")), TEXTBOX_CLEAR, WAIT(10), @@ -382,9 +382,9 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000036, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), ALERT_CUE(6), WAIT(1), CALL_SCRIPT(WAKEUP_FUNC), @@ -407,7 +407,7 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - AWAIT_CUE(5), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_NPC(1, _(" Wh-where...?")), TEXTBOX_CLEAR, WAIT(10), @@ -536,10 +536,10 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0003, 0x00000000), MSG_NPC(2, _(" My baby's safe...{WAIT_PRESS}\nI'm sorry, I don't know how I could ever\nthank you properly...")), TEXTBOX_CLEAR, WAIT(10), diff --git a/src/data/ground/ground_data_d01p02_station.h b/src/data/ground/ground_data_d01p02_station.h index 5d6f01330..216b505de 100644 --- a/src/data/ground/ground_data_d01p02_station.h +++ b/src/data/ground/ground_data_d01p02_station.h @@ -37,9 +37,9 @@ static const struct ScriptCommand s_gs179_g1_s0_lives0_dlg0[] = { /* 0x822fdd0 - { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), ALERT_CUE(7), AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000042), diff --git a/src/data/ground/ground_data_d02p01_station.h b/src/data/ground/ground_data_d02p01_station.h index f867caff3..f3f46c48a 100644 --- a/src/data/ground/ground_data_d02p01_station.h +++ b/src/data/ground/ground_data_d02p01_station.h @@ -57,7 +57,7 @@ static const struct ScriptCommand s_gs180_g1_s0_lives0_dlg0[] = { /* 0x823047c * ALERT_CUE(8), AWAIT_CUE(5), { 0x2d, 0x0a, 0x0000, 0x00000001, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), 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!")), @@ -172,7 +172,7 @@ static const struct ScriptCommand s_gs180_g2_s0_lives0_dlg0[] = { /* 0x8230ae4 * ALERT_CUE(7), ALERT_CUE(8), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" The {NAME_2} are in\nthere somewhere.")), ALERT_CUE(6), AWAIT_CUE(5), @@ -256,9 +256,9 @@ static const struct ScriptCommand s_gs180_g3_s0_lives0_dlg0[] = { /* 0x8231020 * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(90), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000001), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000001), - PORTRAIT(PLACEMENT_LEFT_, 0x0005, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000001), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0005, 0x00000001), ALERT_CUE(9), ALERT_CUE(6), ALERT_CUE(7), @@ -293,7 +293,7 @@ static const struct ScriptCommand s_gs180_g3_s0_lives0_dlg0[] = { /* 0x8231020 * ALERT_CUE(9), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" YOU ARE OUR HERO.\nTHANK YOU. BZBZBZZ!")), TEXTBOX_CLEAR, WAIT(30), diff --git a/src/data/ground/ground_data_d02p02_station.h b/src/data/ground/ground_data_d02p02_station.h index f37c9cbfc..2abc24060 100644 --- a/src/data/ground/ground_data_d02p02_station.h +++ b/src/data/ground/ground_data_d02p02_station.h @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs181_g1_s0_lives0_dlg0[] = { /* 0x8231d84 * ALERT_CUE(6), WALK_GRID(256, 0), WAIT(15), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, hey, there they are.\nLet's get them out.")), VARIANT_DEFAULT(_(" Oh, there they are!\nLet's get them out safely.")), diff --git a/src/data/ground/ground_data_d03p01_station.h b/src/data/ground/ground_data_d03p01_station.h index aa173e1e4..9cc9cc3d0 100644 --- a/src/data/ground/ground_data_d03p01_station.h +++ b/src/data/ground/ground_data_d03p01_station.h @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 * ALERT_CUE(6), WALK_RELATIVE(256, 0, -100), WAIT(15), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" So, this is it...\n{COLOR YELLOW_D}Mt. Steel{RESET}...")), VARIANT(/* == */ 1, _(" {NAME_3}'s been taken\nto the peak here...")), @@ -58,7 +58,7 @@ static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 * CALL_SCRIPT(SHOCK_FUNC), WAIT(60), { 0x2d, 0x0a, 0x0000, 0x00000002, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" The peak is {VALUE_0}F!\nThank you for helping! Farewell!")), TEXTBOX_CLEAR, ALERT_CUE(7), @@ -160,7 +160,7 @@ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 * ALERT_CUE(6), CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We'll take another shot at\n{COLOR YELLOW_D}Mt. Steel{RESET}.")), VARIANT(/* == */ 1, _(" We'll rescue {NAME_3}\nno matter what it takes!")), @@ -177,7 +177,7 @@ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 * CALL_SCRIPT(SHOCK_FUNC), WAIT(60), { 0x2d, 0x0a, 0x0000, 0x00000002, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" The peak is {VALUE_0}F!\nThank you for helping! Farewell!")), TEXTBOX_CLEAR, ALERT_CUE(7), diff --git a/src/data/ground/ground_data_d03p02_station.h b/src/data/ground/ground_data_d03p02_station.h index 43799a70b..875b7fdc8 100644 --- a/src/data/ground/ground_data_d03p02_station.h +++ b/src/data/ground/ground_data_d03p02_station.h @@ -51,7 +51,7 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Grr... I can't keep up!{WAIT_PRESS}\nI'll flee for now!")), TEXTBOX_CLEAR, ALERT_CUE(8), @@ -62,7 +62,7 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * WAIT(5), WALK_RELATIVE(256, 0, -24), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey!\nWe sent {NAME_3} packing!")), VARIANT(/* == */ 1, _(" You're safe now.\nCome on down!")), @@ -70,7 +70,7 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * VARIANT_DEFAULT(_(" It's OK now.\nCome down over here.")), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000041), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000041), MSG_NPC(2, _(" I can't...\nI'm too scared to move...")), TEXTBOX_CLEAR, WAIT(10), @@ -97,17 +97,17 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 1), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0004, 0x00000000), MSG_NPC(-1, _(" BZBZBZZ!")), ALERT_CUE(6), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey! It's those {NAME_4}\nfrom that rescue!")), VARIANT_DEFAULT(_(" Oh, hi!\nYou're the {NAME_4} we saved!")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0004, 0x00000000), PORTRAIT_POS(4, 2, 0), MSG_NPC(4, _(" WE GOT WORD OF THIS.{WAIT_PRESS}\nWE CAN RESCUE DIGLETT FROM THE\nSKY. BZBZBZZ!")), TEXTBOX_CLEAR, @@ -115,7 +115,7 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * ALERT_CUE(8), AWAIT_CUE(5), MSG_NPC(4, _(" HOLD ON TO US TIGHT.\nBZBZBZZZ!")), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0004, 0x00000000), PORTRAIT_POS(4, -2, 0), MSG_NPC(4, _(" DON'T BE SCARED.\nWE WON'T MAKE THE MISTAKE OF\nZAPPING YOU. BZBZBZZT!")), TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_d04p01_station.h b/src/data/ground/ground_data_d04p01_station.h index 1ca8608ee..e438cb306 100644 --- a/src/data/ground/ground_data_d04p01_station.h +++ b/src/data/ground/ground_data_d04p01_station.h @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs184_g1_s0_lives0_dlg0[] = { /* 0x82343f8 * ALERT_CUE(6), CMD_UNK_93(4, DIR_TRANS_10, 34), WAIT(20), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is it.\n{NAME_2} is lost in these woods.")), VARIANT(/* == */ 1, _(" {NAME_3}'s crew\nshould have a head start on us.")), @@ -94,7 +94,7 @@ static const struct ScriptCommand s_gs184_g2_s0_lives0_dlg0[] = { /* 0x8234830 * { 0x2d, 0x09, 0x0002, 0x0000005b, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's move it, {NAME_0}!")), VARIANT(/* == */ 1, _(" Even while we're dawdling\nhere, {NAME_2}'s team...")), diff --git a/src/data/ground/ground_data_d04p02_station.h b/src/data/ground/ground_data_d04p02_station.h index f9bb2d708..3ae413bd0 100644 --- a/src/data/ground/ground_data_d04p02_station.h +++ b/src/data/ground/ground_data_d04p02_station.h @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * WAIT(30), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000043), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0003, 0x00000043), MSG_NPC(3, _(" Owowowow...{WAIT_PRESS}\nYou'll pay for this!\nDon't you forget it!")), TEXTBOX_CLEAR, WAIT(16), @@ -58,7 +58,7 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * ALERT_CUE(11), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000009), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Well, those pests are gone.\nLet's find {NAME_2}.")), VARIANT_DEFAULT(_(" No one should hold us back\nnow. Let's find {NAME_2}.")), @@ -75,14 +75,14 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * CMD_UNK_93(4, DIR_TRANS_SPINLEFT1, 94), WAIT_FANFARE2(465), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_BOTTOM, 0x0002, 0x00000000), PORTRAIT_POS(2, 0, -3), MSG_NPC(2, _(" Did you maybe come looking\nfor me?")), TEXTBOX_CLEAR, WAIT(16), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" You must be {NAME_2}.")), MSG_NPC(1, _(" Let's get you home.\nCaterpie was worried about you.")), TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_d05p01_station.h b/src/data/ground/ground_data_d05p01_station.h index c1c5593ff..328e79295 100644 --- a/src/data/ground/ground_data_d05p01_station.h +++ b/src/data/ground/ground_data_d05p01_station.h @@ -51,7 +51,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0x2d, 0x09, 0x0003, 0x0000005b, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(120), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Whew, this is some cliff.")), VARIANT_DEFAULT(_(" Wow! This cliff is steep!")), @@ -62,13 +62,13 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * ALERT_CUE(6), AWAIT_CUE(5), ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" So your friend {NAME_2}\nis somewhere deep in this canyon?")), VARIANT_DEFAULT(_(" Your friend {NAME_2}\nis lost deep in this canyon?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Yes...\nI'm sorry to ask, but please help.")), TEXTBOX_CLEAR, WAIT(10), @@ -98,7 +98,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * VARIANT_DEFAULT(_(" Yes? What is it?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000041), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000041), 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.")), @@ -131,7 +131,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" My stomach suddenly started\ncramping up! Owowow...")), VARIANT(/* == */ 1, _(" I think it's something I ate\nthis morning...")), @@ -139,7 +139,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * VARIANT_DEFAULT(_(" I think my breakfast was\nspoiled or something...")), TEXTBOX_CLEAR, ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}, you too,\nright?")), VARIANT_DEFAULT(_(" Say, {NAME_0}, you're\nfeeling sick too, aren't you?")), @@ -206,7 +206,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * FANFARE_PLAY2(457), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What's wrong with you,\n{NAME_0}?!\nBack me up here!")), VARIANT(/* == */ 1, _(" You're my partner!\nYou have to catch my drift better!")), @@ -265,11 +265,11 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * TEXTBOX_CLEAR, WAIT(10), { 0x2d, 0x0a, 0x0000, 0x00000006, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" My friend Jumpluff should\nbe around B{VALUE_0}F.{WAIT_PRESS}\nPlease take care!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" You bet we will!")), VARIANT_DEFAULT(_(" OK! Gotcha!")), diff --git a/src/data/ground/ground_data_d05p02_station.h b/src/data/ground/ground_data_d05p02_station.h index 3366ad198..f012c8b7e 100644 --- a/src/data/ground/ground_data_d05p02_station.h +++ b/src/data/ground/ground_data_d05p02_station.h @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * ALERT_CUE(12), { 0x89, 0x50, 0x0100, 0x00000004, 0x00000000, NULL }, WAIT(32), - PORTRAIT(PLACEMENT_RIGHT, NPC_PARTNER, 0), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, NPC_PARTNER, 0), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_2}'s friend is\nsupposed to be around here, right?")), VARIANT_DEFAULT(_(" Isn't this the place?\nWhere {NAME_2}'s friend is supposed\nto be?")), @@ -70,7 +70,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * MSG_NPC(NPC_PARTNER, _(" We came for you!\nAre you all right?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, NPC_JUMPLUFF, 65), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, NPC_JUMPLUFF, 65), MSG_NPC(NPC_JUMPLUFF, _(" Yes...\nI'm fine, but...")), TEXTBOX_CLEAR, WAIT(10), @@ -92,7 +92,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * ROTATE_TO(2, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, NPC_PARTNER, 0), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, NPC_PARTNER, 0), MSG_NPC(NPC_PARTNER, _(" Let's go!")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -108,7 +108,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * VARIANT_DEFAULT(_(" Listen! Are you OK?\nSnap out of it!")), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, NPC_SHIFTRY, 65), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, NPC_SHIFTRY, 65), MSG_NPC(NPC_SHIFTRY, _(" ...Urrrgh.\nForget about me...")), MSG_NPC(NPC_SHIFTRY, _(" Get away from here!")), TEXTBOX_CLEAR, @@ -175,7 +175,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * WAIT(15), BGM_SWITCH(MUS_RISING_FEAR), MSG_NPC(-1, _(" I am {NAME_6}!\nThe embodiment of lightning!")), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, NPC_ZAPDOS, 0), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, NPC_ZAPDOS, 0), MSG_NPC(NPC_ZAPDOS, _(" If you wish to save\n{NAME_3}, then scale {COLOR YELLOW_D}Mt. Thunder{RESET}!")), TEXTBOX_CLEAR, ALERT_CUE(11), diff --git a/src/data/ground/ground_data_d06p01_station.h b/src/data/ground/ground_data_d06p01_station.h index 1c6fd663a..84b05a6bc 100644 --- a/src/data/ground/ground_data_d06p01_station.h +++ b/src/data/ground/ground_data_d06p01_station.h @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs188_g1_s0_lives0_dlg0[] = { /* 0x82392cc * ALERT_CUE(6), WALK_GRID(256, 0), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This must be the foot of\n{COLOR YELLOW_D}Mt. Thunder{RESET}...")), VARIANT(/* == */ 1, _(" I wonder if {NAME_3}'s\nteam is already on the way...")), @@ -144,7 +144,7 @@ static const struct ScriptCommand s_gs188_g2_s0_lives0_dlg0[] = { /* 0x8239a30 * AWAIT_CUE(5), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(20), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nThis time, we're gonna rescue\n{NAME_2}!")), VARIANT(/* == */ 1, _(" Let's give it our best!")), diff --git a/src/data/ground/ground_data_d06p02_station.h b/src/data/ground/ground_data_d06p02_station.h index c2ecd8315..9c08562a3 100644 --- a/src/data/ground/ground_data_d06p02_station.h +++ b/src/data/ground/ground_data_d06p02_station.h @@ -151,7 +151,7 @@ static const struct ScriptCommand s_gs189_g1_s0_lives0_dlg0[] = { /* 0x823a4d8 * CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), AWAIT_CUE(5), WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nThings didn't go right for us...")), VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThings didn't turn out in our favor...")), diff --git a/src/data/ground/ground_data_d06p03_station.h b/src/data/ground/ground_data_d06p03_station.h index c27a9d684..796c49e6a 100644 --- a/src/data/ground/ground_data_d06p03_station.h +++ b/src/data/ground/ground_data_d06p03_station.h @@ -61,7 +61,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * { 0x2d, 0x09, 0x0006, 0x00000055, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _("Gyaoooh!")), TEXTBOX_CLEAR, WAIT(30), @@ -69,7 +69,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * ALERT_CUE(10), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), MSG_NPC(3, _(" Wh-what is going on...")), TEXTBOX_CLEAR, WAIT(10), @@ -94,7 +94,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * AWAIT_CUE(5), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" You want more?\nI'll take you on!")), TEXTBOX_CLEAR, WAIT(10), @@ -132,7 +132,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * ALERT_CUE(10), AWAIT_CUE(5), CALL_SCRIPT(NOTICE_FUNC), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Look!\nThere's {NAME_6}!")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -143,22 +143,22 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * WALK_DIRECT(32, 0), CMD_UNK_93(4, DIR_TRANS_10, 85), WAIT(16), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0004, 0x00000000), MSG_NPC(4, _(" Are you OK?")), TEXTBOX_CLEAR, ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0006, 0x00000000), MSG_NPC(6, _(" Ungh... Uh, yeah...{WAIT_PRESS}\nSomehow, I am...")), TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000001), MSG_NPC(1, _(" I'm glad you're safe!")), TEXTBOX_CLEAR, ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0005, 0x00000000), MSG_NPC(5, _(" But that was an eye-opener.")), MSG_NPC(5, _(" Driving off that\n{NAME_2}.")), TEXTBOX_CLEAR, @@ -173,7 +173,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * WAIT(32), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), WAIT(32), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), 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?")), @@ -182,7 +182,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * ALERT_CUE(6), ALERT_CUE(13), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), 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.")), @@ -192,15 +192,15 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * ALERT_CUE(10), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0006, 0x00000041), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0006, 0x00000041), MSG_NPC(6, _(" What?!")), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000041), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0004, 0x00000041), MSG_NPC(4, _(" A human?!")), - PORTRAIT(PLACEMENT_LEFT_, 0x0005, 0x00000041), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0005, 0x00000041), MSG_NPC(5, _(" Is that possible?\nCan something like that happen?")), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0} doesn't really\nknow what happened, either.")), VARIANT(/* == */ 1, _(" {NAME_0} just woke up\none morning here as a Pokémon...")), @@ -228,14 +228,14 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * MSG_NPC(3, _(" No...{WAIT_PRESS}\nI can't determine that.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000005), MSG_NPC(1, _(" Oh...\nI thought you would know...")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(3, _(" However...{WAIT_PRESS}\nThere is a way for unveiling the truth.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000b), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000b), MSG_NPC(1, _(" Oh, really? How?")), TEXTBOX_CLEAR, WAIT(10), @@ -245,7 +245,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * MSG_NPC(3, _(" Xatu is his name.{WAIT_PRESS}\nHe should shed light on your puzzling\nfriend.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" OK!\nSo we should go see Xatu.")), TEXTBOX_CLEAR, WAIT(10), @@ -266,7 +266,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * WAIT(10), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0006, 0x00000000), MSG_NPC(6, _(" Uh... Yeah...{WAIT_PRESS}\nI guess we should...")), TEXTBOX_CLEAR, WAIT(10), @@ -305,13 +305,13 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * ALERT_CUE(4), AWAIT_CUE(5), WAIT(20), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000000), 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?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" There is something that\nconcerns me.{WAIT_PRESS}\nBut it should go unspoken for now.")), MSG_NPC(3, _(" ...For their sake...")), TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_d07p01_station.h b/src/data/ground/ground_data_d07p01_station.h index bdc78939e..86f0cc4d2 100644 --- a/src/data/ground/ground_data_d07p01_station.h +++ b/src/data/ground/ground_data_d07p01_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs191_g1_s0_lives0_dlg0[] = { /* 0x823d8e0 * WAIT(30), WALK_GRID(256, 1), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" This is the {COLOR YELLOW_D}Great Canyon{RESET}...")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -111,7 +111,7 @@ static const struct ScriptCommand s_gs191_g2_s0_lives0_dlg0[] = { /* 0x823ddac * WALK_GRID(256, 1), WAIT(30), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nThis time we'll make it to the peak,\nall right?")), VARIANT(/* == */ 1, _(" We'll meet {NAME_3}\nand ask about you, {NAME_0}.")), diff --git a/src/data/ground/ground_data_d07p02_station.h b/src/data/ground/ground_data_d07p02_station.h index 450e54de8..401e1cd3c 100644 --- a/src/data/ground/ground_data_d07p02_station.h +++ b/src/data/ground/ground_data_d07p02_station.h @@ -192,7 +192,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * WAIT(30), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Yes! We finally made it to\nthe top, {NAME_0}!")), VARIANT_DEFAULT(_(" Yes! We've finally made it\nto the top, {NAME_0}!")), @@ -234,7 +234,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_NPC(1, _(" Hello?")), TEXTBOX_CLEAR, WAIT(10), @@ -273,7 +273,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah? Tickle him?{WAIT_PRESS}\n...OK. I'll try it.")), VARIANT_DEFAULT(_(" Huh? Tickle him?{WAIT_PRESS}\n...OK. It's worth a try.")), @@ -339,7 +339,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * WAIT(30), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_NPC(1, _(" Huh?")), TEXTBOX_CLEAR, WAIT(10), @@ -355,7 +355,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * AWAIT_CUE(5), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" He finally started laughing...")), VARIANT(/* == */ 1, _(" Maybe...{WAIT_PRESS}\nIs he just dense?")), @@ -373,7 +373,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * ALERT_CUE(6), ALERT_CUE(9), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Yikes!")), TEXTBOX_CLEAR, WAIT(10), @@ -384,14 +384,14 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah?\nWe're gonna attack?")), VARIANT_DEFAULT(_(" Huh?\nWe're going to attack?!")), TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000007), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000007), MSG_NPC(1, _(" Uh, no!\nNo way!")), MSG_NPC(1, _(" I mean, he's kind of creepy!")), ALERT_CUE(6), @@ -399,12 +399,12 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(1, _(" It'd be scary for\nsure!")), TEXTBOX_CLEAR, WAIT(60), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...{WAIT_PRESS}Oh, all right. \nYou really want me to do this.")), VARIANT_DEFAULT(_(" ...{WAIT_PRESS}Fine, then.\nI'll do it, OK?")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" If something happens to me,\npromise you'll help me.\nI'm counting on you.")), VARIANT(/* == */ 3, _(" If anything happens to me,\nyou have to help me. You have to promise!")), @@ -418,7 +418,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * AWAIT_CUE(5), WAIT(30), TEXTBOX_AUTO_PRESS(45, 60), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" All right. Counting down.{WAIT_PRESS}\nThree...{WAIT_PRESS} Two...{WAIT_PRESS} One...{WAIT_PRESS} Now...!")), VARIANT_DEFAULT(_(" OK. Counting down.{WAIT_PRESS}\nThree...{WAIT_PRESS} Two...{WAIT_PRESS} One...{WAIT_PRESS} Now...!")), @@ -435,7 +435,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * ALERT_CUE(9), CALL_SCRIPT(JUMP_SURPRISE_FUNC), SET_DIR_WAIT(DIRECTION_NORTHEAST, 10), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Yikes!")), TEXTBOX_CLEAR, WAIT(10), @@ -458,7 +458,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_NPC(1, _(" Guessed your identity?\nThat's a bit much.")), TEXTBOX_CLEAR, WAIT(10), @@ -474,7 +474,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * FANFARE_PLAY2(466), CALL_SCRIPT(NOTICE_FUNC), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Huh?!\nHow can you tell that?!")), TEXTBOX_CLEAR, WAIT(10), @@ -492,7 +492,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * AWAIT_CUE(5), ALERT_CUE(7), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Then, you've got to tell us,\n{NAME_2}!")), VARIANT_DEFAULT(_(" If you know, please tell us,\n{NAME_2}!")), @@ -525,9 +525,9 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(2, _(" They are tied together.\nInseparably so.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_NPC(1, _(" Wait. {NAME_0}\nbecoming a Pokémon and...{WAIT_PRESS}the natural\ndisasters...{WAIT_PRESS}are related?!")), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), 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?")), TEXTBOX_CLEAR, @@ -537,7 +537,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * WAIT(30), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What is it?! Hey?!")), VARIANT(/* == */ 1, _(" Why did you clam up?\nCome on, tell us, please!")), @@ -554,7 +554,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * ALERT_CUE(6), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wh-{WAIT_PRESS}what did you say?")), VARIANT(/* == */ 1, _(" The world...{WAIT_PRESS}\nThe unthinkable is going to happen?")), @@ -567,7 +567,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000005), MSG_NPC(1, _(" Xa-{NAME_2}...")), TEXTBOX_CLEAR, WAIT(10), @@ -582,7 +582,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * BGM_FADEOUT(150), AWAIT_CUE(5), MSG_NPC(3, _(" Kekeh!\nIsn't that a surprise!")), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000044), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000044), MSG_NPC(3, _(" That {NAME_0}...\nwas human...")), TEXTBOX_CLEAR, ALERT_CUE(8), diff --git a/src/data/ground/ground_data_d08p01_station.h b/src/data/ground/ground_data_d08p01_station.h index 6c74d9262..78a1827e2 100644 --- a/src/data/ground/ground_data_d08p01_station.h +++ b/src/data/ground/ground_data_d08p01_station.h @@ -134,14 +134,14 @@ static const struct ScriptCommand s_gs193_g1_s0_lives0_dlg0[] = { /* 0x824313c * WAIT(120), ALERT_CUE(6), WALK_GRID(256, 0), - PORTRAIT(PLACEMENT_RIGHT_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Whew!\nWe sure came a long way out.")), VARIANT_DEFAULT(_(" Whew.\nWe've sure traveled a long way.")), BGM_SWITCH(MUS_LAPIS_CAVE), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But I was thinking...\nWhile we were on the way...")), VARIANT_DEFAULT(_(" But while we were moving,\nI couldn't help thinking...")), @@ -244,7 +244,7 @@ static const struct ScriptCommand s_gs193_g2_s0_lives0_dlg0[] = { /* 0x8243ab8 * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), @@ -448,7 +448,7 @@ static const struct ScriptCommand s_gs193_g4_s0_lives0_dlg0[] = { /* 0x8244804 * ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_NPC(1, _(" What the...?{WAIT_PRESS}\nIsn't this where we started from?!")), TEXTBOX_CLEAR, FANFARE_PLAY2(468), @@ -512,7 +512,7 @@ static const struct ScriptCommand s_gs193_g5_s0_lives0_dlg0[] = { /* 0x8244d30 * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), diff --git a/src/data/ground/ground_data_d08p02_station.h b/src/data/ground/ground_data_d08p02_station.h index c1d699696..0839c9242 100644 --- a/src/data/ground/ground_data_d08p02_station.h +++ b/src/data/ground/ground_data_d08p02_station.h @@ -54,7 +54,7 @@ static const struct ScriptCommand s_gs194_g1_s0_lives0_dlg0[] = { /* 0x8245734 * ALERT_CUE(6), AWAIT_CUE(5), CMD_UNK_93(4, DIR_TRANS_11, 34), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Whew...\nWe finally got through that cave.")), VARIANT(/* == */ 1, _(" Where are the Pokémon\nwho are chasing us?")), diff --git a/src/data/ground/ground_data_d09p01_station.h b/src/data/ground/ground_data_d09p01_station.h index 611aadfa7..67fb4f117 100644 --- a/src/data/ground/ground_data_d09p01_station.h +++ b/src/data/ground/ground_data_d09p01_station.h @@ -183,7 +183,7 @@ static const struct ScriptCommand s_gs195_g1_s0_lives0_dlg0[] = { /* 0x8246544 * CALL_SCRIPT(LOOK_AROUND_FUNC), ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), WAIT(20), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Whew.\nI think we gave them the slip.")), VARIANT_DEFAULT(_(" Whew.\nI think we managed to evade them.")), @@ -405,7 +405,7 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), @@ -415,7 +415,7 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * ALERT_CUE(6), AWAIT_CUE(5), ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), - PORTRAIT(PLACEMENT_RIGHT_FLIP, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM, 0x0001, 0x0000000c), MSG_NPC(1, _(" Ssh!{WAIT_PRESS}\nSomeone's coming.")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -442,7 +442,7 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * WAIT(120), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_NPC(1, _(" ............")), MSG_NPC(1, _(" ........................")), TEXTBOX_CLEAR, @@ -454,11 +454,11 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * CALL_SCRIPT(LOOK_AROUND_FUNC), ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), WAIT(20), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" ...Whew.")), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We'll have to get over this\nmountain to get away from them.")), VARIANT_DEFAULT(_(" If we're going to get away,\nwe'll have to go over the mountain.")), @@ -522,7 +522,7 @@ static const struct ScriptCommand s_gs195_g4_s0_lives0_dlg0[] = { /* 0x8247d30 * ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_NPC(1, _(" What the...?{WAIT_PRESS}\nIsn't this where we started from?!")), TEXTBOX_CLEAR, FANFARE_PLAY2(468), @@ -585,7 +585,7 @@ static const struct ScriptCommand s_gs195_g5_s0_lives0_dlg0[] = { /* 0x8248230 * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), diff --git a/src/data/ground/ground_data_d09p02_station.h b/src/data/ground/ground_data_d09p02_station.h index c08285caa..46e09f571 100644 --- a/src/data/ground/ground_data_d09p02_station.h +++ b/src/data/ground/ground_data_d09p02_station.h @@ -166,7 +166,7 @@ static const struct ScriptCommand s_gs196_g1_s0_lives0_dlg0[] = { /* 0x82491e4 * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nWell, that didn't go well.")), VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThat didn't work out...")), diff --git a/src/data/ground/ground_data_d09p03_station.h b/src/data/ground/ground_data_d09p03_station.h index 932072c44..635db38be 100644 --- a/src/data/ground/ground_data_d09p03_station.h +++ b/src/data/ground/ground_data_d09p03_station.h @@ -49,7 +49,7 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _("Urggggh!")), MSG_NPC(2, _(" I'm not done!\nI'm not finished yet!")), TEXTBOX_CLEAR, @@ -59,7 +59,7 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * FANFARE_PLAY2(455), ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000007), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000007), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wait!\nHold it!")), VARIANT(/* == */ 1, _(" We didn't come to cause any\ntrouble.")), diff --git a/src/data/ground/ground_data_d10p01_station.h b/src/data/ground/ground_data_d10p01_station.h index 9432a4064..9ce330aff 100644 --- a/src/data/ground/ground_data_d10p01_station.h +++ b/src/data/ground/ground_data_d10p01_station.h @@ -151,7 +151,7 @@ static const struct ScriptCommand s_gs198_g1_s0_lives0_dlg0[] = { /* 0x824c290 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...So, we do have to get\nthrough this, huh?")), VARIANT_DEFAULT(_(" OK.\nWe don't have a choice--we have to\nget through this place.")), @@ -353,7 +353,7 @@ static const struct ScriptCommand s_gs198_g3_s0_lives0_dlg0[] = { /* 0x824d0c0 * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), @@ -416,12 +416,12 @@ static const struct ScriptCommand s_gs198_g4_s0_lives0_dlg0[] = { /* 0x824d500 * ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(30), { 0x2d, 0x09, 0x0002, 0x00000066, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmmm...{WAIT_PRESS}\nWell, that didn't go well.")), VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nWe didn't do well at all...")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That {NAME_2}...\nHe's one tough customer.")), VARIANT(/* == */ 1, _(" But why aren't we allowed\nto go into this forest?")), @@ -475,7 +475,7 @@ static const struct ScriptCommand s_gs198_g5_s0_lives0_dlg0[] = { /* 0x824d980 * ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_NPC(1, _(" What the...?{WAIT_PRESS}\nIsn't this where we started from?!")), TEXTBOX_CLEAR, FANFARE_PLAY2(468), @@ -543,7 +543,7 @@ static const struct ScriptCommand s_gs198_g6_s0_lives0_dlg0[] = { /* 0x824ded4 * CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), AWAIT_CUE(5), CMD_UNK_93(4, DIR_TRANS_10, 34), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), diff --git a/src/data/ground/ground_data_d10p02_station.h b/src/data/ground/ground_data_d10p02_station.h index ff7fc7159..ac6fe3f05 100644 --- a/src/data/ground/ground_data_d10p02_station.h +++ b/src/data/ground/ground_data_d10p02_station.h @@ -167,7 +167,7 @@ static const struct ScriptCommand s_gs199_g1_s0_lives0_dlg0[] = { /* 0x824eea4 * CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), AWAIT_CUE(5), { 0x2d, 0x09, 0x0002, 0x00000066, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nWell, that didn't go well.")), VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThat didn't work out...")), @@ -235,7 +235,7 @@ static const struct ScriptCommand s_gs199_g2_s0_lives0_dlg0[] = { /* 0x824f33c * CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), AWAIT_CUE(5), { 0x2d, 0x09, 0x0002, 0x00000066, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmmm...{WAIT_PRESS}\nWell, that didn't go well.")), VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nWe didn't do well at all...")), diff --git a/src/data/ground/ground_data_d10p03_station.h b/src/data/ground/ground_data_d10p03_station.h index f35f4aeb3..6935fb444 100644 --- a/src/data/ground/ground_data_d10p03_station.h +++ b/src/data/ground/ground_data_d10p03_station.h @@ -49,7 +49,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Please, {NAME_2}!")), VARIANT(/* == */ 1, _(" We have to keep moving.\nWe have to get through this.")), @@ -63,7 +63,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0002, 0x00000000), PORTRAIT_POS(2, 3, 0), MSG_NPC(2, _(" No!\nI cannot allow your passage!")), TEXTBOX_CLEAR, @@ -171,7 +171,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * MSG_NPC(2, _(" A-Absol!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), PORTRAIT_POS(3, -2, 2), MSG_NPC(3, _(" There is nothing false in\nwhat they said.")), MSG_NPC(3, _(" Calamities are indeed\noccurring in nature everywhere.")), @@ -235,7 +235,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * ALERT_CUE(8), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0003, 0x00000000), 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.")), diff --git a/src/data/ground/ground_data_d11p01_station.h b/src/data/ground/ground_data_d11p01_station.h index 699ecea63..995264372 100644 --- a/src/data/ground/ground_data_d11p01_station.h +++ b/src/data/ground/ground_data_d11p01_station.h @@ -142,7 +142,7 @@ static const struct ScriptCommand s_gs201_g1_s0_lives0_dlg0[] = { /* 0x8252548 * { 0x2d, 0x09, 0x0003, 0x00000063, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...OK.\nSo that's what happened...")), VARIANT(/* == */ 1, _(" {NAME_2} appeared to\nyou...")), @@ -451,7 +451,7 @@ static const struct ScriptCommand s_gs201_g3_s0_lives0_dlg0[] = { /* 0x82541ac * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Darn...{WAIT_PRESS}\nThat didn't go well.")), VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nThat turned out badly.")), @@ -516,7 +516,7 @@ static const struct ScriptCommand s_gs201_g4_s0_lives0_dlg0[] = { /* 0x82545ec * ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_NPC(1, _(" What the...?{WAIT_PRESS}\nIsn't this where we started from?!")), TEXTBOX_CLEAR, FANFARE_PLAY2(468), @@ -584,7 +584,7 @@ static const struct ScriptCommand s_gs201_g5_s0_lives0_dlg0[] = { /* 0x8254af8 * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), diff --git a/src/data/ground/ground_data_d11p02_station.h b/src/data/ground/ground_data_d11p02_station.h index 9e753068e..959f7ca4c 100644 --- a/src/data/ground/ground_data_d11p02_station.h +++ b/src/data/ground/ground_data_d11p02_station.h @@ -179,7 +179,7 @@ static const struct ScriptCommand s_gs202_g1_s0_lives0_dlg0[] = { /* 0x8255f00 * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nWell, that didn't go well.")), VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThat didn't work out...")), diff --git a/src/data/ground/ground_data_d11p03_station.h b/src/data/ground/ground_data_d11p03_station.h index 479052c67..cdfece895 100644 --- a/src/data/ground/ground_data_d11p03_station.h +++ b/src/data/ground/ground_data_d11p03_station.h @@ -68,7 +68,7 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * WAIT(30), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000041), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000041), MSG_NPC(2, _(" Kekeh! Here at last!\nWe're at the peak!")), TEXTBOX_CLEAR, ALERT_CUE(7), @@ -93,7 +93,7 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * WAIT(10), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" ............{WAIT_PRESS}What do you want?")), TEXTBOX_CLEAR, WAIT(10), @@ -335,7 +335,7 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, ALERT_CUE(6), { 0x89, 0x68, 0x0100, 0x00000004, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We finally made it.")), VARIANT(/* == */ 1, _(" This is the peak.{WAIT_PRESS}\n...Right?")), @@ -362,12 +362,12 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * MSG_NPC(1, _(" A-{NAME_2}!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), 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...")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), 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.")), @@ -384,7 +384,7 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * ALERT_CUE(8), AWAIT_CUE(5), ALERT_CUE(6), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), 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.")), @@ -684,7 +684,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * SELECT_ANIMATION(50), { 0x62, 0x00, 0x0200, -0x00000010, 0x00000010, NULL }, CALL_SCRIPT(SHOCK_FUNC), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000041), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000041), PORTRAIT_POS(2, 0, 3), MSG_NPC(2, _(" Wuh!")), TEXTBOX_CLEAR, @@ -701,21 +701,21 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0003, 0x00000041), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0003, 0x00000041), MSG_NPC(3, _(" W-what?!{WAIT_PRESS}\n{NAME_5}?!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Th-that's {NAME_5}...")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0004, 0x00000041), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0004, 0x00000041), MSG_NPC(4, _(" The legend...\nIt was real...")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0005, 0x00000000), PORTRAIT_POS(5, 1, -1), BGM_SWITCH(MUS_LEGEND_OF_NINETALES), MSG_NPC(5, _(" Cease fighting at once,\n{NAME_2}.")), diff --git a/src/data/ground/ground_data_d12p02_station.h b/src/data/ground/ground_data_d12p02_station.h index 7128e14fb..da9f7a5a7 100644 --- a/src/data/ground/ground_data_d12p02_station.h +++ b/src/data/ground/ground_data_d12p02_station.h @@ -150,7 +150,7 @@ static const struct ScriptCommand s_gs205_g1_s0_lives0_dlg0[] = { /* 0x825e344 * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nWell, that didn't go well.")), VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThat didn't work out...")), diff --git a/src/data/ground/ground_data_d12p04_station.h b/src/data/ground/ground_data_d12p04_station.h index 3d1e2b4db..abcd217d7 100644 --- a/src/data/ground/ground_data_d12p04_station.h +++ b/src/data/ground/ground_data_d12p04_station.h @@ -84,12 +84,12 @@ static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 * ALERT_CUE(6), AWAIT_CUE(5), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_NPC(1, _(" Look! It's {NAME_3}!{WAIT_PRESS}\n{NAME_4} and {NAME_5} too!")), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(10), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" Urrgggh!")), TEXTBOX_CLEAR, WAIT(30), @@ -101,7 +101,7 @@ static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 * ALERT_CUE(9), ALERT_CUE(10), WAIT(10), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000043), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0004, 0x00000043), MSG_NPC(4, _(" Did you do it?\n{NAME_2}?")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -114,7 +114,7 @@ static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 * ALERT_CUE(9), ALERT_CUE(10), WAIT(30), - PORTRAIT(PLACEMENT_TOP_FLIP, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_CENTERRIGHT_TOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Yes, fine.")), MSG_NPC(3, _(" We will be fine.\nBut we must get out immediately.")), TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_d13p01_station.h b/src/data/ground/ground_data_d13p01_station.h index d2ceb218d..11c059b40 100644 --- a/src/data/ground/ground_data_d13p01_station.h +++ b/src/data/ground/ground_data_d13p01_station.h @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs207_g1_s0_lives0_dlg0[] = { /* 0x826008c * { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x002c, 0x00000000, 0x00000000, NULL }, WAIT(60), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Ouch...{WAIT_PRESS}\nWhere are we?")), VARIANT_DEFAULT(_(" Owowow...{WAIT_PRESS}\nWhere are we?")), diff --git a/src/data/ground/ground_data_d13p02_station.h b/src/data/ground/ground_data_d13p02_station.h index 71de04468..91013fadb 100644 --- a/src/data/ground/ground_data_d13p02_station.h +++ b/src/data/ground/ground_data_d13p02_station.h @@ -151,7 +151,7 @@ static const struct ScriptCommand s_gs208_g1_s0_lives0_dlg0[] = { /* 0x8261b84 * CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), AWAIT_CUE(5), WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nWell, that didn't go well.")), VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThat didn't work out...")), diff --git a/src/data/ground/ground_data_d13p03_station.h b/src/data/ground/ground_data_d13p03_station.h index e845fce8b..11bd45fa2 100644 --- a/src/data/ground/ground_data_d13p03_station.h +++ b/src/data/ground/ground_data_d13p03_station.h @@ -84,7 +84,7 @@ static const struct ScriptCommand s_gs209_g1_s0_lives0_dlg0[] = { /* 0x826223c * ALERT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), WAIT(60), - PORTRAIT(PLACEMENT_LEFT_, NPC_PARTNER, 12), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, NPC_PARTNER, 12), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wh-wh-what?! Quake?!{WAIT_PRESS}\nIt can't be!")), VARIANT(/* == */ 1, _(" We're up on clouds...")), @@ -95,7 +95,7 @@ static const struct ScriptCommand s_gs209_g1_s0_lives0_dlg0[] = { /* 0x826223c * FANFARE_PLAY2(465), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, NPC_RAYQUAZA, 0), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, NPC_RAYQUAZA, 0), MSG_NPC(NPC_RAYQUAZA, _(" These are shock waves!{WAIT_PRESS}\nAnd they're huge!")), TEXTBOX_CLEAR, WAIT(30), @@ -261,11 +261,11 @@ static const struct ScriptCommand s_gs209_g2_s0_lives0_dlg0[] = { /* 0x8262f4c * FANFARE_PLAY2(465), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, NPC_RAYQUAZA, 0), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, NPC_RAYQUAZA, 0), MSG_NPC(NPC_RAYQUAZA, _(" What is that?!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, NPC_PARTNER, 12), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, NPC_PARTNER, 12), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" It's a shooting star!\nAnd it's gigantic!")), VARIANT(/* == */ 1, _(" It's going to destroy\nthe world if it isn't stopped!")), @@ -420,7 +420,7 @@ static const struct ScriptCommand s_gs209_g3_s0_lives0_dlg0[] = { /* 0x8263a7c * WAIT(30), WAIT(30), TEXTBOX_AUTO_PRESS(15, 15), - PORTRAIT(PLACEMENT_LEFT_, NPC_PARTNER, 12), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, NPC_PARTNER, 12), MSG_NPC(NPC_PARTNER, _(" Waaaaaaaaaaaaaaaaaah!")), ALERT_CUE(3), HALT, diff --git a/src/data/ground/ground_data_d16p01_station.h b/src/data/ground/ground_data_d16p01_station.h index f9cfa5040..f19004c1b 100644 --- a/src/data/ground/ground_data_d16p01_station.h +++ b/src/data/ground/ground_data_d16p01_station.h @@ -63,7 +63,7 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * WAIT(20), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Gwooooooh!")), TEXTBOX_CLEAR, ALERT_CUE(7), diff --git a/src/data/ground/ground_data_d17p01_station.h b/src/data/ground/ground_data_d17p01_station.h index 78aef0738..5de64225e 100644 --- a/src/data/ground/ground_data_d17p01_station.h +++ b/src/data/ground/ground_data_d17p01_station.h @@ -63,7 +63,7 @@ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 * WAIT(20), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), FANFARE_PLAY2(685), MSG_NPC(2, _(" Gwooooooooooh!{WAIT_PRESS}\n...H-how dare you!")), TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_d18p01_station.h b/src/data/ground/ground_data_d18p01_station.h index 7cd089e2e..f5267cc54 100644 --- a/src/data/ground/ground_data_d18p01_station.h +++ b/src/data/ground/ground_data_d18p01_station.h @@ -63,7 +63,7 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * WAIT(20), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Gwoooooooh!")), TEXTBOX_CLEAR, ALERT_CUE(7), diff --git a/src/data/ground/ground_data_d20p01_station.h b/src/data/ground/ground_data_d20p01_station.h index 8ff3cfbfc..c86be1caa 100644 --- a/src/data/ground/ground_data_d20p01_station.h +++ b/src/data/ground/ground_data_d20p01_station.h @@ -54,7 +54,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 104), WAIT(30), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0000, 0x00000000), MSG_NPC(0, _(" Hey!{WAIT_PRESS}\nGet a move on!")), TEXTBOX_CLEAR, { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -62,7 +62,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * AWAIT_CUE(5), CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000003), MSG_NPC(1, _(" Gasp, gasp...{WAIT_PRESS}\nThis is rough going...")), TEXTBOX_CLEAR, WAIT(10), @@ -199,12 +199,12 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * WAIT(60), { 0x28, 0x01, 0x0005, 0x00000078, 0x00ffffff, NULL }, TEXTBOX_AUTO_PRESS(60, 60), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000003), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000003), FANFARE_PLAY2(877), MSG_NPC(0, _(" Gwaaaaaaaaaaaah!")), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000003), FANFARE_PLAY2(877), MSG_NPC(1, _(" Gyaaaaaaaah!")), TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_d21p01_station.h b/src/data/ground/ground_data_d21p01_station.h index 4d1e1fe0d..7a166e5cb 100644 --- a/src/data/ground/ground_data_d21p01_station.h +++ b/src/data/ground/ground_data_d21p01_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs217_g1_s0_lives0_dlg0[] = { /* 0x8269878 * { 0x27, 0x01, 0x0005, 0x00000005, 0x00ffffff, NULL }, WAIT_FANFARE2(475), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Urghgh...")), TEXTBOX_CLEAR, WAIT(10), diff --git a/src/data/ground/ground_data_d22p01_station.h b/src/data/ground/ground_data_d22p01_station.h index 3f0701562..b12ea5e0a 100644 --- a/src/data/ground/ground_data_d22p01_station.h +++ b/src/data/ground/ground_data_d22p01_station.h @@ -97,7 +97,7 @@ static const struct ScriptCommand s_gs218_g1_s0_lives0_dlg0[] = { /* 0x826a108 * WAIT(20), WALK_GRID(256, 1), WAIT(30), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), 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.")), TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_d23p01_station.h b/src/data/ground/ground_data_d23p01_station.h index 1baa7cf70..dcd2b31dd 100644 --- a/src/data/ground/ground_data_d23p01_station.h +++ b/src/data/ground/ground_data_d23p01_station.h @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs219_g1_s0_lives0_dlg0[] = { /* 0x826a6b8 * ALERT_CUE(6), WALK_GRID(256, 0), WAIT(15), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Look. Over there.\nLet's get this rescue done.")), VARIANT_DEFAULT(_(" Look, there's our Pokémon.\nWe can get this rescue done.")), diff --git a/src/data/ground/ground_data_d24p01_station.h b/src/data/ground/ground_data_d24p01_station.h index d3354b6d8..cc68cb7db 100644 --- a/src/data/ground/ground_data_d24p01_station.h +++ b/src/data/ground/ground_data_d24p01_station.h @@ -54,7 +54,7 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0x89, 0x78, 0x0100, 0x00000004, 0x00000000, NULL }, ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), 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}?")), TEXTBOX_CLEAR, @@ -347,7 +347,7 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * ALERT_CUE(7), AWAIT_CUE(5), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000043), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000043), MSG_NPC(2, _(" W-wait...")), TEXTBOX_CLEAR, WAIT(10), @@ -443,7 +443,7 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * ALERT_CUE(7), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000044), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000044), MSG_NPC(2, _(" N-{NAME_5}!")), MSG_NPC(2, _(" ...But...\nI don't know what you're saying...")), TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_d25p01_station.h b/src/data/ground/ground_data_d25p01_station.h index 7c5bd6cfd..cb3ab5384 100644 --- a/src/data/ground/ground_data_d25p01_station.h +++ b/src/data/ground/ground_data_d25p01_station.h @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs222_g1_s0_lives0_dlg0[] = { /* 0x826dc2c * ALERT_CUE(6), WALK_GRID(256, 0), WAIT(15), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Look. Over there.\nLet's get this rescue done.")), VARIANT_DEFAULT(_(" Look, there's our Pokémon.\nWe can get this rescue done.")), diff --git a/src/data/ground/ground_data_h29p01_station.h b/src/data/ground/ground_data_h29p01_station.h index 9b9dc0276..db59949b1 100644 --- a/src/data/ground/ground_data_h29p01_station.h +++ b/src/data/ground/ground_data_h29p01_station.h @@ -277,9 +277,9 @@ static const struct ScriptCommand s_gs158_g2_s0_lives0_dlg0[] = { /* 0x820d22c * ALERT_CUE(7), // Zapdos faces SouthWest ALERT_CUE(8), // Moltres faces SouthEast WAIT(60), - PORTRAIT(PLACEMENT_TOP, NPC_ARTICUNO, 0), - PORTRAIT(PLACEMENT_RIGHT, NPC_ZAPDOS, 0), - PORTRAIT(PLACEMENT_LEFT_, NPC_MOLTRES, 0), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, NPC_ARTICUNO, 0), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, NPC_ZAPDOS, 0), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, NPC_MOLTRES, 0), // Moltres speaks first. MSG_NPC(NPC_MOLTRES, _(" Fire, ice, and electricity...")), TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_t01p01_station.h b/src/data/ground/ground_data_t01p01_station.h index 420628642..916343e6a 100644 --- a/src/data/ground/ground_data_t01p01_station.h +++ b/src/data/ground/ground_data_t01p01_station.h @@ -829,9 +829,9 @@ static const struct ScriptCommand s_gs1_g4_s1_lives0_dlg0[] = { /* 0x813a9b4 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), AWAIT_CUE(5), FANFARE_PLAY2(515), MSG_OVERHEARD(_(" ...Grrruummmmmbbbbblle...!")), @@ -990,8 +990,8 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" Munchlax hungry...{WAIT_PRESS}\nYou have food?")), CHOICE(/* label */ 1, _("Yes.")), CHOICE(/* label */ 2, _("No.")), @@ -1091,7 +1091,7 @@ static const struct ScriptCommand s_gs1_g4_s4_lives0_dlg2[] = { /* 0x813b988 */ DEBUGINFO_O(1091), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000044), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000044), MSG_NPC(1, _(" ............{WAIT_PRESS}\nYou, good to Munchlax.")), JUMP_SCRIPT(END_TALK), }; @@ -1142,9 +1142,9 @@ static const struct ScriptCommand s_gs1_g5_s1_lives0_dlg0[] = { /* 0x813bbf0 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), AWAIT_CUE(5), FANFARE_PLAY2(400), MSG_OVERHEARD(_(" Flump!")), @@ -1161,7 +1161,7 @@ static const struct ScriptCommand s_gs1_g5_s1_lives0_dlg0[] = { /* 0x813bbf0 */ { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CMD_UNK_93(4, DIR_TRANS_10, 127), WAIT(60), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000045), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000045), MSG_NPC(2, _(" ....................................")), TEXTBOX_CLEAR, WAIT(60), @@ -1849,7 +1849,7 @@ static const struct ScriptCommand s_gs1_g7_s1_lives0_dlg0[] = { /* 0x813e880 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), WAIT(1), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" Huh?\nAre you going home already?")), TEXTBOX_CLEAR, CMD_UNK_93(8, DIR_TRANS_10, 4), @@ -1998,7 +1998,7 @@ static const struct ScriptCommand s_gs1_g8_s1_lives0_dlg0[] = { /* 0x813f0dc */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), WAIT(1), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_NPC(1, _(" Huh?\nYou want to go home already?")), TEXTBOX_CLEAR, CMD_UNK_93(8, DIR_TRANS_10, 4), @@ -2123,7 +2123,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ WALK_GRID(256, 18), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), 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?")), @@ -2153,7 +2153,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(7), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0003, 0x00000000), 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.")), @@ -2180,7 +2180,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ WAIT(10), ALERT_CUE(8), ALERT_CUE(9), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000041), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000041), MSG_NPC(4, _(" YES!\nNOW I CAN JOIN THEIR TEAM!")), MSG_NPC(4, _(" YAY! BZBZBZZT!")), TEXTBOX_CLEAR, @@ -2457,7 +2457,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ WAIT(1), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_NPC(1, _(" Huh? What's going on over\nthere?{WAIT_PRESS}\nThere seems to be a commotion.")), TEXTBOX_CLEAR, BGM_FADEOUT(120), @@ -2469,11 +2469,11 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ WAIT(30), AWAIT_CUE(5), WAIT(15), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000041), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000041), MSG_NPC(2, _(" Please help my friend!\nPlease, I need help!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), MSG_NPC(3, _(" Forget it.\nWe're not about to work for that.")), TEXTBOX_CLEAR, WAIT(10), @@ -2484,7 +2484,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ AWAIT_CUE(5), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, what's up?")), VARIANT_DEFAULT(_(" Hi, what's going on?")), @@ -2493,7 +2493,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ CMD_UNK_93(4, DIR_TRANS_11, 77), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Huh? That scene there?")), MSG_NPC(4, _(" {NAME_2}'s begging for\na rescue mission, but not finding any luck.")), TEXTBOX_CLEAR, @@ -2516,7 +2516,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ ALERT_CUE(9), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(6), - PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), 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.")), TEXTBOX_CLEAR, @@ -2543,7 +2543,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ ALERT_CUE(13), ALERT_CUE(14), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000041), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000041), MSG_NPC(3, _(" Oh! Wh-what do you want?")), TEXTBOX_CLEAR, WAIT(30), @@ -2556,7 +2556,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ ALERT_CUE(13), ALERT_CUE(14), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0005, 0x00000000), 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.")), @@ -2565,7 +2565,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ WAIT(4), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_FLIP, 0x0003, 0x00000041), + PORTRAIT(PLACEMENT_CENTERRIGHT_TOP_FLIP, 0x0003, 0x00000041), MSG_NPC(3, _(" Grr...{WAIT_PRESS}\nTch! OK, we'll do it.")), TEXTBOX_CLEAR, WAIT(10), @@ -2585,7 +2585,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ AWAIT_CUE(5), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, who are those guys?")), VARIANT_DEFAULT(_(" Say, who are they?")), @@ -2594,7 +2594,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), 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.")), TEXTBOX_CLEAR, @@ -2626,11 +2626,11 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ WAIT(16), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Th-thank you.")), TEXTBOX_CLEAR, WAIT(4), - PORTRAIT(PLACEMENT_LEFT_, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0005, 0x00000000), 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.")), TEXTBOX_CLEAR, @@ -2657,7 +2657,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ WAIT(10), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP, 0x0005, 0x00000000), MSG_NPC(5, _(" ...!")), TEXTBOX_CLEAR, WAIT(20), @@ -2668,23 +2668,23 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ ALERT_CUE(9), ALERT_CUE(7), WAIT(24), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" Wah! What's wrong?")), TEXTBOX_CLEAR, WAIT(4), ALERT_CUE(12), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0006, 0x00000000), MSG_NPC(6, _(" What's up?")), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" ......{WAIT_PRESS}\nIt's fine. Nothing.")), TEXTBOX_CLEAR, ALERT_CUE(10), WAIT(64), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP, 0x0005, 0x00000000), MSG_NPC(5, _(" Let's go.")), TEXTBOX_CLEAR, WAIT(15), @@ -2695,13 +2695,13 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ WAIT(30), ALERT_CUE(9), BGM_FADEIN(60, 7), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" Whew!\nThat was scary! Sheesh!")), TEXTBOX_CLEAR, WAIT(10), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, ALERT_CUE(6), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0001, 0x0000000b), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0001, 0x0000000b), MSG_NPC(1, _(" ...C-cool...")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -2719,7 +2719,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ ALERT_CUE(4), AWAIT_CUE(5), { 0x2d, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0005, 0x00000000), WAIT(32), MSG_NPC(-1, _(" Not if I can help it!\nKekeh!")), TEXTBOX_CLEAR, @@ -3268,11 +3268,11 @@ static const struct ScriptCommand s_gs1_g12_s0_lives0_dlg0[] = { /* 0x8144c8c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0000, 0x00000041), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0000, 0x00000041), MSG_NPC(0, _(" Please help my friend!\nPlease, I need help!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_NPC(1, _(" Forget it.\nWe're not about to work for that.")), TEXTBOX_CLEAR, WAIT(10), @@ -3547,7 +3547,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives8_dlg2[] = { /* 0x8145944 */ { 0x2d, 0x09, 0x0002, 0x00000050, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000004e, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000001), MSG_NPC(2, _(" I'm glad to see you're\nback safe.")), TEXTBOX_CLEAR, WAIT(10), @@ -3555,7 +3555,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives8_dlg2[] = { /* 0x8145944 */ MSG_NPC(3, _(" Shiftry came and rescued\nme...")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000001), MSG_NPC(3, _(" I hope he is safe...")), JUMP_SCRIPT(END_TALK), }; @@ -3573,7 +3573,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives9_dlg2[] = { /* 0x8145b14 */ { 0x2d, 0x09, 0x0002, 0x00000050, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000004e, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000001), MSG_NPC(2, _(" I'm glad to see you're\nback safe.")), TEXTBOX_CLEAR, WAIT(10), @@ -3581,7 +3581,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives9_dlg2[] = { /* 0x8145b14 */ MSG_NPC(3, _(" Shiftry came and rescued\nme...")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000001), MSG_NPC(3, _(" I hope he is safe...")), JUMP_SCRIPT(END_TALK), }; @@ -3599,7 +3599,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives10_dlg2[] = { /* 0x8145c54 * { 0x2d, 0x09, 0x0002, 0x00000050, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000004e, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000001), MSG_NPC(2, _(" I'm glad to see you're\nback safe.")), TEXTBOX_CLEAR, WAIT(10), @@ -3607,7 +3607,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives10_dlg2[] = { /* 0x8145c54 * MSG_NPC(3, _(" Shiftry came and rescued\nme...")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000001), MSG_NPC(3, _(" I hope he is safe...")), JUMP_SCRIPT(END_TALK), }; @@ -3841,11 +3841,11 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ MSG_NPC(2, _(" Yeah, I'm kind of shocked.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" I always thought it was\nonly a legend.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" But could it be true?{WAIT_PRESS}\nI'm having a hard time believing it...")), TEXTBOX_CLEAR, WAIT(10), @@ -3862,7 +3862,7 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ ALERT_CUE(8), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_CENTERRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Well, you know the\n{COLOR GREEN}{NAME_6} legend{RESET}?\nThat old story?")), TEXTBOX_CLEAR, WAIT(10), @@ -3870,7 +3870,7 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ WALK_RELATIVE(256, 16, 0), ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_NPC(1, _(" The {NAME_6} legend?{WAIT_PRESS}\nWhat's that?")), TEXTBOX_CLEAR, WAIT(10), @@ -3902,7 +3902,7 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ WAIT(10), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), MSG_NPC(2, _(" {NAME_5} is uh...{WAIT_PRESS}\nYou know, in his pond.")), TEXTBOX_CLEAR, WAIT(10), @@ -3913,7 +3913,7 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ AWAIT_CUE(5), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), - PORTRAIT(PLACEMENT_TOP_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_CENTERRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" You should visit him if you\nwant to know more.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -4126,15 +4126,15 @@ static const struct ScriptCommand s_gs1_g19_s0_lives0_dlg0[] = { /* 0x8147af4 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), WAIT(1), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...Listen, {NAME_0}.")), VARIANT_DEFAULT(_(" ...Say, {NAME_0}.")), TEXTBOX_CLEAR, ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Want to knock\noff for today?\nI can't seem to get into it...")), VARIANT_DEFAULT(_(" Want to call it a day now?\nI can't seem to get motivated today...")), @@ -4205,7 +4205,7 @@ static const struct ScriptCommand s_gs1_g20_s0_lives0_dlg0[] = { /* 0x8147f8c */ ALERT_CUE(6), FANFARE_PLAY2(469), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_NPC(1, _(" Huh?")), TEXTBOX_CLEAR, ROTATE_TO(5, DIR_TRANS_10, DIRECTION_NORTHWEST), @@ -4219,7 +4219,7 @@ static const struct ScriptCommand s_gs1_g20_s0_lives0_dlg0[] = { /* 0x8147f8c */ ALERT_CUE(6), AWAIT_CUE(5), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_NPC(1, _(" Maybe something's happened.")), MSG_NPC(1, _(" {NAME_0}, let's check\nit out!")), TEXTBOX_CLEAR, @@ -4312,7 +4312,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ TEXTBOX_CLEAR, ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0005, 0x00000001), MSG_NPC(5, _(" Let me tell you, I was\namazed!{WAIT_PRESS}\nIt really was true!")), TEXTBOX_CLEAR, WAIT(10), @@ -4327,7 +4327,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ TEXTBOX_CLEAR, ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" {NAME_0}, {NAME_1}.")), TEXTBOX_CLEAR, WAIT(10), @@ -4344,16 +4344,16 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ ALERT_CUE(10), CMD_UNK_93(10, DIR_TRANS_10, 54), WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_NPC(1, _(" Even you came out,\n{NAME_3}?")), TEXTBOX_CLEAR, WAIT(4), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Yes.")), TEXTBOX_CLEAR, ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0006, 0x00000000), MSG_NPC(6, _(" Ssh!{WAIT_PRESS} Quiet.")), MSG_NPC(6, _(" That guy there's telling us.\nKeep it down.")), TEXTBOX_CLEAR, @@ -4395,12 +4395,12 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ WAIT(10), BGM_SWITCH(MUS_RISING_FEAR), ALERT_CUE(7), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), 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!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Shocking stuff?")), TEXTBOX_CLEAR, WAIT(10), @@ -4419,11 +4419,11 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ FANFARE_PLAY2(464), CALL_SCRIPT(NOTICE_FUNC), CMD_UNK_93(5, DIR_TRANS_10, 34), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0005, 0x00000000), MSG_NPC(5, _(" What?!")), TEXTBOX_CLEAR, WAIT(4), - PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_BOTTOM_FLIP, 0x0006, 0x00000000), MSG_NPC(6, _(" It really existed...\nA human that turned into a Pokémon.")), TEXTBOX_CLEAR, WAIT(4), @@ -4432,16 +4432,16 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ MSG_NPC(2, _(" That how the human became\na Pokémon has a lot to do with how\nthe world's balance is upset.")), TEXTBOX_CLEAR, WAIT(4), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Wait a second...{WAIT_PRESS}\nThat's exactly like the Ninetales legend!")), TEXTBOX_CLEAR, WAIT(4), ALERT_CUE(7), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Kekeh!\nDon't be too shocked yet.\nThere's more.")), AWAIT_CUE(5), ALERT_CUE(7), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000004), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000004), 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...")), @@ -4460,7 +4460,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ MSG_NPC(4, _(" Wh-what?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0005, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0005, 0x00000001), MSG_NPC(5, _(" The world...{WAIT_PRESS}\nThe unthinkable's going to happen?")), TEXTBOX_CLEAR, WAIT(10), @@ -4503,7 +4503,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ WAIT(10), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_LEFT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_BOTTOM, 0x0006, 0x00000000), MSG_NPC(6, _(" When you put it that way...\nmaybe you're right.")), TEXTBOX_CLEAR, WAIT(10), @@ -4533,14 +4533,14 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ AWAIT_CUE(5), CLEAR_ARRAY(EVENT_LOCAL), ALERT_CUE(6), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Wha...{WAIT_PRESS} What?!{WAIT_PRESS}\nIt... It can't be!")), TEXTBOX_CLEAR, WAIT(4), MSG_NPC(5, _(" Y-you...{WAIT_PRESS}\nYou were that human?!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0006, 0x00000000), MSG_NPC(6, _(" Is that true?\nHey!")), TEXTBOX_CLEAR, BGM_SWITCH(MUS_THERES_TROUBLE), @@ -4573,12 +4573,12 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ MSG_NPC(1, _(" {NAME_0}...")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" {NAME_0}...")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(7), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000001), MSG_NPC(2, _(" Kekekekekekeh!\nLooks like you have nothing to say\nin your defense, {NAME_0}!")), AWAIT_CUE(5), WAIT(15), @@ -4612,7 +4612,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ ALERT_CUE(11), CALL_LABEL(15), ALERT_CUE(7), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...Wh-what?")), VARIANT(/* == */ 1, _(" E-everyone, hold up.\nWhat's with you?{WAIT_PRESS}\nWhat are you going to do?")), @@ -4627,7 +4627,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ ROTATE_TO(5, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), { 0x62, 0x00, 0x004c, -0x00000008, 0x00000000, NULL }, AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" {NAME_0}, forgive me!")), TEXTBOX_CLEAR, ALERT_CUE(9), @@ -5475,7 +5475,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives0_dlg2[] = { /* 0x814d54c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), { 0x2e, 0x00, 0x0001, -0x00000002, 0x00000000, NULL }, SPECIAL_TEXT(SPECIAL_TEXT_GREEN_KECLEON_SHOP, 0, 0), JUMP_SCRIPT(END_TALK), @@ -5497,7 +5497,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives1_dlg2[] = { /* 0x814d61c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), { 0x2e, 0x00, 0x0001, -0x00000002, 0x00000000, NULL }, SPECIAL_TEXT(SPECIAL_TEXT_PURPLE_KECLEON_SHOP, 0, 0), JUMP_SCRIPT(END_TALK), @@ -5519,7 +5519,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives2_dlg2[] = { /* 0x814d6ec */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), { 0x2e, 0x00, 0x0001, -0x00000002, 0x00000000, NULL }, SPECIAL_TEXT(SPECIAL_TEXT_BANK, 0, 0), JUMP_SCRIPT(END_TALK), @@ -5541,7 +5541,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives3_dlg2[] = { /* 0x814d7bc */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), { 0x2e, 0x00, 0x0001, -0x00000002, 0x00000000, NULL }, SPECIAL_TEXT(SPECIAL_TEXT_LINK_SHOP, 0, 0), JUMP_SCRIPT(END_TALK), @@ -5563,7 +5563,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives4_dlg2[] = { /* 0x814d88c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), { 0x2e, 0x00, 0x0001, -0x00000002, 0x00000000, NULL }, SPECIAL_TEXT(SPECIAL_TEXT_STORAGE_WITH_DIALOG, 0, 0), JUMP_SCRIPT(END_TALK), @@ -5585,7 +5585,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives5_dlg2[] = { /* 0x814d95c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), { 0x2e, 0x00, 0x0001, -0x00000002, 0x00000000, NULL }, SPECIAL_TEXT(SPECIAL_TEXT_FRIEND_SHOP, 0, 0), JUMP_SCRIPT(END_TALK), @@ -5643,7 +5643,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ WAIT(30), FANFARE_PLAY2(472), ALERT_CUE(7), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Kekeh!\nYou lot!")), MSG_NPC(2, _(" Why aren't you out there\nhunting down {NAME_0}'s team?")), TEXTBOX_CLEAR, @@ -5652,7 +5652,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ ALERT_CUE(10), ALERT_CUE(8), WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), MSG_NPC(4, _(" That's easy for you to say...")), TEXTBOX_CLEAR, ALERT_CUE(9), @@ -5660,7 +5660,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ MSG_NPC(4, _(" It's too much for us...")), TEXTBOX_CLEAR, WAIT(4), - PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0005, 0x00000000), 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.")), TEXTBOX_CLEAR, @@ -5672,7 +5672,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ ALERT_CUE(11), ALERT_CUE(13), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), PORTRAIT_POS(3, -1, 0), MSG_NPC(3, _(" I joined the chase...")), MSG_NPC(3, _(" But they fled into Mt. Blaze.")), @@ -5687,7 +5687,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000043), + PORTRAIT(PLACEMENT_CENTERLEFT_TOP, 0x0002, 0x00000043), MSG_NPC(2, _(" Kekeh!\nWhat a spineless lot you are!\nTch!")), TEXTBOX_CLEAR, ALERT_CUE(9), @@ -5699,7 +5699,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), 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!")), TEXTBOX_CLEAR, @@ -5724,7 +5724,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ TEXTBOX_CLEAR, ALERT_CUE(12), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0007, 0x00000042), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0007, 0x00000042), MSG_NPC(7, _(" {NAME_0}...\n{NAME_0} is...")), TEXTBOX_CLEAR, WAIT(4), @@ -5765,18 +5765,18 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ ALERT_CUE(8), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000042), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000042), PORTRAIT_POS(3, 0, -1), MSG_NPC(3, _(" H-hey! Over there...")), WAIT(4), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0006, 0x00000042), + PORTRAIT(PLACEMENT_MIDRIGHT_BOTTOM_FLIP, 0x0006, 0x00000042), PORTRAIT_POS(6, -2, 0), MSG_NPC(6, _(" ...{NAME_0}!")), TEXTBOX_CLEAR, WAIT(4), - PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0005, 0x00000000), PORTRAIT_POS(5, 1, 0), MSG_NPC(5, _(" Th-they're back...")), TEXTBOX_CLEAR, @@ -5792,7 +5792,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ AWAIT_CUE(5), WAIT(30), BGM_SWITCH(MUS_POKEMON_SQUARE), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_NPC(1, _(" Hi, everyone!\nWe're back!")), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Whew!\nWe finally made it back.\nWe've been gone for so long...")), @@ -5839,10 +5839,10 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ WAIT(30), PORTRAIT_REP(0x0002, 0x00000046), MSG_NPC(2, _(" Ugege?!")), - PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), PORTRAIT_POS(4, 1, 0), MSG_NPC(4, _(" Wh-what?!")), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000042), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000042), PORTRAIT_POS(3, -1, 0), MSG_NPC(3, _(" Is that true?!")), TEXTBOX_CLEAR, @@ -5921,7 +5921,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ ALERT_CUE(6), AWAIT_CUE(5), ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), - PORTRAIT(PLACEMENT_LEFT_, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0006, 0x00000000), MSG_NPC(6, _(" I...{WAIT_PRESS}\nI always believed in {NAME_0}!")), ALERT_CUE(11), MSG_NPC(6, _(" You don't fool me!")), @@ -5956,7 +5956,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ ALERT_CUE(12), ALERT_CUE(13), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0002, 0x00000046), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP, 0x0002, 0x00000046), MSG_NPC(2, _(" Ugegegeh!")), TEXTBOX_CLEAR, ALERT_CUE(7), @@ -5967,14 +5967,14 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ MSG_NPC(4, _(" I've heard enough too!\nI believe {NAME_0}!")), TEXTBOX_CLEAR, ALERT_CUE(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" Yeah, that's right!\nWho needs proof?")), TEXTBOX_CLEAR, ALERT_CUE(7), ALERT_CUE(12), ALERT_CUE(13), WAIT(60), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000046), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000046), MSG_NPC(2, _(" Ugegegegegege!")), TEXTBOX_CLEAR, WAIT(45), @@ -6009,17 +6009,17 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ FANFARE_PLAY2(468), ALERT_CUE(13), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0008, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0008, 0x00000000), MSG_NPC(8, _(" What?\nWhat is this?")), TEXTBOX_CLEAR, WAIT(4), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0007, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0007, 0x00000000), MSG_NPC(7, _(" ......{WAIT_PRESS}\nIt looks like a newspaper...\nDoesn't it?")), TEXTBOX_CLEAR, ALERT_CUE(9), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" OK, I'll read it aloud.\nLet's see...")), TEXTBOX_CLEAR, ALERT_CUE(8), @@ -6047,7 +6047,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ ALERT_CUE(10), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0004, 0x00000041), + PORTRAIT(PLACEMENT_MIDRIGHT_BOTTOM_FLIP, 0x0004, 0x00000041), PORTRAIT_POS(4, 2, 0), MSG_NPC(4, _(" You rotten...")), TEXTBOX_CLEAR, @@ -6069,7 +6069,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ FANFARE_PLAY2(471), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Stop, you liar!\nYou conned us!")), TEXTBOX_CLEAR, ALERT_CUE(8), @@ -6084,7 +6084,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ ALERT_CUE(16), CMD_UNK_93(8, DIR_TRANS_11, 54), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0006, 0x00000000), MSG_NPC(6, _(" Welcome back!")), TEXTBOX_CLEAR, PORTRAIT_REP(0x0001, 0x00000009), @@ -6916,8 +6916,8 @@ static const struct ScriptCommand s_gs1_g24_s1_lives0_dlg0[] = { /* 0x8153894 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), 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...")), @@ -7187,7 +7187,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(7), CMD_UNK_93(4, DIR_TRANS_10, 77), WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), 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?")), @@ -7200,7 +7200,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ AWAIT_CUE(5), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), PORTRAIT_POS(3, 0, -1), MSG_NPC(3, _(" Can I get everyone's\nattention here?")), TEXTBOX_CLEAR, @@ -7350,7 +7350,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(9), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), PORTRAIT_POS(4, 0, 1), 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.")), @@ -7381,7 +7381,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(10), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0005, 0x00000000), PORTRAIT_POS(5, 0, -1), MSG_NPC(5, _(" Darlings, when I see a tough\nPokémon, I want to tangle with them.")), TEXTBOX_CLEAR, @@ -7407,7 +7407,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(11), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0006, 0x00000000), PORTRAIT_POS(6, 0, 1), 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.")), @@ -7478,7 +7478,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(7), AWAIT_CUE(5), CMD_UNK_93(4, DIR_TRANS_10, 34), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" OK...\nI guess we can't say anything,\n{NAME_0}.")), VARIANT_DEFAULT(_(" Hmmm...\nIt can't be helped, {NAME_0}.")), @@ -8671,7 +8671,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hey, {NAME_1}.\nW-well...")), TEXTBOX_CLEAR, ALERT_CUE(7), @@ -8688,7 +8688,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(5), BGM_SWITCH(MUS_RISING_FEAR), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Look!\nIt's {NAME_5}!")), TEXTBOX_CLEAR, WAIT(60), @@ -8700,7 +8700,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ VARIANT_DEFAULT(_(" {NAME_3}!{WAIT_PRESS}\nWhat happened here?!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), PORTRAIT_POS(3, 0, -1), MSG_NPC(3, _(" ............{WAIT_PRESS}\nThey were wiped out...{WAIT_PRESS}\nIn the underground dungeon...")), TEXTBOX_CLEAR, @@ -8709,7 +8709,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ MSG_NPC(1, _(" You're kidding!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000003), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0005, 0x00000003), PORTRAIT_POS(5, 0, 1), MSG_NPC(5, _(" Groan... That place...{WAIT_PRESS}\nIt's rough, seriously...")), TEXTBOX_CLEAR, @@ -8717,14 +8717,14 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(8), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(10), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0006, 0x00000000), PORTRAIT_POS(6, 0, -1), MSG_NPC(6, _(" ...We couldn't get far\nenough to even see {NAME_9}...")), TEXTBOX_CLEAR, ALERT_CUE(6), ALERT_CUE(8), WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0007, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0007, 0x00000000), PORTRAIT_POS(7, 0, 1), MSG_NPC(7, _(" I don't want to ever go\nback to a place that bad...")), TEXTBOX_CLEAR, @@ -8753,11 +8753,11 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ WAIT(5), CALL_SCRIPT(SHOCK_FUNC), WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000000), MSG_NPC(4, _(" What fools.{WAIT_PRESS}\nThat's what you get for trying the\nimpossible.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0001, 0x00000003), + PORTRAIT(PLACEMENT_MIDRIGHT_BOTTOM_FLIP, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Ge-{NAME_4}!")), VARIANT(/* == */ 1, _(" Why don't you shut up?!{WAIT_PRESS}\nThis is about saving {NAME_8}'s team.\nWe have to try!")), @@ -8771,12 +8771,12 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(8), CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000000), MSG_NPC(4, _(" Kekeh!\nYou really find thinking hard, don't you?")), TEXTBOX_CLEAR, ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT_FLIP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Even they look smart\ncompared to you.")), TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), @@ -8801,7 +8801,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(4), AWAIT_CUE(5), WAIT(30), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0001, 0x00000005), MSG_NPC(1, _(" ...E-everyone...")), TEXTBOX_CLEAR, ALERT_CUE(9), @@ -8809,12 +8809,12 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(6), CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000000), MSG_NPC(4, _(" You see?\nEven they finally seem to understand\ntheir situation. Kekeh!")), TEXTBOX_CLEAR, ALERT_CUE(4), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" I...{WAIT_PRESS}\nMy leafy fans would burn up...")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -8824,7 +8824,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(9), CMD_UNK_93(4, DIR_TRANS_10, 85), WAIT(15), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x00000005), PORTRAIT_POS(1, -2, 0), MSG_NPC(1, _(" E-even {NAME_3}...")), TEXTBOX_CLEAR, @@ -8832,20 +8832,20 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ AWAIT_CUE(5), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP_FLIP, 0x0001, 0x00000000), MSG_NPC(4, _(" Kekeh! Get over it!\nDon't expect to be rewarded just because\nyou tried!")), ALERT_CUE(9), AWAIT_CUE(5), MSG_NPC(4, _(" Sometimes, it's better to\nwise up and give up!")), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000001), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000001), MSG_NPC(4, _(" ............Huh?{WAIT_PRESS}\nDid I say something profound?\nKekekekekekekeh!")), TEXTBOX_CLEAR, ALERT_CUE(6), CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(30), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0001, 0x00000005), MSG_NPC(1, _(" Urf...")), TEXTBOX_CLEAR, WAIT(30), @@ -8956,17 +8956,17 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ VARIANT_DEFAULT(_(" Never giving up...\nThat's where {COLOR CYAN}Team {TEAM_NAME}{RESET} stakes\nits pride!")), TEXTBOX_CLEAR, WAIT(60), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000003), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000003), MSG_NPC(4, _(" ............{WAIT_PRESS}Keh.{WAIT_PRESS} Kekekeh!{WAIT_PRESS}\nYou really aren't very bright, are you?")), ALERT_CUE(9), AWAIT_CUE(5), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT_FLIP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Why don't you do like\neveryone else and wise up?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), PORTRAIT_POS(3, 0, -1), MSG_NPC(3, _(" ...No.\n{NAME_1} is right.")), TEXTBOX_CLEAR, @@ -8976,7 +8976,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(6), CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 85), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000003), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000003), MSG_NPC(4, _(" ...Ugeh?")), TEXTBOX_CLEAR, WAIT(10), @@ -8990,7 +8990,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ AWAIT_CUE(5), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT_FLIP, 0x0004, 0x00000006), + PORTRAIT(PLACEMENT_MIDLEFT_TOP_FLIP, 0x0004, 0x00000006), MSG_NPC(4, _(" ...Ugegegeh?")), TEXTBOX_CLEAR, WAIT(60), @@ -9029,7 +9029,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ MSG_NPC(5, _(" ...We've only failed once.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000b), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x0000000b), MSG_NPC(1, _(" {NAME_5}!")), TEXTBOX_CLEAR, WAIT(10), @@ -9038,7 +9038,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ WAIT(10), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000006), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000006), MSG_NPC(4, _(" Ugegeh!")), TEXTBOX_CLEAR, WAIT(30), @@ -9067,7 +9067,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(9), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000b), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x0000000b), MSG_NPC(1, _(" {NAME_6}!\nAnd {NAME_7} too!")), TEXTBOX_CLEAR, WAIT(10), @@ -10185,8 +10185,8 @@ static const struct ScriptCommand s_gs1_g29_s0_lives6_dlg2[] = { /* 0x81617c4 */ { 0x2d, 0x09, 0x0002, 0x0000004d, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000068, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(2, _(" What's it like?\nThis {COLOR YELLOW_D}Magma Cavern{RESET}.")), TEXTBOX_CLEAR, WAIT(10), @@ -10208,8 +10208,8 @@ static const struct ScriptCommand s_gs1_g29_s0_lives7_dlg2[] = { /* 0x8161978 */ { 0x2d, 0x09, 0x0002, 0x0000004d, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000068, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(2, _(" What's it like?\nThis {COLOR YELLOW_D}Magma Cavern{RESET}.")), TEXTBOX_CLEAR, WAIT(10), @@ -10231,8 +10231,8 @@ static const struct ScriptCommand s_gs1_g29_s0_lives8_dlg2[] = { /* 0x8161a88 */ { 0x2d, 0x09, 0x0002, 0x0000004f, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000069, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" The {COLOR YELLOW_D}Magma Cavern{RESET}...\nAbove all, there were many Fire-type\nPokémon.")), TEXTBOX_CLEAR, WAIT(10), @@ -10255,8 +10255,8 @@ static const struct ScriptCommand s_gs1_g29_s0_lives9_dlg2[] = { /* 0x8161cac */ { 0x2d, 0x09, 0x0002, 0x0000004f, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000069, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" The {COLOR YELLOW_D}Magma Cavern{RESET}...\nAbove all, there were many Fire-type\nPokémon.")), TEXTBOX_CLEAR, WAIT(10), @@ -10279,8 +10279,8 @@ static const struct ScriptCommand s_gs1_g29_s0_lives10_dlg2[] = { /* 0x8161dcc * { 0x2d, 0x09, 0x0002, 0x00000055, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000006a, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), 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!")), TEXTBOX_CLEAR, @@ -10302,8 +10302,8 @@ static const struct ScriptCommand s_gs1_g29_s0_lives11_dlg2[] = { /* 0x8161f8c * { 0x2d, 0x09, 0x0002, 0x00000055, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000006a, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), 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!")), TEXTBOX_CLEAR, @@ -10337,8 +10337,8 @@ static const struct ScriptCommand s_gs1_g29_s1_lives0_dlg0[] = { /* 0x8162190 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), 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...")), TEXTBOX_CLEAR, @@ -10550,9 +10550,9 @@ static const struct ScriptCommand s_gs1_g30_s0_lives6_dlg2[] = { /* 0x8162d2c */ { 0x2d, 0x09, 0x0005, 0x0000006b, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x00, 0x0005, -0x00000002, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(3, _(" We got wiped again...{WAIT_PRESS}\nFifteen times now we have been to that\ninfernal {COLOR YELLOW_D}Magma Cavern{RESET}.")), TEXTBOX_CLEAR, WAIT(10), @@ -10589,9 +10589,9 @@ static const struct ScriptCommand s_gs1_g30_s0_lives7_dlg2[] = { /* 0x81630c0 */ { 0x2d, 0x09, 0x0005, 0x0000006b, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x00, 0x0005, -0x00000002, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(3, _(" We got wiped again...{WAIT_PRESS}\nFifteen times now we have been to that\ninfernal {COLOR YELLOW_D}Magma Cavern{RESET}.")), TEXTBOX_CLEAR, WAIT(10), @@ -10628,9 +10628,9 @@ static const struct ScriptCommand s_gs1_g30_s0_lives8_dlg2[] = { /* 0x81632d0 */ { 0x2d, 0x09, 0x0005, 0x0000006b, 0x00000000, NULL }, WAIT(1), { 0x2e, 0x00, 0x0005, -0x00000002, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(3, _(" We got wiped again...{WAIT_PRESS}\nFifteen times now we have been to that\ninfernal {COLOR YELLOW_D}Magma Cavern{RESET}.")), TEXTBOX_CLEAR, WAIT(10), @@ -10731,8 +10731,8 @@ static const struct ScriptCommand s_gs1_g30_s1_lives0_dlg0[] = { /* 0x8163b24 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), 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...")), TEXTBOX_CLEAR, @@ -10872,7 +10872,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ ALERT_CUE(10), ALERT_CUE(11), ALERT_CUE(12), - PORTRAIT(PLACEMENT_TOP_FLIP, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_CENTERRIGHT_TOP_FLIP, 0x0003, 0x00000000), PORTRAIT_POS(3, -1, 0), MSG_NPC(3, _(" Look!\nHere they come!")), TEXTBOX_CLEAR, @@ -10885,10 +10885,10 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ WAIT(20), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0006, 0x00000000), MSG_NPC(6, _(" It's true, darlings!")), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Let's go!")), TEXTBOX_CLEAR, ALERT_CUE(4), @@ -10911,11 +10911,11 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ WAIT(30), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0004, 0x00000042), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0004, 0x00000042), MSG_NPC(4, _(" Great work!\nGreat work, {NAME_0}!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0007, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0007, 0x00000000), MSG_NPC(7, _(" You really took down that\nGroudon?!")), TEXTBOX_CLEAR, WAIT(10), @@ -10924,13 +10924,13 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Whoa!\nW-wait a second!")), MSG_NPC(1, _(" How does everyone know\nabout what happened underground?")), TEXTBOX_CLEAR, ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0003, 0x00000000), PORTRAIT_POS(3, 1, 0), MSG_NPC(3, _(" Pelipper spread the word\nwith an extra edition of the Pokémon\nNews.")), TEXTBOX_CLEAR, @@ -10941,7 +10941,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ MSG_NPC(7, _(" You can be proud of it!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" You lot did great!{WAIT_PRESS}\nWhy don't we team up sometime?\nGahahahaha!")), TEXTBOX_CLEAR, WAIT(10), @@ -10982,7 +10982,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ FANFARE_PLAY2(468), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), 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?")), TEXTBOX_CLEAR, @@ -11548,7 +11548,7 @@ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ MSG_NPC(9, _(" You must ask {NAME_7}.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" {NAME_7}?{WAIT_PRESS}\nWhat might that be?")), TEXTBOX_CLEAR, FANFARE_PLAY2(487), @@ -11575,7 +11575,7 @@ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_CENTERRIGHT_TOP_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Then, we'll do it!{WAIT_PRESS}\nWe'll go!")), VARIANT(/* == */ 3, _(" Then, we'll do it!{WAIT_PRESS}\nWe'll go!")), @@ -12577,8 +12577,8 @@ static const struct ScriptCommand s_gs1_g38_s1_lives0_dlg0[] = { /* 0x816b150 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), 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...")), TEXTBOX_CLEAR, @@ -12872,7 +12872,7 @@ static const struct ScriptCommand s_gs1_g42_s0_lives0_dlg2[] = { /* 0x816ca38 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004d, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), 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...")), @@ -12890,7 +12890,7 @@ static const struct ScriptCommand s_gs1_g42_s0_lives1_dlg2[] = { /* 0x816cba0 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004f, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_NPC(1, _(" Good morning.")), MSG_NPC(1, _(" Ahh... Another refreshing\nday...")), JUMP_SCRIPT(END_TALK), @@ -12977,7 +12977,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives0_dlg0[] = { /* 0x816cf4c */ WAIT(1), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT_FLIP, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Oh?")), MSG_NPC(3, _(" Who is that? Over there.")), TEXTBOX_CLEAR, @@ -12985,7 +12985,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives0_dlg0[] = { /* 0x816cf4c */ ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Never seen it before.{WAIT_PRESS}\nIt's not from around these parts.")), TEXTBOX_CLEAR, BGM_FADEOUT(120), @@ -13006,7 +13006,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives0_dlg0[] = { /* 0x816cf4c */ WAIT(10), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Goodness!{WAIT_PRESS}\nIt needs help!")), TEXTBOX_CLEAR, ALERT_CUE(3), @@ -13114,7 +13114,7 @@ static const struct ScriptCommand s_gs1_g44_s0_lives0_dlg2[] = { /* 0x816d78c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000073, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), 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...")), @@ -13350,10 +13350,10 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0005, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0005, 0x00000001), ALERT_CUE(8), AWAIT_CUE(5), MSG_NPC(3, _(" ...I've always wondered...")), @@ -13493,8 +13493,8 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ ALERT_CUE(10), AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000001), - PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0004, 0x00000000), - PORTRAIT(PLACEMENT_TOP_LEFT_FLIP, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_FLIP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP_FLIP, 0x0005, 0x00000000), MSG_NPC(2, _("....................................")), MSG_NPC(3, _("...................................")), MSG_NPC(4, _("....................................")), @@ -13509,10 +13509,10 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ TEXTBOX_CLEAR, WAIT(10), LABEL(8), /* = 0x08 */ - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0005, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0005, 0x00000001), WAIT(60), ALERT_CUE(9), AWAIT_CUE(5), @@ -13580,8 +13580,8 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ MSG_NPC(2, _(" They're hurt bad...{WAIT_PRESS}\nWhat exactly happened?!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0006, 0x00000003), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0007, 0x00000003), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0006, 0x00000003), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0007, 0x00000003), 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...")), TEXTBOX_CLEAR, @@ -13636,9 +13636,9 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ WAIT(60), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), - PORTRAIT(PLACEMENT_TOP_RIGHT_FLIP, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP, 0x0005, 0x00000000), MSG_NPC(2, _(" ...Wow, it really exists...{WAIT_PRESS}\nA Pokémon that tough...")), ALERT_CUE(9), ALERT_CUE(10), @@ -14061,7 +14061,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ ALERT_CUE(6), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000001), MSG_NPC(2, _(" Aiyiyi...\nI do not deserve this! I am outraged!")), TEXTBOX_CLEAR, WAIT(10), @@ -14080,7 +14080,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ AWAIT_CUE(5), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), 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!")), ALERT_CUE(6), @@ -14093,7 +14093,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ ALERT_CUE(9), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" My bank wasn't hit, but...{WAIT_PRESS}\nThese are frightening times.")), TEXTBOX_CLEAR, WAIT(10), @@ -14103,9 +14103,9 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ WAIT(10), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), ALERT_CUE(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" No problem.{WAIT_PRESS}\nNothing gets stolen from under my eye.")), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0005, 0x00000001), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0005, 0x00000001), MSG_NPC(5, _(" This mama's not about to\nmake a stupid mistake like that! Kakakah!")), ALERT_CUE(10), TEXTBOX_CLEAR, @@ -14113,7 +14113,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ ALERT_CUE(7), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0002, 0x00000001), MSG_NPC(2, _(" You're insinuating...{WAIT_PRESS}\nthat we were robbed for being careless?!")), TEXTBOX_CLEAR, WAIT(10), @@ -14124,7 +14124,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ ALERT_CUE(9), ALERT_CUE(10), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0006, 0x00000000), MSG_NPC(6, _(" Now wait.")), WAIT(10), MSG_NPC(6, _(" Tell me, Kecleon.{WAIT_PRESS}\nYou saw...this thief?")), @@ -14132,7 +14132,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ WAIT(10), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0002, 0x00000000), 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...")), TEXTBOX_CLEAR, @@ -14147,10 +14147,10 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ WAIT(10), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" It flew off in yonder\ndirection, yes.")), ALERT_CUE(7), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0002, 0x00000000), MSG_NPC(2, _(" At tremendous speed\ntoo.")), TEXTBOX_CLEAR, WAIT(10), @@ -14163,7 +14163,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ MSG_NPC(6, _(" It's impossible to determine\nwhat the thief is...")), MSG_NPC(6, _(" So we'll need to investigate\nthis matter properly.")), ALERT_CUE(7), - PORTRAIT(PLACEMENT_TOP_LEFT_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Yes. I beg for justice.{WAIT_PRESS}\nMy business faces ruination.")), TEXTBOX_CLEAR, WAIT(10), @@ -14369,7 +14369,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ WAIT(10), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0005, 0x00000000), PORTRAIT_POS(5, -1, 0), MSG_NPC(5, _(" ...Wh-where...?")), TEXTBOX_CLEAR, @@ -14383,7 +14383,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ WAIT(10), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000001), 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!")), TEXTBOX_CLEAR, @@ -14391,7 +14391,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ ALERT_CUE(9), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0004, 0x00000000), PORTRAIT_POS(4, -3, 1), MSG_NPC(4, _(" Now wait.{WAIT_PRESS}\nThere must be a good reason for this.")), MSG_NPC(4, _(" We should at least hear\nthat.")), @@ -14435,14 +14435,14 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...What is that?{WAIT_PRESS}\nWhat's the {COLOR YELLOW_D}Pitfall Valley{RESET}?")), VARIANT_DEFAULT(_(" ...What is that?{WAIT_PRESS}\nWhat is the {COLOR YELLOW_D}Pitfall Valley{RESET}?")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(7), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), 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.")), TEXTBOX_CLEAR, @@ -14456,7 +14456,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_NPC(1, _(" A meteorite?!")), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), @@ -14513,7 +14513,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ MSG_NPC(4, _(" How foolish...{WAIT_PRESS}\nDo you think Latias wishes for that?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But...{WAIT_PRESS}\nIt's a place you can never escape, right?")), VARIANT(/* == */ 1, _(" How are we supposed to pull\noff a rescue from a place like that...?")), @@ -14531,7 +14531,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_NPC(1, _(" You can?!{WAIT_PRESS}\nHow?!")), TEXTBOX_CLEAR, WAIT(10), @@ -14540,7 +14540,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ MSG_NPC(4, _(" The {COLOR GREEN_I}Teleport Gem{RESET}.{WAIT_PRESS}\nUse that.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), 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.")), TEXTBOX_CLEAR, @@ -14549,13 +14549,13 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ 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}...")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000009), MSG_NPC(1, _(" That's it!{WAIT_PRESS}\nIf we did that, we could escape with\nLatias!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!{WAIT_PRESS}\nThis is a rescue that only we can do!")), VARIANT(/* == */ 1, _(" Let's get out there and\nhelp Latias!")), @@ -14788,31 +14788,31 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ WAIT(30), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" {NAME_6}!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0006, 0x00000000), MSG_NPC(6, _(" Latios!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(10), ALERT_CUE(11), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0005, 0x00000001), MSG_NPC(5, _(" You're safe!\nThis is incredible...")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0006, 0x00000000), MSG_NPC(6, _(" I'm sorry...\nI caused you so much worry...")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(7), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Oh, this is great...\nIt's so touching... Sniffle...")), TEXTBOX_CLEAR, WAIT(10), @@ -14822,7 +14822,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ ALERT_CUE(7), AWAIT_CUE(5), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), - PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0005, 0x00000000), 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...")), @@ -14832,7 +14832,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ WAIT(10), ALERT_CUE(6), WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, now, that's OK.{WAIT_PRESS}\nIt's even a little embarrassing when you\nput it that way, hahaha!")), VARIANT_DEFAULT(_(" It's OK, really.{WAIT_PRESS}\nWhen you put it that way, it's even a little\nembarrassing. Hahaha.")), @@ -14845,14 +14845,14 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_NPC(1, _(" Huh...?")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0006, 0x00000000), MSG_NPC(6, _(" We would like to join {COLOR CYAN}Team\n{TEAM_NAME}{RESET} and help with your rescue\nwork.")), TEXTBOX_CLEAR, WAIT(10), @@ -14865,7 +14865,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" {NAME_0}, what do you\nsay?{WAIT_PRESS}\nShould we let Latios and Latias join?")), VARIANT_DEFAULT(_(" {NAME_0}, what should\nwe do?{WAIT_PRESS}\nDo we let Latios and Latias join?")), @@ -14883,11 +14883,11 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ ALERT_CUE(8), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x0000000c), MSG_NPC(1, _(" Huh?\nYou're really sure about that?!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000005), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000005), ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" They're volunteering!\nDon't you think we should let them join?")), CHOICE(/* label */ 10, _("Accept.")), CHOICE(/* label */ 13, _("No, forget it.")), @@ -14902,7 +14902,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ ALERT_CUE(8), AWAIT_CUE(5), WAIT(60), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" It is you who decides.\nThe outcome is of no concern to me.")), MSG_NPC(4, _(" However...")), TEXTBOX_CLEAR, @@ -14925,13 +14925,13 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ ALERT_CUE(8), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, think good\nand hard about this.")), VARIANT_DEFAULT(_(" {NAME_0}, give it good\nthought.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" Should we let Latios and\nLatias join?")), VARIANT_DEFAULT(_(" Do we let Latios and Latias\njoin?")), @@ -14954,7 +14954,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ AWAIT_CUE(5), ALERT_CUE(7), ALERT_CUE(8), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Done deal!")), VARIANT(/* == */ 1, _(" You're our fellow members\nfrom now on! Welcome aboard!")), @@ -15456,7 +15456,7 @@ static const struct ScriptCommand s_gs1_g51_s0_lives0_dlg2[] = { /* 0x8178b08 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I think Gengar headed off\nto {COLOR YELLOW_D}Mt. Freeze{RESET}.")), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000044), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000044), 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), @@ -15488,7 +15488,7 @@ static const struct ScriptCommand s_gs1_g52_s0_lives0_dlg2[] = { /* 0x8178d0c */ LABEL(2), /* = 0x02 */ { 0x3b, 0x30, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(1, /* to label */ 4), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000041), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000041), MSG_NPC(1, _(" Thank you!{WAIT_PRESS}\nI promise to do my best for the team!")), TEXTBOX_CLEAR, WAIT(10), @@ -15513,7 +15513,7 @@ static const struct ScriptCommand s_gs1_g52_s0_lives0_dlg2[] = { /* 0x8178d0c */ { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(END_TALK), LABEL(4), /* = 0x04 */ - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000041), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000041), MSG_NPC(1, _(" Yes!\nThank you!")), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" ...However, there seems to\nbe no space for me in my Friend Area...{WAIT_PRESS}\nThis is disappointing...")), diff --git a/src/data/ground/ground_data_t01p02a_station.h b/src/data/ground/ground_data_t01p02a_station.h index ef5614954..2544af776 100644 --- a/src/data/ground/ground_data_t01p02a_station.h +++ b/src/data/ground/ground_data_t01p02a_station.h @@ -241,8 +241,8 @@ static const struct ScriptCommand s_gs2_g1_s0_lives0_dlg2[] = { /* 0x817e130 */ { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000005e, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), MSG_NPC(3, _(" I went into the cave, but...{WAIT_PRESS}\nI couldn't evolve into Butterfree.")), TEXTBOX_CLEAR, WAIT(10), @@ -269,8 +269,8 @@ static const struct ScriptCommand s_gs2_g1_s0_lives1_dlg2[] = { /* 0x817e3c0 */ { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000005e, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0003, 0x00000000), MSG_NPC(3, _(" I went into the cave, but...{WAIT_PRESS}\nI couldn't evolve into Butterfree.")), TEXTBOX_CLEAR, WAIT(10), @@ -551,8 +551,8 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ CMD_UNK_95(4, DIR_TRANS_10, 5), ALERT_CUE(4), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(2, _(" ........................")), TEXTBOX_CLEAR, WAIT(10), @@ -578,8 +578,8 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ ALERT_CUE(7), ALERT_CUE(8), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), 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.")), TEXTBOX_CLEAR, @@ -596,12 +596,12 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0002, 0x00000002), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0003, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0003, 0x00000001), CJUMP_UNK_C8(92), COND_EQUAL(6, /* to label */ 3), COND_EQUAL(5, /* to label */ 3), COND_EQUAL(7, /* to label */ 3), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000001), LABEL(3), /* = 0x03 */ FANFARE_PLAY2(473), ALERT_CUE(7), @@ -763,8 +763,8 @@ static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ CMD_UNK_95(4, DIR_TRANS_10, 5), ALERT_CUE(4), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), 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...")), TEXTBOX_CLEAR, @@ -798,12 +798,12 @@ static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0002, 0x00000002), - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0003, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0003, 0x00000001), CJUMP_UNK_C8(92), COND_EQUAL(6, /* to label */ 4), COND_EQUAL(5, /* to label */ 4), COND_EQUAL(7, /* to label */ 4), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000001), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000001), LABEL(4), /* = 0x04 */ FANFARE_PLAY2(473), ALERT_CUE(7), @@ -1036,7 +1036,7 @@ static const struct ScriptCommand s_gs2_g10_s0_lives0_dlg2[] = { /* 0x81818ec */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0001, 0x00000000), 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), @@ -1238,7 +1238,7 @@ static const struct ScriptCommand s_gs2_g15_s0_lives0_dlg2[] = { /* 0x8182664 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0001, 0x00000001), MSG_NPC(1, _(" Seeing children at play is\nwhat I most enjoy now.")), JUMP_SCRIPT(END_TALK), }; @@ -1262,8 +1262,8 @@ static const struct ScriptCommand s_gs2_g15_s0_lives1_dlg2[] = { /* 0x8182768 */ { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000005e, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), 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!")), @@ -1286,8 +1286,8 @@ static const struct ScriptCommand s_gs2_g15_s0_lives2_dlg2[] = { /* 0x8182904 */ { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000005e, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), 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!")), @@ -1402,7 +1402,7 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ MSG_NPC(1, _(" But there was someone\nso foolish as to grab a tail.{WAIT_PRESS}\nAnd it was a human.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000004), MSG_NPC(3, _(" A human?")), TEXTBOX_CLEAR, WAIT(10), @@ -1420,7 +1420,7 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ MSG_NPC(1, _(" There exist strong bonds\nbetween humans and Pokémon.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 3), VARIANT(/* == */ 1, _(" ...All right.{WAIT_PRESS}\nBut humans... Aren't there good ones and\nbad ones too?")), VARIANT_DEFAULT(_(" ...OK.{WAIT_PRESS}\nBut humans... Aren't there good humans\nand bad ones too?")), @@ -1438,7 +1438,7 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ ALERT_CUE(8), FANFARE_PLAY2(466), CALL_SCRIPT(SHOCK_FUNC), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x0000000c), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x0000000c), MSG_NPC(3, _(" What?!{WAIT_PRESS}\nA human turn into a Pokémon?!")), TEXTBOX_CLEAR, WAIT(20), @@ -1455,7 +1455,7 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ TEXTBOX_CLEAR, BGM_FADEOUT(120), WAIT(80), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000005), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000005), MSG_NPC(3, _(" ........................")), TEXTBOX_CLEAR, WAIT(10), @@ -1466,7 +1466,7 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000001), MSG_NPC(1, _(" If you feel the urge to hear\nmy tale again, come see me. Hohoho.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -1571,7 +1571,7 @@ static const struct ScriptCommand s_gs2_g18_s0_lives0_dlg0[] = { /* 0x8183f98 */ MSG_NPC(2, _(" And sacrificed herself to\nabsorb the curse.")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000004), MSG_NPC(1, _(" Why?")), MSG_NPC(1, _(" Why would that Pokémon,\nGardevoir, take the human's place?")), TEXTBOX_CLEAR, @@ -2184,7 +2184,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ ALERT_CUE(8), AWAIT_CUE(5), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), - PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0001, 0x00000000), MSG_NPC(1, _(" Hi, {NAME_4}!")), TEXTBOX_CLEAR, ALERT_CUE(4), @@ -2208,7 +2208,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ WAIT(10), ALERT_CUE(10), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0005, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0005, 0x00000000), PORTRAIT_POS(5, 2, 3), MSG_NPC(5, _(" I'm Snubbull.")), TEXTBOX_CLEAR, @@ -2229,7 +2229,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ MSG_NPC(1, _(" What cave?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0006, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0006, 0x00000000), PORTRAIT_POS(6, 0, -1), MSG_NPC(6, _(" It appeared without me\nnoticing.")), TEXTBOX_CLEAR, @@ -2268,7 +2268,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ WAIT(10), ALERT_CUE(9), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0004, 0x00000000), MSG_NPC(4, _(" Snubbull underwent\n“evolution.”{WAIT_PRESS}\nHe evolved.")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -2310,12 +2310,12 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ WAIT(10), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_MIDDLE_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_BOTTOM, 0x0002, 0x00000000), PORTRAIT_POS(2, -2, 0), MSG_NPC(2, _(" So if I evolved, I would\nbecome like {NAME_3}?!")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), PORTRAIT_POS(3, -1, 0), MSG_NPC(3, _(" I wish...{WAIT_PRESS}\nI want to be Butterfree quickly...")), TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_t01p03_station.h b/src/data/ground/ground_data_t01p03_station.h index b70848145..15fee8165 100644 --- a/src/data/ground/ground_data_t01p03_station.h +++ b/src/data/ground/ground_data_t01p03_station.h @@ -783,10 +783,10 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_MIDRIGHT_TOP_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0003, 0x00000000), 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?")), TEXTBOX_CLEAR, @@ -975,12 +975,12 @@ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), ALERT_CUE(6), AWAIT_CUE(5), CMD_UNK_93(4, DIR_TRANS_10, 34), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" “Smeargle's desperate plea,“\nhuh...?{WAIT_PRESS}\nThat's some title.")), VARIANT(/* == */ 1, _(" What's it say?{WAIT_PRESS}\nCan you read it?")), @@ -1129,7 +1129,7 @@ static const struct ScriptCommand s_gs4_g7_s0_lives0_dlg0[] = { /* 0x818e464 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} read the SOS Mail\n{CENTER_ALIGN}apparently sent by Medicham.")), TEXTBOX_CLEAR, WAIT(20), @@ -1236,7 +1236,7 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ ALERT_CUE(8), AWAIT_CUE(5), CMD_UNK_93(4, DIR_TRANS_10, 93), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" Say, sweetie.{WAIT_PRESS}\nHave you seen Gengar around?")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), @@ -1245,7 +1245,7 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ FANFARE_PLAY2(465), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000042), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000042), MSG_NPC(2, _(" Hunh? You did?{WAIT_PRESS}\n...Wh-where?")), TEXTBOX_CLEAR, WAIT(45), @@ -1259,7 +1259,7 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ TEXTBOX_CLEAR, WAIT(10), CMD_UNK_93(4, DIR_TRANS_10, 92), - PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Something seems to be\nwrong with Gengar lately.")), TEXTBOX_CLEAR, WAIT(10), @@ -1433,8 +1433,8 @@ static const struct ScriptCommand s_gs4_g11_s1_lives0_dlg0[] = { /* 0x818f840 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), SPECIAL_TEXT(SPECIAL_TEXT_UNK_23, 0, 0), ALERT_CUE(3), HALT, @@ -1453,7 +1453,7 @@ static const struct ScriptCommand s_gs4_g11_s2_lives0_dlg0[] = { /* 0x818f920 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0000, 0x00000000), SPECIAL_TEXT(SPECIAL_TEXT_UNK_23, 0, 0), ALERT_CUE(3), HALT, @@ -1463,7 +1463,7 @@ static const struct ScriptCommand s_gs4_g11_s3_lives0_dlg0[] = { /* 0x818f9b0 */ DEBUGINFO_O(1463), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0002, 0x00000000), HALT, }; @@ -1471,7 +1471,7 @@ static const struct ScriptCommand s_gs4_g11_s4_lives0_dlg0[] = { /* 0x818fa00 */ DEBUGINFO_O(1471), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_MIDLEFT_TOP, 0x0003, 0x00000000), HALT, }; @@ -1479,7 +1479,7 @@ static const struct ScriptCommand s_gs4_g11_s5_lives0_dlg0[] = { /* 0x818fa50 */ DEBUGINFO_O(1479), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_MIDTOP, 0x0002, 0x00000000), HALT, }; @@ -1487,7 +1487,7 @@ static const struct ScriptCommand s_gs4_g11_s5_lives1_dlg0[] = { /* 0x818faa0 */ DEBUGINFO_O(1487), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_MIDTOP_FLIP, 0x0003, 0x00000000), HALT, }; @@ -1546,7 +1546,7 @@ static const struct ScriptCommand s_gs4_g12_s0_lives0_dlg0[] = { /* 0x818fcdc */ WALK_GRID(256, 12), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is where information\nis gathered from Pokémon needing rescue\nin all sorts of places.")), VARIANT_DEFAULT(_(" This is where information\nis gathered from Pokémon needing rescue\nin various locations.")), @@ -2210,7 +2210,7 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ TEXTBOX_AUTO_PRESS(0, 0), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), ALERT_CUE(6), ALERT_CUE(8), @@ -2218,7 +2218,7 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), ALERT_CUE(6), ALERT_CUE(8), @@ -2226,26 +2226,26 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), ALERT_CUE(6), ALERT_CUE(8), CMD_UNK_93(4, DIR_TRANS_10, 66), TEXTBOX_CLEAR, - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), ALERT_CUE(7), AWAIT_CUE(5), ALERT_CUE(6), ALERT_CUE(8), CMD_UNK_93(4, DIR_TRANS_10, 66), TEXTBOX_AUTO_PRESS(30, 30), - PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), TEXTBOX_AUTO_PRESS(-1, -1), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), 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...")), TEXTBOX_CLEAR, @@ -2469,7 +2469,7 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ TEXTBOX_AUTO_PRESS(0, 0), ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), ALERT_CUE(6), ALERT_CUE(8), @@ -2477,8 +2477,8 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT_FLIP, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), ALERT_CUE(6), ALERT_CUE(8), @@ -2486,7 +2486,7 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), ALERT_CUE(6), ALERT_CUE(8), @@ -2498,13 +2498,13 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ ALERT_CUE(8), CMD_UNK_93(4, DIR_TRANS_10, 66), TEXTBOX_AUTO_PRESS(30, 30), - PORTRAIT(PLACEMENT_RIGHT_FLIP, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT_BOTTOM, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), TEXTBOX_AUTO_PRESS(-1, -1), - PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_2, 0x0002, 0x00000000), MSG_NPC(2, _(" Gasp, gasp...")), TEXTBOX_CLEAR, WAIT(10), diff --git a/src/data/ground/ground_event_data.h b/src/data/ground/ground_event_data.h index 4a57420d4..7b48e9550 100644 --- a/src/data/ground/ground_event_data.h +++ b/src/data/ground/ground_event_data.h @@ -90,7 +90,7 @@ static const struct ScriptCommand s_script_UNIT_TALK[] = { /* 0x811f188 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), { 0x2e, 0x00, 0x0001, -0x00000002, 0x00000000, NULL }, MSG_NPC(1, _("Let's go.")), JUMP_SCRIPT(END_TALK), @@ -101,7 +101,7 @@ static const struct ScriptCommand s_script_HABITAT_TALK[] = { /* 0x811f214 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), { 0x2e, 0x00, 0x0001, -0x00000002, 0x00000000, NULL }, { 0x3b, 0x0a, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), @@ -124,8 +124,8 @@ static const struct ScriptCommand s_script_HABITAT_TALK_S01E02A[] = { /* 0x811f3 SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), - PORTRAIT(PLACEMENT_LEFT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0000, 0x00000000), + PORTRAIT(PLACEMENT_LEFT_BOTTOM_1, 0x0001, 0x00000000), JUMPIF_EQUAL(FLAG_KIND_CHANGE_REQUEST, 0, /* to label */ 0), 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.")), diff --git a/src/data/portrait_placements.h b/src/data/portrait_placements.h new file mode 100644 index 000000000..226c81918 --- /dev/null +++ b/src/data/portrait_placements.h @@ -0,0 +1,50 @@ +// There is no #ifdef guard here because we want this array duplicated into different overlays. + +#define X_L 2 +#define X_MID_L 7 +#define X_CENTER_L 12 +#define X_CENTER_R 13 +#define X_MID_R 18 +#define X_R 23 + +#define Y_T 1 +#define Y_MID_T 2 +#define Y_CENTER 5 +// Looks like they defined `Y_MID_B` as 8 instead of 7 and that's why we have a duplicate placement +#define Y_B 8 + +static const PortraitPlacementInfo sPortraitPlacements[PLACEMENT_COUNT] = { + [PLACEMENT_LEFT_BOTTOM_1] = { { X_L, Y_B }, FALSE }, + [PLACEMENT_CENTERLEFT_CENTER] = { { X_CENTER_L, Y_CENTER }, FALSE }, + [PLACEMENT_LEFT_BOTTOM_2] = { { X_L, Y_B }, FALSE }, + [PLACEMENT_RIGHT_BOTTOM_FLIP] = { { X_R, Y_B }, TRUE }, + [PLACEMENT_MIDLEFT_BOTTOM] = { { X_MID_L, Y_B }, FALSE }, + [PLACEMENT_MIDRIGHT_BOTTOM_FLIP] = { { X_MID_R, Y_B }, TRUE }, + [PLACEMENT_CENTERRIGHT_CENTER_FLIP] = { { X_CENTER_R, Y_CENTER }, TRUE }, + [PLACEMENT_LEFT_BOTTOM_FLIP] = { { X_L, Y_B }, TRUE }, + [PLACEMENT_RIGHT_BOTTOM] = { { X_R, Y_B }, FALSE }, + [PLACEMENT_MIDLEFT_BOTTOM_FLIP] = { { X_MID_L, Y_B }, TRUE }, + [PLACEMENT_MIDRIGHT_BOTTOM] = { { X_MID_R, Y_B }, FALSE }, + [PLACEMENT_CENTERLEFT_TOP] = { { X_CENTER_L, Y_T }, FALSE }, + [PLACEMENT_LEFT_MIDTOP] = { { X_L, Y_MID_T }, FALSE }, + [PLACEMENT_RIGHT_MIDTOP_FLIP] = { { X_R, Y_MID_T }, TRUE }, + [PLACEMENT_MIDLEFT_TOP] = { { X_MID_L, Y_T }, FALSE }, + [PLACEMENT_MIDRIGHT_TOP_FLIP] = { { X_MID_R, Y_T }, TRUE }, + [PLACEMENT_CENTERRIGHT_TOP_FLIP] = { { X_CENTER_R, Y_T }, TRUE }, + [PLACEMENT_LEFT_MIDTOP_FLIP] = { { X_L, Y_MID_T }, TRUE }, + [PLACEMENT_RIGHT_MIDTOP] = { { X_R, Y_MID_T }, FALSE }, + [PLACEMENT_MIDLEFT_TOP_FLIP] = { { X_MID_L, Y_T }, TRUE }, + [PLACEMENT_MIDRIGHT_TOP] = { { X_MID_R, Y_T }, FALSE }, +}; + +#undef X_L +#undef X_MID_L +#undef X_CENTER_L +#undef X_CENTER_R +#undef X_MID_R +#undef X_R + +#undef Y_T +#undef Y_MID_T +#undef Y_CENTER +#undef Y_B \ No newline at end of file diff --git a/src/dungeon_message.c b/src/dungeon_message.c index 8da0e6852..56fa02f8d 100644 --- a/src/dungeon_message.c +++ b/src/dungeon_message.c @@ -444,7 +444,7 @@ void DisplayDungeonDialogue_Async(const struct DungeonDialogueStruct *dialogueIn && dialogueInfo->spriteId != 0x80 && dialogueMonId != MONSTER_NONE) { - const struct PortraitPlacementInfo *placementInfo = GetPortraitPlacementInfo(dialogueInfo->spritePlacementId); + const PortraitPlacementInfo *placementInfo = GetPortraitPlacementInfo(dialogueInfo->spritePlacementId); monPortraitPtr = &monPortrait; monPortraitPtr->faceFile = GetDialogueSpriteDataPtr(dialogueMonId); diff --git a/src/dungeon_portrait_placement.c b/src/dungeon_portrait_placement.c index dfb89212f..a7b875939 100644 --- a/src/dungeon_portrait_placement.c +++ b/src/dungeon_portrait_placement.c @@ -4,31 +4,9 @@ // Note: this file is not part of overlay5. It's most likely arm9.bin, but I couldn't locate the address -static const struct PortraitPlacementInfo sPortraitPlacements[PLACEMENT_COUNT] = { - [PLACEMENT_LEFT] = {{2, 8}, FALSE}, - [PLACEMENT_MIDDLE_TOP] = {{12, 5}, FALSE}, - [PLACEMENT_LEFT_] = {{2, 8}, FALSE}, - [PLACEMENT_RIGHT] = {{23, 8}, TRUE}, - [PLACEMENT_MIDDLE_LEFT] = {{7, 8}, FALSE}, - [PLACEMENT_MIDDLE_RIGHT] = {{18, 8}, TRUE}, - [PLACEMENT_MIDDLE_TOP_FLIP] = {{13, 5}, TRUE}, - [PLACEMENT_LEFT_FLIP] = {{2, 8}, TRUE}, - [PLACEMENT_RIGHT_FLIP] = {{23, 8}, FALSE}, - [PLACEMENT_MIDDLE_LEFT_FLIP] = {{7, 8}, TRUE}, - [PLACEMENT_MIDDLE_RIGHT_FLIP] = {{18, 8}, FALSE}, - [PLACEMENT_TOP] = {{12, 1}, FALSE}, - [PLACEMENT_TOP_LEFT] = {{2, 2}, FALSE}, - [PLACEMENT_TOP_RIGHT] = {{23, 2}, TRUE}, - [PLACEMENT_MIDDLE_TOP_LEFT] = {{7, 1}, FALSE}, - [PLACEMENT_MIDDLE_TOP_RIGHT] = {{18, 1}, TRUE}, - [PLACEMENT_TOP_FLIP] = {{13, 1}, TRUE}, - [PLACEMENT_TOP_LEFT_FLIP] = {{2, 2}, TRUE}, - [PLACEMENT_TOP_RIGHT_FLIP] = {{23, 2}, FALSE}, - [PLACEMENT_MIDDLE_TOP_LEFT_FLIP] = {{7, 1}, TRUE}, - [PLACEMENT_MIDDLE_TOP_RIGHT_FLIP] = {{18, 1}, FALSE}, -}; +#include "data/portrait_placements.h" -const struct PortraitPlacementInfo *GetPortraitPlacementInfo(u8 id) +const PortraitPlacementInfo *GetPortraitPlacementInfo(u8 id) { return &sPortraitPlacements[id]; } diff --git a/src/textbox.c b/src/textbox.c index af1ef6390..4fc65586d 100644 --- a/src/textbox.c +++ b/src/textbox.c @@ -57,34 +57,36 @@ #include "structs/str_file_system.h" #include "structs/str_mon_portrait.h" -struct TextboxPortrait +// Size: 0x24 +typedef struct TextboxPortrait { - // size: 0x24 - s16 unk0; - /* 0x2 */ s16 speciesID; - bool8 showPortrait; - u8 unk5; - s8 spriteId; - u8 placementId; - PixelPos posDelta; // By default 0, 0. Allows to modify the position of the portrait. Can be changed by the scripting command 0x2f. - MonPortraitMsg monPortrait; + /* 0x00 */ s16 unk0; + /* 0x02 */ s16 speciesID; + /* 0x04 */ bool8 showPortrait; + /* 0x05 */ u8 unk5; + /* 0x06 */ s8 spriteId; + /* 0x07 */ u8 placementId; // See enum "PortraitPlacementID" + /* 0x08 */ PixelPos posDelta; // By default 0, 0. Allows to modify the position of the portrait. Can be changed by the scripting command 0x2f. + /* 0x10 */ MonPortraitMsg monPortrait; /* 0x20 */ OpenedFile *faceFile; -}; +} TextboxPortrait; -struct TextboxText +// Size: 0x408 +typedef struct TextboxText { - u16 flags; - u32 unk4; - u8 buffer[0x400]; -}; + /* 0x0 */ u16 flags; + /* 0x4 */ u32 unk4; + /* 0x8 */ u8 buffer[0x400]; +} TextboxText; -struct unkStruct_3001B64_unk418 +// Size: 0x10 +typedef struct unkStruct_3001B64_unk418 { - u16 unk0; - u8 (*unk4)(void); - void (*unk8)(void); - u32 (*unkC)(void); -}; + /* 0x0 */ u16 unk0; + /* 0x4 */ u8 (*unk4)(void); + /* 0x8 */ void (*unk8)(void); + /* 0xC */ u32 (*unkC)(void); +} unkStruct_3001B64_unk418; #define MAX_TEXTBOX_PORTRAITS 10 @@ -97,28 +99,28 @@ enum TextboxTypeID TEXTBOX_TYPE_4, }; -// size: 0x5A8 -struct Textbox +// Size: R=0x5A8 | B=0x5A6 +typedef struct Textbox { - u32 type; // See enum "TextboxTypeID" - s32 endMsgFrames; - s32 midMsgFrames; - struct TextboxText text; - u32 unk414; // See enum "SpecialTextKind" - const struct unkStruct_3001B64_unk418 *unk418; - const MenuItem *unk41C; - u32 unk420; - u32 unk424; - u32 unk428; - MonOrStringPtr unk42C; - s32 unk430; // See enum "ScriptID" - s32 unk434; - u32 fill438; - struct TextboxPortrait portraits[MAX_TEXTBOX_PORTRAITS]; - s16 unk5A4; // See enum "ScriptID" -}; + /* 0x000 */ u32 type; // See enum "TextboxTypeID" + /* 0x004 */ s32 endMsgFrames; + /* 0x008 */ s32 midMsgFrames; + /* 0x00C */ TextboxText text; + /* 0x414 */ u32 unk414; // See enum "SpecialTextKind" + /* 0x418 */ const unkStruct_3001B64_unk418 *unk418; + /* 0x41C */ const MenuItem *unk41C; + /* 0x420 */ u32 unk420; + /* 0x424 */ u32 unk424; + /* 0x428 */ u32 unk428; + /* 0x42C */ MonOrStringPtr unk42C; + /* 0x430 */ s32 unk430; // See enum "ScriptID" + /* 0x434 */ s32 unk434; + /* 0x438 */ u32 unused438; + /* 0x43C */ TextboxPortrait portraits[MAX_TEXTBOX_PORTRAITS]; + /* 0x5A4 */ s16 unk5A4; // See enum "ScriptID" +} Textbox; -static IWRAM_INIT struct Textbox *sTextbox = { NULL }; +static IWRAM_INIT Textbox *sTextbox = { NULL }; void sub_809B028(const MenuItem *, s32 a1_, s32 a2, s32 a3, s32 a4_, const u8 *text); bool8 sub_809B18C(s32 *sp); @@ -163,29 +165,7 @@ extern u32 sub_802DFD8(void); // Only dialogue sound #define TEXTBOX_FLAG_DIALOGUE_SOUND (1 << 9) -static const struct PortraitPlacementInfo sPortraitPlacements[PLACEMENT_COUNT] = { - [PLACEMENT_LEFT] = { { 2, 8}, FALSE }, - [PLACEMENT_MIDDLE_TOP] = { { 12, 5}, FALSE }, - [PLACEMENT_LEFT_] = { { 2, 8}, FALSE }, - [PLACEMENT_RIGHT] = { { 23, 8}, TRUE }, - [PLACEMENT_MIDDLE_LEFT] = { { 7, 8}, FALSE }, - [PLACEMENT_MIDDLE_RIGHT] = { { 18, 8}, TRUE }, - [PLACEMENT_MIDDLE_TOP_FLIP] = { { 13, 5}, TRUE }, - [PLACEMENT_LEFT_FLIP] = { { 2, 8}, TRUE }, - [PLACEMENT_RIGHT_FLIP] = { { 23, 8}, FALSE }, - [PLACEMENT_MIDDLE_LEFT_FLIP] = { { 7, 8}, TRUE }, - [PLACEMENT_MIDDLE_RIGHT_FLIP] = { { 18, 8}, FALSE }, - [PLACEMENT_TOP] = { { 12, 1}, FALSE }, - [PLACEMENT_TOP_LEFT] = { { 2, 2}, FALSE }, - [PLACEMENT_TOP_RIGHT] = { { 23, 2}, TRUE }, - [PLACEMENT_MIDDLE_TOP_LEFT] = { { 7, 1}, FALSE }, - [PLACEMENT_MIDDLE_TOP_RIGHT] = { { 18, 1}, TRUE }, - [PLACEMENT_TOP_FLIP] = { { 13, 1}, TRUE }, - [PLACEMENT_TOP_LEFT_FLIP] = { { 2, 2}, TRUE }, - [PLACEMENT_TOP_RIGHT_FLIP] = { { 23, 2}, FALSE }, - [PLACEMENT_MIDDLE_TOP_LEFT_FLIP] = { { 7, 1}, TRUE }, - [PLACEMENT_MIDDLE_TOP_RIGHT_FLIP] = { { 18, 1}, FALSE }, -}; +#include "data/portrait_placements.h" static const MenuItem gUnknown_81160E8[] = { @@ -240,11 +220,11 @@ EWRAM_DATA u16 gUnknown_20399DC = 0; EWRAM_DATA u16 gUnknown_20399DE = 0; static void ResetAllTextboxPortraits(void); -static bool8 ScriptPrintTextInternal(struct TextboxText *ptr, u32 flags_, s32 a2_, const char *text); +static bool8 ScriptPrintTextInternal(TextboxText *ptr, u32 flags_, s32 a2_, const char *text); // textboxType: See enum "TextboxTypeID" static bool8 SetTextboxType(u32 textboxType, bool8 unused); static void ResetTextbox(void); -static bool8 IsTextboxOpen_809B40C(struct TextboxText *a0); +static bool8 IsTextboxOpen_809B40C(TextboxText *a0); static u8 *sub_809B428(u8 *a0, s32 a1, u8 *a2); static bool8 sub_809B648(void); static void sub_809C39C(void); @@ -259,7 +239,7 @@ static void sub_809C550(void); void TextboxInit(void) { ResetDialogueBox(); - sTextbox = MemoryAlloc(sizeof(struct Textbox), 6); + sTextbox = MemoryAlloc(sizeof(Textbox), 6); sTextbox->type = 0; sTextbox->endMsgFrames = -1; sTextbox->midMsgFrames = -1; @@ -405,7 +385,7 @@ bool8 ScriptClearTextbox2(void) static void ResetAllTextboxPortraits(void) { s32 i; - struct TextboxPortrait *ptr = &sTextbox->portraits[0]; + TextboxPortrait *ptr = &sTextbox->portraits[0]; for (i = 0; i < MAX_TEXTBOX_PORTRAITS; i++, ptr++) { ptr->unk0 = -1; @@ -426,7 +406,7 @@ static void ResetAllTextboxPortraits(void) void ResetTextboxPortrait(s16 id_) { s32 id = id_; - struct TextboxPortrait *ptr = &sTextbox->portraits[id]; + TextboxPortrait *ptr = &sTextbox->portraits[id]; ptr->unk0 = -1; ptr->speciesID = MONSTER_NONE; @@ -450,7 +430,7 @@ static bool8 sub_809A8B8(s32 param_1, s32 param_2) s16 speciesId; s32 portraitId = (s16) param_1; s16 local_28 = (s16) param_2; - struct TextboxPortrait *portraitPtr = &sTextbox->portraits[portraitId]; + TextboxPortrait *portraitPtr = &sTextbox->portraits[portraitId]; bool8 showPortrait = TRUE; bool8 byte1 = FALSE; @@ -577,7 +557,7 @@ bool8 sub_809AB4C(s32 a0_, s32 a1_) { s32 a0 = (s16) a0_; s32 a1 = (s16) a1_; - struct TextboxPortrait *portrait = &sTextbox->portraits[a0]; + TextboxPortrait *portrait = &sTextbox->portraits[a0]; if (sub_809A8B8(a0, a1)) { CopyCyanMonsterNametoBuffer(gFormatBuffer_Monsters[a0], portrait->speciesID); @@ -593,7 +573,7 @@ bool8 sub_809ABB4(s32 id_, s32 a1_) { s32 id = (s16) id_; s32 a1 = (s16) a1_; - struct TextboxPortrait *portrait = &sTextbox->portraits[id]; + TextboxPortrait *portrait = &sTextbox->portraits[id]; if (sub_809A8B8(id, a1)) { CopyCyanMonsterNametoBuffer(gFormatBuffer_Monsters[id], portrait->speciesID); @@ -609,7 +589,7 @@ bool8 sub_809AC18(s32 a0_, s32 a1_) { s32 a0 = (s16) a0_; s32 a1 = (s16) a1_; - struct TextboxPortrait *portrait = &sTextbox->portraits[a0]; + TextboxPortrait *portrait = &sTextbox->portraits[a0]; if (sub_809A8B8(a0, a1)) { CopyCyanMonsterNametoBuffer(gFormatBuffer_Monsters[a0], portrait->speciesID); @@ -626,7 +606,7 @@ bool8 ScriptSetPortraitInfo(s32 portraitId_, s32 spriteId_, s32 placementId_) s32 portraitId = (s16) portraitId_; s32 spriteId = (s8) spriteId_; u8 placementId = (u8) placementId_; - struct TextboxPortrait *portraitPtr = &sTextbox->portraits[portraitId]; + TextboxPortrait *portraitPtr = &sTextbox->portraits[portraitId]; TRY_CLOSE_FILE_AND_SET_NULL(portraitPtr->faceFile); @@ -711,7 +691,7 @@ bool8 ScriptSetPortraitInfo(s32 portraitId_, s32 spriteId_, s32 placementId_) bool8 ScriptSetPortraitPosDelta(s32 portraitId_, PixelPos *newPosDelta) { s32 portraitId = (s16) portraitId_; - struct TextboxPortrait *portraitPtr = &sTextbox->portraits[portraitId]; + TextboxPortrait *portraitPtr = &sTextbox->portraits[portraitId]; if (portraitPtr->speciesID < 0) return FALSE; @@ -729,7 +709,7 @@ static MonPortraitMsg *GetSpeakerPortrait(s32 portraitId_) s32 portraitId = (s16) portraitId_; if (portraitId >= 0) { - struct TextboxPortrait *portraitPtr = &sTextbox->portraits[portraitId]; + TextboxPortrait *portraitPtr = &sTextbox->portraits[portraitId]; if (portraitPtr->speciesID != MONSTER_NONE && portraitPtr->spriteId == -1) { ScriptSetPortraitInfo(portraitId, 0, 0); } @@ -908,7 +888,7 @@ static void ResetTextbox(void) ScriptPrintTextInternal(&sTextbox->text, TEXTBOX_FLAG_NONE, -1, NULL); } -static bool8 ScriptPrintTextInternal(struct TextboxText *textboxText, u32 flags_, s32 speakerId_, const char *text) +static bool8 ScriptPrintTextInternal(TextboxText *textboxText, u32 flags_, s32 speakerId_, const char *text) { u16 flags = (u16) flags_; s32 speakerId = (s16) speakerId_; @@ -957,7 +937,7 @@ static bool8 ScriptPrintTextInternal(struct TextboxText *textboxText, u32 flags_ return TRUE; } -static bool8 IsTextboxOpen_809B40C(struct TextboxText *a0) +static bool8 IsTextboxOpen_809B40C(TextboxText *a0) { switch (a0->unk4) { case 0: @@ -993,7 +973,7 @@ static u8 *sub_809B428(u8 *a0, s32 a1, u8 *a2) void sub_809B474(void) { - const struct unkStruct_3001B64_unk418 *unkStructPtr; + const unkStruct_3001B64_unk418 *unkStructPtr; switch (sTextbox->type) { case 0: @@ -1105,7 +1085,7 @@ UNUSED static void nullsub_210(void) } -static const struct unkStruct_3001B64_unk418 gUnknown_81161A8 = +static const unkStruct_3001B64_unk418 gUnknown_81161A8 = { .unk0 = 1, .unk4 = NULL, @@ -1113,7 +1093,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_81161A8 = .unkC = sub_801D0DC, }; -static const struct unkStruct_3001B64_unk418 gUnknown_81161B8 = +static const unkStruct_3001B64_unk418 gUnknown_81161B8 = { .unk0 = 1, .unk4 = NULL, @@ -1121,7 +1101,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_81161B8 = .unkC = sub_801D0DC, }; -static const struct unkStruct_3001B64_unk418 gUnknown_81161C8 = +static const unkStruct_3001B64_unk418 gUnknown_81161C8 = { .unk0 = 1, .unk4 = NULL, @@ -1129,7 +1109,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_81161C8 = .unkC = KangaskhanStorageCallback, }; -static const struct unkStruct_3001B64_unk418 gUnknown_81161D8 = +static const unkStruct_3001B64_unk418 gUnknown_81161D8 = { .unk0 = 1, .unk4 = sub_8017E1C, @@ -1137,7 +1117,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_81161D8 = .unkC = sub_8017E54, }; -static const struct unkStruct_3001B64_unk418 gUnknown_81161E8 = +static const unkStruct_3001B64_unk418 gUnknown_81161E8 = { .unk0 = 1, .unk4 = NULL, @@ -1145,7 +1125,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_81161E8 = .unkC = FelicityBankCallback, }; -static const struct unkStruct_3001B64_unk418 gUnknown_81161F8 = +static const unkStruct_3001B64_unk418 gUnknown_81161F8 = { .unk0 = 1, .unk4 = NULL, @@ -1153,7 +1133,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_81161F8 = .unkC = KecleonBrosCallback, }; -static const struct unkStruct_3001B64_unk418 gUnknown_8116208 = +static const unkStruct_3001B64_unk418 gUnknown_8116208 = { .unk0 = 1, .unk4 = NULL, @@ -1161,7 +1141,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_8116208 = .unkC = sub_801FC40, }; -static const struct unkStruct_3001B64_unk418 gUnknown_8116218 = +static const unkStruct_3001B64_unk418 gUnknown_8116218 = { .unk0 = 1, .unk4 = NULL, @@ -1169,7 +1149,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_8116218 = .unkC = sub_8021C5C, }; -static const struct unkStruct_3001B64_unk418 gUnknown_8116228 = +static const unkStruct_3001B64_unk418 gUnknown_8116228 = { .unk0 = 1, .unk4 = sub_8027F88, @@ -1177,7 +1157,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_8116228 = .unkC = sub_8028078, }; -static const struct unkStruct_3001B64_unk418 gUnknown_8116238 = +static const unkStruct_3001B64_unk418 gUnknown_8116238 = { .unk0 = 1, .unk4 = sub_802B2D4, @@ -1185,7 +1165,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_8116238 = .unkC = sub_802B358, }; -static const struct unkStruct_3001B64_unk418 gUnknown_8116248 = +static const unkStruct_3001B64_unk418 gUnknown_8116248 = { .unk0 = 1, .unk4 = CreateThankYouMailPelipper, @@ -1193,7 +1173,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_8116248 = .unkC = ThankYouMailPelipperCallback, }; -static const struct unkStruct_3001B64_unk418 gUnknown_8116258 = +static const unkStruct_3001B64_unk418 gUnknown_8116258 = { .unk0 = 1, .unk4 = NULL, @@ -1201,7 +1181,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_8116258 = .unkC = HelperPelipperCallback, }; -static const struct unkStruct_3001B64_unk418 gUnknown_8116268 = +static const unkStruct_3001B64_unk418 gUnknown_8116268 = { .unk0 = 1, .unk4 = sub_802E864, @@ -1209,7 +1189,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_8116268 = .unkC = sub_802E890, }; -static const struct unkStruct_3001B64_unk418 gUnknown_8116278 = +static const unkStruct_3001B64_unk418 gUnknown_8116278 = { .unk0 = 1, .unk4 = sub_802DFB0, @@ -1217,7 +1197,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_8116278 = .unkC = sub_802DFD8, }; -static const struct unkStruct_3001B64_unk418 gUnknown_8116288 = +static const unkStruct_3001B64_unk418 gUnknown_8116288 = { .unk0 = 1, .unk4 = NULL, @@ -1226,7 +1206,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_8116288 = }; // These 3 are identical -static const struct unkStruct_3001B64_unk418 gUnknown_8116298 = +static const unkStruct_3001B64_unk418 gUnknown_8116298 = { .unk0 = 1, .unk4 = NULL, @@ -1234,7 +1214,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_8116298 = .unkC = HandleMakuhitaDojoState, }; -static const struct unkStruct_3001B64_unk418 gUnknown_81162A8 = +static const unkStruct_3001B64_unk418 gUnknown_81162A8 = { .unk0 = 1, .unk4 = NULL, @@ -1242,7 +1222,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_81162A8 = .unkC = HandleMakuhitaDojoState, }; -static const struct unkStruct_3001B64_unk418 gUnknown_81162B8 = +static const unkStruct_3001B64_unk418 gUnknown_81162B8 = { .unk0 = 1, .unk4 = NULL, @@ -1250,7 +1230,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_81162B8 = .unkC = HandleMakuhitaDojoState, }; -static const struct unkStruct_3001B64_unk418 gUnknown_81162C8 = +static const unkStruct_3001B64_unk418 gUnknown_81162C8 = { .unk0 = 0, .unk4 = CreateTestTracker, @@ -1258,7 +1238,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_81162C8 = .unkC = HandleTestTrackerState, }; -static const struct unkStruct_3001B64_unk418 gUnknown_81162D8 = +static const unkStruct_3001B64_unk418 gUnknown_81162D8 = { .unk0 = 0, .unk4 = sub_8035678, @@ -1266,7 +1246,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_81162D8 = .unkC = sub_80356A0, }; -static const struct unkStruct_3001B64_unk418 gUnknown_81162E8 = +static const unkStruct_3001B64_unk418 gUnknown_81162E8 = { .unk0 = 0, .unk4 = NULL, @@ -1274,7 +1254,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_81162E8 = .unkC = sub_803B120, }; -static const struct unkStruct_3001B64_unk418 gUnknown_81162F8 = +static const unkStruct_3001B64_unk418 gUnknown_81162F8 = { .unk0 = 1, .unk4 = NULL, @@ -1282,7 +1262,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_81162F8 = .unkC = sub_8025354, }; -static const struct unkStruct_3001B64_unk418 gUnknown_8116308 = +static const unkStruct_3001B64_unk418 gUnknown_8116308 = { .unk0 = 0, .unk4 = NULL, @@ -1290,7 +1270,7 @@ static const struct unkStruct_3001B64_unk418 gUnknown_8116308 = .unkC = ScriptItemTextboxFunc, }; -static const struct unkStruct_3001B64_unk418 gUnknown_8116318 = +static const unkStruct_3001B64_unk418 gUnknown_8116318 = { .unk0 = 1, .unk4 = NULL,