diff --git a/include/data_script.h b/include/data_script.h index dbcabb0d8..d6c2091dc 100644 --- a/include/data_script.h +++ b/include/data_script.h @@ -1,3 +1,4 @@ +#include "constants/direction.h" #include "constants/event_flag.h" #include "constants/item.h" #include "constants/ground_map.h" @@ -58,7 +59,9 @@ // 3a: yes/no choice (only used for saving) // 3b: uber command (conditional jump) // 3c: unknown textbox-related cjump -// 3d..3f: input boxes? +#define RENAME_ALLY(id) { 0x3D, 0, 0, id, 0, NULL } +#define RENAME_TEAM { 0x3E, 0, 0, 0, 0, NULL } +// 3f: input box? // 40: unused? #define REMOVE_ITEMSTACK(i) { 0x41, 0, i, 0, 0, NULL } #define MUSIC_STOP_ALL { 0x42, 0, 0, 0, 0, NULL } @@ -75,7 +78,14 @@ #define FANFARE_STOP2(i) { 0x4d, 0, 0, i, 0, NULL } #define FANFARE_FADEOUT2(f,i) { 0x4e, 0, f, i, 0, NULL } // 4f..57: more movement/position? Some sprite stuff? +#define SELECT_ANIMATION(id) { 0x54, 0, id, 0, 0, NULL } // 58..95: position and movement-related +// For WARP/WALK, every map has a list of predefined locations. +#define WARP_WAYPOINT(u, w) { 0x5B, u, 0, w, 0, NULL } +#define WALK_RELATIVE(spd, h, v){ 0x6A, 0, spd, h, v, NULL } +#define WALK_GRID(spd, w) { 0x6B, 0, spd, w, 0, NULL } +#define WALK_DIRECT(spd, w) { 0x7A, 0, spd, w, 0, NULL } +#define ROTATE(spd, d, o) { 0x91, spd, d, o, 0, NULL } // d=cw/ccw/shortest, o=final orientation // 96: unused? // 97..9a: ??? (maybe more camera?) // 9b..a3: camera-related @@ -137,6 +147,8 @@ #define WAIT_RANDOM(a,b) { 0xDC, 0, a, b, 0, NULL } // dd..e2 - various HandleAction commands // e3..e5 - locking/condvar commands +#define AWAIT_CUE(id) { 0xE3, 0, id, 0, 0, NULL } +#define ALERT_CUE(id) { 0xE4, 0, id, 0, 0, NULL } #define CALL_LABEL(x) { 0xE6, 0, x, 0, 0, NULL } #define JUMP_LABEL(x) { 0xE7, 0, x, 0, 0, NULL } #define CALL_SCRIPT(x) { 0xE8, 0, x, 0, 0, NULL } diff --git a/src/data/ground/ground_data_a01p01_station.h b/src/data/ground/ground_data_a01p01_station.h index d192ee525..7957e1384 100644 --- a/src/data/ground/ground_data_a01p01_station.h +++ b/src/data/ground/ground_data_a01p01_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs162_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(4), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(90), @@ -33,7 +33,7 @@ static const struct ScriptRef s_gs162_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs162_g1_s0_lives0_dlg0[] = { /* 0x820fe54 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -51,7 +51,7 @@ static const struct ScriptCommand s_gs162_g1_s0_lives0_dlg0[] = { /* 0x820fe54 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......{WAIT_PRESS}Hmm... I can't remember.") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -63,7 +63,7 @@ static const struct ScriptCommand s_gs162_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(4), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), FANFARE_FADEOUT2(60, 453), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -84,7 +84,7 @@ static const struct ScriptCommand s_gs162_g2_s0_eff0_script[] = { /* 0x8210150 * static const struct ScriptCommand s_gs162_g2_s0_lives0_dlg0[] = { /* 0x8210190 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -111,7 +111,7 @@ static const struct ScriptCommand s_gs162_g2_s0_lives0_dlg0[] = { /* 0x8210190 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("........................") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -123,7 +123,7 @@ static const struct ScriptCommand s_gs162_g3_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(4), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(90), @@ -135,7 +135,7 @@ static const struct ScriptRef s_gs162_g3_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs162_g3_s0_lives0_dlg0[] = { /* 0x8210568 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -151,14 +151,14 @@ static const struct ScriptCommand s_gs162_g3_s0_lives0_dlg0[] = { /* 0x8210568 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Huh?{WAIT_PRESS} I'm hearing better this time...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...What?{WAIT_PRESS} Human?{WAIT_PRESS} My role?") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000007), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("W-wait.\nPlease, tell me more.") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......{WAIT_PRESS}\nI can't... Drifting off...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("........................") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -166,61 +166,61 @@ static const struct ScriptCommand s_gs162_g3_s0_lives0_dlg0[] = { /* 0x8210568 * static const struct ScriptCommand s_gs162_g3_s1_lives0_dlg0[] = { /* 0x82107fc */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), END_DELETE, @@ -232,7 +232,7 @@ static const struct ScriptCommand s_gs162_g4_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(4), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(90), @@ -243,7 +243,7 @@ static const struct ScriptRef s_gs162_g4_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs162_g4_s0_lives0_dlg0[] = { /* 0x8210c68 */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000052, 0x00000000, NULL }, @@ -288,7 +288,7 @@ static const struct ScriptCommand s_gs162_g4_s0_lives0_dlg0[] = { /* 0x8210c68 * MSG_NPC(2, _(" I am your...")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(30), PORTRAIT_REP(0x0000, 0x0000000c), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oh! Wait.{WAIT_PRESS} Just a little longer...") }, @@ -299,7 +299,7 @@ static const struct ScriptCommand s_gs162_g4_s0_lives0_dlg0[] = { /* 0x8210c68 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("........................") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -314,61 +314,61 @@ static const struct ScriptCommand s_gs162_g4_s1_lives0_dlg0[] = { /* 0x821124c * DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), END_DELETE, @@ -380,7 +380,7 @@ static const struct ScriptCommand s_gs162_g5_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(5), { 0x27, 0x00, 0x0005, 0x00000020, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), FANFARE_PLAY2(506), { 0x28, 0x01, 0x0005, 0x00000020, 0x00ffffff, NULL }, RET, @@ -391,10 +391,10 @@ static const struct ScriptRef s_gs162_g5_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs162_g5_s0_lives0_dlg0[] = { /* 0x82116b8 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x91, 0x0a, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 1, DIRECTION_SOUTH), WAIT(30), MSG_NPC(-1, _(" I've been waiting for you.")), TEXTBOX_CLEAR, @@ -403,7 +403,7 @@ static const struct ScriptCommand s_gs162_g5_s0_lives0_dlg0[] = { /* 0x82116b8 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Ga...{WAIT_PRESS}{NAME_2}!") }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -415,7 +415,7 @@ static const struct ScriptCommand s_gs162_g6_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(5), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), FANFARE_FADEOUT2(60, 453), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -428,7 +428,7 @@ static const struct ScriptRef s_gs162_g6_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000052, 0x00000000, NULL }, @@ -448,8 +448,8 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......You're......{WAIT_PRESS} {NAME_2}...") }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(60), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Yes...")), @@ -536,10 +536,10 @@ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Wah!\nE-earthquake?!") }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("No! Wait!{WAIT_PRESS}\nI need to know more...") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -569,104 +569,104 @@ static const struct ScriptCommand s_gs162_g6_s1_lives0_dlg0[] = { /* 0x8212774 * DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHWEST), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), END_DELETE, @@ -677,7 +677,7 @@ static const struct ScriptCommand s_gs162_g7_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(162), SELECT_ENTITIES(-1, -1), { 0x27, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, RET, }; @@ -687,7 +687,7 @@ static const struct ScriptRef s_gs162_g7_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs162_g7_s0_lives0_dlg0[] = { /* 0x8212e70 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -696,7 +696,7 @@ static const struct ScriptCommand s_gs162_g7_s0_lives0_dlg0[] = { /* 0x8212e70 * 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, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -704,7 +704,7 @@ static const struct ScriptCommand s_gs162_g7_s0_lives0_dlg0[] = { /* 0x8212e70 * static const struct ScriptCommand s_gs162_g7_s0_lives1_dlg0[] = { /* 0x8212f40 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; @@ -715,7 +715,7 @@ static const struct ScriptCommand s_gs162_g8_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(5), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(90), @@ -727,7 +727,7 @@ static const struct ScriptRef s_gs162_g8_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -744,8 +744,8 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}{NAME_1}...") }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(60), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" It's tomorrow, isn't it?{WAIT_PRESS}\nThat you take to that underground dungeon.")), @@ -803,8 +803,8 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * MSG_NPC(1, _(" You became a Pokémon in\norder to fulfill a certain role...")), MSG_NPC(1, _(" And that role brought\nyou here.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Now, that role...{WAIT_PRESS}\nis finally drawing to its conclusion.")), TEXTBOX_CLEAR, WAIT(10), @@ -817,10 +817,10 @@ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c * MSG_NPC(1, _(" I think I can tell you when\nthis adventure is finished.")), MSG_NPC(1, _(" Au revoir...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -828,149 +828,149 @@ static const struct ScriptCommand s_gs162_g8_s1_lives0_dlg0[] = { /* 0x8213b50 * DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHWEST), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; @@ -980,7 +980,7 @@ static const struct ScriptCommand s_gs162_g9_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(5), { 0x27, 0x00, 0x0005, 0x0000003c, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(90), @@ -992,7 +992,7 @@ static const struct ScriptRef s_gs162_g9_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000052, 0x00000000, NULL }, @@ -1004,7 +1004,7 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * WAIT(30), FANFARE_PLAY2(477), SELECT_LIVES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(60), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Gardevoir...{WAIT_PRESS}\nWill you tell me now?") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Who or what I am...?") }, @@ -1117,10 +1117,10 @@ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c * MSG_NPC(2, _(" ...That Pokémon...\nI think ran off crying...")), MSG_NPC(2, _(" ............{WAIT_PRESS}\nIt will be morning soon.{WAIT_PRESS}\nAu revoir.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -1147,89 +1147,89 @@ static const struct ScriptCommand s_gs162_g9_s1_lives0_dlg0[] = { /* 0x82157b8 * DEBUGINFO, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHWEST), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; @@ -1238,7 +1238,7 @@ static const struct ScriptCommand s_gs162_g10_s0_station_sref_script[] = { /* 0x SELECT_MAP(162), SELECT_ENTITIES(-1, 0), { 0x27, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, RET, }; @@ -1248,14 +1248,14 @@ static const struct ScriptRef s_gs162_g10_s0_station_sref = { 400, 7, NULL /* EV static const struct ScriptCommand s_gs162_g10_s0_lives0_dlg0[] = { /* 0x8215da4 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" You can return to your\nhuman world.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -1263,7 +1263,7 @@ static const struct ScriptCommand s_gs162_g10_s0_lives0_dlg0[] = { /* 0x8215da4 static const struct ScriptCommand s_gs162_g10_s0_lives1_dlg0[] = { /* 0x8215e54 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_a01p02_station.h b/src/data/ground/ground_data_a01p02_station.h index 347d7eed2..0cbc4e204 100644 --- a/src/data/ground/ground_data_a01p02_station.h +++ b/src/data/ground/ground_data_a01p02_station.h @@ -29,7 +29,7 @@ static const struct ScriptCommand s_gs163_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_FADEIN(120, 29), { 0x22, 0x01, 0x005a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, RET, }; @@ -40,7 +40,7 @@ static const struct ScriptRef s_gs163_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs163_g1_s0_lives0_dlg0[] = { /* 0x8216594 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -49,7 +49,7 @@ static const struct ScriptCommand s_gs163_g1_s0_lives0_dlg0[] = { /* 0x8216594 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...But why...?{WAIT_PRESS}\nWhy do I feel this terrible...?") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("This is...{WAIT_PRESS} The first time...") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -59,7 +59,7 @@ static const struct ScriptCommand s_gs163_g2_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(163), SELECT_ENTITIES(-1, -1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x0005, 0x0000003c, 0x00ffffff, NULL }, RET, }; @@ -69,7 +69,7 @@ static const struct ScriptRef s_gs163_g2_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs163_g2_s0_lives0_dlg0[] = { /* 0x8216758 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -80,7 +80,7 @@ static const struct ScriptCommand s_gs163_g2_s0_lives0_dlg0[] = { /* 0x8216758 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......The pain......") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......It's going away............") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -91,7 +91,7 @@ static const struct ScriptCommand s_gs163_g3_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_FADEIN(60, 37), { 0x22, 0x01, 0x005a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), FANFARE_PLAY2(506), BGM_FADEOUT(90), { 0x28, 0x01, 0x0005, 0x0000001e, 0x00ffffff, NULL }, @@ -104,7 +104,7 @@ static const struct ScriptRef s_gs163_g3_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs163_g3_s0_lives0_dlg0[] = { /* 0x8216954 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -114,8 +114,8 @@ static const struct ScriptCommand s_gs163_g3_s0_lives0_dlg0[] = { /* 0x8216954 * TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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!")), @@ -240,7 +240,7 @@ static const struct ScriptCommand s_gs163_g3_s0_lives0_dlg0[] = { /* 0x8216954 * LABEL(10), /* = 0x0a */ { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I understand now...\n{CENTER_ALIGN}My questions are finished.") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -257,12 +257,12 @@ static const struct ScriptCommand s_gs163_g3_s0_lives0_dlg0[] = { /* 0x8216954 * static const struct ScriptCommand s_gs163_g3_s0_lives1_dlg0[] = { /* 0x8217f50 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; diff --git a/src/data/ground/ground_data_a02p01_station.h b/src/data/ground/ground_data_a02p01_station.h index 2ff69208e..baea2ea13 100644 --- a/src/data/ground/ground_data_a02p01_station.h +++ b/src/data/ground/ground_data_a02p01_station.h @@ -32,7 +32,7 @@ static const struct ScriptCommand s_gs164_g1_s0_station_sref_script[] = { /* 0x8 { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -42,29 +42,29 @@ static const struct ScriptRef s_gs164_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs164_g1_s0_lives0_dlg0[] = { /* 0x821833c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x86, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 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?!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs164_g1_s0_lives1_dlg0[] = { /* 0x8218458 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), HALT, }; diff --git a/src/data/ground/ground_data_a02p02_station.h b/src/data/ground/ground_data_a02p02_station.h index c232631c5..84a8b655a 100644 --- a/src/data/ground/ground_data_a02p02_station.h +++ b/src/data/ground/ground_data_a02p02_station.h @@ -29,7 +29,7 @@ static const struct ScriptCommand s_gs165_g1_s0_station_sref_script[] = { /* 0x8 { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0000, 0x00000021, 0x00000000, NULL }, @@ -50,12 +50,12 @@ static const struct ScriptRef s_gs165_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs165_g1_s0_lives0_dlg0[] = { /* 0x8218834 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(204, 0), + ROTATE(4, 11, DIRECTION_NORTH), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -65,25 +65,25 @@ static const struct ScriptCommand s_gs165_g1_s0_lives0_dlg0[] = { /* 0x8218834 * VARIANT_DEFAULT(_(" The forest fire is still\nraging...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x0064, 0x00000000, 0x00000000, NULL }, { 0x89, 0x80, 0x00cc, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs165_g1_s0_lives1_dlg0[] = { /* 0x8218a34 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00cc, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x08, 0x000b, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(204, 1), + ROTATE(8, 11, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x89, 0x80, 0x00cc, 0x00000002, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_a02p03_station.h b/src/data/ground/ground_data_a02p03_station.h index 2aa5306ba..ad3183d98 100644 --- a/src/data/ground/ground_data_a02p03_station.h +++ b/src/data/ground/ground_data_a02p03_station.h @@ -22,7 +22,7 @@ static const struct ScriptCommand s_gs166_g1_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(166), SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -31,43 +31,43 @@ static const struct ScriptRef s_gs166_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs166_g1_s0_lives0_dlg0[] = { /* 0x8218cb0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(512, 0), WAIT(15), - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_WEST), BGM_FADEOUT(60), WAIT(20), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), MSG_NPC(1, _(" Gasp... Gasp...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Oh, no! Look!")), TEXTBOX_CLEAR, BGM_SWITCH(38), - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_EAST), WAIT(20), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs166_g1_s0_lives1_dlg0[] = { /* 0x8218e38 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(512, 1), + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), WAIT(20), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; @@ -76,7 +76,7 @@ static const struct ScriptCommand s_gs166_g2_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(166), SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x3b, 0x39, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, MSG_NPC(-1, _(" Look at them go!\nThey're running for Mt. Blaze!")), @@ -100,7 +100,7 @@ static const struct ScriptRef s_gs166_g2_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs166_g2_s0_lives0_dlg0[] = { /* 0x821915c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -111,14 +111,14 @@ static const struct ScriptCommand s_gs166_g2_s0_lives0_dlg0[] = { /* 0x821915c * PORTRAIT_REP(0x0001, 0x00000005), MSG_NPC(1, _(" Look at all that lava\npouring from the crater...")), MSG_NPC(1, _(" Can we even make it\nthrough there?")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" But they're catching up to\nus...")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_SOUTHEAST), PORTRAIT_REP(0x0001, 0x00000005), MSG_NPC(1, _(" What'll we do,\n{NAME_0}?")), TEXTBOX_CLEAR, @@ -126,22 +126,22 @@ static const struct ScriptCommand s_gs166_g2_s0_lives0_dlg0[] = { /* 0x821915c * MSG_NPC(-1, _(" Look! There they are!")), TEXTBOX_CLEAR, FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_WEST), MSG_NPC(-1, _(" Get them!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000002), MSG_NPC(1, _(" There's no choice now!")), MSG_NPC(1, _(" Let's go, {NAME_0}!")), TEXTBOX_CLEAR, { 0x23, 0x00, 0x0028, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(5), { 0x89, 0x50, 0x0200, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -149,21 +149,21 @@ static const struct ScriptCommand s_gs166_g2_s0_lives0_dlg0[] = { /* 0x821915c * static const struct ScriptCommand s_gs166_g2_s0_lives1_dlg0[] = { /* 0x821952c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_WEST), + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x89, 0x50, 0x0200, 0x00000002, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_a02p04_station.h b/src/data/ground/ground_data_a02p04_station.h index 47c4f07cd..5c2bf1d65 100644 --- a/src/data/ground/ground_data_a02p04_station.h +++ b/src/data/ground/ground_data_a02p04_station.h @@ -38,7 +38,7 @@ static const struct ScriptCommand s_gs167_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(24), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0000, 0x00000021, 0x00000000, NULL }, @@ -66,32 +66,32 @@ static const struct ScriptCommand s_gs167_g2_s0_eff0_script[] = { /* 0x8219b58 * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 0), + AWAIT_CUE(4), + WALK_GRID(153, 3), + AWAIT_CUE(4), WAIT(45), { 0x23, 0x00, 0x005a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), WAIT(120), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 1), { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, WAIT(80), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Gasp, gasp...\nWe've done a lot of walking.")), @@ -101,24 +101,24 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * VARIANT_DEFAULT(_(" Pant, pant...\nWe sure walked a lot.")), VARIANT_DEFAULT(_(" I'm bushed.\nLet's rest up.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(15), - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTH), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Haaah!\nThe view's great here.")), VARIANT_DEFAULT(_(" Mmm...\nThe view's fantastic.")), TEXTBOX_CLEAR, FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, hey!\n{NAME_0}, you have to see this!")), VARIANT_DEFAULT(_(" Oh, look!\n{NAME_0}, look over there!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Look at that.\nSee how small Mt. Blaze looks?")), VARIANT(/* == */ 1, _(" We sure came a long way...")), @@ -126,13 +126,13 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * VARIANT_DEFAULT(_(" We've come a really long\nway, haven't we?")), TEXTBOX_CLEAR, WAIT(90), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}Hey, {NAME_0}.")), VARIANT(/* == */ 3, _(" ............{WAIT_PRESS}Um, {NAME_0}?")), VARIANT_DEFAULT(_(" ............{WAIT_PRESS}{NAME_0}.")), - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHEAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" You remember how tough it\nwas getting over Mt. Blaze, right?")), VARIANT(/* == */ 1, _(" I don't think many Pokémon\ncan get through there.")), @@ -159,8 +159,8 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * TEXTBOX_CLEAR, WAIT(30), FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What?{WAIT_PRESS} There are others?")), @@ -184,7 +184,7 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * 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?!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000001), MSG_NPC(1, _(" Yeah, you're right.\nThere can't be anyone else.\nHahahahaha.")), MSG_NPC(1, _(" All right!\nWe can say good-bye to living like\nfugitives.")), @@ -204,8 +204,8 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * JUMP_LABEL(4), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), LABEL(4), /* = 0x04 */ - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We're not out of this yet.\nLet's get going.")), @@ -217,16 +217,16 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * VARIANT(/* == */ 1, _(" Let's knuckle down and keep\ngoing.")), VARIANT_DEFAULT(_(" Let's be positive and keep\nmoving.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Huh?{WAIT_PRESS} What's the matter?\nAren't you coming, {NAME_0}?")), VARIANT(/* == */ 3, _(" Oh?{WAIT_PRESS} What's wrong?\nAren't we going, {NAME_0}?")), VARIANT_DEFAULT(_(" Huh?{WAIT_PRESS} What's the matter?\nAren't you coming, {NAME_0}?")), TEXTBOX_CLEAR, - { 0x91, 0x0a, 0x000b, 0x00000007, 0x00000000, NULL }, + ROTATE(10, 11, DIRECTION_SOUTHWEST), WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...{WAIT_PRESS}What?{WAIT_PRESS}\nAren't I tired, you're asking?")), @@ -251,11 +251,11 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * VARIANT_DEFAULT(_(" ...Oh, come on.\nNo need for that long face.\nI'm fine.")), VARIANT_DEFAULT(_(" Let's go, {NAME_0}!\nI'll go wherever you go!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(4), WAIT(15), - { 0x6b, 0x00, 0x0099, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_GRID(153, 4), + ALERT_CUE(3), HALT, }; @@ -263,55 +263,55 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * static const struct ScriptCommand s_gs167_g2_s0_lives1_dlg0[] = { /* 0x821b5d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(10), - { 0x6b, 0x00, 0x0099, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + WALK_GRID(153, 2), + AWAIT_CUE(6), { 0x54, 0x00, 0x002d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x89, 0x10, 0x0099, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), WAIT(15), - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 1), LABEL(0), /* = 0x00 */ CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), LABEL(1), /* = 0x01 */ { 0x54, 0x00, 0x002d, 0x00000000, 0x00000000, NULL }, WAIT(160), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_GRID(153, 3), WAIT(30), - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_GRID(153, 4), HALT, }; diff --git a/src/data/ground/ground_data_a03p01_station.h b/src/data/ground/ground_data_a03p01_station.h index bfff92bd5..006390efb 100644 --- a/src/data/ground/ground_data_a03p01_station.h +++ b/src/data/ground/ground_data_a03p01_station.h @@ -22,7 +22,7 @@ static const struct ScriptCommand s_gs168_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_FADEIN(120, 36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -33,51 +33,51 @@ static const struct ScriptCommand s_gs168_g1_s0_eff0_script[] = { /* 0x821bb38 * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x50, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x89, 0x50, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), WAIT(1), END_DELETE, }; static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x36, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(80), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x3b, 0x36, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), MSG_NPC(1, _(" ...Brr... It's cold!{WAIT_PRESS}")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(8), FANFARE_PLAY2(480), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000007), MSG_NPC(1, _(" Hachoo!")), TEXTBOX_CLEAR, WAIT(8), - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTHWEST), WAIT(24), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + SELECT_ANIMATION(2), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000005), MSG_NPC(1, _(" Yuck...{WAIT_PRESS}\nMy nose is running, and it's freezing.")), TEXTBOX_CLEAR, WAIT(30), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), { 0x3b, 0x36, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), + ALERT_CUE(6), WAIT(60), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -93,58 +93,58 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * VARIANT_DEFAULT(_(" Maybe we're all alone here.")), TEXTBOX_CLEAR, { 0x3b, 0x36, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Huh? What's up?")), VARIANT_DEFAULT(_(" Oh? What's the matter?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), MSG_NPC(-1, _(" ........................")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0001, 0x0000000c), MSG_NPC(1, _(" Wh-what's that?!")), TEXTBOX_CLEAR, WAIT(40), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(90), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), MSG_NPC(1, _(" ...{WAIT_PRESS}What was that?{WAIT_PRESS}\nIt looked like a Pokémon, but...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Was I seeing things?{WAIT_PRESS}\nNo, that can't be right.{WAIT_PRESS}\nI'm sure there was someone there...")), VARIANT_DEFAULT(_(" Did I imagine that?{WAIT_PRESS}\nNo, I don't think so.{WAIT_PRESS}\nI'm sure there was somebody there.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" I wonder what they were\ndoing in this lonely place?")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 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.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + SELECT_ANIMATION(5), { 0x3b, 0x36, 0x0004, 0x00000000, 0x00000000, NULL }, WAIT(64), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -153,58 +153,58 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * static const struct ScriptCommand s_gs168_g1_s0_lives1_dlg0[] = { /* 0x821c620 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + SELECT_ANIMATION(2), { 0x62, 0x00, 0x0100, -0x00000018, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x54, 0x00, 0x002f, 0x00000000, 0x00000000, NULL }, WAIT(4), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), + SELECT_ANIMATION(5), + AWAIT_CUE(6), + SELECT_ANIMATION(2), + ROTATE(4, 2, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), { 0x56, 0x00, 0x0000, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x0c, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), + ALERT_CUE(5), + SELECT_ANIMATION(5), HALT, }; static const struct ScriptCommand s_gs168_g1_s0_lives2_dlg0[] = { /* 0x821c8e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0x54, 0x00, 0x0020, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_EAST), + SELECT_ANIMATION(32), WAIT(9), FANFARE_PLAY2(478), { 0x89, 0x50, 0x0400, 0x00000002, 0x00000000, NULL }, @@ -218,7 +218,7 @@ static const struct ScriptCommand s_gs168_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, RET, }; @@ -227,54 +227,54 @@ static const struct ScriptRef s_gs168_g2_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs168_g2_s0_lives0_dlg0[] = { /* 0x821ca1c */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x3b, 0x36, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x3b, 0x36, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wow!")), VARIANT_DEFAULT(_(" Oh!")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTHEAST), + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nCheck that out!")), VARIANT_DEFAULT(_(" {NAME_0}! Look!")), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), + ALERT_CUE(6), MSG_NPC(1, _(" See that?{WAIT_PRESS}\nThose trees are frozen!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs168_g2_s0_lives1_dlg0[] = { /* 0x821cc58 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x00000058, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), + AWAIT_CUE(6), HALT, }; diff --git a/src/data/ground/ground_data_a03p02_station.h b/src/data/ground/ground_data_a03p02_station.h index 132ccae0a..43761539c 100644 --- a/src/data/ground/ground_data_a03p02_station.h +++ b/src/data/ground/ground_data_a03p02_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs169_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -30,7 +30,7 @@ static const struct ScriptRef s_gs169_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs169_g1_s0_lives0_dlg0[] = { /* 0x821cfa4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -41,14 +41,14 @@ static const struct ScriptCommand s_gs169_g1_s0_lives0_dlg0[] = { /* 0x821cfa4 * MSG_NPC(1, _(" It looks pretty, but...{WAIT_PRESS}\nIt must be harsh there...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs169_g1_s0_lives1_dlg0[] = { /* 0x821d0e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_a03p03_station.h b/src/data/ground/ground_data_a03p03_station.h index 6d3e8ae36..028a1e0fa 100644 --- a/src/data/ground/ground_data_a03p03_station.h +++ b/src/data/ground/ground_data_a03p03_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs170_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_FADEIN(30, 36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), FANFARE_PLAY2(506), { 0x28, 0x01, 0x0005, 0x00000010, 0x00ffffff, NULL }, RET, @@ -31,7 +31,7 @@ static const struct ScriptRef s_gs170_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x36, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -82,9 +82,9 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * TEXTBOX_CLEAR, WAIT(10), { 0x3b, 0x36, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), PORTRAIT_POS(1, 0, 2), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -103,8 +103,8 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * VARIANT_DEFAULT(_(" Sorry, {NAME_0}.{WAIT_PRESS}\nI was just feeling sorry for myself.")), VARIANT_DEFAULT(_(" I have faith in you, \n{NAME_0}.\nThat's what brought me here.")), VARIANT_DEFAULT(_(" And that's not changing.\nI still have faith in you, {NAME_0}...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I'll go wherever you go.")), @@ -116,9 +116,9 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * TEXTBOX_CLEAR, WAIT(10), { 0x3b, 0x36, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), PORTRAIT_POS(1, 0, 2), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -140,8 +140,8 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * VARIANT_DEFAULT(_(" Don't worry!\nThere's got to be something ahead.")), VARIANT_DEFAULT(_(" I have faith in you, \n{NAME_0}.\nThat's what brought me here.")), VARIANT_DEFAULT(_(" And that's not changing.\nI still have faith in you, {NAME_0}...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I'll go wherever you go.")), @@ -149,7 +149,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * VARIANT_DEFAULT(_(" I'll keep going wherever\nyou go.")), TEXTBOX_CLEAR, LABEL(5), /* = 0x05 */ - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(45), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Yes...)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("({NAME_1} trusts me without any\ndoubt.)") }, @@ -160,31 +160,31 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * BGM_FADEOUT(30), FANFARE_PLAY2(476), { 0x28, 0x01, 0x0007, 0x00000004, 0x00806040, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), { 0x54, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0x27, 0x01, 0x0007, 0x00000008, 0x00806040, NULL }, { 0x28, 0x01, 0x0007, 0x00000008, 0x00806040, NULL }, { 0x27, 0x01, 0x0007, 0x0000000c, 0x00806040, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(60), PORTRAIT_REP(0x0000, 0x00000002), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...{WAIT_PRESS}Wh-what?{WAIT_PRESS} What was that?)") }, TEXTBOX_CLEAR, FANFARE_PLAY2(476), { 0x28, 0x01, 0x0007, 0x00000004, 0x00806040, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), { 0x54, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0x27, 0x01, 0x0007, 0x00000008, 0x00806040, NULL }, { 0x28, 0x01, 0x0007, 0x00000008, 0x00806040, NULL }, { 0x27, 0x01, 0x0007, 0x0000000c, 0x00806040, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...D-dizzy?{WAIT_PRESS} Or what?)") }, TEXTBOX_CLEAR, FANFARE_PLAY2(469), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), PORTRAIT_POS(1, 0, 2), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -193,14 +193,14 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * TEXTBOX_CLEAR, FANFARE_PLAY2(476), { 0x28, 0x01, 0x0007, 0x00000004, 0x00806040, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), { 0x54, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0x27, 0x01, 0x0007, 0x00000008, 0x00806040, NULL }, { 0x28, 0x01, 0x0007, 0x00000008, 0x00806040, NULL }, { 0x27, 0x01, 0x0007, 0x0000000c, 0x00806040, NULL }, { 0x28, 0x01, 0x0005, 0x00000008, 0x00000000, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), MSG_NPC(-1, _(" ...Finally.")), MSG_NPC(-1, _(" ...Finally, you have arrived...")), TEXTBOX_CLEAR, @@ -213,12 +213,12 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * FANFARE_PLAY2(477), SELECT_ENTITIES(-1, 1), { 0x27, 0x01, 0x0005, 0x00000030, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), WAIT(30), MSG_NPC(-1, _(" Finally...")), MSG_NPC(-1, _(" You have arrived...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -231,30 +231,30 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * static const struct ScriptCommand s_gs170_g1_s0_lives1_dlg0[] = { /* 0x821ec08 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + SELECT_ANIMATION(2), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs170_g1_s0_lives2_dlg0[] = { /* 0x821ed08 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), + AWAIT_CUE(6), + SELECT_ANIMATION(2), + ROTATE(4, 2, DIRECTION_NORTHEAST), + AWAIT_CUE(6), HALT, }; @@ -263,7 +263,7 @@ static const struct ScriptCommand s_gs170_g1_s1_lives0_dlg0[] = { /* 0x821ed78 * { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), RET, }; @@ -272,7 +272,7 @@ static const struct ScriptCommand s_gs170_g2_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(170), SELECT_ENTITIES(-1, 0), { 0x27, 0x00, 0x0005, 0x00000020, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(120), { 0x23, 0x01, 0x0078, 0x00000000, 0x00000000, NULL }, RET, @@ -282,11 +282,11 @@ static const struct ScriptRef s_gs170_g2_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" I am so glad.{WAIT_PRESS}\nFinally, we get to meet.")), TEXTBOX_CLEAR, @@ -295,8 +295,8 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...You're...{WAIT_PRESS} What...") }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000004), PORTRAIT_POS(1, 0, 2), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -308,9 +308,9 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * WAIT(10), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTHEAST), WAIT(64), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), WAIT(16), MSG_NPC(2, _(" I cannot be seen by others.")), MSG_NPC(2, _(" I am visible only to you.")), @@ -327,7 +327,7 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * WAIT(10), MSG_NPC(2, _(" Ninetales awaits your\narrival.")), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" Beware...")), TEXTBOX_CLEAR, WAIT(10), @@ -338,8 +338,8 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("..................") }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}!\nCome on, {NAME_0}!")), VARIANT(/* == */ 1, _(" What were you doing?{WAIT_PRESS}\nWhat just happened to you...?")), @@ -347,7 +347,7 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * VARIANT_DEFAULT(_(" What's the matter?{WAIT_PRESS}\nWhat happened...?")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -360,28 +360,28 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * static const struct ScriptCommand s_gs170_g2_s0_lives1_dlg0[] = { /* 0x821f534 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs170_g2_s0_lives2_dlg0[] = { /* 0x821f5e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(6), HALT, }; @@ -390,24 +390,24 @@ static const struct ScriptCommand s_gs170_g2_s0_lives3_dlg0[] = { /* 0x821f684 * { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), LABEL(0), /* = 0x00 */ - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 0), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(24), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, END_DELETE, }; diff --git a/src/data/ground/ground_data_a04p01_station.h b/src/data/ground/ground_data_a04p01_station.h index 9a21ef430..64612af62 100644 --- a/src/data/ground/ground_data_a04p01_station.h +++ b/src/data/ground/ground_data_a04p01_station.h @@ -32,7 +32,7 @@ static const struct ScriptCommand s_gs171_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(19), { 0x27, 0x00, 0x0005, 0x00000020, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -43,18 +43,18 @@ static const struct ScriptCommand s_gs171_g1_s0_eff0_script[] = { /* 0x821fac0 * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0xa0, 0x0180, 0x00000004, 0x00000000, NULL }, { 0x3b, 0x38, 0x0000, 0x00000001, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs171_g1_s0_lives0_dlg0[] = { /* 0x821fb60 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x38, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -63,9 +63,9 @@ static const struct ScriptCommand s_gs171_g1_s0_lives0_dlg0[] = { /* 0x821fb60 * MSG_NPC(0, _(" ...It is huge...{WAIT_PRESS}\nA giant of a star!")), MSG_NPC(0, _(" The star, it falls.\nIt falls straight to us.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(3), HALT, }; @@ -76,7 +76,7 @@ static const struct ScriptCommand s_gs171_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(19), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x0005, 0x00000020, 0x00ffffff, NULL }, RET, }; @@ -87,16 +87,16 @@ static const struct ScriptCommand s_gs171_g2_s0_eff0_script[] = { /* 0x821fd44 * DEBUGINFO, { 0x59, 0x00, 0x0000, -0x000000e0, 0x00000000, NULL }, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x70, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs171_g2_s0_lives0_dlg0[] = { /* 0x821fdc4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -105,14 +105,14 @@ static const struct ScriptCommand s_gs171_g2_s0_lives0_dlg0[] = { /* 0x821fdc4 * MSG_NPC(0, _(" The balance of the world,\nit has been upset...")), MSG_NPC(0, _(" All because of the star.\nThe star that slowly comes closer.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 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, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -125,7 +125,7 @@ static const struct ScriptCommand s_gs171_g3_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(19), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -134,33 +134,33 @@ static const struct ScriptRef s_gs171_g3_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(10), { 0x89, 0x68, 0x0100, 0x00000004, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), PORTRAIT_POS(2, 0, 2), MSG_NPC(2, _(" Ah, good of you to come.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" Kwaaaaaaaaaah!")), TEXTBOX_CLEAR, FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_NORTHWEST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" Wh-{WAIT_PRESS}what's going on?{WAIT_PRESS}\nWhat is {NAME_3} doing?")), TEXTBOX_CLEAR, @@ -168,30 +168,30 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * MSG_NPC(2, _(" It is almost ready.{WAIT_PRESS}\nThe {COLOR GREEN}Teleport Gem{RESET}...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" Teleport Gem?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), MSG_NPC(3, _(" Kwaaaaaaaaaah!")), TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(489), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(30), MSG_NPC(3, _(" .........{WAIT_PRESS}It is made.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), WAIT(30), MSG_NPC(3, _(" This...\nThis is the {COLOR GREEN}Teleport Gem{RESET}.")), MSG_NPC(3, _(" This will deliver you\nto the world of the sky.")), @@ -199,42 +199,42 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * TEXTBOX_CLEAR, WAIT(30), { 0x84, 0x00, 0x0100, -0x00000018, -0x00000018, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), WAIT(30), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), FANFARE_PLAY(212), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0}'s team received\n{CENTER_ALIGN}the {COLOR GREEN}Teleport Gem{RESET}.")), { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x84, 0x00, 0x0100, 0x00000018, 0x00000018, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT(30), MSG_NPC(3, _(" That was made using\nthe powers of psychics.")), MSG_NPC(3, _(" By me, {NAME_2},\nand...{WAIT_PRESS}\nOh?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(30), MSG_NPC(3, _(" A Ghost-type Pokémon.\nWe received help from it.")), MSG_NPC(3, _(" ...Gone away, it seems...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, WAIT(30), MSG_NPC(1, _(" Who could it be?")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT_REP(0x0002, 0x00000042), MSG_NPC(2, _(" Hahaha! It must be bashful.\nLet it be.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Now...{WAIT_PRESS}\nI must ask you this one last time.")), MSG_NPC(2, _(" This journey will be fraught\nwith considerable danger.{WAIT_PRESS}\nWill you still go?")), @@ -261,7 +261,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Gardevoir said...)") }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -278,83 +278,83 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * static const struct ScriptCommand s_gs171_g3_s0_lives1_dlg0[] = { /* 0x8220df0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0x68, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs171_g3_s0_lives2_dlg0[] = { /* 0x8220f50 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(7), + ROTATE(10, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs171_g3_s0_lives3_dlg0[] = { /* 0x8221070 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + SELECT_ANIMATION(9), + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(8, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(8), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs171_g3_s0_lives4_dlg0[] = { /* 0x8221180 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(10), { 0x89, 0x60, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs171_g3_s0_eff1_script[] = { /* 0x82211e0 */ DEBUGINFO, { 0x59, 0x00, -0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x00000069, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), @@ -367,14 +367,14 @@ static const struct ScriptCommand s_gs171_g3_s0_eff1_script[] = { /* 0x82211e0 * WAIT(1), { 0x56, 0x00, 0x0000, 0x0000006c, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), { 0x89, 0x70, 0x0033, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), HALT, }; @@ -384,7 +384,7 @@ static const struct ScriptCommand s_gs171_g4_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(19), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), RET, @@ -394,7 +394,7 @@ static const struct ScriptRef s_gs171_g4_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs171_g4_s0_lives0_dlg0[] = { /* 0x82213fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -403,9 +403,9 @@ static const struct ScriptCommand s_gs171_g4_s0_lives0_dlg0[] = { /* 0x82213fc * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(This will be my last adventure...{WAIT_PRESS}\nWith {NAME_1}...)") }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_WEST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nLet's do this right!")), VARIANT_DEFAULT(_(" {NAME_0}!\nLet's get this done!")), @@ -413,32 +413,32 @@ static const struct ScriptCommand s_gs171_g4_s0_lives0_dlg0[] = { /* 0x82213fc * WAIT(10), { 0x54, 0x00, 0x002f, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), PORTRAIT_POS(2, 0, 2), MSG_NPC(2, _(" We're counting on you!\n{NAME_1}! {NAME_0}!")), TEXTBOX_CLEAR, WAIT(30), FANFARE_PLAY2(500), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(6), + ALERT_CUE(12), + AWAIT_CUE(5), + ALERT_CUE(10), + ALERT_CUE(11), CJUMP_UNK_C6(10), COND_EQUAL(0, /* to label */ 3), - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(13), LABEL(3), /* = 0x03 */ - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0x59, 0x00, 0x0000, -0x000000c8, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), BGM_FADEOUT(90), WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -447,58 +447,58 @@ static const struct ScriptCommand s_gs171_g4_s0_lives0_dlg0[] = { /* 0x82213fc * static const struct ScriptCommand s_gs171_g4_s0_lives1_dlg0[] = { /* 0x8221794 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(120), { 0x89, 0x10, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x59, 0x00, 0x0000, -0x000000c8, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs171_g4_s0_lives2_dlg0[] = { /* 0x8221864 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs171_g4_s0_lives3_dlg0[] = { /* 0x8221904 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs171_g4_s0_lives4_dlg0[] = { /* 0x8221944 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x52, 0x00, 0x0000, 0x00010000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(120), { 0x89, 0x10, 0x0100, 0x00000004, 0x00000000, NULL }, { 0x89, 0x08, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(12), { 0x59, 0x00, 0x0000, -0x000000c8, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), HALT, }; static const struct ScriptCommand s_gs171_g4_s0_eff1_script[] = { /* 0x8221a04 */ DEBUGINFO, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x52, 0x00, 0x0000, 0x00020000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x000000a5, 0x00000000, NULL }, WAIT(180), @@ -507,62 +507,62 @@ static const struct ScriptCommand s_gs171_g4_s0_eff1_script[] = { /* 0x8221a04 * { 0x56, 0x00, 0x0000, 0x000000a6, 0x00000000, NULL }, WAIT(120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs171_g4_s0_eff2_script[] = { /* 0x8221ad4 */ DEBUGINFO, { 0x59, 0x00, 0x0000, -0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x56, 0x00, 0x0000, 0x000000a0, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x000000a1, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x56, 0x00, 0x0000, 0x000000a4, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs171_g4_s0_eff3_script[] = { /* 0x8221bc4 */ DEBUGINFO, { 0x59, 0x00, 0x0000, -0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x56, 0x00, 0x0000, 0x000000a0, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x000000a1, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x56, 0x00, 0x0000, 0x000000a4, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs171_g4_s0_eff4_script[] = { /* 0x8221cb4 */ DEBUGINFO, { 0x59, 0x00, 0x0000, -0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), { 0x56, 0x00, 0x0000, 0x000000a0, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x000000a1, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x56, 0x00, 0x0000, 0x000000a4, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(13), HALT, }; @@ -572,7 +572,7 @@ static const struct ScriptCommand s_gs171_g5_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(171), SELECT_ENTITIES(5, 0), BGM_STOP, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_SWITCH(41), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, @@ -584,20 +584,20 @@ static const struct ScriptCommand s_gs171_g5_s0_eff0_script[] = { /* 0x8221e40 * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x24, 0x0200, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x89, 0x40, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 */ DEBUGINFO, - { 0x54, 0x00, 0x0034, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(52), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000007, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000058, 0x00000000, NULL }, @@ -612,22 +612,22 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...{WAIT_PRESS}Huh...?{WAIT_PRESS} This place...)") }, TEXTBOX_CLEAR, { 0x3b, 0x39, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), FANFARE_PLAY2(465), CALL_LABEL(3), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000002), MSG_NPC(1, _("............Urgggh......")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _("...Regained consciousness!")), TEXTBOX_CLEAR, MSG_NPC(-1, _(" Oooooooohhhhh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), WAIT(15), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...{WAIT_PRESS}I'm sure of it...)") }, @@ -641,8 +641,8 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * WAIT(10), CALL_LABEL(3), WAIT(30), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000042), PORTRAIT_POS(4, -3, 0), MSG_NPC(4, _(" Awesome, you're alive!{WAIT_PRESS}\nYou really had all of us worried!")), @@ -652,35 +652,35 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * MSG_NPC(8, _(" You were incredible!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0006, 0x00000042), MSG_NPC(6, _(" Snivel...\nI'm so glad you're safe!{WAIT_PRESS}\nIt's fantastic!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000b), MSG_NPC(1, _(" Everyone... Thank you.{WAIT_PRESS}\nBut...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" What about the star?!{WAIT_PRESS}\nWhat happened to it?!")), TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(474), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Kwaaaaaaaaah!") }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), CALL_LABEL(3), - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_NORTH), + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(60), TEXTBOX_CLEAR2, WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 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.")), @@ -689,8 +689,8 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * CJUMP_UNK_C6(10), COND_EQUAL(0, /* to label */ 10), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), CJUMP_UNK_C6(11), COND_EQUAL(0, /* to label */ 12), JUMP_LABEL(13), @@ -713,16 +713,16 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * TEXTBOX_CLEAR, WAIT(10), LABEL(10), /* = 0x0a */ - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000b), MSG_NPC(1, _(" Really!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, CALL_LABEL(3), PORTRAIT_REP(0x0001, 0x00000001), @@ -733,22 +733,22 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * VARIANT_DEFAULT(_(" We've won peace!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, LABEL(3), /* = 0x03 */ - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(13), + ALERT_CUE(14), + ALERT_CUE(15), + ALERT_CUE(16), + ALERT_CUE(17), + ALERT_CUE(18), + ALERT_CUE(19), + ALERT_CUE(20), RET_DIRECT, HALT, }; @@ -766,290 +766,290 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * static const struct ScriptCommand s_gs171_g5_s0_lives1_dlg0[] = { /* 0x8222c44 */ DEBUGINFO, - { 0x54, 0x00, 0x0034, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(52), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(10), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x06, 0x000a, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(6, 10, DIRECTION_NORTH), WAIT(20), - { 0x91, 0x06, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_SOUTH), WAIT(20), - { 0x91, 0x06, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(6), CJUMP_UNK_C6(10), COND_EQUAL(0, /* to label */ 0), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(20), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), LABEL(0), /* = 0x00 */ CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives2_dlg0[] = { /* 0x8222ec4 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + AWAIT_CUE(7), + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(7), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives3_dlg0[] = { /* 0x8222fb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + SELECT_ANIMATION(9), + AWAIT_CUE(8), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), - { 0x91, 0x0a, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives4_dlg0[] = { /* 0x8223084 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(3), { 0x89, 0x08, 0x0100, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), WAIT(7), - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(9), WAIT(2), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives5_dlg0[] = { /* 0x82231b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), WAIT(3), { 0x89, 0x08, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), WAIT(7), - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(11), WAIT(3), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives6_dlg0[] = { /* 0x82232e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(8), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(2), { 0x89, 0x08, 0x0100, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(5), - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(12), WAIT(6), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(12), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives7_dlg0[] = { /* 0x82233f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), WAIT(8), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), WAIT(8), { 0x89, 0x08, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), WAIT(6), - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(13), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(13), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives8_dlg0[] = { /* 0x8223504 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(16), WAIT(1), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), WAIT(3), { 0x89, 0x08, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), WAIT(3), - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(16), WAIT(8), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(16), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives9_dlg0[] = { /* 0x8223604 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(15), + AWAIT_CUE(15), WAIT(4), { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), WAIT(5), - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(15), WAIT(11), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(15), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives10_dlg0[] = { /* 0x82236e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(14), WAIT(5), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), WAIT(7), { 0x89, 0x08, 0x0100, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), WAIT(4), - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(14), WAIT(7), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(14), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives11_dlg0[] = { /* 0x82237e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(17), WAIT(8), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), WAIT(5), { 0x89, 0x08, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), WAIT(4), - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(17), WAIT(12), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(17), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives12_dlg0[] = { /* 0x82238e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(18), + AWAIT_CUE(18), WAIT(3), { 0x89, 0x08, 0x0100, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(18), WAIT(4), - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(18), WAIT(9), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(18), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives13_dlg0[] = { /* 0x82239c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(19), WAIT(2), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(19), WAIT(6), { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(19), WAIT(5), - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(19), WAIT(9), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(19), HALT, }; static const struct ScriptCommand s_gs171_g5_s0_lives14_dlg0[] = { /* 0x8223ac4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(6), { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(3), - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_NORTH), + AWAIT_CUE(20), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(20), HALT, }; @@ -1059,7 +1059,7 @@ static const struct ScriptCommand s_gs171_g6_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(41), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, RET, }; @@ -1070,31 +1070,31 @@ static const struct ScriptCommand s_gs171_g6_s0_eff0_script[] = { /* 0x8223c40 * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x50, 0x0080, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x28, 0x0080, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x89, 0x18, 0x0099, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + ALERT_CUE(4), { 0x89, 0xa0, 0x004c, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000007, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000058, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0007, 0x00000000), PORTRAIT_POS(7, 3, 0), MSG_NPC(7, _(" Yippee!\nThis is the greatest!")), @@ -1106,81 +1106,81 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * TEXTBOX_CLEAR, WAIT(10), { 0x2d, 0x09, 0x0009, 0x00000068, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(14), WAIT(10), PORTRAIT(PLACEMENT_RIGHT, 0x0009, 0x00000000), MSG_NPC(9, _(" Let me shoot my Hydro\nPump to kick it off!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(14), WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 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 }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(15), PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0009, 0x00000042), MSG_NPC(9, _(" No, no!\nLet it loose! Hahaha!")), TEXTBOX_CLEAR, CALL_LABEL(2), - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(13), WAIT(80), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), MSG_NPC(4, _(" Y-you've gotta be kidding\nme!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(9), + ALERT_CUE(13), CALL_LABEL(2), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT(120), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0008, 0x00000000), MSG_NPC(8, _(" I'll secure him so he can't\nget away.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(16), + AWAIT_CUE(5), { 0x2d, 0x09, 0x0009, 0x00000059, 0x00000000, NULL }, PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0009, 0x00000000), MSG_NPC(9, _(" Oh?{WAIT_PRESS} Not bad!")), TEXTBOX_CLEAR, CALL_LABEL(2), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CLEAR_ARRAY(EVENT_LOCAL), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), WAIT(150), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000000), PORTRAIT_POS(4, 0, 0), MSG_NPC(4, _(" What, you're serious?!\nNooooo! Don't!")), TEXTBOX_CLEAR, WAIT(10), CALL_LABEL(2), - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(13), MSG_NPC(-1, _(" Ahahahahaha!")), TEXTBOX_CLEAR, WAIT(60), MSG_NPC(-1, _(" {NAME_0}...")), TEXTBOX_CLEAR, BGM_FADEOUT(180), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), CLEAR_ARRAY(EVENT_LOCAL), CALL_LABEL(2), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(13), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), WAIT(60), FANFARE_PLAY2(477), SELECT_LIVES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(............{WAIT_PRESS}\n{NAME_5}...)") }, TEXTBOX_CLEAR, @@ -1199,62 +1199,62 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(It's finally come...{WAIT_PRESS}\nThis time has finally arrived...)") }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), WAIT(120), MSG_NPC(5, _(" {NAME_0}...{WAIT_PRESS}\nI am so sorry for this...{WAIT_PRESS}\nTo everyone...{WAIT_PRESS} Please bid farewell...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), + ALERT_CUE(9), + ALERT_CUE(13), + ALERT_CUE(16), + ALERT_CUE(7), + ALERT_CUE(19), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(120), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + ALERT_CUE(4), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0006, 0x00000000), MSG_NPC(6, _(" Oh? {NAME_0}?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(9), + ALERT_CUE(13), CALL_LABEL(2), WAIT(45), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x0000000c), 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?")), VARIANT_DEFAULT(_(" ...!{WAIT_PRESS} {NAME_0}...!{WAIT_PRESS}\nYour body...{WAIT_PRESS} What's happening to you?")), TEXTBOX_CLEAR, - { 0x91, 0x0a, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_NORTH), WAIT(30), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("{NAME_1}...") }, TEXTBOX_CLEAR, - { 0x91, 0x0a, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_NORTHWEST), WAIT(30), - { 0x91, 0x0a, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_NORTHEAST), WAIT(30), - { 0x91, 0x0a, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_NORTH), WAIT(30), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("And, everyone...{WAIT_PRESS} I'm sorry.{WAIT_PRESS}\nBut I have to leave.") }, TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(465), CALL_LABEL(2), - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(13), + ALERT_CUE(6), WAIT(30), - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0007, 0x00000041), MSG_NPC(7, _(" What?!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(18), { 0x2d, 0x09, 0x0009, 0x0000004f, 0x00000000, NULL }, PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0009, 0x00000041), MSG_NPC(9, _(" Wh-what are you saying?!")), @@ -1263,7 +1263,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Everyone...{WAIT_PRESS}\nThank you for everything all this time.") }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" ...Huh?")), MSG_NPC(1, _(" ...{WAIT_PRESS}Leave...?{WAIT_PRESS}\nWhat do you mean, leave?")), @@ -1273,7 +1273,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I have to return to the human world.") }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Unbelievable!")), TEXTBOX_CLEAR, @@ -1283,26 +1283,26 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * MSG_NPC(9, _(" Go back...{WAIT_PRESS}\nTo the human world?!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Huh? W-why...?{WAIT_PRESS}\nWhy?!")), MSG_NPC(1, _(" I don't understand!\nWhy do you have to leave?!")), PORTRAIT_REP(0x0001, 0x00000002), MSG_NPC(1, _(" Didn't we...{WAIT_PRESS}\nAren't we friends?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), WAIT(60), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Yes.{WAIT_PRESS}\nYou will always be my friend,\n{NAME_1}.") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I will never forget you.") }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000008), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wait, {NAME_0}......")), VARIANT_DEFAULT(_(" Don't go, {NAME_0}......")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), WAIT(60), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I'm blessed to have met you.") }, TEXTBOX_CLEAR, @@ -1315,12 +1315,12 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * WAIT(10), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I'm so very sorry.\nThis is good-bye...") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), WAIT(60), CALL_LABEL(2), - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(13), + ALERT_CUE(8), + ALERT_CUE(9), WAIT(30), TEXTBOX_AUTO_PRESS(60, 60), { 0x2d, 0x09, 0x0009, 0x0000004e, 0x00000000, NULL }, @@ -1340,27 +1340,27 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * PORTRAIT_POS(6, -1, 2), MSG_NPC(6, _(" {NAME_0}...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), + AWAIT_CUE(5), { 0x59, 0x00, 0x0000, -0x000000c8, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), TEXTBOX_AUTO_PRESS(180, 180), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000006), MSG_NPC(1, _(" {NAME_0}!!! Nooooo!!!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, LABEL(2), /* = 0x02 */ - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(14), + ALERT_CUE(15), + ALERT_CUE(16), + ALERT_CUE(17), + ALERT_CUE(18), + ALERT_CUE(19), RET_DIRECT, HALT, }; @@ -1385,58 +1385,58 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * static const struct ScriptCommand s_gs171_g6_s0_lives1_dlg0[] = { /* 0x8225528 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(6), WAIT(15), - { 0x6b, 0x00, 0x00b3, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 0), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, 0x00000000, 0x00000008, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(128, 0, 8), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0033, 0x00000000, 0x0000000a, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(51, 0, 10), + AWAIT_CUE(6), WAIT(110), - { 0x91, 0x0c, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_NORTH), WAIT(40), { 0x89, 0x50, 0x004c, 0x00000004, 0x00000000, NULL }, WAIT(10), { 0x89, 0x28, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives2_dlg0[] = { /* 0x8225728 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00b3, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(7), + WALK_GRID(179, 1), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(7), + AWAIT_CUE(7), WAIT(30), LABEL(0), /* = 0x00 */ CALL_SCRIPT(SMILE_START_FUNC), @@ -1451,211 +1451,211 @@ static const struct ScriptCommand s_gs171_g6_s0_lives2_dlg0[] = { /* 0x8225728 * LABEL(1), /* = 0x01 */ WAIT(1), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(2), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(5), - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, 8), + AWAIT_CUE(7), WAIT(170), - { 0x91, 0x0c, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_NORTH), WAIT(25), - { 0x6a, 0x00, 0x0080, 0x00000010, -0x00000010, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(128, 16, -16), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(7), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives3_dlg0[] = { /* 0x8225a58 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, 0x00000000, 0x0000000c, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + WALK_RELATIVE(128, 0, 12), + AWAIT_CUE(8), WAIT(260), - { 0x91, 0x0c, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 1, DIRECTION_NORTH), + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives4_dlg0[] = { /* 0x8225b08 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), { 0x7e, 0x00, 0x004c, 0x00000000, -0x00000028, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT(15), - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTHEAST), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(JUMP_SURPRISE_FUNC), LABEL(0), /* = 0x00 */ - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), WAIT(10), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), WAIT(10), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT(30), LABEL(2), /* = 0x02 */ - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), WAIT(30), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), WAIT(60), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), WAIT(50), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT(50), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), JUMP_LABEL(2), LABEL(3), /* = 0x03 */ WAIT(1), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(4), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(9), WAIT(6), - { 0x6a, 0x00, 0x0100, 0x00000000, 0x0000000a, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, 10), + AWAIT_CUE(9), WAIT(170), - { 0x91, 0x0c, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 2, DIRECTION_NORTH), + AWAIT_CUE(9), WAIT(30), - { 0x6a, 0x00, 0x00b3, 0x00000000, -0x00000010, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(179, 0, -16), + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives5_dlg0[] = { /* 0x8225f38 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), WAIT(7), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00b3, 0x00000002, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(11), + WALK_GRID(179, 2), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(11), + AWAIT_CUE(11), + AWAIT_CUE(11), + ROTATE(10, 10, DIRECTION_SOUTHEAST), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), + AWAIT_CUE(11), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), WAIT(2), - { 0x6a, 0x00, 0x00cc, 0x00000000, 0x0000000a, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(204, 0, 10), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(11), WAIT(120), - { 0x91, 0x0c, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 2, DIRECTION_NORTH), + AWAIT_CUE(11), WAIT(60), - { 0x6a, 0x00, 0x00b3, 0x00000000, -0x00000010, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(179, 0, -16), + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives6_dlg0[] = { /* 0x8226168 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(12), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(4), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(12), WAIT(30), - { 0x6b, 0x00, 0x00b3, 0x00000004, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 4), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(12), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(3), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(12), + AWAIT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(8), - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, 8), + AWAIT_CUE(12), WAIT(190), - { 0x91, 0x0c, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x6a, 0x00, 0x004c, 0x00000000, -0x00000010, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 1, DIRECTION_NORTH), + WALK_RELATIVE(76, 0, -16), + AWAIT_CUE(12), + AWAIT_CUE(12), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives7_dlg0[] = { /* 0x82263c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), WAIT(35), - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000040, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, -64), + WALK_RELATIVE(256, 16, 0), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(13), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_SCRIPT(SMILE_END_FUNC), { 0x54, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(15), LABEL(0), /* = 0x00 */ CALL_SCRIPT(SMILE_START_FUNC), @@ -1670,44 +1670,44 @@ static const struct ScriptCommand s_gs171_g6_s0_lives7_dlg0[] = { /* 0x82263c8 * LABEL(1), /* = 0x01 */ WAIT(1), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(13), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), WAIT(10), - { 0x6a, 0x00, 0x00b3, 0x00000000, 0x00000006, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(179, 0, 6), + AWAIT_CUE(13), WAIT(200), - { 0x91, 0x0c, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 2, DIRECTION_NORTH), + AWAIT_CUE(13), WAIT(10), - { 0x6a, 0x00, 0x004c, 0x00000000, -0x00000010, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(76, 0, -16), + AWAIT_CUE(13), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives8_dlg0[] = { /* 0x82266e8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), WAIT(2), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(16), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(16), WAIT(40), - { 0x6b, 0x00, 0x00b3, 0x00000006, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 6), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(16), + AWAIT_CUE(16), WAIT(45), LABEL(0), /* = 0x00 */ CALL_SCRIPT(SMILE_START_FUNC), @@ -1722,195 +1722,195 @@ static const struct ScriptCommand s_gs171_g6_s0_lives8_dlg0[] = { /* 0x82266e8 * LABEL(1), /* = 0x01 */ WAIT(1), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(16), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), WAIT(6), - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, 8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(16), WAIT(170), - { 0x91, 0x0c, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 1, DIRECTION_NORTHWEST), + AWAIT_CUE(16), WAIT(40), - { 0x6a, 0x00, 0x00b3, 0x00000000, -0x00000010, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(179, 0, -16), + AWAIT_CUE(16), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives9_dlg0[] = { /* 0x8226a08 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), WAIT(6), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(14), WAIT(40), - { 0x6b, 0x00, 0x00b3, 0x00000007, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 7), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(14), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), WAIT(2), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(14), + AWAIT_CUE(14), WAIT(3), - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, 8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(14), WAIT(120), - { 0x91, 0x0c, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 1, DIRECTION_NORTH), + AWAIT_CUE(14), WAIT(40), - { 0x6a, 0x00, 0x00b3, 0x00000000, -0x00000010, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(179, 0, -16), + AWAIT_CUE(14), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives10_dlg0[] = { /* 0x8226c68 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), WAIT(8), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(15), WAIT(40), - { 0x6b, 0x00, 0x00b3, 0x0000000a, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 10), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(15), + AWAIT_CUE(15), + AWAIT_CUE(15), WAIT(7), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(15), + AWAIT_CUE(15), + WALK_RELATIVE(256, 0, 8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(15), WAIT(90), - { 0x91, 0x0c, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 1, DIRECTION_NORTH), + AWAIT_CUE(15), WAIT(55), - { 0x6a, 0x00, 0x0066, 0x00000000, -0x00000010, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(102, 0, -16), + AWAIT_CUE(15), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives11_dlg0[] = { /* 0x8226e68 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), WAIT(7), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(17), WAIT(10), - { 0x6b, 0x00, 0x00b3, 0x00000003, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 3), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(17), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), WAIT(7), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(17), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), WAIT(6), - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, 8), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(17), WAIT(170), - { 0x91, 0x0c, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 2, DIRECTION_NORTH), + AWAIT_CUE(17), WAIT(40), - { 0x6a, 0x00, 0x0080, 0x00000000, -0x00000010, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(128, 0, -16), + AWAIT_CUE(17), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives12_dlg0[] = { /* 0x8227098 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(18), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(18), WAIT(4), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(18), WAIT(35), - { 0x6b, 0x00, 0x00b3, 0x00000005, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 5), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(18), + AWAIT_CUE(18), + AWAIT_CUE(18), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(18), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(18), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(18), WAIT(10), - { 0x6a, 0x00, 0x00b3, 0x00000000, 0x00000006, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(179, 0, 6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(18), WAIT(210), - { 0x91, 0x0c, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 1, DIRECTION_NORTH), + AWAIT_CUE(18), WAIT(25), - { 0x6a, 0x00, 0x00b3, 0x00000000, -0x00000010, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(179, 0, -16), + AWAIT_CUE(18), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives13_dlg0[] = { /* 0x82272c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(19), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(19), WAIT(7), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(19), WAIT(45), - { 0x6b, 0x00, 0x00b3, 0x00000008, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 8), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(19), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(19), CALL_SCRIPT(SMILE_END_FUNC), WAIT(20), LABEL(0), /* = 0x00 */ @@ -1926,42 +1926,42 @@ static const struct ScriptCommand s_gs171_g6_s0_lives13_dlg0[] = { /* 0x82272c8 LABEL(1), /* = 0x01 */ WAIT(1), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(19), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(19), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, 0x0000000c, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(19), + WALK_RELATIVE(256, 0, 12), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(19), WAIT(120), - { 0x91, 0x0c, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 2, DIRECTION_NORTH), + AWAIT_CUE(19), WAIT(50), - { 0x6a, 0x00, 0x0066, 0x00000000, -0x00000010, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(102, 0, -16), + AWAIT_CUE(19), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_lives14_dlg0[] = { /* 0x82275c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(19), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(19), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(19), WAIT(40), - { 0x6b, 0x00, 0x00b3, 0x00000009, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 9), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(19), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(19), CALL_SCRIPT(SMILE_END_FUNC), WAIT(20), LABEL(0), /* = 0x00 */ @@ -1977,77 +1977,77 @@ static const struct ScriptCommand s_gs171_g6_s0_lives14_dlg0[] = { /* 0x82275c8 LABEL(1), /* = 0x01 */ WAIT(1), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(19), WAIT(7), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(19), + AWAIT_CUE(19), WAIT(2), - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, 8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(19), WAIT(130), - { 0x91, 0x0c, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 1, DIRECTION_NORTH), + AWAIT_CUE(19), WAIT(60), - { 0x6a, 0x00, 0x00b3, 0x00000000, -0x00000010, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(179, 0, -16), + AWAIT_CUE(19), HALT, }; static const struct ScriptCommand s_gs171_g6_s0_eff1_script[] = { /* 0x82278c8 */ DEBUGINFO, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x000000a7, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x56, 0x00, 0x0000, 0x000000a8, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x56, 0x00, 0x0000, 0x000000a9, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x56, 0x00, 0x0000, 0x000000aa, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, WAIT(1), FANFARE_PLAY2(511), { 0x56, 0x00, 0x0003, 0x0000016c, 0x00000000, NULL }, { 0x59, 0x00, 0x0000, 0x00000003, 0x00000000, NULL }, WAIT(20), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0003, 0x0000016d, 0x00000000, NULL }, WAIT(120), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0066, 0x00000000, -0x00000080, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(13), + ALERT_CUE(14), + ALERT_CUE(15), + ALERT_CUE(16), + ALERT_CUE(17), + ALERT_CUE(18), + ALERT_CUE(19), + WALK_RELATIVE(102, 0, -128), + ALERT_CUE(7), + ALERT_CUE(9), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(13), + ALERT_CUE(14), + ALERT_CUE(15), + ALERT_CUE(16), + ALERT_CUE(17), + ALERT_CUE(18), + ALERT_CUE(19), WAIT(160), { 0x56, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, WAIT(1), @@ -2061,8 +2061,8 @@ static const struct ScriptCommand s_gs171_g6_s0_eff1_script[] = { /* 0x82278c8 * { 0x89, 0x90, 0x0099, 0x00000004, 0x00000000, NULL }, FANFARE_FADEOUT2(180, 514), { 0x56, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(20), HALT, }; @@ -2071,28 +2071,28 @@ static const struct ScriptCommand s_gs171_g6_s1_lives0_dlg0[] = { /* 0x8227d08 * { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(6), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(2), { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), + SELECT_ANIMATION(24), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; @@ -2103,7 +2103,7 @@ static const struct ScriptCommand s_gs171_g7_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(171), SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, RET, }; @@ -2112,7 +2112,7 @@ static const struct ScriptRef s_gs171_g7_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x09, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000007, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000058, 0x00000000, NULL }, @@ -2144,8 +2144,8 @@ static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 * MSG_NPC(4, _(" Just when things were\ngoing to get better...{WAIT_PRESS} Sob...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), 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...")), @@ -2169,7 +2169,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 * MSG_NPC(1, _(" {NAME_0} knew that\nwould be the time to leave...")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000008), MSG_NPC(1, _(" Why...{WAIT_PRESS}\nWhy didn't {NAME_0} tell me earlier...?")), MSG_NPC(1, _(" If this was coming...{WAIT_PRESS}\nWhy didn't {NAME_0} tell me?")), @@ -2182,26 +2182,26 @@ static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 * MSG_NPC(2, _(" Try to understand,\n{NAME_1}.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Sob...{WAIT_PRESS}\n{NAME_0}...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, LABEL(1), /* = 0x01 */ - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(13), + ALERT_CUE(14), + ALERT_CUE(15), + ALERT_CUE(16), + ALERT_CUE(17), + ALERT_CUE(18), + ALERT_CUE(19), RET_DIRECT, HALT, }; @@ -2211,155 +2211,155 @@ static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 * static const struct ScriptCommand s_gs171_g7_s0_lives1_dlg0[] = { /* 0x8228974 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + SELECT_ANIMATION(9), + AWAIT_CUE(6), { 0x54, 0x00, 0x002d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives2_dlg0[] = { /* 0x8228a14 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives3_dlg0[] = { /* 0x8228ab4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, 0x00000000, 0x00000008, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + WALK_RELATIVE(128, 0, 8), + ALERT_CUE(5), + AWAIT_CUE(8), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives4_dlg0[] = { /* 0x8228b64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives5_dlg0[] = { /* 0x8228be4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives6_dlg0[] = { /* 0x8228c64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(12), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives7_dlg0[] = { /* 0x8228ce4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(13), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives8_dlg0[] = { /* 0x8228d64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(16), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(16), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives9_dlg0[] = { /* 0x8228dd4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(14), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(14), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives10_dlg0[] = { /* 0x8228e44 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(15), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(15), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives11_dlg0[] = { /* 0x8228eb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(17), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(17), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives12_dlg0[] = { /* 0x8228f24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(18), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(18), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives13_dlg0[] = { /* 0x8228f94 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(19), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(19), HALT, }; static const struct ScriptCommand s_gs171_g7_s0_lives14_dlg0[] = { /* 0x8229004 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(19), WAIT_RANDOM(0, 15), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(19), HALT, }; diff --git a/src/data/ground/ground_data_a04p02_station.h b/src/data/ground/ground_data_a04p02_station.h index 588572f41..b7769d07c 100644 --- a/src/data/ground/ground_data_a04p02_station.h +++ b/src/data/ground/ground_data_a04p02_station.h @@ -21,9 +21,9 @@ static const struct ScriptCommand s_gs172_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), { 0x2d, 0x09, 0x0000, 0x00000022, 0x00000000, NULL }, BGM_SWITCH(22), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), MSG_NPC(0, _(" It's a huge tower of\nclouds...")), TEXTBOX_CLEAR, @@ -37,10 +37,10 @@ static const struct ScriptRef s_gs172_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs172_g1_s0_eff0_script[] = { /* 0x8229a2c */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0xe0, 0x004c, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), HALT, }; diff --git a/src/data/ground/ground_data_a04p03_station.h b/src/data/ground/ground_data_a04p03_station.h index dc149e2d6..46679c487 100644 --- a/src/data/ground/ground_data_a04p03_station.h +++ b/src/data/ground/ground_data_a04p03_station.h @@ -38,7 +38,7 @@ static const struct ScriptCommand s_gs173_g1_s0_eff0_script[] = { /* 0x8229c80 * DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x6b, 0x00, 0x00b3, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 0), HALT, }; @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs173_g2_s0_station_sref_script[] = { /* 0x8 FANFARE_PLAY2(508), { 0x97, 0x00, 0x0002, 0x00000001, 0x00000001, NULL }, { 0x22, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(210), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, FANFARE_FADEOUT2(30, 508), @@ -65,8 +65,8 @@ static const struct ScriptCommand s_gs173_g2_s0_eff0_script[] = { /* 0x8229d9c * WAIT(1), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x30, 0x0300, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; @@ -77,7 +77,7 @@ static const struct ScriptCommand s_gs173_g3_s0_station_sref_script[] = { /* 0x8 BGM_SWITCH(26), { 0x97, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x27, 0x00, 0x0005, 0x00000010, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(120), { 0x28, 0x01, 0x0005, 0x00000008, 0x00ffffff, NULL }, WAIT(5), @@ -100,8 +100,8 @@ static const struct ScriptCommand s_gs173_g3_s0_eff0_script[] = { /* 0x8229f58 * WAIT(1), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x18, 0x0400, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; diff --git a/src/data/ground/ground_data_a04p04_station.h b/src/data/ground/ground_data_a04p04_station.h index e98abdfb7..1b7bfa9dd 100644 --- a/src/data/ground/ground_data_a04p04_station.h +++ b/src/data/ground/ground_data_a04p04_station.h @@ -22,7 +22,7 @@ static const struct ScriptCommand s_gs174_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_STOP, { 0x27, 0x01, 0x0005, 0x0000003c, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(150), { 0x28, 0x01, 0x0005, 0x0000003c, 0x00ffffff, NULL }, WAIT(180), @@ -33,7 +33,7 @@ static const struct ScriptRef s_gs174_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 */ DEBUGINFO, - { 0x54, 0x00, 0x0034, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(52), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -60,24 +60,24 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...This shadow...{WAIT_PRESS}\n{NAME_4}...)") }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 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, WAIT(30), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT_REP(0x0004, 0x00000041), MSG_NPC(4, _(" I know!")), MSG_NPC(4, _(" I'll drag you into the dark\nworld. That'll do it.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0033, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), + SELECT_ANIMATION(51), { 0x3b, 0x36, 0x0004, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000005), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(............)") }, @@ -92,28 +92,28 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * MSG_NPC(4, _(" ......")), MSG_NPC(4, _(" ............")), { 0x3b, 0x36, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0034, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), + SELECT_ANIMATION(52), PORTRAIT_REP(0x0004, 0x00000044), MSG_NPC(4, _(" ..................{WAIT_PRESS}Hunh?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), MSG_NPC(4, _(" Darn it...\nI took the wrong path...")), TEXTBOX_CLEAR, WAIT(10), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(......What?)") }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), WAIT(60), MSG_NPC(4, _(" This isn't like me...{WAIT_PRESS}\nI can't tell which way is which...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0004, 0x00000044), MSG_NPC(4, _(" Keh! To heck with this.{WAIT_PRESS}\nI'll just ditch you here...")), @@ -122,9 +122,9 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * TEXTBOX_CLEAR, WAIT(10), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), WAIT(20), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -133,46 +133,46 @@ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 * static const struct ScriptCommand s_gs174_g1_s1_lives0_dlg0[] = { /* 0x822abd8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, 0x00000010, 0x00000020, NULL }, - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + WALK_RELATIVE(128, 16, 32), + ROTATE(8, 10, DIRECTION_WEST), WAIT(60), - { 0x91, 0x0a, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_EAST), WAIT(45), { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x06, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(6, 10, DIRECTION_NORTH), WAIT(20), - { 0x91, 0x06, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_SOUTH), WAIT(20), - { 0x91, 0x06, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x06, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(6, 10, DIRECTION_NORTH), WAIT(20), - { 0x91, 0x06, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_SOUTH), WAIT(20), - { 0x91, 0x06, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_EAST), WAIT(60), { 0x89, 0x10, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(9), { 0x89, 0x50, 0x0099, 0x00000002, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, diff --git a/src/data/ground/ground_data_a05p01_station.h b/src/data/ground/ground_data_a05p01_station.h index 3710b5697..d6456f028 100644 --- a/src/data/ground/ground_data_a05p01_station.h +++ b/src/data/ground/ground_data_a05p01_station.h @@ -22,7 +22,7 @@ static const struct ScriptCommand s_gs175_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), { 0x3b, 0x36, 0x0000, -0x00000002, 0x00000000, NULL }, { 0x22, 0x01, 0x00b4, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), WAIT(0), { 0x28, 0x01, 0x0001, 0x0000001e, 0x00ffffff, NULL }, WAIT(45), @@ -55,7 +55,7 @@ static const struct ScriptCommand s_gs175_g1_s0_eff1_script[] = { /* 0x822b0f4 * TEXTBOX_AUTO_PRESS(-210, 50), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Voices...{WAIT_PRESS}\nI hear voices...)") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -67,7 +67,7 @@ static const struct ScriptCommand s_gs175_g2_s0_station_sref_script[] = { /* 0x8 { 0x3b, 0x36, 0x0000, -0x00000002, 0x00000000, NULL }, BGM_STOP, { 0x22, 0x01, 0x00b4, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, WAIT(170), { 0x28, 0x01, 0x0002, 0x0000003c, 0x00ffffff, NULL }, @@ -97,7 +97,7 @@ static const struct ScriptCommand s_gs175_g2_s0_eff1_script[] = { /* 0x822b3d0 * MSG_ON_BG_AUTO(30, _("\n{CENTER_ALIGN}Irreplaceable friend...")), WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; diff --git a/src/data/ground/ground_data_a05p02_station.h b/src/data/ground/ground_data_a05p02_station.h index 97bf6068c..502e086b1 100644 --- a/src/data/ground/ground_data_a05p02_station.h +++ b/src/data/ground/ground_data_a05p02_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs176_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), { 0x3b, 0x36, 0x0000, -0x00000002, 0x00000000, NULL }, { 0x27, 0x01, 0x0001, 0x0000001e, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x0005, 0x00000078, 0x00ffffff, NULL }, WAIT(90), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -109,7 +109,7 @@ static const struct ScriptCommand s_gs176_g1_s0_eff1_script[] = { /* 0x822bb50 * MSG_ON_BG_AUTO(90, _("{CENTER_ALIGN}Perhaps you will meet again.")), TEXTBOX_CLEAR2, WAIT(60), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; diff --git a/src/data/ground/ground_data_b01p01a_station.h b/src/data/ground/ground_data_b01p01a_station.h index a9cdfd3e7..3a6e96777 100644 --- a/src/data/ground/ground_data_b01p01a_station.h +++ b/src/data/ground/ground_data_b01p01a_station.h @@ -461,7 +461,7 @@ static const struct ScriptCommand s_gs9_g0_s0_evt1_sref_script[] = { /* 0x819bf5 HALT, LABEL(1), /* = 0x01 */ JUMPIF(JUDGE_LE, FRIEND_SUM, 2, /* to label */ 2), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_TOP_LEFT, 0x0000, 0x00000004), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("This will be a dangerous journey.") }, @@ -515,7 +515,7 @@ static const struct ScriptRef s_gs9_g0_s0_evt3_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs9_g0_s0_obj0_dlg2[] = { /* 0x819c378 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), CJUMP_DIR_TO_LINK(0), @@ -549,7 +549,7 @@ static const struct ScriptCommand s_gs9_g0_s0_obj0_dlg2[] = { /* 0x819c378 */ static const struct ScriptCommand s_gs9_g0_s0_obj2_dlg2[] = { /* 0x819c748 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_INSTANT(_("\n ← Friend Areas")), @@ -562,11 +562,11 @@ static const struct ScriptCommand s_gs9_g0_s0_obj2_dlg2[] = { /* 0x819c748 */ COND_EQUAL(0, /* to label */ 2), HALT, LABEL(2), /* = 0x02 */ - { 0xe4, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(2), RET, LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_LE, FRIEND_SUM, 2, /* to label */ 1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_TOP_LEFT, 0x0000, 0x00000004), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("This will be a dangerous journey.") }, @@ -582,7 +582,7 @@ static const struct ScriptCommand s_gs9_g0_s0_obj3_dlg0[] = { /* 0x819c8f4 */ END_DELETE, LABEL(0), /* = 0x00 */ { 0x53, 0x00, 0x0000, 0x000001e0, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; @@ -592,7 +592,7 @@ static const struct ScriptCommand s_gs9_g0_s0_obj4_dlg0[] = { /* 0x819c974 */ END_DELETE, LABEL(0), /* = 0x00 */ { 0x53, 0x00, 0x0000, 0x000001e0, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; @@ -602,7 +602,7 @@ static const struct ScriptCommand s_gs9_g0_s0_obj5_dlg0[] = { /* 0x819c9e4 */ END_DELETE, LABEL(0), /* = 0x00 */ { 0x53, 0x00, 0x0000, 0x000001e0, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; @@ -612,76 +612,76 @@ static const struct ScriptCommand s_gs9_g0_s0_obj6_dlg0[] = { /* 0x819ca54 */ END_DELETE, LABEL(0), /* = 0x00 */ { 0x53, 0x00, 0x0000, 0x000001e0, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs9_g0_s1_lives0_dlg0[] = { /* 0x819cac4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs9_g0_s1_lives1_dlg0[] = { /* 0x819cb04 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs9_g0_s2_lives0_dlg0[] = { /* 0x819cb44 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs9_g0_s2_lives1_dlg0[] = { /* 0x819cb84 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs9_g0_s3_lives0_dlg0[] = { /* 0x819cbc4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs9_g0_s3_lives1_dlg0[] = { /* 0x819cc04 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs9_g0_s4_lives0_dlg0[] = { /* 0x819cc44 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs9_g0_s4_lives1_dlg0[] = { /* 0x819cc84 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs9_g0_s5_lives0_dlg0[] = { /* 0x819ccc4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs9_g0_s5_lives1_dlg0[] = { /* 0x819cd04 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -1033,10 +1033,10 @@ static const struct ScriptCommand s_gs9_g1_s1_lives3_dlg2[] = { /* 0x819e7c4 */ static const struct ScriptCommand s_gs9_g2_s0_station_sref_script[] = { /* 0x819e7e4 */ DEBUGINFO, SELECT_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), + AWAIT_CUE(3), JUMPIF_ARRAY(EVENT_B01P01, 3, /* to label */ 0), { 0x3b, 0x0f, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), @@ -1052,39 +1052,39 @@ static const struct ScriptCommand s_gs9_g2_s0_eff0_script[] = { /* 0x819e8c0 */ DEBUGINFO, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), WAIT(1), END_DELETE, }; static const struct ScriptCommand s_gs9_g2_s1_lives0_dlg0[] = { /* 0x819e920 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x00000030, 0x00000000, NULL }, FANFARE_PLAY2(451), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Flap! Flap!") }, - { 0x6b, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, + WALK_GRID(256, 3), TEXTBOX_CLEAR, - { 0x91, 0x1e, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(30, 2, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, FANFARE_STOP2(451), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), WAIT(20), FANFARE_PLAY2(501), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Clunk!") }, WAIT(60), TEXTBOX_CLEAR, FANFARE_PLAY2(451), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x68, 0x00, 0x0100, 0x00000030, 0x00000000, NULL }, WAIT(15), - { 0x91, 0x1e, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, + ROTATE(30, 1, DIRECTION_WEST), + WALK_GRID(256, 4), FANFARE_STOP2(451), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), END_DELETE, }; @@ -1099,7 +1099,7 @@ static const struct ScriptCommand s_gs9_g2_s1_eff0_script[] = { /* 0x819eaf4 */ static const struct ScriptCommand s_gs9_g2_s2_obj0_dlg0[] = { /* 0x819eb44 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x000001e0, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; @@ -1193,7 +1193,7 @@ static const struct ScriptCommand s_gs9_g5_s0_station_sref_script[] = { /* 0x819 CALL_STATION( 4, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), JUMP_STATION( 8, 0), RET, }; @@ -1202,7 +1202,7 @@ static const struct ScriptRef s_gs9_g5_s0_station_sref = { 402, 7, NULL /* EVENT static const struct ScriptCommand s_gs9_g5_s0_lives0_dlg0[] = { /* 0x819f048 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -1213,23 +1213,23 @@ static const struct ScriptCommand s_gs9_g5_s0_lives0_dlg0[] = { /* 0x819f048 */ VARIANT_DEFAULT(_(" Good morning, {NAME_0}.")), VARIANT_DEFAULT(_(" We failed yesterday,\nso let's try harder this time.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs9_g5_s0_lives1_dlg0[] = { /* 0x819f1cc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g5_s1_lives0_dlg0[] = { /* 0x819f20c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -1248,7 +1248,7 @@ static const struct ScriptCommand s_gs9_g6_s0_station_sref_script[] = { /* 0x819 LABEL(2), /* = 0x02 */ BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -1260,7 +1260,7 @@ static const struct ScriptRef s_gs9_g6_s0_station_sref = { 400, 7, NULL /* EVENT static const struct ScriptCommand s_gs9_g6_s1_lives0_dlg0[] = { /* 0x819f3a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -1272,27 +1272,27 @@ static const struct ScriptCommand s_gs9_g6_s1_lives0_dlg0[] = { /* 0x819f3a8 */ VARIANT_DEFAULT(_(" Didn't we do good today?{WAIT_PRESS}\nLet's call it a night and get some rest.")), VARIANT_DEFAULT(_(" OK, see you tomorrow!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs9_g6_s1_lives1_dlg0[] = { /* 0x819f554 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g6_s2_lives0_dlg0[] = { /* 0x819f594 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("That was good work today.\nI should get some rest.") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -1315,7 +1315,7 @@ static const struct ScriptCommand s_gs9_g7_s0_station_sref_script[] = { /* 0x819 CALL_STATION( 4, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), JUMP_STATION( 8, 0), RET, }; @@ -1324,29 +1324,29 @@ static const struct ScriptRef s_gs9_g7_s0_station_sref = { 402, 7, NULL /* EVENT static const struct ScriptCommand s_gs9_g7_s0_lives0_dlg0[] = { /* 0x819f7c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), MSG_NPC(1, _(" Good morning, {NAME_0}.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs9_g7_s0_lives1_dlg0[] = { /* 0x819f854 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g7_s1_lives0_dlg0[] = { /* 0x819f894 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -1355,9 +1355,9 @@ static const struct ScriptCommand s_gs9_g8_s0_station_sref_script[] = { /* 0x819 SELECT_ENTITIES(-1, 0), { 0x3b, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(1, /* to label */ 0), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), WAIT(1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, LABEL(0), /* = 0x00 */ CALL_STATION( 2, 0), @@ -1368,30 +1368,30 @@ static const struct ScriptRef s_gs9_g8_s0_station_sref = { 401, 7, NULL /* EVENT static const struct ScriptCommand s_gs9_g8_s0_lives0_dlg0[] = { /* 0x819f9b0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), WAIT(1), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs9_g8_s0_lives1_dlg0[] = { /* 0x819fa40 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), WAIT(1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs9_g9_s0_lives0_dlg2[] = { /* 0x819fac0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3( TRUE, /*default*/ 0, /* speaker */ -1, _("Trigger sub-scenario 1-2\n\"Team Flag\"?")), @@ -1410,7 +1410,7 @@ static const struct ScriptCommand s_gs9_g9_s0_lives0_dlg2[] = { /* 0x819fac0 */ static const struct ScriptCommand s_gs9_g10_s0_lives0_dlg2[] = { /* 0x819fbf0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3( TRUE, /*default*/ 0, /* speaker */ -1, _("Trigger sub-scenario 3\n\"Meteor Cave\"?")), @@ -1428,7 +1428,7 @@ static const struct ScriptCommand s_gs9_g10_s0_lives0_dlg2[] = { /* 0x819fbf0 */ static const struct ScriptCommand s_gs9_g11_s0_lives0_dlg2[] = { /* 0x819fcfc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3( TRUE, /*default*/ 0, /* speaker */ -1, _("Trigger sub-scenario 4\n\"Rainbow Wing\"?")), @@ -1446,7 +1446,7 @@ static const struct ScriptCommand s_gs9_g11_s0_lives0_dlg2[] = { /* 0x819fcfc */ static const struct ScriptCommand s_gs9_g12_s0_lives0_dlg2[] = { /* 0x819fe08 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3( TRUE, /*default*/ 0, /* speaker */ -1, _("Trigger sub-scenario 5\n\"The Toughest Pokémon\"?")), @@ -1464,7 +1464,7 @@ static const struct ScriptCommand s_gs9_g12_s0_lives0_dlg2[] = { /* 0x819fe08 */ static const struct ScriptCommand s_gs9_g13_s0_lives0_dlg2[] = { /* 0x819ff1c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3( TRUE, /*default*/ 0, /* speaker */ -1, _("Trigger sub-scenario 6\n\"Latios and Latias\"?")), @@ -1482,7 +1482,7 @@ static const struct ScriptCommand s_gs9_g13_s0_lives0_dlg2[] = { /* 0x819ff1c */ static const struct ScriptCommand s_gs9_g14_s0_lives0_dlg2[] = { /* 0x81a002c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3( TRUE, /*default*/ 0, /* speaker */ -1, _("Trigger sub-scenario 1-2\n\"Buried Relic\"?")), @@ -1500,7 +1500,7 @@ static const struct ScriptCommand s_gs9_g14_s0_lives0_dlg2[] = { /* 0x81a002c */ static const struct ScriptCommand s_gs9_g15_s0_lives0_dlg2[] = { /* 0x81a013c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3( TRUE, /*default*/ 0, /* speaker */ -1, _("Trigger sub-scenario 8\n\"Wish Cave\"?")), @@ -1518,7 +1518,7 @@ static const struct ScriptCommand s_gs9_g15_s0_lives0_dlg2[] = { /* 0x81a013c */ static const struct ScriptCommand s_gs9_g16_s0_lives0_dlg2[] = { /* 0x81a0244 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3( TRUE, /*default*/ 0, /* speaker */ -1, _("Trigger sub-scenario 9\n\"Gengar and Gardevoir\"?")), @@ -1541,7 +1541,7 @@ static const struct ScriptCommand s_gs9_g17_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x3b, 0x39, 0x0001, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(120), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -1564,11 +1564,11 @@ static const struct ScriptRef s_gs9_g17_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g17_s0_eff0_script[] = { /* 0x81a050c - PART 1 0:18:58-0:19:03 - Possibly the camera scroll? WAIT timing seems to match */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_GRID(256, 5), WAIT(70), - { 0x6b, 0x00, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 6), + ALERT_CUE(5), { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), END_DELETE, @@ -1576,23 +1576,23 @@ static const struct ScriptCommand s_gs9_g17_s0_eff0_script[] = { /* 0x81a050c - static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - PART 1 0:18:53-0:22:03 - Player */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), - { 0x6b, 0x00, 0x0100, 0x00000007, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + WALK_GRID(256, 7), + ROTATE(4, 1, DIRECTION_EAST), WAIT(30), MSG_NPC(1, _(" Well, this is the place...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_NORTH), WAIT(30), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(30), CALL_SCRIPT(SMILE_START_FUNC), FANFARE_PLAY2(455), @@ -1609,8 +1609,8 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Maybe I feel that way because I'm\n{POKEMON_0}!)") }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh? {NAME_0}.\nI can tell you're impressed.")), @@ -1623,16 +1623,16 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - VARIANT_DEFAULT(_(" I was sure you would\nlike it.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(8, 10, DIRECTION_NORTH), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 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.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" You know that fissure\n{NAME_2} fell into?")), @@ -1668,7 +1668,7 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - TEXTBOX_CLEAR, WAIT(4), SELECT_LIVES(-1, 2), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), BGM_FADEIN(30, 1), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -1691,7 +1691,7 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - TEXTBOX_CLEAR, WAIT(4), SELECT_LIVES(-1, 3), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" OK! That's done it!")), @@ -1711,14 +1711,14 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - VARIANT_DEFAULT(_(" The team name...\nWell, I don't have one yet.")), VARIANT_DEFAULT(_(" So, {NAME_0}.\nWhat do you think would be a good\nname for us?")), TEXTBOX_CLEAR, - { 0x3e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + RENAME_TEAM, WAIT(30), { 0xb0, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SCENARIO_CALC(SCENARIO_MAIN, 3, 0), { 0x3b, 0x39, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x39, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {COLOR CYAN}{TEAM_NAME}{RESET}!{WAIT_PRESS}\nYeah... That's a good name! It suits us!")), @@ -1729,14 +1729,14 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - VARIANT_DEFAULT(_(" Rescue Team\n{TEAM_NAME}{RESET}!{WAIT_PRESS}\nLet's do good starting tomorrow!")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x06, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_SOUTH), WAIT(20), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(1), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -1751,27 +1751,27 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - static const struct ScriptCommand s_gs9_g17_s0_lives1_dlg0[] = { /* 0x81a1e94 - PART 1 0:18:53-0:20:11 - Partner */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - { 0x6b, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + WALK_GRID(256, 8), + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_WEST), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x0000000a, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_GRID(153, 10), + ROTATE(4, 2, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTH), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), { 0xda, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(1, /* to label */ 0), COND_EQUAL(2, /* to label */ 1), @@ -1788,7 +1788,7 @@ static const struct ScriptCommand s_gs9_g17_s0_lives1_dlg0[] = { /* 0x81a1e94 - static const struct ScriptCommand s_gs9_g17_s2_lives0_dlg0[] = { /* 0x81a20f0 - PART 1 0:20:11-0:20:39 - Partner - refused Rescue Team question */ DEBUGINFO, BGM_FADEOUT(5), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), WAIT(10), @@ -1796,24 +1796,24 @@ static const struct ScriptCommand s_gs9_g17_s2_lives0_dlg0[] = { /* 0x81a20f0 - FANFARE_PLAY2(473), CALL_SCRIPT(SHOCK_FUNC), WAIT(60), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs9_g17_s3_lives0_dlg0[] = { /* 0x81a21b0 - PART 1 0:20:40-0:22:03 - Partner - accepted Rescue Team question */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(2), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, HALT, @@ -1830,7 +1830,7 @@ static const struct ScriptCommand s_gs9_g18_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), CALL_STATION( 19, 0), RET, @@ -1841,32 +1841,32 @@ static const struct ScriptRef s_gs9_g18_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g18_s0_eff0_script[] = { /* 0x81a239c */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000000c, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_GRID(256, 12), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000003c, 0x00000000, NULL }, { 0x2d, 0x09, 0x0004, 0x0000003f, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" ...Hunh?! Oh, no!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(468), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hahaha, sorry!{WAIT_PRESS}\nI was so excited, I've been waiting out\nhere since dawn...")), @@ -1876,8 +1876,8 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ VARIANT_DEFAULT(_(" Hahaha, sorry!{WAIT_PRESS}\nI was so excited, I came out here at\ndawn to wait for you.")), VARIANT_DEFAULT(_(" I must have snoozed off.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -1897,21 +1897,21 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ VARIANT_DEFAULT(_(" ...But, anyway...\nWe don't have any job offers yet...\nHahahaha...")), TEXTBOX_CLEAR, FANFARE_PLAY2(470), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(60), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Oh, yeah!{WAIT_PRESS}\nMaybe there's something in the Mailbox...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(4), WAIT(60), - { 0x6b, 0x00, 0x0100, 0x0000000e, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 14), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(5), WAIT(30), { 0x3b, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} checked the Mailbox.")), @@ -1919,22 +1919,22 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ MSG_INSTANT(_("{CENTER_ALIGN}The Mailbox contained\n{CENTER_ALIGN}a {COLOR CYAN}Rescue Team Starter Set{RESET}!")), { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000b), MSG_NPC(1, _(" I knew it'd be there!{WAIT_PRESS}\nIt's the {COLOR CYAN}Rescue Team Starter Set{RESET}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" You always get one when\nyou start a rescue team.")), VARIANT_DEFAULT(_(" They always give you one\nif you start a rescue team.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} opened\n{CENTER_ALIGN}the {COLOR CYAN}Rescue Team Starter Set{RESET}.")), FANFARE_PLAY(213), @@ -1948,8 +1948,8 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Yeah!{WAIT_PRESS}\nThere's all sorts of good stuff in it!")), @@ -1970,8 +1970,8 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ VARIANT_DEFAULT(_(" I'll put the {COLOR CYAN}Pokémon News{RESET}\nin the Mailbox.\nYou should read it later on.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" And, let's see...{WAIT_PRESS}\nIs there any other mail...?{WAIT_PRESS}\nDid we miss anything?")), @@ -1982,51 +1982,51 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ MSG_INSTANT(_("{CENTER_ALIGN}But the Mailbox was empty.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000005), MSG_NPC(1, _(" OK, so there isn't any\nmail for us after all...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" If there were any rescue\njobs, we would be getting mail, but...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I guess no one knows us\nbecause we just started this team.\nHahaha...")), VARIANT_DEFAULT(_(" Nobody knows about us\nsince we're so new a team, I guess.\nHahaha...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ALERT_CUE(7), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Flap! Flap!") }, FANFARE_PLAY2(451), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), WAIT(60), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x1e, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(30, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Huh? What's up?")), VARIANT_DEFAULT(_(" Oh?\nI wonder what it could be.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x95, 0x04, 0x000a, 0x0000000f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(7), + AWAIT_CUE(5), FANFARE_STOP2(451), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -2041,113 +2041,113 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ static const struct ScriptCommand s_gs9_g18_s0_lives1_dlg0[] = { /* 0x81a3a10 */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), FANFARE_PLAY2(482), CALL_SCRIPT(SHOCK_FUNC), WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(20), { 0x93, 0x08, 0x0002, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(SMILE_START_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x95, 0x04, 0x000a, 0x0000000c, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000000c, 0x00000000, NULL }, + WALK_GRID(256, 12), { 0x95, 0x04, 0x000a, 0x0000000d, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000000d, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + WALK_GRID(256, 13), + ROTATE(4, 10, DIRECTION_NORTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), { 0x95, 0x04, 0x000a, 0x0000000f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x95, 0x04, 0x000a, 0x0000000f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_NORTHEAST), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x95, 0x04, 0x000a, 0x0000000f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x95, 0x04, 0x000a, 0x0000000c, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000000c, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 12), + ALERT_CUE(5), { 0x95, 0x04, 0x000a, 0x0000000b, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000000b, 0x00000000, NULL }, + WALK_GRID(256, 11), { 0x95, 0x04, 0x000a, 0x0000000f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(SMILE_START_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x1e, 0x0001, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(30, 1, DIRECTION_WEST), CALL_SCRIPT(QUESTION_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ALERT_CUE(5), { 0x95, 0x04, 0x000a, 0x0000000f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs9_g18_s0_lives2_dlg0[] = { /* 0x81a3ef0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x00000030, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0x91, 0x1e, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + WALK_GRID(256, 3), + ROTATE(30, 2, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, FANFARE_STOP2(451), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), WAIT(20), FANFARE_PLAY2(501), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Clunk!") }, WAIT(60), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(451), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x68, 0x00, 0x0100, 0x00000030, 0x00000000, NULL }, WAIT(15), - { 0x91, 0x1e, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(30, 1, DIRECTION_WEST), + WALK_GRID(256, 4), + ALERT_CUE(5), END_DELETE, }; @@ -2167,7 +2167,7 @@ static const struct ScriptCommand s_gs9_g19_s0_lives0_dlg0[] = { /* 0x81a40ec */ static const struct ScriptCommand s_gs9_g19_s0_lives0_dlg2[] = { /* 0x81a411c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -2181,7 +2181,7 @@ static const struct ScriptCommand s_gs9_g19_s0_lives0_dlg2[] = { /* 0x81a411c */ static const struct ScriptCommand s_gs9_g19_s0_obj0_dlg2[] = { /* 0x81a4254 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), CJUMP_DIR_TO_LINK(0), @@ -2208,7 +2208,7 @@ static const struct ScriptCommand s_gs9_g19_s1_station_sref_script[] = { /* 0x81 DEBUGINFO, SELECT_ENTITIES(-1, -1), CANCEL_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(-1, 0), RET, }; @@ -2217,7 +2217,7 @@ static const struct ScriptRef s_gs9_g19_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g19_s1_lives0_dlg0[] = { /* 0x81a43f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0001, 0x00000000), @@ -2225,23 +2225,23 @@ static const struct ScriptCommand s_gs9_g19_s1_lives0_dlg0[] = { /* 0x81a43f8 */ VARIANT(/* == */ 1, _(" Hey, {NAME_0}, aren't\nyou going to check the Mailbox?")), VARIANT_DEFAULT(_(" {NAME_0}, please check\nthe Mailbox.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs9_g19_s1_lives1_dlg0[] = { /* 0x81a4504 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; static const struct ScriptCommand s_gs9_g19_s1_lives1_dlg2[] = { /* 0x81a4574 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), @@ -2265,7 +2265,7 @@ static const struct ScriptCommand s_gs9_g19_s1_lives1_dlg2[] = { /* 0x81a4574 */ static const struct ScriptCommand s_gs9_g20_s0_station_sref_script[] = { /* 0x81a47dc */ DEBUGINFO, SELECT_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0xaf, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, SCENARIO_CALC(SCENARIO_MAIN, 3, 6), { 0x04, 0x00, 0x001e, 0x00000001, 0x00000000, NULL }, @@ -2276,26 +2276,26 @@ static const struct ScriptRef s_gs9_g20_s0_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g20_s0_eff0_script[] = { /* 0x81a4858 */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(1), END_DELETE, }; static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000003c, 0x00000000, NULL }, { 0x2d, 0x09, 0x0004, 0x0000003f, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 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?")), @@ -2325,7 +2325,7 @@ static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ WAIT(30), BGM_STOP, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), BGM_SWITCH(1), WAIT(30), @@ -2343,19 +2343,19 @@ static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ TEXTBOX_CLEAR, WAIT(4), SELECT_ENTITIES(-1, 2), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 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!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -2364,40 +2364,40 @@ static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ static const struct ScriptCommand s_gs9_g20_s0_lives1_dlg0[] = { /* 0x81a50ac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 16), { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs9_g20_s1_lives0_dlg0[] = { /* 0x81a512c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(473), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(1), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(20), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs9_g20_s2_lives0_dlg0[] = { /* 0x81a51fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(6), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, HALT, }; @@ -2413,7 +2413,7 @@ static const struct ScriptCommand s_gs9_g21_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -2422,12 +2422,12 @@ static const struct ScriptRef s_gs9_g21_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g21_s0_lives0_dlg0[] = { /* 0x81a5378 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000003c, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(15), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_NPC(1, _(" Morning, {NAME_0}.")), @@ -2441,23 +2441,23 @@ static const struct ScriptCommand s_gs9_g21_s0_lives0_dlg0[] = { /* 0x81a5378 */ VARIANT_DEFAULT(_(" Let's try to get it right\ntoday!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g21_s0_lives1_dlg0[] = { /* 0x81a55ac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x59, 0x00, 0x0000, 0x00000060, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000060, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(256, 0, -96), + ALERT_CUE(5), + AWAIT_CUE(6), RET, }; @@ -2478,49 +2478,49 @@ static const struct ScriptRef s_gs9_g22_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g22_s1_lives0_dlg0[] = { /* 0x81a56b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(1), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_NPC(1, _(" {NAME_0}!\nThe dungeon isn't that way.")), TEXTBOX_CLEAR, { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {COLOR YELLOW_D}Thunderwave Cave{RESET} is\nover this way!")), VARIANT_DEFAULT(_(" {COLOR YELLOW_D}Thunderwave Cave{RESET} is \nout this way.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's go rescue Magnemite\nalready!")), VARIANT_DEFAULT(_(" We have to hurry.\nMagnemite's waiting to be rescued!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g22_s1_lives1_dlg0[] = { /* 0x81a5930 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x95, 0x08, 0x000a, 0x00000011, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -2535,49 +2535,49 @@ static const struct ScriptRef s_gs9_g22_s2_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g22_s2_lives0_dlg0[] = { /* 0x81a5a7c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(1), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" {NAME_0}!\nThe dungeon isn't that way.")), TEXTBOX_CLEAR, { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {COLOR YELLOW_D}Thunderwave Cave{RESET} is\nover this way!")), VARIANT_DEFAULT(_(" {COLOR YELLOW_D}Thunderwave Cave{RESET} is \nout this way.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's go rescue Magnemite\nalready!")), VARIANT_DEFAULT(_(" We have to hurry.\nMagnemite's waiting to be rescued!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g22_s2_lives1_dlg0[] = { /* 0x81a5c1c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x95, 0x08, 0x000a, 0x00000011, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -2588,7 +2588,7 @@ static const struct ScriptCommand s_gs9_g23_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -2599,7 +2599,7 @@ static const struct ScriptRef s_gs9_g23_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g23_s0_lives0_dlg0[] = { /* 0x81a5dd8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -2623,21 +2623,21 @@ static const struct ScriptCommand s_gs9_g23_s0_lives0_dlg0[] = { /* 0x81a5dd8 */ VARIANT_DEFAULT(_(" I'm exhausted now.\nI've got to go get some sleep.")), VARIANT_DEFAULT(_(" Let's keep up our good work\ntomorrow.\nSee you.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(30), - { 0x91, 0x0a, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(10, 1, DIRECTION_WEST), WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs9_g23_s0_lives1_dlg0[] = { /* 0x81a62e8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000012, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 18), HALT, }; @@ -2651,7 +2651,7 @@ static const struct ScriptRef s_gs9_g24_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs9_g24_s0_obj0_dlg2[] = { /* 0x81a6384 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), CJUMP_DIR_TO_LINK(0), @@ -2680,7 +2680,7 @@ static const struct ScriptCommand s_gs9_g24_s1_station_sref_script[] = { /* 0x81 DEBUGINFO, SELECT_ENTITIES(-1, -1), CANCEL_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(-1, 0), RET, }; @@ -2689,20 +2689,20 @@ static const struct ScriptRef s_gs9_g24_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g24_s1_lives0_dlg0[] = { /* 0x81a655c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Oops!{WAIT_PRESS}\nI'd better check the Mailbox.") }, TEXTBOX_CLEAR, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, + WALK_RELATIVE(256, 0, -8), WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs9_g25_s0_station_sref_script[] = { /* 0x81a6614 */ DEBUGINFO, SELECT_ENTITIES(-1, -1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), WAIT(60), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, EXECUTE_FUNCTION(EVENT_M01E02B_L002), @@ -2713,31 +2713,31 @@ static const struct ScriptRef s_gs9_g25_s0_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g25_s0_eff0_script[] = { /* 0x81a6690 */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(1), END_DELETE, }; static const struct ScriptCommand s_gs9_g25_s0_lives0_dlg0[] = { /* 0x81a6700 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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?")), TEXTBOX_CLEAR, { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh!\nYou checked the Mailbox, did you?")), @@ -2748,13 +2748,13 @@ static const struct ScriptCommand s_gs9_g25_s0_lives0_dlg0[] = { /* 0x81a6700 */ VARIANT_DEFAULT(_(" ...So, was there anything?\nWere there any rescue requests?")), TEXTBOX_CLEAR, WAIT(30), - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(45), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah?\nIt was empty?!")), @@ -2782,11 +2782,11 @@ static const struct ScriptCommand s_gs9_g25_s0_lives0_dlg0[] = { /* 0x81a6700 */ VARIANT_DEFAULT(_(" Pokémon Square's over\nthis way.\nLet's go.")), TEXTBOX_CLEAR, BGM_FADEOUT(150), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(15), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000014, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x000000a0, 0x00000000, NULL }, + ALERT_CUE(3), + WALK_GRID(256, 20), + WALK_RELATIVE(256, 160, 0), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; @@ -2794,22 +2794,22 @@ static const struct ScriptCommand s_gs9_g25_s0_lives0_dlg0[] = { /* 0x81a6700 */ static const struct ScriptCommand s_gs9_g25_s0_lives1_dlg0[] = { /* 0x81a6f34 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000013, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 19), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000015, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x000000a0, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_GRID(256, 21), + WALK_RELATIVE(256, 160, 0), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; @@ -2825,7 +2825,7 @@ static const struct ScriptCommand s_gs9_g26_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -2834,13 +2834,13 @@ static const struct ScriptRef s_gs9_g26_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g26_s0_lives0_dlg0[] = { /* 0x81a7140 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!")), @@ -2848,7 +2848,7 @@ static const struct ScriptCommand s_gs9_g26_s0_lives0_dlg0[] = { /* 0x81a7140 */ MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}Hah?!")), VARIANT_DEFAULT(_(" ............{WAIT_PRESS}Huh?!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Someone just asked you to\ngo out on a rescue?")), @@ -2859,7 +2859,7 @@ static const struct ScriptCommand s_gs9_g26_s0_lives0_dlg0[] = { /* 0x81a7140 */ TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 1), WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000004, NULL }, WAIT(60), @@ -2868,12 +2868,12 @@ static const struct ScriptCommand s_gs9_g26_s0_lives0_dlg0[] = { /* 0x81a7140 */ 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!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(50), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), FANFARE_PLAY2(470), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(10), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -2881,9 +2881,9 @@ static const struct ScriptCommand s_gs9_g26_s0_lives0_dlg0[] = { /* 0x81a7140 */ VARIANT_DEFAULT(_(" ...{WAIT_PRESS}Uh, OK...{WAIT_PRESS}\nLet's go...")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -2892,22 +2892,22 @@ static const struct ScriptCommand s_gs9_g26_s0_lives0_dlg0[] = { /* 0x81a7140 */ static const struct ScriptCommand s_gs9_g26_s0_lives1_dlg0[] = { /* 0x81a7614 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x59, 0x00, 0x0000, 0x00000060, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000060, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(256, 0, -96), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -2917,15 +2917,15 @@ static const struct ScriptCommand s_gs9_g26_s1_lives0_dlg0[] = { /* 0x81a7744 */ { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), { 0x57, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, END_DELETE, }; @@ -2941,7 +2941,7 @@ static const struct ScriptCommand s_gs9_g27_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -2950,11 +2950,11 @@ static const struct ScriptRef s_gs9_g27_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g27_s0_lives0_dlg0[] = { /* 0x81a7910 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}.")), VARIANT(/* == */ 1, _(" We blew it yesterday.\nLet's save that little guy today for sure.")), @@ -2962,23 +2962,23 @@ static const struct ScriptCommand s_gs9_g27_s0_lives0_dlg0[] = { /* 0x81a7910 */ VARIANT_DEFAULT(_(" We couldn't do it yesterday,\nso let's be sure to do this rescue today.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g27_s0_lives1_dlg0[] = { /* 0x81a7ab4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x59, 0x00, 0x0000, 0x00000060, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000060, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(256, 0, -96), + ALERT_CUE(5), + AWAIT_CUE(6), RET, }; @@ -2988,7 +2988,7 @@ static const struct ScriptCommand s_gs9_g28_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(103), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(90), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -3000,16 +3000,16 @@ static const struct ScriptRef s_gs9_g28_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g28_s0_eff0_script[] = { /* 0x81a7c00 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000019, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_GRID(256, 25), + ALERT_CUE(5), { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, END_DELETE, }; static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0005, 0x00000043, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), @@ -3017,15 +3017,15 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), MSG_NPC(2, _(" Ohhh...\nI was very scared.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000044, 0x00000000, NULL }, MSG_NPC(2, _(" Maybe because I was\nsomewhere up so high...")), MSG_NPC(2, _(" My feet feel like they're\nstill walking on air...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), WAIT(30), @@ -3037,31 +3037,31 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" (HE HAS THEM? FEET?)") }, TEXTBOX_CLEAR, WAIT(45), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT_REP(0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, well, you're safe now.\nGood thing, huh?")), VARIANT_DEFAULT(_(" Well, you're safe now.\nThat's what counts.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" Yes.\nThank you very much.")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" Oh! You've been rescued!\nGreat! Great!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ROTATE(4, 2, DIRECTION_WEST), WAIT_RANDOM(10, 20), - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_EAST), WAIT_RANDOM(10, 20), - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTH), WAIT_RANDOM(10, 20), - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTH), WAIT(45), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), CALL_SCRIPT(QUESTION_FUNC), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -3072,40 +3072,40 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ MSG_NPC(-1, _(" ...Whoops! You can't see us?{WAIT_PRESS}\nThat's terribly rude of us!")), TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(8), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), WAIT(30), MSG_NPC(-1, _(" Hello. {NAME_4} here.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" Oh! Papa!")), TEXTBOX_CLEAR, WAIT(10), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), MSG_NPC(4, _(" {NAME_2}!\nYou had us worried!\nYou're not hurt?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTH), MSG_NPC(2, _(" Nope!\nIt was scary, but I'm all right.{WAIT_PRESS}\nIt's all thanks to {NAME_0}'s team.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" Thank you for everything.\nYou're heroes.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" If you want to thank\nanyone, thank our {NAME_3} friends.")), @@ -3116,16 +3116,16 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ VARIANT_DEFAULT(_(" This rescue was impossible\nfor us to do on our own.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), WAIT(10), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), MSG_NPC(4, _(" Oh, how rude of us!\nThank you so much!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(3, _(" NO, NO.{WAIT_PRESS}\nIT WAS THE ONLY THING TO DO.{WAIT_PRESS}\nAND...")), MSG_NPC(3, _(" HOW BOTH OUR EVOLVED\nFORMS ARE JOINED TRIOS...{WAIT_PRESS}\nI FELT A CERTAIN KINSHIP.")), MSG_NPC(3, _(" AFTER ALL, POKéMON MUST\nHELP EACH OTHER.")), @@ -3134,23 +3134,23 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ MSG_NPC(4, _(" I'm impressed.\nSincerely, thank you.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(7), + ALERT_CUE(6), + ALERT_CUE(8), WAIT(10), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" We must be going.\n{NAME_0}.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(9), + ALERT_CUE(7), MSG_NPC(2, _(" {NAME_1}.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(7), WAIT(10), PORTRAIT(PLACEMENT_TOP, 0x0005, 0x00000000), MSG_NPC(5, _(" Thank you.")), @@ -3158,33 +3158,33 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ MSG_NPC(4, _(" Farewell!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(90), { 0x3c, 0x2b, 0x0000, 0x00000006, 0x00000001, NULL }, { 0x3c, 0x2c, 0x0000, 0x00000014, 0x00000001, NULL }, { 0x3c, 0x2c, 0x0000, 0x00000049, 0x00000001, NULL }, TEXTBOX_CLEAR, WAIT(80), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), MSG_NPC(3, _(" WE'LL BE ON OUR WAY\nTOO...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wait a sec!\nHold on!")), VARIANT_DEFAULT(_(" Oh, wait!\nDon't go away!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, PORTRAIT_REP(0x0003, 0x00000000), MSG_NPC(3, _(" WHAT IS IT?")), @@ -3197,7 +3197,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ VARIANT_DEFAULT(_(" Uh...{WAIT_PRESS}\nWould you like to join our team?")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), MSG_NPC(3, _(" JOIN YOUR TEAM?")), TEXTBOX_CLEAR, WAIT(10), @@ -3206,9 +3206,9 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ MSG_NPC(1, _(" I thought we would need\nmore help for doing rescues in the future.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0001, 0x00000000), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nYou think so too, right?")), @@ -3219,8 +3219,8 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" Hah? Why?!\nDon't you want more members?")), @@ -3263,8 +3263,8 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ CHOICE(/* label */ 32, _("I can fly.")), LABEL(32), /* = 0x20 */ TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" Really? You're serious?{WAIT_PRESS}\n...So how about showing me?")), @@ -3274,12 +3274,12 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ LABEL(33), /* = 0x21 */ TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What the...?\nWhat, you were just joshing me?!\nSheesh!")), @@ -3289,9 +3289,9 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ WAIT(30), LABEL(27), /* = 0x1b */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" So, come on! How about it?")), @@ -3302,46 +3302,46 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ VARIANT_DEFAULT(_(" Will you join us as members\nof our rescue team?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), PORTRAIT_REP(0x0003, 0x00000001), MSG_NPC(3, _(" RESCUE TEAM...{WAIT_PRESS}\nTHAT SOUNDS FUN! BZZ BZZ BZZ!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000000), MSG_NPC(3, _(" ...BUT...IF YOU NEED US\nTO RUSH OVER TO RESCUES...")), MSG_NPC(3, _(" WE NEED SOMEWHERE TO\nLIVE CLOSE BY.")), MSG_NPC(3, _(" IS THERE ANYWHERE WE\nCAN LIVE IN THIS AREA?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" ...Ummm...well...")), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(10), MSG_NPC(3, _(" OH...\nTHERE ISN'T...")), MSG_NPC(3, _(" TOO BAD.{WAIT_PRESS}\nSORRY, BUT WE CAN'T JOIN YOU.{WAIT_PRESS}\nSEE YOU! BZZ BZZ BZZ!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), + ROTATE(12, 1, DIRECTION_SOUTH), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000005), MSG_NPC(1, _(" That is too bad.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I guess we need somewhere\nPokémon can live if we want them to\njoin the rescue team...")), VARIANT_DEFAULT(_(" It looks like we need to\nfind places for Pokémon to live if we\nwant some to join our rescue team...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I know!{WAIT_PRESS}\nLet's go out to {COLOR CYAN}Pokémon Square{RESET}\ntomorrow.")), @@ -3363,7 +3363,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ VARIANT_DEFAULT(_(" We may be able to get\nsome information.")), VARIANT_DEFAULT(_(" OK, that's what we'll do\ntomorrow.{WAIT_PRESS}\nWe'll go to Pokémon Square.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -3401,222 +3401,222 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ static const struct ScriptCommand s_gs9_g28_s0_lives1_dlg0[] = { /* 0x81aa778 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHEAST), WAIT_RANDOM(10, 20), - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTHWEST), WAIT(15), - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_EAST), WAIT(15), - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), FANFARE_PLAY2(482), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), FANFARE_PLAY2(473), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(470), { 0x54, 0x00, 0x002c, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(472), CALL_SCRIPT(JUMP_ANGRY_FUNC), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), LABEL(0), /* = 0x00 */ - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(12, 2, DIRECTION_SOUTH), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs9_g28_s0_lives2_dlg0[] = { /* 0x81aac28 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHEAST), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), { 0x2d, 0x09, 0x0002, 0x00000044, 0x00000000, NULL }, END_DELETE, }; static const struct ScriptCommand s_gs9_g28_s0_lives3_dlg0[] = { /* 0x81aade8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(8), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTH), WAIT_RANDOM(10, 20), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), WAIT_RANDOM(10, 20), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), WAIT_RANDOM(10, 20), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(8), CALL_SCRIPT(QUESTION_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x2d, 0x09, 0x0002, 0x0000003c, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(8), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, 0x0000, 0x0000005c, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), LABEL(0), /* = 0x00 */ CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(5), WAIT(30), - { 0x6b, 0x00, 0x0100, 0x00000018, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 24), + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs9_g28_s0_lives4_dlg0[] = { /* 0x81ab198 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_EAST), WAIT_RANDOM(10, 20), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), WAIT_RANDOM(10, 20), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), WAIT_RANDOM(10, 20), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(8), CALL_SCRIPT(QUESTION_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(8), { 0x2d, 0x09, 0x0002, 0x0000003c, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(8), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, 0x0000, 0x0000005c, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), LABEL(0), /* = 0x00 */ CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000018, 0x00000000, NULL }, + AWAIT_CUE(8), + WALK_GRID(256, 24), END_DELETE, }; @@ -3625,26 +3625,26 @@ static const struct ScriptCommand s_gs9_g28_s1_lives0_dlg0[] = { /* 0x81ab488 */ { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(9), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0004, 0x00000042, 0x00000000, NULL }, { 0x57, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3657,7 +3657,7 @@ static const struct ScriptCommand s_gs9_g29_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -3666,26 +3666,26 @@ static const struct ScriptRef s_gs9_g29_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), MSG_NPC(1, _(" Morning, {NAME_0}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 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?")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...Hah?{WAIT_PRESS}\nYou've been having weird dreams?")), @@ -3693,9 +3693,9 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ VARIANT_DEFAULT(_(" ...Oh?{WAIT_PRESS}\nYou've been having strange dreams?")), VARIANT_DEFAULT(_(" What was strange about\nthem?")), TEXTBOX_CLEAR, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(45), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(16), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} told {NAME_1}\n{CENTER_ALIGN}about the dreams.")), TEXTBOX_CLEAR, @@ -3754,7 +3754,7 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ PORTRAIT_REP(0x0000, 0x00000005), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(............{WAIT_PRESS}\nNope. I can't remember a thing...)") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, wow.\nSo you forgot everything?")), @@ -3783,7 +3783,7 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ VARIANT(/* == */ 3, _(" Well, maybe so.\nIt must be more fun for you to be\nhere with me!")), VARIANT_DEFAULT(_(" Well, I hope so!\nIt sure must be more fun to be here\nwith me!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(60), LABEL(9), /* = 0x09 */ PORTRAIT_REP(0x0001, 0x00000000), @@ -3796,12 +3796,12 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ VARIANT_DEFAULT(_(" Let's get going.")), TEXTBOX_CLEAR, BGM_FADEOUT(120), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000001b, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 27), + ALERT_CUE(3), HALT, }; @@ -3814,25 +3814,25 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ static const struct ScriptCommand s_gs9_g29_s0_lives1_dlg0[] = { /* 0x81aca18 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000001a, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 26), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000001b, 0x00000000, NULL }, + WALK_GRID(256, 27), END_DELETE, }; @@ -3847,7 +3847,7 @@ static const struct ScriptCommand s_gs9_g30_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEIN(60, 1), SELECT_EVENTS(0, 0), RET, @@ -3859,25 +3859,25 @@ static const struct ScriptCommand s_gs9_g30_s0_eff0_script[] = { /* 0x81acc54 */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x3c, 0x0180, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000001d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), + WALK_GRID(256, 29), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning!\nLet's keep up our good work today!")), @@ -3887,10 +3887,10 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ MSG_NPC(-1, _(" Is this the place?\nWhere that team named {COLOR CYAN}{TEAM_NAME}{RESET}\nis based?")), TEXTBOX_CLEAR, BGM_FADEOUT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(30), BGM_SWITCH(10), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), @@ -3906,11 +3906,11 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ MSG_NPC(2, _(" Keh!\nWho'd run a rescue team from a dump\nlike this? Unbelievable.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -3918,38 +3918,38 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ VARIANT_DEFAULT(_(" Who are you people?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000041), MSG_NPC(4, _(" Oh!{WAIT_PRESS}\nOver there. A Mailbox〜♪")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + AWAIT_CUE(5), + ALERT_CUE(6), { 0x8e, 0x04, 0x0000, 0x0000005b, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000041), MSG_NPC(2, _(" Kekeh, yeah!\nCheck it out!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 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), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000041), MSG_NPC(3, _(" Yessss!\nRescue job offers!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000041), MSG_NPC(4, _(" Oo-la-la!\nIsn't that rather tasty〜♪")), TEXTBOX_CLEAR, @@ -3958,8 +3958,8 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ MSG_NPC(2, _(" We'll have them all.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey!{WAIT_PRESS}\nThose rescue jobs were meant for us!")), @@ -3970,9 +3970,9 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ VARIANT_DEFAULT(_(" Don't butt in!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), WAIT(20), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Keh!{WAIT_PRESS}\nIt doesn't matter who does it!")), @@ -3991,13 +3991,13 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ MSG_NPC(4, _(" We have our eyes on\nworld domination〜♪")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000c), MSG_NPC(1, _(" Wha...{WAIT_PRESS}\nWorld domination?!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 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!")), @@ -4006,11 +4006,11 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ MSG_NPC(2, _(" See you around!\nKekeh!")), TEXTBOX_CLEAR, BGM_FADEOUT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + AWAIT_CUE(5), { 0x89, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, WAIT(30), PORTRAIT_REP(0x0001, 0x00000003), @@ -4018,8 +4018,8 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ VARIANT(/* == */ 1, _(" Hey! Wait!")), VARIANT_DEFAULT(_(" Now wait a second!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -4028,11 +4028,11 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ VARIANT_DEFAULT(_(" ...They took off.{WAIT_PRESS}\nWhat an unbelievable bunch.")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000006), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wah!\nThis is empty!")), @@ -4040,32 +4040,32 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ TEXTBOX_CLEAR, FANFARE_PLAY2(473), CALL_SCRIPT(SHOCK_FUNC), - { 0x6b, 0x00, 0x0200, 0x0000001f, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, + WALK_GRID(512, 31), + ROTATE(4, 1, DIRECTION_SOUTHWEST), WAIT(16), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Those guys cleaned us out!")), VARIANT_DEFAULT(_(" They took everything!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHEAST), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(5), + ALERT_CUE(10), + AWAIT_CUE(5), { 0x3b, 0x06, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTHWEST), WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -4075,7 +4075,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ VARIANT_DEFAULT(_(" We can go on rescue\nmissions again with this.")), TEXTBOX_CLEAR, WAIT(45), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(30), PORTRAIT_REP(0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -4084,9 +4084,9 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ TEXTBOX_CLEAR, WAIT(30), { 0x9d, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -4112,67 +4112,67 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ static const struct ScriptCommand s_gs9_g30_s0_lives1_dlg0[] = { /* 0x81ae20c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000001a, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 26), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000005, NULL }, FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), WAIT(1), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), { 0xe2, 0x00, 0x01c9, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(458), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(10), { 0xe2, 0x00, 0x01ca, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(473), CALL_SCRIPT(SHOCK_FUNC), WAIT(20), { 0xe2, 0x00, 0x01d9, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x89, 0x10, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(463), CALL_SCRIPT(NOTICE_FUNC), WAIT(10), - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + WALK_GRID(256, 2), { 0x90, 0x01, 0x0000, 0x0000001c, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(20), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(10, 2, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHEAST), + AWAIT_CUE(6), CALL_SCRIPT(ANGRY_START_FUNC), - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(6), CALL_SCRIPT(ANGRY_END_FUNC), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -4180,111 +4180,111 @@ static const struct ScriptCommand s_gs9_g30_s0_lives1_dlg0[] = { /* 0x81ae20c */ static const struct ScriptCommand s_gs9_g30_s0_lives2_dlg0[] = { /* 0x81ae61c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000001e, 0x00000000, NULL }, + AWAIT_CUE(7), + WALK_GRID(256, 30), { 0x8e, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x0000001f, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + WALK_GRID(512, 31), { 0x90, 0x01, 0x0000, 0x0000001c, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000020, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + WALK_GRID(512, 32), END_DELETE, }; static const struct ScriptCommand s_gs9_g30_s0_lives3_dlg0[] = { /* 0x81ae78c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000021, 0x00000000, NULL }, + AWAIT_CUE(8), + WALK_GRID(256, 33), { 0x8e, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000022, 0x00000000, NULL }, + AWAIT_CUE(8), + WALK_GRID(512, 34), { 0x90, 0x01, 0x0000, 0x0000001c, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), FANFARE_PLAY2(463), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000023, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(8), + WALK_GRID(512, 35), END_DELETE, }; static const struct ScriptCommand s_gs9_g30_s0_lives4_dlg0[] = { /* 0x81ae8ac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000024, 0x00000000, NULL }, + AWAIT_CUE(9), + WALK_GRID(256, 36), { 0x8e, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), FANFARE_PLAY2(463), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000025, 0x00000000, NULL }, + AWAIT_CUE(9), + WALK_GRID(512, 37), { 0x90, 0x01, 0x0000, 0x0000001c, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000026, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(9), + WALK_GRID(512, 38), END_DELETE, }; static const struct ScriptCommand s_gs9_g30_s0_lives5_dlg0[] = { /* 0x81aea0c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x00000030, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Flap! Flap!") }, FANFARE_PLAY2(451), - { 0x6b, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 3), + ALERT_CUE(6), + ALERT_CUE(5), TEXTBOX_CLEAR, - { 0x91, 0x1e, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(30, 2, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, FANFARE_STOP2(451), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + SELECT_ANIMATION(22), WAIT(20), FANFARE_PLAY2(501), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Clunk! Clunk!") }, WAIT(60), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), FANFARE_PLAY2(451), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x68, 0x00, 0x0100, 0x00000030, 0x00000000, NULL }, WAIT(15), - { 0x91, 0x1e, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, + ROTATE(30, 1, DIRECTION_WEST), + ALERT_CUE(6), + WALK_GRID(256, 4), FANFARE_STOP2(451), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; @@ -4299,7 +4299,7 @@ static const struct ScriptCommand s_gs9_g31_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), CALL_STATION( 32, 0), BGM_FADEIN(60, 1), @@ -4312,26 +4312,26 @@ static const struct ScriptCommand s_gs9_g31_s0_eff0_script[] = { /* 0x81aed48 */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x18, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x20, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x20, 0x0080, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nLet's keep up our good work today!")), @@ -4342,32 +4342,32 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ MSG_NPC(-1, _(" {NAME_0}!\n{NAME_1}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hunh? Who's that?")), VARIANT_DEFAULT(_(" Huh?\nWho was that?")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + ALERT_CUE(4), BGM_FADEOUT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x84, 0x00, 0x0100, 0x00000010, 0x0000001e, NULL }, { 0x93, 0x04, 0x000a, 0x00000036, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(10), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 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?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000000), MSG_NPC(5, _(" Please!{WAIT_PRESS}\nPlease help my friend!")), TEXTBOX_CLEAR, @@ -4385,31 +4385,31 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ WAIT(30), MSG_NPC(-1, _(" Oh, I see, I see!\nThat does sound bad!\nKekeke!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), BGM_SWITCH(10), WAIT(16), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey! Not you again!")), VARIANT_DEFAULT(_(" Hey! What do you think\nyou're doing?!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(10), WAIT(16), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Have no fear!\nWe're here to save your chum Metapod.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey!\n{NAME_5} came to us for help!")), @@ -4421,13 +4421,13 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ MSG_NPC(2, _(" Keh!\nYou think you can do this rescue with\nyour amateur-level skills?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What?!")), VARIANT_DEFAULT(_(" What did you say?!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(10), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" It doesn't matter who does\nthe rescuing, see?")), @@ -4448,43 +4448,43 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ MSG_NPC(2, _(" I'm sure we can persuade\nyour parents to reward us with interest\nafterward, kekeh!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000041), MSG_NPC(2, _(" Oh, yeah.{WAIT_PRESS}\nYou can even join our team.\nThere's an offer you can't refuse.")), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(2, _(" When you join us, \n{NAME_5}, we'll let you be a big wheel\nin Team {COLOR CYAN}Meanies{RESET}, kekekeke!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" That's the deal,\n{NAME_1}.\nThe first to rescue wins!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Come on, move!\nLet's get this done, already!")), TEXTBOX_CLEAR, WAIT(10), BGM_FADEOUT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), WAIT(120), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(60), PORTRAIT_REP(0x0005, 0x00000000), MSG_NPC(5, _(" ...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Don't worry.\nWe'll save your friend first.")), @@ -4492,20 +4492,20 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ VARIANT_DEFAULT(_(" Don't worry.\nWe'll save your friend first.")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!{WAIT_PRESS}\nLet's roll, and quick!")), VARIANT_DEFAULT(_(" {NAME_0}!{WAIT_PRESS}\nLet's get going!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), + ALERT_CUE(6), RET, }; @@ -4528,45 +4528,45 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ static const struct ScriptCommand s_gs9_g31_s0_lives1_dlg0[] = { /* 0x81b002c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00020000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000001a, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000003, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 26), + WALK_RELATIVE(256, 0, -3), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000036, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(10), - { 0x6a, 0x00, 0x0100, -0x00000008, 0x00000000, NULL }, + WALK_RELATIVE(256, -8, 0), { 0x93, 0x04, 0x000a, 0x00000036, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(5), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(5), { 0xe2, 0x00, 0x01c9, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(ANGRY_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x00020000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -4574,90 +4574,90 @@ static const struct ScriptCommand s_gs9_g31_s0_lives1_dlg0[] = { /* 0x81b002c */ static const struct ScriptCommand s_gs9_g31_s0_lives2_dlg0[] = { /* 0x81b02dc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x89, 0x24, 0x0200, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + ALERT_CUE(8), WAIT(16), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(9), WAIT(16), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000020, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + WALK_GRID(256, 32), WAIT(32), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(28), END_DELETE, }; static const struct ScriptCommand s_gs9_g31_s0_lives3_dlg0[] = { /* 0x81b04bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x89, 0x24, 0x0200, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000023, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(8), + WALK_GRID(256, 35), WAIT(60), END_DELETE, }; static const struct ScriptCommand s_gs9_g31_s0_lives4_dlg0[] = { /* 0x81b057c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x89, 0x24, 0x0200, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000026, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(9), + WALK_GRID(256, 38), WAIT(60), END_DELETE, }; static const struct ScriptCommand s_gs9_g31_s0_lives5_dlg0[] = { /* 0x81b063c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000027, 0x00000000, NULL }, + AWAIT_CUE(10), + WALK_GRID(256, 39), { 0x93, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000004, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(10), RET, }; @@ -4677,7 +4677,7 @@ static const struct ScriptCommand s_gs9_g32_s0_lives0_dlg0[] = { /* 0x81b07e8 */ static const struct ScriptCommand s_gs9_g32_s0_lives0_dlg2[] = { /* 0x81b0818 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" ...What should I do?{WAIT_PRESS}\nI don't have any money, and...")), @@ -4697,7 +4697,7 @@ static const struct ScriptCommand s_gs9_g33_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -4706,7 +4706,7 @@ static const struct ScriptRef s_gs9_g33_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g33_s0_lives0_dlg0[] = { /* 0x81b0a00 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -4717,17 +4717,17 @@ static const struct ScriptCommand s_gs9_g33_s0_lives0_dlg0[] = { /* 0x81b0a00 */ VARIANT_DEFAULT(_(" We came up short\nyesterday, so let's be sure to do things\nright today.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g33_s0_lives1_dlg0[] = { /* 0x81b0b8c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -4738,7 +4738,7 @@ static const struct ScriptCommand s_gs9_g34_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(103), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(90), { 0x23, 0x01, 0x005a, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -4749,46 +4749,46 @@ static const struct ScriptRef s_gs9_g34_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000042), MSG_NPC(2, _(" This is great!\nWelcome back, {NAME_3}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" Thank you, {NAME_2}!")), TEXTBOX_CLEAR, WAIT(16), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), WAIT(10), PORTRAIT_REP(0x0002, 0x00000041), MSG_NPC(2, _(" And thank you,\n{NAME_1} and {NAME_0}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" But I don't have any money...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), PORTRAIT(PLACEMENT_RIGHT, 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.")), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" It's just great to see\nthat {NAME_3} is back safe and sound.")), @@ -4797,8 +4797,8 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ WAIT(30), PORTRAIT_REP(0x0002, 0x00000041), MSG_NPC(2, _(" ............{WAIT_PRESS}\nCool...")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" You're even more cool\nthan I thought!")), MSG_NPC(2, _(" I want to go on rescues\nwhen I grow up!")), TEXTBOX_CLEAR, @@ -4808,14 +4808,14 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ VARIANT(/* == */ 1, _(" Hahaha!\nThat'd be awesome!\nGo for it!")), VARIANT_DEFAULT(_(" Hahaha!\nThat would be great!\nChase that dream!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" I have an idea!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, how about we\ndo something right here?")), @@ -4826,36 +4826,36 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ VARIANT_DEFAULT(_(" We should make a proper\nrescue team base here.\nSomething impressive.")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000041), MSG_NPC(2, _(" That's cool!\nA rescue team base is cool!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ROTATE(4, 2, DIRECTION_NORTH), WAIT(4), MSG_NPC(2, _(" I want to work here when\nI grow up!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000000), MSG_NPC(3, _(" Me too! Me too!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ROTATE(4, 1, DIRECTION_NORTHEAST), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Haha!\nThat's settled, then!")), VARIANT_DEFAULT(_(" Haha!\nThat's what we'll do!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ROTATE(4, 1, DIRECTION_EAST), WAIT(10), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -4863,18 +4863,18 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ VARIANT(/* == */ 3, _(" Let's be sure to build\nour own rescue team base!")), VARIANT_DEFAULT(_(" Let's work hard and build\nour own rescue team base!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), CALL_SCRIPT(SMILE_END_FUNC), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), PORTRAIT_REP(0x0003, 0x00000000), MSG_NPC(3, _(" {NAME_0} and\n{NAME_1}, thank you again!")), TEXTBOX_CLEAR, @@ -4885,15 +4885,15 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ VARIANT_DEFAULT(_(" OK, bye!\nBe careful going home.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(10, 1, DIRECTION_EAST), + AWAIT_CUE(5), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), WAIT(30), PORTRAIT_REP(0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -4904,8 +4904,8 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ PORTRAIT_REP(0x0001, 0x00000001), MSG_NPC(1, _(" And we got to show\nGengar's team a thing or two, so it's all\ngood!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -4913,7 +4913,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ VARIANT_DEFAULT(_(" That was a tiring day.{WAIT_PRESS}\nLet's do some more good tomorrow!\nSee you!")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -4930,123 +4930,123 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ static const struct ScriptCommand s_gs9_g34_s0_lives1_dlg0[] = { /* 0x81b1da4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), FANFARE_STOP2(465), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHWEST), + AWAIT_CUE(6), WAIT(5), - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SMILE_END_FUNC), - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(10, 1, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_WEST), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs9_g34_s0_lives2_dlg0[] = { /* 0x81b2054 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x0000005e, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(10), FANFARE_STOP2(470), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(5), - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(7), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), WAIT(20), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(458), CALL_SCRIPT(JUMP_HAPPY_FUNC), WAIT(5), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(7), WAIT(4), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x8e, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000028, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 40), + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs9_g34_s0_lives3_dlg0[] = { /* 0x81b2384 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000036, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000028, 0x00000000, NULL }, + WALK_GRID(256, 40), END_DELETE, }; @@ -5056,7 +5056,7 @@ static const struct ScriptCommand s_gs9_g35_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -5065,12 +5065,12 @@ static const struct ScriptRef s_gs9_g35_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g35_s0_lives0_dlg0[] = { /* 0x81b2540 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(LOOK_AROUND_FUNC), SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, morning!\nLet's keep up our good work today!")), @@ -5080,15 +5080,15 @@ static const struct ScriptCommand s_gs9_g35_s0_lives0_dlg0[] = { /* 0x81b2540 */ MSG_NPC(-1, _(" Umm... Hello?")), TEXTBOX_CLEAR, FANFARE_PLAY2(469), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Huh? Who could that be?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), BGM_FADEOUT(120), SELECT_ENTITIES(-1, 2), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), MSG_NPC(2, _(" Umm... Is rescue team\n{COLOR CYAN}{TEAM_NAME}{RESET} here?")), @@ -5096,7 +5096,7 @@ static const struct ScriptCommand s_gs9_g35_s0_lives0_dlg0[] = { /* 0x81b2540 */ PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" That's right...{WAIT_PRESS} Huh?{WAIT_PRESS}\nWait, aren't you...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -5107,30 +5107,30 @@ static const struct ScriptCommand s_gs9_g35_s0_lives0_dlg0[] = { /* 0x81b2540 */ static const struct ScriptCommand s_gs9_g35_s1_lives0_dlg0[] = { /* 0x81b2854 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000002b, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 43), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_SOUTH), WAIT(70), { 0x86, 0x00, 0x00cc, 0x0000002c, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs9_g35_s2_lives0_dlg0[] = { /* 0x81b2944 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x6b, 0x00, 0x0100, 0x0000002d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 45), + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; @@ -5144,7 +5144,7 @@ static const struct ScriptCommand s_gs9_g36_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_SWITCH(1), SELECT_EVENTS(0, 0), CALL_STATION( 37, 0), @@ -5155,14 +5155,14 @@ static const struct ScriptRef s_gs9_g36_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000055, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 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.")), @@ -5178,7 +5178,7 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ MSG_NPC(2, _(" He hasn't come back yet\nfrom the rescue mission.")), TEXTBOX_CLEAR, FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), WAIT(30), BGM_SWITCH(9), @@ -5192,8 +5192,8 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(469), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" Not even a breeze?{WAIT_PRESS}\nThat is strange...")), TEXTBOX_CLEAR, @@ -5211,27 +5211,27 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ TEXTBOX_CLEAR, BGM_FADEOUT(120), WAIT(150), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(15), - { 0x91, 0x0c, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHEAST), WAIT(40), PORTRAIT_REP(0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh?{WAIT_PRESS}\nThat's the spirit, {NAME_0}.{WAIT_PRESS}\nYour look says you won't need to be asked.")), VARIANT_DEFAULT(_(" Oh?{WAIT_PRESS} That's the spirit,\n{NAME_0}.{WAIT_PRESS}\nYour expression tells me you're ready.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_SOUTH), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's it, then!\nWe'll go look for them!")), VARIANT(/* == */ 3, _(" OK!\nWe'll go look for them!")), VARIANT_DEFAULT(_(" OK, then!\nWe'll go look for them!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" R-really?\nThank you!")), TEXTBOX_CLEAR, @@ -5241,18 +5241,18 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ VARIANT(/* == */ 1, _(" Leave it to us!")), VARIANT_DEFAULT(_(" No problem!\nYou can count on us!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_SOUTHEAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's get to it,\n{NAME_0}!")), VARIANT_DEFAULT(_(" Let's go, {NAME_0}!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -5267,41 +5267,41 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ static const struct ScriptCommand s_gs9_g36_s0_lives1_dlg0[] = { /* 0x81b3680 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(8, 1, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs9_g36_s0_lives2_dlg0[] = { /* 0x81b37f0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; @@ -5322,7 +5322,7 @@ static const struct ScriptCommand s_gs9_g37_s0_lives0_dlg0[] = { /* 0x81b38dc */ static const struct ScriptCommand s_gs9_g37_s0_lives0_dlg2[] = { /* 0x81b390c */ DEBUGINFO, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(1), MSG_NPC(1, _(" My friend is stuck in\na place called {COLOR YELLOW_D}Silent Chasm{RESET}.")), MSG_NPC(1, _(" I hate to burden you,\nbut you're our only hope...")), @@ -5340,7 +5340,7 @@ static const struct ScriptCommand s_gs9_g38_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -5349,7 +5349,7 @@ static const struct ScriptRef s_gs9_g38_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g38_s0_lives0_dlg0[] = { /* 0x81b3acc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -5359,17 +5359,17 @@ static const struct ScriptCommand s_gs9_g38_s0_lives0_dlg0[] = { /* 0x81b3acc */ VARIANT_DEFAULT(_(" Good morning!{WAIT_PRESS}\nLet's do our best like always!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g38_s0_lives1_dlg0[] = { /* 0x81b3c24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -5380,7 +5380,7 @@ static const struct ScriptCommand s_gs9_g39_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -5392,31 +5392,31 @@ static const struct ScriptRef s_gs9_g39_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g39_s0_eff0_script[] = { /* 0x81b3d30 */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x24, 0x0200, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x89, 0x1e, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), MSG_NPC(2, _(" Yay! Saved!\nI'm so happy!")), TEXTBOX_CLEAR, WAIT(45), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(7), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000041), MSG_NPC(3, _(" But even though I'm safe,\nShiftry is in trouble...")), TEXTBOX_CLEAR, @@ -5426,8 +5426,8 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ VARIANT(/* == */ 1, _(" Tell us.\nWhat went down, exactly?")), VARIANT_DEFAULT(_(" Please tell us.\nExactly what happened?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(7), MSG_NPC(3, _(" ...Yes...")), MSG_NPC(3, _(" Shiftry whipped up winds\nwith his fans...")), MSG_NPC(3, _(" And released me from\nbetween the rocks.")), @@ -5444,27 +5444,27 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ BGM_FADEOUT(30), MSG_NPC(-1, _(" Did you say Zapdos?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ROTATE(4, 1, DIRECTION_EAST), + AWAIT_CUE(5), WAIT(30), FANFARE_PLAY2(466), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0001, 0x0000000c), MSG_NPC(1, _(" {NAME_4}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), WAIT(64), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 11, DIRECTION_NORTHEAST), BGM_SWITCH(114), PORTRAIT(PLACEMENT_TOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Zapdos...{WAIT_PRESS}\nIt's one of the legendary bird Pokémon.")), @@ -5474,7 +5474,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ MSG_NPC(1, _(" So Shiftry woke it up?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), PORTRAIT_REP(0x0004, 0x00000000), MSG_NPC(4, _(" No.{WAIT_PRESS}\nShiftry's winds were only the trigger.")), MSG_NPC(4, _(" To begin with, the absence\nof winds there was unnatural.")), @@ -5483,45 +5483,45 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ MSG_NPC(4, _(" Shiftry must be saved.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000000), MSG_NPC(5, _(" But Zapdos won't be easy.{WAIT_PRESS}\nIts electric attacks are wicked nasty.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP, 0x0004, 0x00000000), MSG_NPC(4, _(" I know that.{WAIT_PRESS}\nWe will need to be cautious.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 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!")), VARIANT_DEFAULT(_(" We'll go too!\nWe'll go help Shiftry!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), WAIT(20), PORTRAIT(PLACEMENT_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, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, now!\nWe're not that wimpy!")), VARIANT(/* == */ 3, _(" Wait a second!\nWe're not that weak!")), VARIANT_DEFAULT(_(" Hey!\nWe're not that weak!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_EAST), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), PORTRAIT_REP(0x0001, 0x00000000), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), @@ -5532,8 +5532,8 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ LABEL(15), /* = 0x0f */ TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), MSG_NPC(6, _(" Have you ever been hit\nwith an electric blast?")), { 0x2e, 0x15, 0x0006, -0x00000002, 0x00000000, NULL }, @@ -5543,8 +5543,8 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ LABEL(18), /* = 0x12 */ TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 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?")), @@ -5553,9 +5553,9 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ LABEL(20), /* = 0x14 */ TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_NORTHEAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We're a rescue team too!")), @@ -5574,8 +5574,8 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, { 0x54, 0x00, 0x002d, 0x00000000, 0x00000000, NULL }, WAIT(90), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -5588,7 +5588,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ TEXTBOX_CLEAR, FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We're a rescue team too!")), @@ -5599,16 +5599,16 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ VARIANT_DEFAULT(_(" We want to help Shiftry!")), TEXTBOX_CLEAR, LABEL(21), /* = 0x15 */ - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), WAIT(120), PORTRAIT(PLACEMENT_TOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" ......")), MSG_NPC(4, _(" Fine.{WAIT_PRESS}\nI see that you have courage.")), TEXTBOX_CLEAR, FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_NPC(1, _(" Yes!")), TEXTBOX_CLEAR, @@ -5620,17 +5620,17 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ MSG_NPC(4, _(" You should make way for\n{COLOR YELLOW_D}Mt. Thunder{RESET} only when you are fully\nprepared.")), MSG_NPC(4, _(" Our objective is to rescue\nShiftry!\nLet us find success!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Yes!\nI'm getting stoked for this!")), VARIANT_DEFAULT(_(" Yes!\nI'm getting excited over this!")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nLet's give it our best, partner!")), @@ -5638,10 +5638,10 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ VARIANT_DEFAULT(_(" {NAME_0}!\nLet's do our best!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -5667,154 +5667,154 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ static const struct ScriptCommand s_gs9_g39_s0_lives1_dlg0[] = { /* 0x81b56f0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_EAST), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_NORTHEAST), + AWAIT_CUE(6), { 0x70, 0x00, 0x0200, 0x00000007, 0x00000000, NULL }, WAIT(1), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 0), - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_EAST), WAIT(16), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), LABEL(0), /* = 0x00 */ CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x70, 0x00, 0x0200, 0x00000007, 0x00000000, NULL }, WAIT(1), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs9_g39_s0_lives2_dlg0[] = { /* 0x81b59c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), WAIT(20), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), + AWAIT_CUE(7), WAIT(5), - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(7), + ROTATE(4, 11, DIRECTION_EAST), + AWAIT_CUE(7), + ROTATE(4, 11, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 11, DIRECTION_EAST), + AWAIT_CUE(7), + ROTATE(4, 11, DIRECTION_SOUTH), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs9_g39_s0_lives3_dlg0[] = { /* 0x81b5b60 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_WEST), + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(8), + ROTATE(4, 11, DIRECTION_EAST), + AWAIT_CUE(8), + ROTATE(4, 11, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 11, DIRECTION_EAST), + AWAIT_CUE(8), + ROTATE(4, 11, DIRECTION_SOUTH), + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs9_g39_s0_lives4_dlg0[] = { /* 0x81b5c80 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x89, 0x58, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(9), + ROTATE(4, 1, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(9), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs9_g39_s0_lives5_dlg0[] = { /* 0x81b5da0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x89, 0x58, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000005, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(8, 2, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(10), + WALK_RELATIVE(256, -5, 0), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs9_g39_s0_lives6_dlg0[] = { /* 0x81b5ea0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x89, 0x58, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(11), + WALK_RELATIVE(256, -5, 0), + ALERT_CUE(5), + AWAIT_CUE(11), HALT, }; @@ -5829,7 +5829,7 @@ static const struct ScriptCommand s_gs9_g40_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -5838,11 +5838,11 @@ static const struct ScriptRef s_gs9_g40_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g40_s0_lives0_dlg0[] = { /* 0x81b603c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000055, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nGet a good night's sleep?")), @@ -5859,20 +5859,20 @@ static const struct ScriptCommand s_gs9_g40_s0_lives0_dlg0[] = { /* 0x81b603c */ VARIANT_DEFAULT(_(" But anyway, let's do our\nbest like always!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g40_s0_lives1_dlg0[] = { /* 0x81b64a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x89, 0x60, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -5895,7 +5895,7 @@ static const struct ScriptCommand s_gs9_g42_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -5904,7 +5904,7 @@ static const struct ScriptRef s_gs9_g42_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g42_s0_lives0_dlg0[] = { /* 0x81b6630 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -5914,17 +5914,17 @@ static const struct ScriptCommand s_gs9_g42_s0_lives0_dlg0[] = { /* 0x81b6630 */ VARIANT_DEFAULT(_(" Good morning!{WAIT_PRESS}\nLet's do our best like always!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g42_s0_lives1_dlg0[] = { /* 0x81b6750 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -5940,7 +5940,7 @@ static const struct ScriptCommand s_gs9_g43_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -5951,21 +5951,21 @@ static const struct ScriptCommand s_gs9_g43_s0_eff0_script[] = { /* 0x81b688c */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x28, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, morning!")), VARIANT(/* == */ 1, _(" I did a little checking\naround yesterday.")), @@ -5977,9 +5977,9 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ VARIANT_DEFAULT(_(" We should go there right\naway!\nOff to the {COLOR YELLOW_D}Great Canyon{RESET}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), @@ -6062,16 +6062,16 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ TEXTBOX_CLEAR, JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's what it's about.\nSo anyway, let's give it our best as\nusual!")), VARIANT_DEFAULT(_(" That's what this is about.\nSo, as always, let's try our best to \ndo well!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -6079,26 +6079,26 @@ static const struct ScriptCommand s_gs9_g43_s0_lives0_dlg0[] = { /* 0x81b690c */ static const struct ScriptCommand s_gs9_g43_s0_lives1_dlg0[] = { /* 0x81b7674 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000002e, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x0000002f, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 46), + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_GRID(153, 47), FANFARE_PLAY2(463), CALL_SCRIPT(NOTICE_FUNC), WAIT(30), FANFARE_STOP2(463), - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTH), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -6114,7 +6114,7 @@ static const struct ScriptCommand s_gs9_g44_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -6123,7 +6123,7 @@ static const struct ScriptRef s_gs9_g44_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g44_s0_lives0_dlg0[] = { /* 0x81b78c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -6134,17 +6134,17 @@ static const struct ScriptCommand s_gs9_g44_s0_lives0_dlg0[] = { /* 0x81b78c0 */ VARIANT_DEFAULT(_(" Let's do our best like we\nalways do!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g44_s0_lives1_dlg0[] = { /* 0x81b7a14 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -6160,7 +6160,7 @@ static const struct ScriptCommand s_gs9_g45_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -6169,13 +6169,13 @@ static const struct ScriptRef s_gs9_g45_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000061, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!")), VARIANT(/* == */ 1, _(" Let's keep doing our best...{WAIT_PRESS}\nActually, I need to ask you something.")), @@ -6192,7 +6192,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Yeah, I guess so.\nIt would bother you too, {NAME_0}.")), @@ -6209,7 +6209,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah?!\nIt doesn't have anything to do with you?!")), @@ -6221,8 +6221,8 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ VARIANT_DEFAULT(_(" The world might be\ndestroyed!")), VARIANT_DEFAULT(_(" And how you became a\nPokémon, {NAME_0}...\nThat's all supposed to be related!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh!\n...I get it.")), @@ -6261,8 +6261,8 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, really?!{WAIT_PRESS}\n{NAME_0}, you know?!")), @@ -6281,7 +6281,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ FANFARE_PLAY2(473), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, WAIT(100), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + 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), @@ -6290,7 +6290,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ VARIANT_DEFAULT(_(" Hmm...\nI'm getting even more confused...")), TEXTBOX_CLEAR, CLEAR_ARRAY(EVENT_LOCAL), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" So, the world's balance is\nwhere out in space?")), VARIANT_DEFAULT(_(" OK, so where exactly in\nspace is the world's balance?")), @@ -6325,16 +6325,16 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ WAIT(30), SELECT_LIVES(-1, 1), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(5), + ALERT_CUE(6), + AWAIT_CUE(5), + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey! {NAME_2}!")), @@ -6344,16 +6344,16 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ VARIANT_DEFAULT(_(" Oh! {NAME_2}!")), VARIANT_DEFAULT(_(" Just who we need!{WAIT_PRESS}\nYou see, we're wondering if you could\ncarry us to space...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" No way!\nNot a chance!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(90), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_SOUTH), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000003), ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" ........................")), CHOICE(/* label */ 10, _("It appears to be impossible...")), @@ -6361,10 +6361,10 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ LABEL(10), /* = 0x0a */ TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What is it with you?!\nGoofing around like that!")), @@ -6373,7 +6373,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ VARIANT_DEFAULT(_(" I wish you'd be more\nconsiderate before making jokes!")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" So, you don't know anything\nat all, {NAME_0}...")), @@ -6384,10 +6384,10 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0x54, 0x00, 0x0029, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(41), WAIT(100), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What do you mean, guts?!")), @@ -6396,7 +6396,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ VARIANT_DEFAULT(_(" If that's all it took,\nnone of this would be necessary!")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" So, you don't know anything\nat all, {NAME_0}...")), @@ -6407,7 +6407,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What?!\nThat's really lame!")), @@ -6416,7 +6416,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ VARIANT_DEFAULT(_(" Don't joke around like that!")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...But, yeah, I guess it's\nimpossible to tell what it is...")), @@ -6450,83 +6450,83 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ VARIANT_DEFAULT(_(" One thing at a time...")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g45_s0_lives1_dlg0[] = { /* 0x81b9ee8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000002e, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 46), + ALERT_CUE(5), + AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 0), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), LABEL(0), /* = 0x00 */ - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 2), FANFARE_PLAY2(463), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 4), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 4), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 5), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(470), { 0x54, 0x00, 0x002c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(2), FANFARE_PLAY2(471), CALL_SCRIPT(ANGRY_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), JUMP_LABEL(2), LABEL(5), /* = 0x05 */ FANFARE_PLAY2(471), CALL_SCRIPT(ANGRY_START_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), LABEL(4), /* = 0x04 */ FANFARE_PLAY2(471), CALL_SCRIPT(ANGRY_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), LABEL(2), /* = 0x02 */ { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -6537,40 +6537,40 @@ static const struct ScriptCommand s_gs9_g45_s0_lives1_dlg0[] = { /* 0x81b9ee8 */ static const struct ScriptCommand s_gs9_g45_s1_lives0_dlg0[] = { /* 0x81ba378 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x00000030, 0x00000000, NULL }, { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Flap! Flap!") }, FANFARE_PLAY2(451), - { 0x6b, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 3), + ALERT_CUE(6), + ALERT_CUE(5), TEXTBOX_CLEAR, - { 0x91, 0x1e, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(30, 2, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, FANFARE_STOP2(451), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHEAST), WAIT(30), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(451), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x68, 0x00, 0x0100, 0x00000030, 0x00000000, NULL }, WAIT(15), - { 0x91, 0x1e, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, + ROTATE(30, 1, DIRECTION_WEST), + ALERT_CUE(6), + WALK_GRID(256, 4), FANFARE_STOP2(451), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; @@ -6580,7 +6580,7 @@ static const struct ScriptCommand s_gs9_g46_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(90), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(90), @@ -6591,7 +6591,7 @@ static const struct ScriptRef s_gs9_g46_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g46_s0_lives0_dlg0[] = { /* 0x81ba664 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000061, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -6610,15 +6610,15 @@ static const struct ScriptCommand s_gs9_g46_s0_lives0_dlg0[] = { /* 0x81ba664 */ VARIANT_DEFAULT(_(" I'll see you tomorrow.")), TEXTBOX_CLEAR, BGM_FADEOUT(160), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(10), - { 0x91, 0x0c, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x1e, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 2, DIRECTION_NORTHEAST), + AWAIT_CUE(5), + ROTATE(30, 2, DIRECTION_WEST), + AWAIT_CUE(5), WAIT(45), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0001, 0x00000007), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nSorry!")), @@ -6656,34 +6656,34 @@ static const struct ScriptCommand s_gs9_g46_s0_lives0_dlg0[] = { /* 0x81ba664 */ VARIANT_DEFAULT(_(" OK, {NAME_0}!\nLet's do our best tomorrow like always!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(12, 10, DIRECTION_WEST), WAIT(150), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs9_g46_s0_lives1_dlg0[] = { /* 0x81baf28 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000030, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000031, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(128, 48), + ALERT_CUE(5), + WALK_GRID(153, 49), WAIT(90), - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(3), { 0x70, 0x00, 0x0200, 0x00000004, 0x00000000, NULL }, WAIT(1), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000032, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_GRID(256, 50), HALT, }; @@ -6698,7 +6698,7 @@ static const struct ScriptCommand s_gs9_g47_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -6707,12 +6707,12 @@ static const struct ScriptRef s_gs9_g47_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g47_s0_lives0_dlg0[] = { /* 0x81bb154 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), MSG_NPC(1, _(" Morning, {NAME_0}!")), TEXTBOX_CLEAR, @@ -6727,8 +6727,8 @@ static const struct ScriptCommand s_gs9_g47_s0_lives0_dlg0[] = { /* 0x81bb154 */ VARIANT_DEFAULT(_(" Well, anyway.\nAs always, let's try to do our best!")), TEXTBOX_CLEAR, FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_NPC(1, _(" Oh, yeah!")), PORTRAIT_REP(0x0001, 0x00000004), @@ -6736,26 +6736,26 @@ static const struct ScriptCommand s_gs9_g47_s0_lives0_dlg0[] = { /* 0x81bb154 */ MSG_NPC(1, _(" I wonder if something\nhappened...")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g47_s0_lives1_dlg0[] = { /* 0x81bb4d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x59, 0x00, 0x0000, 0x00000060, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000060, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, -96), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -6765,7 +6765,7 @@ static const struct ScriptCommand s_gs9_g48_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -6776,37 +6776,37 @@ static const struct ScriptCommand s_gs9_g48_s0_eff0_script[] = { /* 0x81bb62c */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x00b3, 0x00000014, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, -0x00000018, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_RELATIVE(179, 20, 0), + AWAIT_CUE(4), + WALK_RELATIVE(128, -24, 0), { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ DEBUGINFO, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0006, 0x00000063, 0x00000000, NULL }, { 0x2d, 0x09, 0x0007, 0x00000052, 0x00000000, NULL }, { 0x59, 0x00, 0x00a0, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x6a, 0x00, 0x0300, -0x000000a0, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(768, -160, 0), + AWAIT_CUE(5), BGM_FADEOUT(150), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Gasp, gasp...{WAIT_PRESS}\nWow, that was a real shock!")), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x05, 0x0002, 0x00000022, 0x00000000, NULL }, PORTRAIT_REP(0x0001, 0x00000005), MSG_NPC(1, _(" I never expected everyone\nto attack us like that.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But, hey, {NAME_0}.")), @@ -6837,7 +6837,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ WAIT(4), LABEL(2), /* = 0x02 */ FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wh-what's the matter now?\nWhat are you saying all of a sudden?")), @@ -6852,15 +6852,15 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" Hah? You're tired?\nWhat are you saying?")), TEXTBOX_CLEAR, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(60), { 0x54, 0x00, 0x0800, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...Hah?{WAIT_PRESS}\nYou're saying you don't deserve to be on\nour rescue team?!")), @@ -6872,16 +6872,16 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ TEXTBOX_CLEAR, JUMP_LABEL(4), LABEL(4), /* = 0x04 */ - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(60), { 0x54, 0x00, 0x0800, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" ............{WAIT_PRESS}Huh?\nYou had a dream?")), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_NPC(1, _(" And {NAME_7} appeared\nin it?")), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" ...And that made you think\nthat maybe you were that human after\nall...")), @@ -6889,7 +6889,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ MSG_NPC(1, _(" ...So that's what it is.\nThat's what happened...")), TEXTBOX_CLEAR, WAIT(45), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}!")), @@ -6901,8 +6901,8 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ VARIANT_DEFAULT(_(" Listen, {NAME_0}.")), VARIANT_DEFAULT(_(" Did your dream make\nyou remember what you were like as a\nhuman being?")), VARIANT_DEFAULT(_(" Since it didn't, you don't\nknow what really happened.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I...{WAIT_PRESS}\nYou know that I believe in you,\n{NAME_0}, right?")), @@ -6914,16 +6914,16 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 1), WAIT(90), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000c), MSG_NPC(1, _(" Oh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), WAIT(30), { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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...")), @@ -6931,7 +6931,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ TEXTBOX_CLEAR, BGM_SWITCH(9), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wh-what did you say?!")), @@ -6942,37 +6942,37 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ MSG_NPC(2, _(" I had hoped it would not\ncome to this, but...{WAIT_PRESS}\nIt is unfortunate.")), MSG_NPC(2, _(" We will...\nDefeat you with all our might!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), WAIT(15), { 0x62, 0x00, 0x0080, -0x00000004, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000c), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" (W-we're fighting here...?)") }, TEXTBOX_CLEAR, { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), BGM_FADEOUT(90), WAIT(30), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" We will give you tonight.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + SELECT_ANIMATION(2), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" Huh?")), TEXTBOX_CLEAR, @@ -6983,13 +6983,13 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ MSG_NPC(2, _(" And not just you.")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" Anyone that goes with\n{NAME_0} will be considered an enemy.")), MSG_NPC(2, _(" The trackers will attack\nwithout mercy.")), MSG_NPC(2, _(" That goes for us too.\nWe will join the hunt to be rid of you.")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), 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.")), @@ -7001,17 +7001,17 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ WAIT(10), MSG_NPC(2, _(" There will be no mercy\nthe next time we meet.{WAIT_PRESS}\nFarewell.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), WAIT(45), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(30), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), + AWAIT_CUE(5), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(4), WAIT(60), { 0x93, 0x0a, 0x000a, 0x00000022, 0x00000000, NULL }, PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), @@ -7042,12 +7042,12 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 2), WAIT(1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000000), MSG_NPC(5, _(" {NAME_0}.")), TEXTBOX_CLEAR, WAIT(4), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x0a, 0x000a, 0x00000036, 0x00000000, NULL }, @@ -7056,8 +7056,8 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ MSG_NPC(1, _(" {NAME_5}...")), TEXTBOX_CLEAR, WAIT(4), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT_REP(0x0005, 0x00000000), MSG_NPC(5, _(" {NAME_0}...\nI made a promise, remember?")), MSG_NPC(5, _(" That we would make a\nrescue team base here.")), @@ -7066,21 +7066,21 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ MSG_NPC(5, _(" You're a hero to me,\n{NAME_0}.")), MSG_NPC(5, _(" I believe in you too,\n{NAME_0}.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 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!")), LABEL(18), /* = 0x12 */ TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(10), + AWAIT_CUE(5), + ALERT_CUE(10), + AWAIT_CUE(5), + ALERT_CUE(10), BGM_SWITCH(7), PORTRAIT_REP(0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -7090,8 +7090,8 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ VARIANT(/* == */ 3, _(" That's what we expect from\nour {NAME_0}!")), VARIANT_DEFAULT(_(" Yeah!\nThat's right!\nThat's more like it!")), VARIANT_DEFAULT(_(" That's what we expect from\nour {NAME_0}!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(10), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We'll have to leave here for\nnow...")), @@ -7108,7 +7108,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ BGM_FADEOUT(90), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(120), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -7129,119 +7129,119 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ static const struct ScriptCommand s_gs9_g48_s0_lives1_dlg0[] = { /* 0x81bddd8 */ DEBUGINFO, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x59, 0x00, 0x00a0, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x6a, 0x00, 0x0300, -0x000000a0, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(768, -160, 0), + SELECT_ANIMATION(2), + ROTATE(4, 2, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(ANGRY_START_FUNC), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), WAIT(30), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000058, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(464), { 0x56, 0x00, 0x0000, 0x00000058, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x8b, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x004c, -0x00000008, -0x00000010, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), { 0x62, 0x00, 0x0080, -0x00000004, 0x00000000, NULL }, WAIT(15), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(30), - { 0x91, 0x06, 0x0001, 0x00000007, 0x00000000, NULL }, + ROTATE(6, 1, DIRECTION_SOUTHWEST), WAIT(15), - { 0x91, 0x06, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(6, 2, DIRECTION_SOUTHEAST), WAIT(15), - { 0x91, 0x06, 0x0001, 0x00000007, 0x00000000, NULL }, + ROTATE(6, 1, DIRECTION_SOUTHWEST), WAIT(15), - { 0x91, 0x06, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(6, 2, DIRECTION_SOUTHEAST), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(6), + SELECT_ANIMATION(2), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(6), { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x0a, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHEAST), WAIT(60), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), CALL_SCRIPT(SMILE_START_FUNC), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_END_FUNC), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs9_g48_s1_lives0_dlg0[] = { /* 0x81be318 */ DEBUGINFO, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x59, 0x00, 0x0064, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x00cc, -0x00000064, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x00cc, -0x00000010, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(204, -100, 0), + AWAIT_CUE(7), + WALK_RELATIVE(204, -16, 0), + SELECT_ANIMATION(2), WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(497), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + AWAIT_CUE(7), + SELECT_ANIMATION(2), WAIT(60), { 0x62, 0x00, 0x004c, 0x00000008, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x05, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0099, 0x000000a0, 0x00000000, NULL }, + AWAIT_CUE(7), + WALK_RELATIVE(153, 160, 0), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, END_DELETE, }; @@ -7249,20 +7249,20 @@ static const struct ScriptCommand s_gs9_g48_s1_lives0_dlg0[] = { /* 0x81be318 */ static const struct ScriptCommand s_gs9_g48_s1_lives1_dlg0[] = { /* 0x81be4f8 */ DEBUGINFO, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x59, 0x00, 0x0064, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x00cc, -0x00000064, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x004c, -0x00000010, 0x00000008, NULL }, + WALK_RELATIVE(204, -100, 0), + AWAIT_CUE(8), + WALK_RELATIVE(76, -16, 8), FANFARE_PLAY2(497), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(8), { 0x62, 0x00, 0x004c, 0x00000008, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0099, 0x000000a0, -0x00000010, NULL }, + AWAIT_CUE(8), + WALK_RELATIVE(153, 160, -16), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, END_DELETE, }; @@ -7270,53 +7270,53 @@ static const struct ScriptCommand s_gs9_g48_s1_lives1_dlg0[] = { /* 0x81be4f8 */ static const struct ScriptCommand s_gs9_g48_s1_lives2_dlg0[] = { /* 0x81be618 */ DEBUGINFO, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x59, 0x00, 0x0064, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x00cc, -0x00000064, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x004c, -0x00000010, -0x00000008, NULL }, + WALK_RELATIVE(204, -100, 0), + AWAIT_CUE(9), + WALK_RELATIVE(76, -16, -8), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(9), { 0x62, 0x00, 0x004c, 0x00000008, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0099, 0x000000a0, 0x00000010, NULL }, + AWAIT_CUE(9), + WALK_RELATIVE(153, 160, 16), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, END_DELETE, }; static const struct ScriptCommand s_gs9_g48_s2_lives0_dlg0[] = { /* 0x81be728 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x59, 0x00, 0x0064, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, -0x00000028, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(128, -40, 0), + SELECT_ANIMATION(2), WAIT(15), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000050, 0x00000000, NULL }, + AWAIT_CUE(10), + WALK_RELATIVE(256, -80, 0), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(10), + SELECT_ANIMATION(2), + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(10), CALL_SCRIPT(SMILE_START_FUNC), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + AWAIT_CUE(10), CALL_SCRIPT(SMILE_END_FUNC), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(10), HALT, }; @@ -7337,7 +7337,7 @@ static const struct ScriptCommand s_gs9_g49_s0_station_sref_script[] = { /* 0x81 { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 50, 0), SELECT_EVENTS(0, 0), RET, @@ -7348,13 +7348,13 @@ static const struct ScriptRef s_gs9_g49_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g49_s0_lives0_dlg0[] = { /* 0x81bea68 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nIt's early, but I guessed you would be up!")), @@ -7375,7 +7375,7 @@ static const struct ScriptCommand s_gs9_g49_s0_lives0_dlg0[] = { /* 0x81bea68 */ VARIANT_DEFAULT(_(" Tell me when you're\nready.{WAIT_PRESS}\nLet's leave then.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, LABEL(2), /* = 0x02 */ EXECUTE_FUNCTION(EVENT_M01E07A_L002), @@ -7386,12 +7386,12 @@ static const struct ScriptCommand s_gs9_g49_s0_lives0_dlg0[] = { /* 0x81bea68 */ static const struct ScriptCommand s_gs9_g49_s0_lives1_dlg0[] = { /* 0x81bedfc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000033, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 51), + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -7412,7 +7412,7 @@ static const struct ScriptCommand s_gs9_g50_s0_lives0_dlg0[] = { /* 0x81beec8 */ static const struct ScriptCommand s_gs9_g50_s0_lives0_dlg2[] = { /* 0x81beef8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), @@ -7449,7 +7449,7 @@ static const struct ScriptRef s_gs9_g50_s1_evt0_sref = { 57, 7, NULL /* NORMAL_E static const struct ScriptCommand s_gs9_g50_s2_station_sref_script[] = { /* 0x81bf11c */ DEBUGINFO, SELECT_ENTITIES(-1, -1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(-1, 0), SCENARIO_CALC(SCENARIO_MAIN, 11, 3), RET, @@ -7459,7 +7459,7 @@ static const struct ScriptRef s_gs9_g50_s2_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g50_s2_lives0_dlg0[] = { /* 0x81bf188 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, @@ -7474,23 +7474,23 @@ static const struct ScriptCommand s_gs9_g50_s2_lives0_dlg0[] = { /* 0x81bf188 */ VARIANT_DEFAULT(_(" It's still early, so I think\neveryone will still be asleep...")), VARIANT_DEFAULT(_(" But be sure not to wake\nanyone up.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs9_g50_s2_lives1_dlg0[] = { /* 0x81bf44c */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x01, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; static const struct ScriptCommand s_gs9_g50_s2_lives1_dlg2[] = { /* 0x81bf4bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), @@ -7514,7 +7514,7 @@ static const struct ScriptCommand s_gs9_g50_s2_lives1_dlg2[] = { /* 0x81bf4bc */ static const struct ScriptCommand s_gs9_g50_s3_station_sref_script[] = { /* 0x81bf5ec */ DEBUGINFO, SELECT_ENTITIES(-1, -1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(-1, 0), RET, }; @@ -7523,31 +7523,31 @@ static const struct ScriptRef s_gs9_g50_s3_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g50_s3_lives0_dlg0[] = { /* 0x81bf648 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(1), PORTRAIT(PLACEMENT_TOP, 0x0001, 0x00000000), MSG_NPC(1, _(" Huh?\nAre you ready to leave?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs9_g50_s3_lives1_dlg0[] = { /* 0x81bf708 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs9_g51_s0_station_sref_script[] = { /* 0x81bf778 */ DEBUGINFO, SELECT_ENTITIES(-1, -1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -7556,7 +7556,7 @@ static const struct ScriptRef s_gs9_g51_s0_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g51_s0_lives0_dlg0[] = { /* 0x81bf7d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000058, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -7597,7 +7597,7 @@ static const struct ScriptCommand s_gs9_g51_s0_lives0_dlg0[] = { /* 0x81bf7d4 */ { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Like {NAME_2} said that time...)") }, TEXTBOX_CLEAR, { 0x5f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -7605,7 +7605,7 @@ static const struct ScriptCommand s_gs9_g51_s0_lives0_dlg0[] = { /* 0x81bf7d4 */ static const struct ScriptCommand s_gs9_g51_s0_lives1_dlg0[] = { /* 0x81bfe94 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x5f, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, HALT, @@ -7617,7 +7617,7 @@ static const struct ScriptCommand s_gs9_g52_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(24), { 0x27, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, RET, }; @@ -7626,7 +7626,7 @@ static const struct ScriptRef s_gs9_g52_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g52_s0_lives0_dlg0[] = { /* 0x81bff70 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x59, 0x00, -0x0004, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -7636,14 +7636,14 @@ static const struct ScriptCommand s_gs9_g52_s0_lives0_dlg0[] = { /* 0x81bff70 */ MSG_NPC(2, _(" Run, run...{WAIT_PRESS}\nAnd survive.")), MSG_NPC(2, _(" You must run till you\nuncover the truth.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs9_g52_s0_lives1_dlg0[] = { /* 0x81c0040 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x59, 0x00, -0x0004, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, HALT, @@ -7651,23 +7651,23 @@ static const struct ScriptCommand s_gs9_g52_s0_lives1_dlg0[] = { /* 0x81c0040 */ static const struct ScriptCommand s_gs9_g52_s0_lives2_dlg0[] = { /* 0x81c0090 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g52_s0_lives3_dlg0[] = { /* 0x81c00f0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g52_s0_lives4_dlg0[] = { /* 0x81c0130 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, HALT, }; @@ -7678,7 +7678,7 @@ static const struct ScriptCommand s_gs9_g53_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(24), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -7689,24 +7689,24 @@ static const struct ScriptCommand s_gs9_g53_s0_eff0_script[] = { /* 0x81c01fc */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x50, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x89, 0x28, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x18, 0x0099, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0xf0, 0x0099, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0xa0, 0x0100, 0x00000000, 0x00000000, NULL }, END_DELETE, }; static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x5e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -7726,40 +7726,40 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ MSG_NPC(-1, _(" {NAME_0}!")), TEXTBOX_CLEAR, FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTH), WAIT(15), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(11), + ALERT_CUE(12), + AWAIT_CUE(5), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x00000034, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTH), WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000b), MSG_NPC(1, _(" Caterpie! And Metapod too!")), MSG_NPC(1, _(" Oh, and even Jumpluff!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(11), + ALERT_CUE(12), + AWAIT_CUE(5), + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Wow, I'm glad!\nWe made it!")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0006, 0x00000000), MSG_NPC(6, _(" We wanted to see you off,\n{NAME_0}.")), TEXTBOX_CLEAR, @@ -7767,68 +7767,68 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ MSG_NPC(-1, _(" M-me too!")), TEXTBOX_CLEAR, FANFARE_PLAY2(469), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(11), + ALERT_CUE(12), CALL_SCRIPT(QUESTION_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(30), FANFARE_PLAY2(454), SELECT_ENTITIES(-1, 2), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(11), + ALERT_CUE(12), + ROTATE(4, 11, DIRECTION_SOUTHEAST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(30), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" Good morning.\nIt's me, Diglett.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), MSG_NPC(4, _(" I wanted to send you off\ntoo.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000008), MSG_NPC(1, _(" Everyone...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(11), + ROTATE(4, 2, DIRECTION_EAST), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_SOUTHWEST), + AWAIT_CUE(5), + ALERT_CUE(10), + AWAIT_CUE(5), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" It's a letter.\n{NAME_0}, can you read it?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x00000039, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTH), WAIT(30), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} began reading the letter.")), TEXTBOX_CLEAR, @@ -7843,37 +7843,37 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ PORTRAIT_REP(0x0001, 0x00000008), MSG_NPC(1, _(" Sniff...\nEveryone, thank you!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT_REP(0x0004, 0x00000000), MSG_NPC(4, _(" The other Pokémon will\nbe waking up soon.")), MSG_NPC(4, _(" You have to go!\nHurry!")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHEAST), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000000), MSG_NPC(1, _(" Yup.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" {NAME_0}!\nLet's go! Hit the road!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(11), + ALERT_CUE(12), { 0x89, 0xe0, 0x0099, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_NORTH), + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), TEXTBOX_AUTO_PRESS(-1, -1), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), @@ -7888,11 +7888,11 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ VARIANT_DEFAULT(_(" We'll be back!\nThat's for sure!")), VARIANT_DEFAULT(_(" Take care until then!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, { 0x89, 0x78, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -7912,269 +7912,269 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ static const struct ScriptCommand s_gs9_g53_s0_lives1_dlg0[] = { /* 0x81c1318 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x5e, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(12), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000044, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(30), - { 0x91, 0x0a, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 11, DIRECTION_SOUTH), WAIT(30), - { 0x91, 0x0a, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 11, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(20), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, -0x00000004, 0x00000004, NULL }, + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + WALK_RELATIVE(128, -4, 4), WAIT(30), - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(25), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x0000003a, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000008, 0x00000008, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, -8, 8), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x89, 0xe0, 0x0099, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x89, 0x78, 0x0100, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g53_s0_lives2_dlg0[] = { /* 0x81c1678 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x89, 0x40, 0x0080, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x86, 0x00, 0x0100, 0x00000035, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), WAIT(15), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 11, DIRECTION_NORTHEAST), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(22), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(7), + ROTATE(4, 11, DIRECTION_WEST), + AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x0000003b, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_WEST), + AWAIT_CUE(7), + ROTATE(4, 11, DIRECTION_SOUTH), WAIT(20), TEXTBOX_AUTO_PRESS(60, 60), PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Take care!")), TEXTBOX_CLEAR2, TEXTBOX_AUTO_PRESS(-1, -1), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs9_g53_s0_lives3_dlg0[] = { /* 0x81c1904 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x89, 0x40, 0x0080, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x86, 0x00, 0x0100, 0x00000036, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(QUESTION_FUNC), WAIT(4), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000b, 0x00000044, 0x00000000, NULL }, CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(8), + ROTATE(4, 11, DIRECTION_WEST), + AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x0000003c, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_WEST), + AWAIT_CUE(8), + ROTATE(4, 11, DIRECTION_SOUTH), HALT, }; static const struct ScriptCommand s_gs9_g53_s0_lives4_dlg0[] = { /* 0x81c1a94 */ DEBUGINFO, { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x00000030, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Flap! Flap!") }, FANFARE_PLAY2(451), - { 0x6b, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 3), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(5), TEXTBOX_CLEAR, - { 0x91, 0x1e, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(30, 2, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, FANFARE_STOP2(451), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(5), + SELECT_ANIMATION(22), WAIT(20), FANFARE_PLAY2(501), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Clunk!") }, WAIT(60), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), FANFARE_PLAY2(451), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x68, 0x00, 0x0100, 0x00000030, 0x00000000, NULL }, WAIT(15), - { 0x91, 0x1e, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, + ROTATE(30, 1, DIRECTION_WEST), + WALK_GRID(256, 4), FANFARE_STOP2(451), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs9_g53_s0_lives5_dlg0[] = { /* 0x81c1d74 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x89, 0x40, 0x0080, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x86, 0x00, 0x0100, 0x00000037, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), WAIT(12), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x93, 0x04, 0x000b, 0x00000044, 0x00000000, NULL }, CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), WAIT(25), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(11), + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(11), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x0000003d, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(11), + ROTATE(4, 11, DIRECTION_SOUTH), WAIT(110), TEXTBOX_AUTO_PRESS(80, 80), PORTRAIT(PLACEMENT_TOP, 0x0006, 0x00000000), MSG_NPC(6, _(" We'll be waiting for both\nof you to return!")), TEXTBOX_CLEAR2, TEXTBOX_AUTO_PRESS(-1, -1), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs9_g53_s0_lives6_dlg0[] = { /* 0x81c2004 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x89, 0x40, 0x0080, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x86, 0x00, 0x0100, 0x00000038, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_SCRIPT(QUESTION_FUNC), WAIT(8), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x93, 0x04, 0x000b, 0x00000044, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(12), + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(12), + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(12), + ROTATE(4, 11, DIRECTION_SOUTH), HALT, }; static const struct ScriptCommand s_gs9_g53_s2_lives0_dlg0[] = { /* 0x81c2174 */ DEBUGINFO, { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 1, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(9), + ROTATE(4, 11, DIRECTION_WEST), + AWAIT_CUE(9), + ROTATE(4, 1, DIRECTION_WEST), + AWAIT_CUE(9), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 11, DIRECTION_SOUTH), HALT, }; @@ -8189,7 +8189,7 @@ static const struct ScriptCommand s_gs9_g55_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x3b, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_EVENTS(0, 0), CALL_STATION( 4, 0), @@ -8200,12 +8200,12 @@ static const struct ScriptRef s_gs9_g55_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g55_s0_lives0_dlg0[] = { /* 0x81c23c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}.\nGet a good night's sleep?")), @@ -8219,18 +8219,18 @@ static const struct ScriptCommand s_gs9_g55_s0_lives0_dlg0[] = { /* 0x81c23c0 */ SELECT_ENTITIES(-1, 1), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Flap! Flap!") }, WAIT(5), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x000b, 0x00000037, 0x00000000, NULL }, WAIT(100), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 11, DIRECTION_SOUTHWEST), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), WAIT(10), { 0x93, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, WAIT(10), @@ -8243,9 +8243,9 @@ static const struct ScriptCommand s_gs9_g55_s0_lives0_dlg0[] = { /* 0x81c23c0 */ VARIANT_DEFAULT(_(" Let's try to do our best like\nwe always did, {NAME_0}!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -8253,19 +8253,19 @@ static const struct ScriptCommand s_gs9_g55_s0_lives0_dlg0[] = { /* 0x81c23c0 */ static const struct ScriptCommand s_gs9_g55_s0_lives1_dlg0[] = { /* 0x81c2858 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000003e, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 62), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x000b, 0x00000037, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -8273,32 +8273,32 @@ static const struct ScriptCommand s_gs9_g55_s0_lives1_dlg0[] = { /* 0x81c2858 */ static const struct ScriptCommand s_gs9_g55_s1_lives0_dlg0[] = { /* 0x81c2958 */ DEBUGINFO, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x00000030, 0x00000000, NULL }, FANFARE_PLAY2(451), - { 0x6b, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0x91, 0x1e, 0x0002, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 3), + ROTATE(30, 2, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, FANFARE_STOP2(451), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), WAIT(20), FANFARE_PLAY2(501), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Clunk! Clunk!") }, WAIT(60), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(451), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x68, 0x00, 0x0100, 0x00000030, 0x00000000, NULL }, WAIT(15), - { 0x91, 0x1e, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, + ROTATE(30, 1, DIRECTION_WEST), + WALK_GRID(256, 4), FANFARE_STOP2(451), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; @@ -8321,7 +8321,7 @@ static const struct ScriptCommand s_gs9_g57_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), CALL_STATION( 4, 0), RET, @@ -8331,7 +8331,7 @@ static const struct ScriptRef s_gs9_g57_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g57_s0_lives0_dlg0[] = { /* 0x81c2c50 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -8340,16 +8340,16 @@ static const struct ScriptCommand s_gs9_g57_s0_lives0_dlg0[] = { /* 0x81c2c50 */ MSG_NPC(1, _(" Good morning, {NAME_0}!")), TEXTBOX_CLEAR, FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...Hunh? What's up?\nIs something wrong?")), VARIANT_DEFAULT(_(" ...Huh? What's the matter?\nIs something wrong?")), TEXTBOX_CLEAR, FANFARE_PLAY2(463), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, right!{WAIT_PRESS}\nThat earthquake earlier!")), @@ -8384,23 +8384,23 @@ static const struct ScriptCommand s_gs9_g57_s0_lives0_dlg0[] = { /* 0x81c2c50 */ VARIANT_DEFAULT(_(" So let's do our best with\nthe rescue team!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g57_s0_lives1_dlg0[] = { /* 0x81c35ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -8411,7 +8411,7 @@ static const struct ScriptCommand s_gs9_g58_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -8422,17 +8422,17 @@ static const struct ScriptCommand s_gs9_g58_s0_eff0_script[] = { /* 0x81c3738 */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x20, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs9_g58_s0_lives0_dlg0[] = { /* 0x81c37c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -8447,51 +8447,51 @@ static const struct ScriptCommand s_gs9_g58_s0_lives0_dlg0[] = { /* 0x81c37c8 */ TEXTBOX_CLEAR, WAIT(15), SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), BGM_FADEOUT(90), MSG_NPC(-1, _(" Hey!")), TEXTBOX_CLEAR, FANFARE_PLAY2(463), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), WAIT(15), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x0000003f, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTH), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 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, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" We need you at the square!\nEveryone's gathering there.")), TEXTBOX_CLEAR, FANFARE_PLAY2(469), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Is there something wrong?")), TEXTBOX_CLEAR, MSG_NPC(2, _(" I'm not really sure...\nShiftry's calling everyone out.")), MSG_NPC(2, _(" He's getting the other rescue\nteams to come.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 11, DIRECTION_WEST), MSG_NPC(1, _(" {NAME_0}, let's go!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(5), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x20, 0x0200, 0x00000000, 0x00000000, NULL }, { 0x89, 0x60, 0x0200, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -8505,41 +8505,41 @@ static const struct ScriptCommand s_gs9_g58_s0_lives0_dlg0[] = { /* 0x81c37c8 */ static const struct ScriptCommand s_gs9_g58_s0_lives1_dlg0[] = { /* 0x81c3df4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTH), + AWAIT_CUE(6), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_EAST), + AWAIT_CUE(6), WAIT(5), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x20, 0x0200, 0x00000000, 0x00000000, NULL }, { 0x89, 0x60, 0x0200, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs9_g58_s1_lives0_dlg0[] = { /* 0x81c3f14 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000040, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000041, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + WALK_GRID(512, 64), + WALK_GRID(512, 65), + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000040, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + WALK_GRID(512, 64), { 0x89, 0x60, 0x0200, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; @@ -8555,7 +8555,7 @@ static const struct ScriptCommand s_gs9_g59_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -8564,7 +8564,7 @@ static const struct ScriptRef s_gs9_g59_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g59_s0_lives0_dlg0[] = { /* 0x81c4100 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000068, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -8581,18 +8581,18 @@ static const struct ScriptCommand s_gs9_g59_s0_lives0_dlg0[] = { /* 0x81c4100 */ VARIANT_DEFAULT(_(" We'll keep doing the best we\ncan in our rescue work.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g59_s0_lives1_dlg0[] = { /* 0x81c444c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -8608,7 +8608,7 @@ static const struct ScriptCommand s_gs9_g60_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), CALL_STATION( 61, 0), RET, @@ -8625,7 +8625,7 @@ static const struct ScriptCommand s_gs9_g60_s0_eff0_script[] = { /* 0x81c4598 */ static const struct ScriptCommand s_gs9_g60_s0_lives0_dlg0[] = { /* 0x81c45d8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000005b, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -8643,18 +8643,18 @@ static const struct ScriptCommand s_gs9_g60_s0_lives0_dlg0[] = { /* 0x81c45d8 */ VARIANT_DEFAULT(_(" Let me know when you're\nall ready to go.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g60_s0_lives1_dlg0[] = { /* 0x81c4994 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -8676,7 +8676,7 @@ static const struct ScriptCommand s_gs9_g61_s0_lives0_dlg0[] = { /* 0x81c4a40 */ static const struct ScriptCommand s_gs9_g61_s0_lives0_dlg2[] = { /* 0x81c4a70 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), @@ -8711,7 +8711,7 @@ static const struct ScriptCommand s_gs9_g61_s0_lives0_dlg2[] = { /* 0x81c4a70 */ static const struct ScriptCommand s_gs9_g61_s1_station_sref_script[] = { /* 0x81c4d58 */ DEBUGINFO, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(-1, 0), RET, }; @@ -8720,24 +8720,24 @@ static const struct ScriptRef s_gs9_g61_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g61_s1_lives0_dlg0[] = { /* 0x81c4db4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(1), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" Huh?\nAre you ready to leave?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs9_g61_s1_lives1_dlg0[] = { /* 0x81c4e54 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; @@ -8752,7 +8752,7 @@ static const struct ScriptCommand s_gs9_g62_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -8763,20 +8763,20 @@ static const struct ScriptCommand s_gs9_g62_s0_eff0_script[] = { /* 0x81c4fa0 */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0x89, 0x40, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x30, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs9_g62_s0_lives0_dlg0[] = { /* 0x81c5060 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000058, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000052, 0x00000000, NULL }, @@ -8793,8 +8793,8 @@ static const struct ScriptCommand s_gs9_g62_s0_lives0_dlg0[] = { /* 0x81c5060 */ TEXTBOX_CLEAR, WAIT(30), BGM_FADEOUT(150), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(4), WAIT(10), { 0x89, 0x40, 0x0100, 0x00000000, 0x00000000, NULL }, WAIT(45), @@ -8809,9 +8809,9 @@ static const struct ScriptCommand s_gs9_g62_s0_lives0_dlg0[] = { /* 0x81c5060 */ VARIANT(/* == */ 1, _(" Hey.")), VARIANT_DEFAULT(_(" Hello!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(15), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What, are you stunned?\nLet's go, already!")), @@ -8822,9 +8822,9 @@ static const struct ScriptCommand s_gs9_g62_s0_lives0_dlg0[] = { /* 0x81c5060 */ BGM_SWITCH(1), { 0x89, 0x48, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -8833,13 +8833,13 @@ static const struct ScriptCommand s_gs9_g62_s0_lives0_dlg0[] = { /* 0x81c5060 */ static const struct ScriptCommand s_gs9_g62_s0_lives1_dlg0[] = { /* 0x81c5538 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0xa0, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0x20, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -8855,7 +8855,7 @@ static const struct ScriptCommand s_gs9_g63_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -8864,7 +8864,7 @@ static const struct ScriptRef s_gs9_g63_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g63_s0_lives0_dlg0[] = { /* 0x81c56b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -8882,18 +8882,18 @@ static const struct ScriptCommand s_gs9_g63_s0_lives0_dlg0[] = { /* 0x81c56b4 */ VARIANT_DEFAULT(_(" We might be able to get\nsome information if we go to the square.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g63_s0_lives1_dlg0[] = { /* 0x81c5a54 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -8908,7 +8908,7 @@ static const struct ScriptRef s_gs9_g64_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs9_g64_s1_station_sref_script[] = { /* 0x81c5ae0 */ DEBUGINFO, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(-1, 0), RET, }; @@ -8917,13 +8917,13 @@ static const struct ScriptRef s_gs9_g64_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g64_s1_lives0_dlg0[] = { /* 0x81c5b3c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Whoops.\nI'd better get packed to leave.") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -8938,7 +8938,7 @@ static const struct ScriptCommand s_gs9_g65_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -8947,12 +8947,12 @@ static const struct ScriptRef s_gs9_g65_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g65_s0_lives0_dlg0[] = { /* 0x81c5cd4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning!\nGet a good night's sleep?")), VARIANT(/* == */ 1, _(" This is it!{WAIT_PRESS}\nLet's roll, {NAME_0}!\nTo the sky we go!")), @@ -8960,21 +8960,21 @@ static const struct ScriptCommand s_gs9_g65_s0_lives0_dlg0[] = { /* 0x81c5cd4 */ VARIANT_DEFAULT(_(" This is it!{WAIT_PRESS}\nLet's go, {NAME_0}!\nWe're off to the sky!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g65_s0_lives1_dlg0[] = { /* 0x81c5eb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0x60, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -8998,7 +8998,7 @@ static const struct ScriptCommand s_gs9_g67_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -9007,7 +9007,7 @@ static const struct ScriptRef s_gs9_g67_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g67_s0_lives0_dlg0[] = { /* 0x81c605c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -9029,17 +9029,17 @@ static const struct ScriptCommand s_gs9_g67_s0_lives0_dlg0[] = { /* 0x81c605c */ VARIANT_DEFAULT(_(" Let's keep doing our best,\n{NAME_0}!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs9_g67_s0_lives1_dlg0[] = { /* 0x81c63e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -9049,7 +9049,7 @@ static const struct ScriptCommand s_gs9_g68_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), { 0x27, 0x01, 0x000d, 0x0000001e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), WAIT(0), { 0x28, 0x01, 0x000d, 0x00000023, 0x00000000, NULL }, WAIT(90), @@ -9066,64 +9066,64 @@ static const struct ScriptCommand s_gs9_g68_s0_eff0_script[] = { /* 0x81c6520 */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000042, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 66), + ALERT_CUE(5), + AWAIT_CUE(4), { 0x89, 0x30, 0x004c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs9_g68_s0_lives0_dlg0[] = { /* 0x81c65e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x59, 0x00, 0x00c8, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(150), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(120), - { 0xe4, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(17), + AWAIT_CUE(5), WAIT(80), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(90), - { 0xe4, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(17), + AWAIT_CUE(5), { 0x59, 0x00, -0x00c8, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(15), + ALERT_CUE(16), { 0x89, 0x78, 0x004c, 0x00000004, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_LABEL(0), WAIT(100), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_LABEL(0), - { 0x6b, 0x00, 0x0100, 0x00000043, 0x00000000, NULL }, + WALK_GRID(256, 67), WAIT(140), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, LABEL(0), /* = 0x00 */ - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(13), + ALERT_CUE(14), + ALERT_CUE(15), + ALERT_CUE(16), RET_DIRECT, HALT, }; @@ -9133,316 +9133,316 @@ static const struct ScriptCommand s_gs9_g68_s0_lives1_dlg0[] = { /* 0x81c68e0 */ { 0x54, 0x00, 0x002d, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(50), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(15), - { 0x91, 0x0a, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_SOUTH), WAIT(30), - { 0xe4, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(18), WAIT(30), WAIT(20), { 0x89, 0x28, 0x004c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0x28, 0x004c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000044, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 68), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs9_g68_s0_eff1_script[] = { /* 0x81c6a20 */ DEBUGINFO, - { 0xe3, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(18), CALL_SCRIPT(NOTICE_FUNC), END_DELETE, }; static const struct ScriptCommand s_gs9_g68_s0_lives2_dlg0[] = { /* 0x81c6a60 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(30), - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), WAIT(10), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x89, 0x10, 0x0080, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(40), { 0x89, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), WAIT(30), CALL_SCRIPT(JUMP_ANGRY_FUNC), WAIT(60), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs9_g68_s0_lives3_dlg0[] = { /* 0x81c6be0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(5), - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTH), WAIT(20), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(8), WAIT(15), CALL_SCRIPT(NOTICE_FUNC), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), WAIT(40), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(8), WAIT(35), { 0x89, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), WAIT(30), CALL_SCRIPT(JUMP_HAPPY_FUNC), WAIT(45), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs9_g68_s0_lives4_dlg0[] = { /* 0x81c6dc0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTH), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(9), WAIT(10), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(60), - { 0x91, 0x0c, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(9), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT(40), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), WAIT(10), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), WAIT(20), CALL_SCRIPT(JUMP_HAPPY_FUNC), WAIT(20), CALL_SCRIPT(SMILE_START_FUNC), WAIT(45), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs9_g68_s0_lives5_dlg0[] = { /* 0x81c6fc0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(7), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), WAIT(20), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(9), WAIT(15), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(50), - { 0x91, 0x0c, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(9), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), WAIT(40), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), WAIT(40), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(35), - { 0x6b, 0x00, 0x0100, 0x00000045, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 69), + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs9_g68_s0_lives6_dlg0[] = { /* 0x81c7170 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), WAIT(25), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(10), WAIT(20), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), WAIT(10), { 0x89, 0x20, 0x0080, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), WAIT(35), - { 0x6b, 0x00, 0x0100, 0x00000047, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 71), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs9_g68_s0_lives7_dlg0[] = { /* 0x81c72a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), WAIT(5), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), WAIT(30), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(11), + ROTATE(4, 10, DIRECTION_SOUTHEAST), WAIT(30), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), WAIT(45), - { 0x6b, 0x00, 0x00cc, 0x00000048, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + WALK_GRID(204, 72), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs9_g68_s0_lives8_dlg0[] = { /* 0x81c73e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(15), - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTH), + AWAIT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, -0x00000008, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + WALK_RELATIVE(128, -8, 0), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(4, 10, DIRECTION_SOUTHWEST), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(10), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(40), - { 0x6b, 0x00, 0x0100, 0x00000049, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 73), + ROTATE(4, 10, DIRECTION_SOUTH), CALL_SCRIPT(JUMP_ANGRY_FUNC), WAIT(45), CALL_SCRIPT(JUMP_ANGRY_FUNC), WAIT(45), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), HALT, }; static const struct ScriptCommand s_gs9_g68_s0_lives9_dlg0[] = { /* 0x81c7630 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), WAIT(30), - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(13), WAIT(10), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(13), + ROTATE(4, 10, DIRECTION_WEST), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), WAIT(20), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), WAIT(50), - { 0x6b, 0x00, 0x0100, 0x00000046, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 70), + AWAIT_CUE(13), HALT, }; static const struct ScriptCommand s_gs9_g68_s0_lives10_dlg0[] = { /* 0x81c77c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(10), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x06, 0x000a, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(14), + ROTATE(6, 10, DIRECTION_NORTH), WAIT(70), { 0x89, 0x28, 0x0080, 0x00000002, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTH), + AWAIT_CUE(14), { 0x89, 0x10, 0x0080, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), WAIT(30), - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_WEST), + AWAIT_CUE(14), HALT, }; static const struct ScriptCommand s_gs9_g68_s0_lives11_dlg0[] = { /* 0x81c7940 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(15), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), WAIT(60), - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(15), + ROTATE(12, 10, DIRECTION_NORTHEAST), WAIT(30), - { 0x91, 0x0c, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(15), WAIT(30), { 0x89, 0x08, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_NORTHEAST), WAIT(30), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), @@ -9451,28 +9451,28 @@ static const struct ScriptCommand s_gs9_g68_s0_lives11_dlg0[] = { /* 0x81c7940 * CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), HALT, }; static const struct ScriptCommand s_gs9_g68_s0_lives12_dlg0[] = { /* 0x81c7b10 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(10), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), + AWAIT_CUE(15), WAIT(60), - { 0x91, 0x0c, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_WEST), + AWAIT_CUE(16), + AWAIT_CUE(16), WAIT(35), { 0x89, 0x0c, 0x0100, 0x00000005, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), @@ -9480,54 +9480,54 @@ static const struct ScriptCommand s_gs9_g68_s0_lives12_dlg0[] = { /* 0x81c7b10 * CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), HALT, }; static const struct ScriptCommand s_gs9_g68_s0_eff2_script[] = { /* 0x81c7cb0 */ DEBUGINFO, { 0x59, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), { 0x56, 0x00, 0x0003, 0x000001b7, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(13), + ALERT_CUE(14), + ALERT_CUE(15), + ALERT_CUE(16), { 0x56, 0x00, 0x0003, 0x00000180, 0x00000000, NULL }, WAIT(100), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(17), { 0x56, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x56, 0x00, 0x0003, 0x00000181, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(13), + ALERT_CUE(14), + ALERT_CUE(15), + ALERT_CUE(16), WAIT(1), { 0x56, 0x00, 0x0000, 0x000000aa, 0x00000000, NULL }, WAIT(90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(14), + ALERT_CUE(12), + ALERT_CUE(6), { 0x56, 0x00, 0x0000, 0x000000a9, 0x00000000, NULL }, WAIT(70), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -9539,8 +9539,8 @@ static const struct ScriptCommand s_gs9_g68_s0_eff2_script[] = { /* 0x81c7cb0 */ { 0x56, 0x00, 0x0000, 0x000000a7, 0x00000000, NULL }, WAIT(30), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(17), HALT, }; @@ -9550,7 +9550,7 @@ static const struct ScriptCommand s_gs9_g69_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -9560,42 +9560,42 @@ static const struct ScriptCommand s_gs9_g69_s0_eff0_script[] = { /* 0x81c80bc */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x30, 0x0080, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), WAIT(90), BGM_FADEOUT(60), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs9_g69_s0_lives0_dlg0[] = { /* 0x81c817c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x89, 0x15, 0x0080, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2e, 0x02, 0x0002, -0x00000002, 0x00000000, NULL }, MSG_NPC(2, _(" {NAME_0}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), { 0x89, 0x18, 0x0080, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" Oh, hi, {NAME_2} and\n{NAME_3}.{WAIT_PRESS}\nWhat's the matter?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), MSG_NPC(2, _(" It's Snubbull!{WAIT_PRESS}\nThere's something weird going on!")), TEXTBOX_CLEAR, @@ -9608,20 +9608,20 @@ static const struct ScriptCommand s_gs9_g69_s0_lives0_dlg0[] = { /* 0x81c817c */ MSG_NPC(3, _(" He looks completely\ndifferent...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" {NAME_0}!\nLet's go to the square!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), WAIT(10), { 0x89, 0x50, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x89, 0x50, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -9633,64 +9633,64 @@ static const struct ScriptCommand s_gs9_g69_s0_lives0_dlg0[] = { /* 0x81c817c */ static const struct ScriptCommand s_gs9_g69_s0_lives1_dlg0[] = { /* 0x81c8584 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0x18, 0x0080, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x0000004a, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(15), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x48, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x89, 0x50, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs9_g69_s0_lives2_dlg0[] = { /* 0x81c86f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x40, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHEAST), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), WAIT(5), { 0x89, 0x40, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x89, 0x68, 0x0100, 0x00000002, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs9_g69_s0_lives3_dlg0[] = { /* 0x81c8804 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x48, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), WAIT(5), { 0x89, 0x38, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x89, 0x68, 0x0100, 0x00000002, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), HALT, }; @@ -9705,7 +9705,7 @@ static const struct ScriptRef s_gs9_g70_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs9_g71_s0_station_sref_script[] = { /* 0x81c8920 */ DEBUGINFO, SELECT_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(30), EXECUTE_FUNCTION(EVENT_M02E01A_L003), @@ -9716,13 +9716,13 @@ static const struct ScriptRef s_gs9_g71_s0_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g71_s0_lives0_dlg0[] = { /* 0x81c899c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_NORTH), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, yeah, {NAME_0}!\nHang on a second!")), VARIANT(/* == */ 1, _(" There's something I wanted\nto bounce off you before we go to any\ndungeon.")), @@ -9732,19 +9732,19 @@ static const struct ScriptCommand s_gs9_g71_s0_lives0_dlg0[] = { /* 0x81c899c */ VARIANT_DEFAULT(_(" There's something I wanted\nto talk over with you before we go to\na dungeon.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs9_g71_s0_lives1_dlg0[] = { /* 0x81c8c24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -9760,7 +9760,7 @@ static const struct ScriptCommand s_gs9_g72_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -9769,7 +9769,7 @@ static const struct ScriptRef s_gs9_g72_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g72_s0_lives0_dlg0[] = { /* 0x81c8d90 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -9810,7 +9810,7 @@ static const struct ScriptCommand s_gs9_g72_s0_lives0_dlg0[] = { /* 0x81c8d90 */ TEXTBOX_CLEAR, WAIT(4), SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah? Why?")), @@ -9835,7 +9835,7 @@ static const struct ScriptCommand s_gs9_g72_s0_lives0_dlg0[] = { /* 0x81c8d90 */ TEXTBOX_CLEAR, WAIT(4), SELECT_ENTITIES(-1, 2), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Yeah, that's right!{WAIT_PRESS}\nYou think so too, {NAME_0}!")), @@ -9862,9 +9862,9 @@ static const struct ScriptCommand s_gs9_g72_s0_lives0_dlg0[] = { /* 0x81c8d90 */ VARIANT_DEFAULT(_(" We should always choose\nthe team leader in its Friend Area\nbefore sending the team to any dungeon.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -9873,32 +9873,32 @@ static const struct ScriptCommand s_gs9_g72_s0_lives0_dlg0[] = { /* 0x81c8d90 */ static const struct ScriptCommand s_gs9_g72_s0_lives1_dlg0[] = { /* 0x81ca410 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs9_g72_s1_lives0_dlg0[] = { /* 0x81ca470 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs9_g72_s2_lives0_dlg0[] = { /* 0x81ca500 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -9915,7 +9915,7 @@ static const struct ScriptCommand s_gs9_g74_s0_station_sref_script[] = { /* 0x81 DEBUGINFO, SELECT_ENTITIES(-1, 0), CANCEL_ENTITIES(73, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), EXECUTE_FUNCTION(EVENT_S01E01A_L001), RET, }; @@ -9924,7 +9924,7 @@ static const struct ScriptRef s_gs9_g74_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g74_s0_eff0_script[] = { /* 0x81ca628 */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x9b, 0x00, 0x0080, 0x00000000, 0x00000000, NULL }, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -9934,7 +9934,7 @@ static const struct ScriptCommand s_gs9_g74_s0_eff0_script[] = { /* 0x81ca628 */ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), @@ -9945,82 +9945,82 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ TEXTBOX_CLEAR, FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), WAIT(45), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000004b, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + WALK_GRID(256, 75), + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), MSG_NPC(2, _(" Um...{WAIT_PRESS}\nI'm Wynaut, and this is...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(5), { 0x2d, 0x03, 0x0003, 0x0000006e, 0x00000000, NULL }, PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000041), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, { 0x2d, 0x09, 0x0003, 0x0000006e, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" We have a notice on the\nBulletin Board outside the Pelipper Post\nOffice.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000041), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), MSG_NPC(2, _(" Please look at it for me.\nPlease, please.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000041), MSG_NPC(3, _(" Wobbuffet!!!{WAIT_PRESS}")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ROTATE(4, 10, DIRECTION_EAST), MSG_NPC(2, _(" Please help me.{WAIT_PRESS}\nI have to go now.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(5), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(5), + ALERT_CUE(6), WAIT(1), - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTH), WAIT(10), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -10038,9 +10038,9 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ VARIANT_DEFAULT(_(" Only one thing to do.{WAIT_PRESS}\nLet's go check the Pelipper Post Office's\nBulletin Board.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -10048,105 +10048,105 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ static const struct ScriptCommand s_gs9_g74_s0_lives1_dlg0[] = { /* 0x81cb178 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000004c, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(6), + WALK_GRID(256, 76), + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_SOUTH), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_SOUTH), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), { 0xe2, 0x00, 0x01d6, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs9_g74_s0_lives2_dlg0[] = { /* 0x81cb3a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x01, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000004d, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000004e, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + WALK_GRID(256, 77), + WALK_GRID(256, 78), + ROTATE(8, 10, DIRECTION_WEST), + AWAIT_CUE(7), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), WAIT(5), - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(19), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000052, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000004f, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), + WALK_GRID(256, 82), + ALERT_CUE(8), + ALERT_CUE(6), + WALK_GRID(256, 79), END_DELETE, }; static const struct ScriptCommand s_gs9_g74_s0_lives3_dlg0[] = { /* 0x81cb508 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000050, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + WALK_GRID(256, 80), + ROTATE(8, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000052, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000051, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + WALK_GRID(256, 82), + WALK_GRID(256, 81), + ALERT_CUE(5), END_DELETE, }; @@ -10156,7 +10156,7 @@ static const struct ScriptCommand s_gs9_g75_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(10), RET, @@ -10167,12 +10167,12 @@ static const struct ScriptRef s_gs9_g75_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g75_s0_eff0_script[] = { /* 0x81cb804 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000053, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000054, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_GRID(512, 83), + ALERT_CUE(5), + AWAIT_CUE(4), + WALK_GRID(256, 84), + ALERT_CUE(5), { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), END_DELETE, @@ -10180,7 +10180,7 @@ static const struct ScriptCommand s_gs9_g75_s0_eff0_script[] = { /* 0x81cb804 */ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -10200,46 +10200,46 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ VARIANT_DEFAULT(_(" That should teach them not\nto be so wild.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" Everyone, thank you for\neverything, really.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000041), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), MSG_NPC(2, _(" Yes, we're filled with\ngratitude!")), MSG_NPC(2, _(" This is our thanks.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), FANFARE_PLAY(203), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0}'s team received\n{CENTER_ALIGN}a peeled {COLOR GREEN}Chestnut{RESET} as their reward.")), { 0xe1, 0x00, 0x00cb, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" ..................{WAIT_PRESS}\nThis...{WAIT_PRESS}\nA peeled Chestnut?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(2, _(" Yes. It's a peeled Chestnut.{WAIT_PRESS}\nYou see, we...")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Don't have any money.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), MSG_NPC(2, _(" So we can only give you\na Chestnut as our reward.{WAIT_PRESS}\nAre you unhappy?")), TEXTBOX_CLEAR, @@ -10252,7 +10252,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ VARIANT(/* == */ 3, _(" I mean, peeled Chestnuts\nare tasty...")), VARIANT_DEFAULT(_(" Um... No. No...{WAIT_PRESS}\nWe're fine with this.")), VARIANT_DEFAULT(_(" Peeled Chestnuts are\ndelicious...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I like them! Hahahaha!\n(Though I wish we did get some money...)")), @@ -10263,21 +10263,21 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ CALL_SCRIPT(SWEAT_FUNC), { 0xe2, 0x00, 0x01d6, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_EAST), WAIT(30), MSG_NPC(-1, _(" Hey, you!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), WAIT(1), - { 0x91, 0x08, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_SOUTH), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), BGM_FADEOUT(90), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(15), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x0000000c), PORTRAIT_POS(1, 2, 0), @@ -10296,60 +10296,60 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ VARIANT_DEFAULT(_(" Did they chase us here to\nget us back?")), TEXTBOX_CLEAR, BGM_SWITCH(10), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), + ALERT_CUE(7), + ALERT_CUE(8), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), MSG_NPC(4, _(" That's right, you!")), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(6), + ROTATE(8, 2, DIRECTION_SOUTHEAST), MSG_NPC(4, _(" You got lucky!\nYou don't mess with us!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" We're not gonna lose this\ntime!\nWe'll pulverize you!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), MSG_NPC(4, _(" Mukkeeeeh!\nCrush them!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(1), - { 0x91, 0x08, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0029, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_SOUTH), + SELECT_ANIMATION(41), BGM_STOP, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(4, _(" Whoa!\nL-look at that!")), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), MSG_NPC(4, _(" Ch-Chestnut!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), MSG_NPC(4, _(" It is!\nIt's a peeled Chestnut!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), PORTRAIT_POS(1, -1, -4), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -10357,10 +10357,10 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ VARIANT_DEFAULT(_(" Wh-what?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), MSG_NPC(4, _(" Whisper, whisper...")), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), TEXTBOX_CLEAR, @@ -10373,11 +10373,11 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ VARIANT_DEFAULT(_(" What are they doing?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" They look like...{WAIT_PRESS}\nThey're having a discussion.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, WAIT(10), @@ -10386,12 +10386,12 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ VARIANT_DEFAULT(_(" What's going on?")), TEXTBOX_CLEAR, BGM_FADEIN(30, 1), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(5), WAIT(20), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), MSG_NPC(4, _(" ...Uh, listen.{WAIT_PRESS}\nYou got something we want...")), @@ -10410,15 +10410,15 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Why don't you just go get\nChestnuts on your own?")), VARIANT_DEFAULT(_(" Can't you just get Chestnuts\nby yourselves?")), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), MSG_NPC(4, _(" You know how Chestnuts\nhave that spiky shell?")), MSG_NPC(4, _(" Trying to peel that spiky\nshell... It hurts.{WAIT_PRESS}\nAnd we end up losing our tempers!")), MSG_NPC(4, _(" That's why we're asking.\nGive us that peeled Chestnut.{WAIT_PRESS}\nWe'll do whatever you want.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" Hmmm...\n{NAME_0}, what do you think?")), ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Should we give our peeled\nChestnut to the {NAME_4} gang?")), @@ -10427,41 +10427,41 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ LABEL(16), /* = 0x10 */ TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTH), SELECT_ENTITIES(-1, 1), WAIT(2), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(20), MSG_NPC(4, _(" What?!\nYou won't give it up for us?!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" Who do you think you are?!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), MSG_NPC(4, _(" Mukkeeeeeh!\nGet them!")), TEXTBOX_CLEAR, { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), WAIT(4), { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0029, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(41), BGM_FADEOUT(60), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x01, 0x0000, 0x00000059, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WARP_WAYPOINT(1, 89), + SELECT_ANIMATION(5), + ALERT_CUE(11), + ALERT_CUE(10), + ALERT_CUE(9), WAIT(30), MSG_ON_BG_AUTO(30, _("{CENTER_ALIGN}{NAME_0} was suddenly attacked\n{CENTER_ALIGN}by the {NAME_4} gang!")), MSG_ON_BG_AUTO(30, _("{CENTER_ALIGN}However...")), @@ -10474,30 +10474,30 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x8b, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(11), + ALERT_CUE(9), + ALERT_CUE(7), + ALERT_CUE(8), { 0x62, 0x00, 0x0200, -0x00000010, -0x00000010, NULL }, WAIT(20), - { 0x54, 0x00, 0x0029, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(41), WAIT(30), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0500, 0x00000008, 0x00000008, NULL }, CALL_SCRIPT(SHOCK_FUNC), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(5), MSG_NPC(4, _(" Ow, ow, ow...")), MSG_NPC(4, _(" ...W-we lost...")), TEXTBOX_CLEAR, BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(6), { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -10516,9 +10516,9 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ MSG_NPC(4, _(" Please?\nWe'll do anything you want if you'll just\ngive us your peeled Chestnut...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), PORTRAIT_POS(1, -1, -4), MSG_NPC(1, _(" Hmmm...\n{NAME_0}, what do you think?")), @@ -10542,7 +10542,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ PORTRAIT_POS(3, -2, 0), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I know!{WAIT_PRESS}\nHey, {NAME_4} gang, how are you guys\nwith physical labor?")), @@ -10582,26 +10582,26 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ VARIANT_DEFAULT(_(" How does that sound?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), MSG_NPC(4, _(" Whisper, whisper...")), TEXTBOX_CLEAR, WAIT(10), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" Mutter, mutter...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), MSG_NPC(4, _(" OK.\nWe'll help!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_NPC(1, _(" Really?{WAIT_PRESS}\nYou'll help us?")), TEXTBOX_CLEAR, @@ -10617,80 +10617,80 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ MSG_NPC(4, _(" ...In return...{WAIT_PRESS}\nHand over that peeled Chestnut.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0007, 0x00000041), MSG_NPC(7, _(" Me too!\nI'll help too!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), WAIT(1), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), WAIT(30), MSG_NPC(7, _(" I'll spit silk for gluing\nthings together!")), TEXTBOX_CLEAR, WAIT(10), { 0xe5, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" I'll help too!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000041), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" I felt bad because we only\nhad a peeled Chestnut for your reward.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Wobbuffet!!!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000b), MSG_NPC(1, _(" Sniff...\nThanks, everyone!")), TEXTBOX_CLEAR, WAIT(30), MSG_NPC(4, _(" OK!{WAIT_PRESS}\nLet's get a move on!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + ALERT_CUE(12), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" OK!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), WAIT(10), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), MSG_NPC(4, _(" OK!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ALERT_CUE(7), + ALERT_CUE(12), + ROTATE(4, 2, DIRECTION_SOUTH), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, WAIT(80), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -10726,356 +10726,356 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ static const struct ScriptCommand s_gs9_g75_s0_lives1_dlg0[] = { /* 0x81ce8cc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), WAIT(1), - { 0x91, 0x08, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x02, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0029, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_SOUTH), + AWAIT_CUE(6), + ROTATE(8, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + ROTATE(2, 2, DIRECTION_SOUTH), + SELECT_ANIMATION(41), + AWAIT_CUE(6), + SELECT_ANIMATION(2), FANFARE_PLAY2(468), CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x02, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(2, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs9_g75_s0_lives2_dlg0[] = { /* 0x81cea9c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(19), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), { 0x89, 0x10, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x89, 0x10, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(19), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x61, 0x00, 0x0200, 0x00000128, 0x00000138, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), + SELECT_ANIMATION(5), WAIT(20), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), - { 0x91, 0x08, 0x0001, 0x00000007, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_SOUTHWEST), WAIT(20), - { 0x91, 0x08, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_SOUTHEAST), WAIT(20), - { 0x91, 0x08, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_SOUTH), + AWAIT_CUE(7), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000055, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(7), + WALK_GRID(256, 85), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(19), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(19), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(19), HALT, }; static const struct ScriptCommand s_gs9_g75_s0_lives3_dlg0[] = { /* 0x81cee3c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x61, 0x00, 0x0200, 0x00000100, 0x00000138, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(8), + SELECT_ANIMATION(5), WAIT(20), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(8), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), - { 0x91, 0x08, 0x0001, 0x00000007, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_SOUTHWEST), WAIT(20), - { 0x91, 0x08, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_SOUTHEAST), WAIT(20), - { 0x91, 0x08, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_SOUTH), + AWAIT_CUE(8), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000056, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(8), + WALK_GRID(256, 86), + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + SELECT_ANIMATION(19), HALT, }; static const struct ScriptCommand s_gs9_g75_s0_lives4_dlg0[] = { /* 0x81cf1ac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000057, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000058, 0x00000000, NULL }, + AWAIT_CUE(9), + WALK_GRID(256, 87), + AWAIT_CUE(9), + ROTATE(4, 1, DIRECTION_NORTHEAST), + AWAIT_CUE(9), + ROTATE(4, 2, DIRECTION_NORTH), + WALK_GRID(256, 88), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), WAIT(30), { 0x63, 0x00, 0x0040, 0x00000057, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(8, 2, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(8, 1, DIRECTION_NORTH), + ALERT_CUE(5), + ROTATE(8, 1, DIRECTION_NORTHEAST), + AWAIT_CUE(9), + ROTATE(8, 2, DIRECTION_NORTH), HALT, }; static const struct ScriptCommand s_gs9_g75_s0_lives5_dlg0[] = { /* 0x81cf33c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000005a, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + WALK_GRID(256, 90), + AWAIT_CUE(10), FANFARE_PLAY2(458), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000005b, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), + WALK_GRID(256, 91), CALL_SCRIPT(NOTICE_FUNC), WAIT(30), { 0x63, 0x00, 0x0040, 0x0000005a, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(8, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(10), + ROTATE(8, 10, DIRECTION_NORTH), HALT, }; static const struct ScriptCommand s_gs9_g75_s0_lives6_dlg0[] = { /* 0x81cf49c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000005c, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + WALK_GRID(256, 92), + AWAIT_CUE(11), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000005d, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), + WALK_GRID(256, 93), CALL_SCRIPT(NOTICE_FUNC), WAIT(30), { 0x63, 0x00, 0x0040, 0x0000005c, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), + ROTATE(8, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(11), + ROTATE(8, 10, DIRECTION_NORTH), HALT, }; static const struct ScriptCommand s_gs9_g75_s0_lives7_dlg0[] = { /* 0x81cf60c */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x0000005e, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), + WALK_GRID(384, 94), + SELECT_ANIMATION(2), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000005f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000060, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(12), + WALK_GRID(256, 95), + WALK_GRID(256, 96), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(12), + SELECT_ANIMATION(17), + AWAIT_CUE(12), HALT, }; static const struct ScriptCommand s_gs9_g75_s1_lives0_dlg0[] = { /* 0x81cf72c */ DEBUGINFO, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_SOUTH), WAIT(1), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0029, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + SELECT_ANIMATION(41), WAIT(1), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x58, 0x01, 0x0000, 0x00000148, 0x00000168, NULL }, { 0x8b, 0x01, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), + AWAIT_CUE(6), WAIT(10), { 0x62, 0x00, 0x0100, 0x00000010, -0x00000010, NULL }, - { 0x54, 0x00, 0x0029, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(41), WAIT(30), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0a00, -0x00000010, 0x00000010, NULL }, CALL_SCRIPT(SHOCK_FUNC), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(1), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs9_g75_s1_lives1_dlg0[] = { /* 0x81cf94c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(472), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000058, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x01, 0x0000, 0x00000061, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + WALK_GRID(256, 88), + AWAIT_CUE(9), + WARP_WAYPOINT(1, 97), + AWAIT_CUE(9), + SELECT_ANIMATION(5), WAIT(40), { 0x63, 0x00, 0x0100, 0x00000059, 0x00000000, NULL }, { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, WAIT(5), { 0x63, 0x00, 0x0100, 0x00000057, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + SELECT_ANIMATION(2), { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs9_g75_s1_lives2_dlg0[] = { /* 0x81cfacc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), FANFARE_PLAY2(458), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x01, 0x0000, 0x0000005a, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), + WALK_GRID(256, 91), + AWAIT_CUE(10), + WARP_WAYPOINT(1, 90), { 0x8b, 0x01, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(2), { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g75_s1_lives3_dlg0[] = { /* 0x81cfbec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000005d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), + WALK_GRID(256, 93), + AWAIT_CUE(11), { 0x8b, 0x01, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x58, 0x01, 0x0000, 0x00000130, 0x00000180, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + SELECT_ANIMATION(5), WAIT(10), { 0x62, 0x00, 0x0200, 0x00000010, -0x00000010, NULL }, WAIT(40), @@ -11084,84 +11084,84 @@ static const struct ScriptCommand s_gs9_g75_s1_lives3_dlg0[] = { /* 0x81cfbec */ WAIT(1), { 0x63, 0x00, 0x0100, 0x0000005c, 0x00000000, NULL }, WAIT(10), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + SELECT_ANIMATION(2), { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g75_s2_lives0_dlg0[] = { /* 0x81cfd9c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTH), + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTH), + AWAIT_CUE(6), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTH), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g75_s2_lives1_dlg0[] = { /* 0x81cff1c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(8, 2, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(8, 1, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(8, 10, DIRECTION_SOUTH), HALT, }; static const struct ScriptCommand s_gs9_g75_s2_lives2_dlg0[] = { /* 0x81cffdc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000062, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(8, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(10), + ROTATE(8, 10, DIRECTION_NORTH), + AWAIT_CUE(10), + WALK_GRID(256, 98), + AWAIT_CUE(10), + ROTATE(8, 2, DIRECTION_SOUTH), HALT, }; static const struct ScriptCommand s_gs9_g75_s2_lives3_dlg0[] = { /* 0x81d009c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000063, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000064, 0x00000000, NULL }, - { 0x91, 0x01, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + ROTATE(8, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(11), + ROTATE(8, 10, DIRECTION_NORTH), + AWAIT_CUE(11), + WALK_GRID(256, 99), + WALK_GRID(256, 100), + ROTATE(1, 2, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(11), + ROTATE(8, 1, DIRECTION_SOUTH), HALT, }; @@ -11181,7 +11181,7 @@ static const struct ScriptCommand s_gs9_g76_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_FADEIN(60, 1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -11194,14 +11194,14 @@ static const struct ScriptRef s_gs9_g76_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g76_s0_eff0_script[] = { /* 0x81d034c */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000066, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 102), + ALERT_CUE(5), + AWAIT_CUE(4), { 0x86, 0x00, 0x0200, 0x00000067, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000068, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), + WALK_GRID(256, 104), + ALERT_CUE(5), { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), END_DELETE, @@ -11209,9 +11209,9 @@ static const struct ScriptCommand s_gs9_g76_s0_eff0_script[] = { /* 0x81d034c */ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), @@ -11220,77 +11220,77 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ PORTRAIT(PLACEMENT_TOP_LEFT, 0x0003, 0x00000000), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0007, 0x00000000), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_WEST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), MSG_NPC(1, _(" Whew...{WAIT_PRESS}\nOur base is coming along quickly.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000041), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), PORTRAIT_REP(0x0001, 0x00000009), MSG_NPC(1, _(" We owe everyone for this.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(12), + ROTATE(4, 1, DIRECTION_NORTHEAST), + ALERT_CUE(8), WAIT(80), - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), MSG_NPC(7, _(" But there's still lots to do.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(7), + ALERT_CUE(8), MSG_NPC(7, _(" We still have difficult\nthings to do.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Yeah...{WAIT_PRESS} But we're getting\nclose, right, {NAME_4} gang?{WAIT_PRESS}\n...{WAIT_PRESS}Hah?")), VARIANT_DEFAULT(_(" That's true.{WAIT_PRESS} But we're\ngetting close, right, {NAME_4} gang?{WAIT_PRESS}\n...{WAIT_PRESS}Huh?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Look!\nOver there!")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTHWEST), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(6), WAIT(20), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(12), WAIT(1), { 0x53, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000069, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000006a, 0x00000000, NULL }, + WALK_GRID(256, 105), + WALK_GRID(256, 106), { 0x52, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0000, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), @@ -11301,24 +11301,24 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ VARIANT_DEFAULT(_(" What's the matter?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), MSG_NPC(7, _(" We need to keep working.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP, 0x0004, 0x00000000), PORTRAIT_POS(4, -2, 0), MSG_NPC(4, _(" Don't wanna.")), TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(20), PORTRAIT_REP(0x0001, 0x0000000c), @@ -11343,9 +11343,9 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ MSG_NPC(4, _(" We just can't be bothered.\nWe need peeled Chestnuts to motivate us.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHWEST), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Problem, {NAME_0}.")), VARIANT(/* == */ 1, _(" It looks like the\n{NAME_4} gang won't work unless\nwe get them another peeled Chestnut.")), @@ -11355,7 +11355,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ VARIANT_DEFAULT(_(" I guess we'll have to give\nthe {NAME_4} gang any peeled\nChestnuts that we find.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -11370,172 +11370,172 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ static const struct ScriptCommand s_gs9_g76_s0_lives1_dlg0[] = { /* 0x81d11b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHEAST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(5), - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTH), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(1), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTHWEST), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000006b, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000006c, 0x00000000, NULL }, + WALK_GRID(256, 107), + WALK_GRID(256, 108), { 0x52, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_SOUTHEAST), WAIT(1), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs9_g76_s0_lives2_dlg0[] = { /* 0x81d1408 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTHEAST), + SELECT_ANIMATION(5), WAIT(20), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_NORTHEAST), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(7), WAIT(16), { 0x53, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000073, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000074, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000075, 0x00000000, NULL }, + WALK_GRID(256, 115), + WALK_GRID(256, 116), + WALK_GRID(256, 117), { 0x52, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(7), CALL_SCRIPT(JUMP_SURPRISE_FUNC), HALT, }; static const struct ScriptCommand s_gs9_g76_s0_lives3_dlg0[] = { /* 0x81d1578 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTH), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_EAST), WAIT(20), - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_EAST), + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000070, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000071, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000072, 0x00000000, NULL }, + WALK_GRID(256, 112), + WALK_GRID(256, 113), + WALK_GRID(256, 114), { 0x52, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), CALL_SCRIPT(JUMP_SURPRISE_FUNC), HALT, }; static const struct ScriptCommand s_gs9_g76_s0_lives4_dlg0[] = { /* 0x81d17f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + SELECT_ANIMATION(2), + ROTATE(8, 10, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs9_g76_s0_lives5_dlg0[] = { /* 0x81d1888 */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x59, 0x01, 0x0000, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(2), + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs9_g76_s0_lives6_dlg0[] = { /* 0x81d1918 */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + SELECT_ANIMATION(2), + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs9_g76_s0_lives7_dlg0[] = { /* 0x81d1998 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(8, 2, DIRECTION_SOUTHWEST), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000010, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), + AWAIT_CUE(12), + WALK_RELATIVE(256, -16, 0), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(12), { 0x53, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, WAIT(20), - { 0x6b, 0x00, 0x00cc, 0x0000006d, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000006e, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000006f, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + WALK_GRID(204, 109), + WALK_GRID(256, 110), + WALK_GRID(256, 111), + ROTATE(4, 10, DIRECTION_WEST), { 0x52, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), HALT, }; @@ -11562,7 +11562,7 @@ static const struct ScriptCommand s_gs9_g77_s0_lives0_dlg0[] = { /* 0x81d1bc4 */ static const struct ScriptCommand s_gs9_g77_s0_lives0_dlg2[] = { /* 0x81d1bf4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_HASITEM(ITEM_CHESTNUT, /* to label */ 0), @@ -11586,7 +11586,7 @@ static const struct ScriptCommand s_gs9_g77_s0_lives1_dlg0[] = { /* 0x81d1df4 */ static const struct ScriptCommand s_gs9_g77_s0_lives1_dlg2[] = { /* 0x81d1e24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_HASITEM(ITEM_CHESTNUT, /* to label */ 0), @@ -11610,7 +11610,7 @@ static const struct ScriptCommand s_gs9_g77_s0_lives2_dlg0[] = { /* 0x81d1f5c */ static const struct ScriptCommand s_gs9_g77_s0_lives2_dlg2[] = { /* 0x81d1f8c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_HASITEM(ITEM_CHESTNUT, /* to label */ 0), @@ -11633,7 +11633,7 @@ static const struct ScriptCommand s_gs9_g77_s0_lives3_dlg0[] = { /* 0x81d206c */ static const struct ScriptCommand s_gs9_g77_s0_lives3_dlg2[] = { /* 0x81d208c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" We're going to work hard!\nWe'll finish the rescue team base!")), @@ -11642,31 +11642,31 @@ static const struct ScriptCommand s_gs9_g77_s0_lives3_dlg2[] = { /* 0x81d208c */ static const struct ScriptCommand s_gs9_g77_s0_lives4_dlg2[] = { /* 0x81d2130 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000041), WAIT(1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Wobbuffet!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(1), JUMP_SCRIPT(END_TALK), }; static const struct ScriptCommand s_gs9_g77_s0_lives4_dlg3[] = { /* 0x81d21f0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTH), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(2), + ALERT_CUE(5), CALL_SCRIPT(WAIT_END_TALK_FUNC), RET, }; @@ -11681,14 +11681,14 @@ static const struct ScriptRef s_gs9_g77_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g77_s1_eff0_script[] = { /* 0x81d22fc */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000053, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000054, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_GRID(256, 83), + ALERT_CUE(5), + AWAIT_CUE(4), + WALK_GRID(256, 84), + ALERT_CUE(5), { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), END_DELETE, @@ -11696,7 +11696,7 @@ static const struct ScriptCommand s_gs9_g77_s1_eff0_script[] = { /* 0x81d22fc */ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0000, 0x00000000), @@ -11725,7 +11725,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 2), WAIT(2), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(20), PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" What?!\nYou won't give it up for us?!")), @@ -11740,9 +11740,9 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ PORTRAIT_POS(2, -2, 0), MSG_NPC(2, _(" Mukkeeeeeh!\nGet them!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), BGM_FADEOUT(60), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -11756,7 +11756,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ { 0xe5, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x22, 0x00, 0x0028, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Ow, ow, ow...")), MSG_NPC(2, _(" ...W-we lost...")), @@ -11769,7 +11769,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), JUMP_SCRIPT(END_TALK), LABEL(3), /* = 0x03 */ TEXTBOX_CLEAR, @@ -11782,13 +11782,13 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ PORTRAIT(PLACEMENT_TOP_LEFT, 0x0000, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000001), MSG_NPC(2, _(" Yes!\nA peeled Chestnut!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), WAIT(1), { 0xe5, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -11801,9 +11801,9 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ PORTRAIT_POS(2, 1, 0), MSG_NPC(2, _(" Why don't you quit lounging\naround yourself?!\nGet moving!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), WAIT(1), { 0xe5, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, @@ -11840,7 +11840,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), JUMP_SCRIPT(END_TALK), LABEL(8), /* = 0x08 */ BGM_FADEOUT(60), @@ -11855,142 +11855,142 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ static const struct ScriptCommand s_gs9_g77_s1_lives1_dlg0[] = { /* 0x81d3084 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs9_g77_s1_lives2_dlg0[] = { /* 0x81d3104 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs9_g77_s1_lives3_dlg0[] = { /* 0x81d3164 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs9_g77_s1_lives4_dlg0[] = { /* 0x81d31c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs9_g77_s2_lives0_dlg0[] = { /* 0x81d3224 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x6f, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(8), WAIT(10), - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_WEST), + ROTATE(4, 2, DIRECTION_SOUTH), + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs9_g77_s2_lives1_dlg0[] = { /* 0x81d3314 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x6f, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + SELECT_ANIMATION(8), WAIT(10), - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_WEST), + ROTATE(4, 2, DIRECTION_SOUTH), HALT, }; static const struct ScriptCommand s_gs9_g77_s2_lives2_dlg0[] = { /* 0x81d33e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x6f, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + SELECT_ANIMATION(8), WAIT(10), - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_WEST), + ROTATE(4, 2, DIRECTION_SOUTH), HALT, }; static const struct ScriptCommand s_gs9_g77_s3_lives0_dlg0[] = { /* 0x81d34b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(8, 10, DIRECTION_NORTHEAST), WAIT(1), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(1), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs9_g77_s3_lives1_dlg0[] = { /* 0x81d35a4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(1), - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTH), WAIT(1), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(1), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs9_g77_s3_lives2_dlg0[] = { /* 0x81d3694 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(8, 10, DIRECTION_WEST), WAIT(1), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(1), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), HALT, }; @@ -12010,7 +12010,7 @@ static const struct ScriptCommand s_gs9_g78_s0_station_sref_script[] = { /* 0x81 { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12038,31 +12038,31 @@ static const struct ScriptRef s_gs9_g78_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g78_s0_eff0_script[] = { /* 0x81d3b84 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000076, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000077, 0x00000000, NULL }, + WALK_GRID(256, 118), + ALERT_CUE(5), + AWAIT_CUE(4), + WALK_GRID(256, 119), BGM_STOP, WAIT(20), FANFARE_PLAY(201), { 0xe1, 0x00, 0x00c9, 0x00000000, 0x00000000, NULL }, WAIT(30), BGM_FADEIN(120, 1), - { 0x6b, 0x00, 0x0100, 0x00000076, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 118), + ALERT_CUE(5), WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000078, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_GRID(512, 120), { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0000, 0x00000000), @@ -12071,17 +12071,17 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0007, 0x00000000), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Sniff...{WAIT_PRESS}\nFinally...{WAIT_PRESS}\nThis day has finally come...")), VARIANT_DEFAULT(_(" Sniff...{WAIT_PRESS}\nFinally...{WAIT_PRESS}\nThis day has finally arrived...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(8, 1, DIRECTION_EAST), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nIt's finally finished!")), @@ -12091,77 +12091,77 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ VARIANT_DEFAULT(_(" {NAME_0}!\nIt's ready! Finally!")), VARIANT_DEFAULT(_(" Our... {COLOR CYAN}{TEAM_NAME}{RESET}'s\nrescue team base!")), TEXTBOX_CLEAR, - { 0x91, 0x08, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_NORTH), + ALERT_CUE(4), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Sniff... This is so cool.{WAIT_PRESS}\nI can stare at it forever! Our rescue team\nbase is so cool.")), VARIANT_DEFAULT(_(" Sniff... It's so cool.{WAIT_PRESS}\nEvery time I take a look at our rescue\nteam base, I only see coolness.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(8, 1, DIRECTION_EAST), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" The way it looks like you\nis a nice touch, {NAME_0}!")), VARIANT_DEFAULT(_(" Its resemblance to you\nis a nice touch, {NAME_0}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(5), MSG_NPC(7, _(" We all worked very hard!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + ROTATE(8, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(5), MSG_NPC(2, _(" It was very hard, but it\nwas worth it!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000041), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0001, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(10, 1, DIRECTION_SOUTH), WAIT(20), - { 0x91, 0x0a, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(10, 2, DIRECTION_SOUTHEAST), WAIT(20), - { 0x91, 0x0a, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 1, DIRECTION_SOUTH), WAIT(20), - { 0x91, 0x0a, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(10, 2, DIRECTION_SOUTHEAST), WAIT(20), PORTRAIT_REP(0x0001, 0x0000000a), MSG_NPC(1, _(" Sniff... Everyone...{WAIT_PRESS}\nThank you!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP, 0x0004, 0x00000000), PORTRAIT_POS(4, -3, 0), MSG_NPC(4, _(" Say, there.{WAIT_PRESS}\nThere's something I want to ask...")), TEXTBOX_CLEAR, WAIT(10), { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_WEST), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(12), MSG_NPC(4, _(" If this rescue team base is\nfinished...")), MSG_NPC(4, _(" Does that maybe mean...{WAIT_PRESS}\nYou won't bring us peeled Chestnuts\nanymore?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hahaha!\nWell, what do you think?")), @@ -12172,10 +12172,10 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ VARIANT_DEFAULT(_(" To our {NAME_4} gang!{WAIT_PRESS}\nSincerely, thank you for everything!")), TEXTBOX_CLEAR, BGM_FADEOUT(120), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_TOP_FLIP, 0x0004, 0x00000000), PORTRAIT_POS(4, -3, 0), @@ -12193,7 +12193,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe5, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(4, _(" Ukkeeeeeeeeh!")), TEXTBOX_CLEAR, CLEAR_ARRAY(EVENT_LOCAL), @@ -12202,13 +12202,13 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe5, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(5), WAIT(10), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), MSG_NPC(1, _(" Wh-what?!")), @@ -12217,7 +12217,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe5, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Whoa, whoa, whoa!\nWhat are you doing?!\nStop that!")), @@ -12228,19 +12228,19 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ { 0xe5, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x6a, 0x00, 0x0180, 0x00000000, -0x00000030, NULL }, + WALK_RELATIVE(384, 0, -48), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(20), - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), WAIT(60), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + ALERT_CUE(3), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, WAIT(10), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; @@ -12255,51 +12255,51 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ static const struct ScriptCommand s_gs9_g78_s0_lives1_dlg0[] = { /* 0x81d4d24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0001, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(8, 2, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(8, 1, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(8, 2, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(6), + ROTATE(10, 1, DIRECTION_WEST), WAIT(20), - { 0x91, 0x0a, 0x0002, 0x00000007, 0x00000000, NULL }, + ROTATE(10, 2, DIRECTION_SOUTHWEST), WAIT(20), - { 0x91, 0x0a, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 2, DIRECTION_SOUTH), WAIT(20), - { 0x91, 0x0a, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_WEST), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(10), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(10), - { 0x91, 0x06, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0180, -0x00000010, -0x00000040, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000007a, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000079, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_NORTH), + AWAIT_CUE(6), + WALK_RELATIVE(384, -16, -64), + WALK_GRID(256, 122), + WALK_GRID(256, 121), + ROTATE(4, 1, DIRECTION_NORTH), + SELECT_ANIMATION(9), + ALERT_CUE(9), WAIT(100), - { 0x54, 0x00, 0x0028, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(40), + ALERT_CUE(9), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000004, NULL }, WAIT(30), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, @@ -12309,91 +12309,91 @@ static const struct ScriptCommand s_gs9_g78_s0_lives1_dlg0[] = { /* 0x81d4d24 */ static const struct ScriptCommand s_gs9_g78_s0_lives2_dlg0[] = { /* 0x81d5054 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(5), WAIT(20), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(7), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(7), WAIT(70), - { 0x6b, 0x00, 0x0100, 0x0000007e, 0x00000000, NULL }, + WALK_GRID(256, 126), CALL_SCRIPT(LOOK_AROUND_FUNC), HALT, }; static const struct ScriptCommand s_gs9_g78_s0_lives3_dlg0[] = { /* 0x81d5184 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_NORTHWEST), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(8), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(10), - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTH), + AWAIT_CUE(8), WAIT(90), - { 0x6a, 0x00, 0x0200, -0x00000020, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000038, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(512, -32, 0), + WALK_RELATIVE(256, 0, -56), + ROTATE(4, 1, DIRECTION_SOUTH), + SELECT_ANIMATION(19), HALT, }; static const struct ScriptCommand s_gs9_g78_s0_lives4_dlg0[] = { /* 0x81d52f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(8, 10, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(8, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(9), FANFARE_PLAY2(472), CALL_SCRIPT(JUMP_ANGRY_FUNC), { 0xe2, 0x00, 0x01d8, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x0000007b, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), + WALK_GRID(512, 123), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(9), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(702), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(24), FANFARE_PLAY2(610), { 0xe2, 0x00, 0x0262, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, WAIT(10), FANFARE_PLAY2(702), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(24), FANFARE_PLAY2(610), { 0xe2, 0x00, 0x0262, 0x00000000, 0x00000000, NULL }, @@ -12401,9 +12401,9 @@ static const struct ScriptCommand s_gs9_g78_s0_lives4_dlg0[] = { /* 0x81d52f4 */ LABEL(1), /* = 0x01 */ FANFARE_FADEOUT2(100, 702), FANFARE_FADEOUT2(100, 610), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + SELECT_ANIMATION(9), + AWAIT_CUE(9), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, 0x00000004, NULL }, WAIT(30), @@ -12413,35 +12413,35 @@ static const struct ScriptCommand s_gs9_g78_s0_lives4_dlg0[] = { /* 0x81d52f4 */ static const struct ScriptCommand s_gs9_g78_s0_lives5_dlg0[] = { /* 0x81d5644 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(10), + ROTATE(8, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(10), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(20), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x0000007c, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + WALK_GRID(512, 124), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(10), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(20), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(9), + AWAIT_CUE(10), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, HALT, @@ -12449,31 +12449,31 @@ static const struct ScriptCommand s_gs9_g78_s0_lives5_dlg0[] = { /* 0x81d5644 */ static const struct ScriptCommand s_gs9_g78_s0_lives6_dlg0[] = { /* 0x81d5854 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(11), + ROTATE(8, 10, DIRECTION_NORTH), + AWAIT_CUE(11), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x0000007c, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x0000007d, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + WALK_GRID(512, 124), + WALK_GRID(512, 125), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(4), + AWAIT_CUE(11), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, WAIT(10), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(16), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ @@ -12487,21 +12487,21 @@ static const struct ScriptCommand s_gs9_g78_s0_lives6_dlg0[] = { /* 0x81d5854 */ static const struct ScriptCommand s_gs9_g78_s0_lives7_dlg0[] = { /* 0x81d5a84 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(4, 1, DIRECTION_NORTHEAST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(8, 2, DIRECTION_WEST), + AWAIT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(5), - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTH), + AWAIT_CUE(12), { 0x93, 0x06, 0x000a, 0x00000072, 0x00000000, NULL }, WAIT(80), - { 0x6b, 0x00, 0x00cc, 0x0000007f, 0x00000000, NULL }, + WALK_GRID(204, 127), HALT, }; @@ -12511,7 +12511,7 @@ static const struct ScriptCommand s_gs9_g79_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -12524,22 +12524,22 @@ static const struct ScriptCommand s_gs9_g79_s0_eff0_script[] = { /* 0x81d5c40 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000080, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, 0x00000000, -0x00000074, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_GRID(512, 128), + ALERT_CUE(5), + AWAIT_CUE(4), + WALK_RELATIVE(512, 0, -116), + ALERT_CUE(5), + AWAIT_CUE(4), { 0x89, 0xa8, 0x0100, 0x00000004, 0x00000000, NULL }, { 0x89, 0x48, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -12547,8 +12547,8 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ MSG_NPC(2, _(" Thank you so much.\nYou saved me from great peril.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's cool, {NAME_2}.{WAIT_PRESS}\nBut why'd you run away?")), @@ -12557,42 +12557,42 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ VARIANT_DEFAULT(_(" Your letter said something\nabout not wanting to become an adult...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" That is...")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" Oh!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), WAIT(15), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + AWAIT_CUE(5), WAIT(15), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), MSG_NPC(3, _(" Look, there he is!")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" Yeah, I see him.\nWe've got to get him back quick!")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTH), PORTRAIT(PLACEMENT_RIGHT, 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...")), VARIANT_DEFAULT(_(" More {NAME_2}?{WAIT_PRESS}\nTwo of them...")), WAIT(20), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_2}.{WAIT_PRESS}\nWho are those guys?")), @@ -12602,11 +12602,11 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ MSG_NPC(2, _(" They're...{WAIT_PRESS}\nMy friends.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), MSG_NPC(3, _(" Now, come with us.{WAIT_PRESS}\nThe grown-up ritual is ready for you.")), TEXTBOX_CLEAR, @@ -12615,123 +12615,123 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ MSG_NPC(3, _(" Quit fighting this.\nHave the paw print applied without a fuss.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), PORTRAIT_POS(2, 3, 0), MSG_NPC(2, _(" N-no!")), WAIT(20), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" If I have to get that\npaw print on my back...{WAIT_PRESS}\nI'd rather not become a grown-up!")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What is that?{WAIT_PRESS}\nThis grown-up ritual?")), VARIANT_DEFAULT(_(" What was that?{WAIT_PRESS}\nWhat grown-up ritual?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), MSG_NPC(3, _(" It is a custom among us {POKEMON_2}.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(9), + ROTATE(4, 2, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_RIGHT, 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), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTH), PORTRAIT(PLACEMENT_LEFT_, 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), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" I can't live with anything\nso tasteless.")), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), WAIT(20), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" I have dreams of creating\ngreat art, so I have certain standards\nfor design that I swear by.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ...I know!{WAIT_PRESS}\nI have decided!")), MSG_NPC(2, _(" I shall join {NAME_0}'s\nrescue team!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(2, _(" I will participate in your\nrescue activities!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" So...\nI won't return to the pack!{WAIT_PRESS}\nThis is where I will dedicate myself!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(7), WAIT(15), PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), MSG_NPC(3, _(" Is... Is that so?\nThen there is nothing we can do.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(7), PORTRAIT(PLACEMENT_RIGHT, 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, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(45), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" Oh, wow...\nThat's one pushy way of getting a job.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" But, that's OK.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTHEAST), PORTRAIT_REP(0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Welcome to the team!{WAIT_PRESS}\nWe expect your best, {NAME_2}!")), VARIANT_DEFAULT(_(" You're on the team now!{WAIT_PRESS}\nWe expect your best, {NAME_2}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), MSG_NPC(2, _(" Yes!\nThank you!")), TEXTBOX_CLEAR, @@ -12740,22 +12740,22 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ MSG_NPC(2, _(" For example...{WAIT_PRESS}\nLet me see...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Ah, how about that?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(5), SELECT_LIVES(79, 1), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000081, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + WALK_GRID(256, 129), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(5), + ALERT_CUE(7), MSG_NPC(2, _(" Observe, the design of that\nflag.")), MSG_NPC(2, _(" I could perhaps redesign\nthe flag?")), MSG_NPC(2, _(" If you wish to alter the\nflag's design, you must tell me, please.")), @@ -12772,7 +12772,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ CHOICE(/* label */ 17, _("*Yes")), CHOICE(/* label */ 18, _("No")), LABEL(17), /* = 0x11 */ - { 0x3d, 0x00, 0x0000, -0x00000001, 0x00000000, NULL }, + RENAME_ALLY(-1), LABEL(18), /* = 0x12 */ { 0x3b, 0x1f, 0x0002, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, @@ -12780,7 +12780,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ MSG_NPC(2, _(" I will find my own place\nin the {COLOR GREEN}Sky Blue Plains{RESET}.\nUntil then...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, LABEL(16), /* = 0x10 */ SCENARIO_CALC(SCENARIO_SUB1, 32, 2), @@ -12789,7 +12789,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ MSG_NPC(2, _(" Please speak with me\nagain then.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -12811,208 +12811,208 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ static const struct ScriptCommand s_gs9_g79_s0_lives1_dlg0[] = { /* 0x81d764c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHWEST), WAIT(20), - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), WAIT(10), - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTHWEST), WAIT(20), - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHWEST), + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(5), - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000070, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(6), + WALK_RELATIVE(256, 0, -112), + ROTATE(4, 2, DIRECTION_NORTHWEST), HALT, }; static const struct ScriptCommand s_gs9_g79_s0_lives2_dlg0[] = { /* 0x81d797c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, -0x00000010, 0x00000000, NULL }, + AWAIT_CUE(7), + WALK_RELATIVE(512, -16, 0), FANFARE_PLAY2(457), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x62, 0x00, 0x0200, -0x00000010, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), { 0x62, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(7), WAIT(10), - { 0x91, 0x08, 0x0001, 0x00000007, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_SOUTHWEST), WAIT(30), - { 0x91, 0x08, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_SOUTHEAST), WAIT(30), - { 0x91, 0x08, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_SOUTH), WAIT(30), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, 0x00000000, 0x00000020, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + WALK_RELATIVE(512, 0, 32), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), WAIT(1), CALL_SCRIPT(JUMP_HAPPY_FUNC), WAIT(20), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(20), - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTHWEST), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000081, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + WALK_GRID(512, 129), + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs9_g79_s0_lives3_dlg0[] = { /* 0x81d7dcc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000020, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000058, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + WALK_RELATIVE(256, 0, -32), + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTHEAST), + AWAIT_CUE(8), + WALK_RELATIVE(256, 0, -88), + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_NORTHEAST), + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(8), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_EAST), { 0x62, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, WAIT(5), - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x62, 0x00, 0x0100, -0x00000004, 0x00000000, NULL }, WAIT(60), - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000050, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_NORTHEAST), + AWAIT_CUE(8), + WALK_RELATIVE(256, 0, 80), END_DELETE, }; static const struct ScriptCommand s_gs9_g79_s0_lives4_dlg0[] = { /* 0x81d7fbc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(10), - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000010, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000068, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, -16), + AWAIT_CUE(9), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(9), + WALK_RELATIVE(256, 0, -104), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(9), + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(9), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 2, DIRECTION_WEST), WAIT(30), { 0x62, 0x00, 0x0100, -0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(35), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x62, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, WAIT(30), - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTH), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000050, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(9), + WALK_RELATIVE(256, 0, 80), + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs9_g79_s1_lives0_dlg0[] = { /* 0x81d81ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), HALT, }; @@ -13026,29 +13026,29 @@ static const struct ScriptCommand s_gs9_g80_s0_lives0_dlg1[] = { /* 0x81d825c */ static const struct ScriptCommand s_gs9_g80_s0_lives0_dlg2[] = { /* 0x81d829c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000001), MSG_NPC(1, _(" Pshehehehehe!")), MSG_NPC(1, _(" That Lombre... He amuses\nme so!\nPshehehehehe!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Oh, long time no see.\nYou are well?")), PORTRAIT_REP(0x0001, 0x00000001), MSG_NPC(1, _(" You see, I have heard about\nLombre's tale.\nIt is too funny.")), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" I have heard that Lombre\nalmost drowned at sea!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000001), MSG_NPC(1, _(" But that Lombre--he lives\nin water! How very pathetic!\nPshehehehehe!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), JUMPIF_SCENE_GT(SCENARIO_SUB2, 33, 2, /* to label */ 1), SCENARIO_CALC(SCENARIO_SUB2, 33, 2), LABEL(1), /* = 0x01 */ @@ -13059,22 +13059,22 @@ static const struct ScriptCommand s_gs9_g80_s0_lives0_dlg2[] = { /* 0x81d829c */ static const struct ScriptCommand s_gs9_g80_s0_lives0_dlg3[] = { /* 0x81d8594 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(2), RET, }; @@ -13091,7 +13091,7 @@ static const struct ScriptCommand s_gs9_g81_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), RET, @@ -13101,7 +13101,7 @@ static const struct ScriptRef s_gs9_g81_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -13113,24 +13113,24 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ VARIANT(/* == */ 1, _(" After all that's happened...")), VARIANT(/* == */ 3, _(" After everything that\nwe went through...")), VARIANT_DEFAULT(_(" After everything that\nwe went through...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_2}, you must be\ninterested in our adventures!\nHahahaha!")), VARIANT(/* == */ 3, _(" {NAME_2}, you must be\ninterested in our achievements!\nHahahaha!")), VARIANT_DEFAULT(_(" {NAME_2}, you must be\nintrigued by our achievements!\nHahahaha!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, CALL_SCRIPT(SHOCK_FUNC), PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Kwaaaaaah!")), TEXTBOX_CLEAR, { 0xe5, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(60), MSG_NPC(2, _(" Wrong!")), MSG_NPC(2, _(" Shopping in Pokémon\nSquare is what I came to do.")), @@ -13138,23 +13138,23 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(470), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000005), MSG_NPC(1, _(" Oh...\nIs that all...")), TEXTBOX_CLEAR, WAIT(60), MSG_NPC(-1, _(" Hey, {NAME_2}!")), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), @@ -13168,25 +13168,25 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ MSG_NPC(3, _(" Well, to the northeast of\n{COLOR YELLOW_D}Mt. Thunder{RESET}...")), MSG_NPC(3, _(" There's a gigantic cave!")), MSG_NPC(3, _(" There wasn't anything like\nthat there before, hey?")), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" So, I figured {NAME_2}\nwould know something...")), TEXTBOX_CLEAR, WAIT(10), WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, CALL_SCRIPT(SHOCK_FUNC), MSG_NPC(2, _(" Kwaaaah!")), TEXTBOX_CLEAR, WAIT(10), { 0xe5, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" I shall call it...{WAIT_PRESS}\nThe {COLOR YELLOW_D}Meteor Cave{RESET}.")), TEXTBOX_CLEAR, WAIT(10), @@ -13199,15 +13199,15 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ MSG_NPC(2, _(" One tumbled to earth.\nIt fell into a mountain, and made the\ncavern you speak of.")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Say, {NAME_3}.")), VARIANT_DEFAULT(_(" Um, {NAME_3}.")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, MSG_NPC(1, _(" Did you explore inside the\n{COLOR YELLOW_D}Meteor Cave{RESET}?")), TEXTBOX_CLEAR, @@ -13219,36 +13219,36 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ MSG_NPC(3, _(" It freaked me out.\nI couldn't stay there long...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x0000000a), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Ahaha!\nWho would've thought it?\n{NAME_3}'s kind of cowardly!")), VARIANT_DEFAULT(_(" Hahaha!\nSurprise, surprise!\n{NAME_3}'s kind of cowardly!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(8), PORTRAIT_REP(0x0003, 0x00000002), MSG_NPC(3, _(" What's that?!")), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(3, _(" Hey, you, {NAME_1}.{WAIT_PRESS}\nIf you were to see that dungeon, you'd be\nintimidated too!")), PORTRAIT_REP(0x0003, 0x00000003), MSG_NPC(3, _(" I've never seen anything\nlike it before...")), MSG_NPC(3, _(" There were downright\nbizarre things in there that I'm not\nsure were even Pokémon.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" {NAME_2}, do you have\nany idea what are in that place?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(2, _(" ...I draw a blank.{WAIT_PRESS}\nI do not know...")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" However...{WAIT_PRESS}\nThat cavern. The collision that caused \nit had to be enormous.")), MSG_NPC(2, _(" If there were things that\nsurvived the crash...")), MSG_NPC(2, _(" Perhaps...\nOf this world they may not be.")), @@ -13257,14 +13257,14 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ MSG_NPC(3, _(" You mean...{WAIT_PRESS}\nThey came from that falling star?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Perhaps that is so...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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}.")), @@ -13272,15 +13272,15 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ TEXTBOX_CLEAR, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), BGM_STOP, FANFARE_PLAY(205), MSG_INSTANT(_("{CENTER_ALIGN}The rescue team gained\n{CENTER_ALIGN}access to the {COLOR YELLOW_D}Meteor Cave{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -13304,111 +13304,111 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ static const struct ScriptCommand s_gs9_g81_s0_lives1_dlg0[] = { /* 0x81d9bb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(4), RET, }; static const struct ScriptCommand s_gs9_g81_s0_lives2_dlg0[] = { /* 0x81d9e14 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), FANFARE_PLAY2(474), - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(7), FANFARE_PLAY2(474), - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), + SELECT_ANIMATION(4), RET, }; static const struct ScriptCommand s_gs9_g81_s0_lives3_dlg0[] = { /* 0x81da054 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000084, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(8), + WALK_GRID(256, 132), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTHWEST), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005e, 0x00000000, NULL }, WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), + SELECT_ANIMATION(4), RET, }; @@ -13430,7 +13430,7 @@ static const struct ScriptCommand s_gs9_g83_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(30), RET, @@ -13440,7 +13440,7 @@ static const struct ScriptRef s_gs9_g83_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g83_s0_eff1_script[] = { /* 0x81da31c */ DEBUGINFO, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), LABEL(0), /* = 0x00 */ UPDATE_VARINT(CALC_ADD, EVENT_LOCAL, 1), { 0x56, 0x00, 0x0000, 0x00000063, 0x00000000, NULL }, @@ -13453,41 +13453,41 @@ static const struct ScriptCommand s_gs9_g83_s0_eff1_script[] = { /* 0x81da31c */ static const struct ScriptCommand s_gs9_g83_s0_lives0_dlg0[] = { /* 0x81da3bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x97, 0x00, 0x0002, 0x00000001, 0x00000003, NULL }, { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Whooooooosh!") }, - { 0x6a, 0x00, 0x0200, 0x00000000, 0x00000050, NULL }, + WALK_RELATIVE(512, 0, 80), WAIT(60), TEXTBOX_CLEAR, PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x0000000c), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...This sound...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...Something's coming closer?!") }, TEXTBOX_CLEAR, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTHEAST), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Whoooooooooooooooooooooooshhh!") }, WAIT(20), FANFARE_STOP2(508), FANFARE_PLAY2(779), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x97, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(1), /* = 0x01 */ - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE(4, 1, DIRECTION_SOUTHEAST), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 30, /* to label */ 2), JUMP_LABEL(1), LABEL(2), /* = 0x02 */ - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTH), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), - { 0x6a, 0x00, 0x0200, 0x00000000, 0x00000028, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + WALK_RELATIVE(512, 0, 40), + ROTATE(4, 1, DIRECTION_WEST), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0000, 0x00000004), @@ -13496,28 +13496,28 @@ static const struct ScriptCommand s_gs9_g83_s0_lives0_dlg0[] = { /* 0x81da3bc */ { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("It seemed to be going...\nToward the mountain range in the north?") }, TEXTBOX_CLEAR, WAIT(30), - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}\nYawwwwwn...\nStill sleepy...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("It's still early.\nI'll catch a little more sleep...") }, TEXTBOX_CLEAR, WAIT(10), - { 0x6a, 0x00, 0x0099, 0x00000000, -0x00000028, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0099, 0x00000000, -0x00000028, NULL }, + WALK_RELATIVE(153, 0, -40), + ALERT_CUE(3), + WALK_RELATIVE(153, 0, -40), HALT, }; static const struct ScriptCommand s_gs9_g83_s0_lives1_dlg0[] = { /* 0x81da88c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x1400, -0x00000078, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x1400, -0x00000078, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + WALK_RELATIVE(5120, -120, 0), + ALERT_CUE(5), + WALK_RELATIVE(5120, -120, 0), + ALERT_CUE(8), END_DELETE, }; @@ -13527,7 +13527,7 @@ static const struct ScriptCommand s_gs9_g84_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -13538,13 +13538,13 @@ static const struct ScriptRef s_gs9_g84_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g84_s0_lives0_dlg0[] = { /* 0x81da9c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), + ALERT_CUE(7), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000002), PORTRAIT_POS(3, 2, 0), MSG_NPC(3, _(" {NAME_2}!{WAIT_PRESS}\nYou're safe! Yesssss!")), @@ -13555,9 +13555,9 @@ static const struct ScriptCommand s_gs9_g84_s0_lives0_dlg0[] = { /* 0x81da9c8 */ MSG_NPC(2, _(" I'm so sorry, {NAME_3}.{WAIT_PRESS}\nThat dungeon--it was too much for me.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000001), MSG_NPC(2, _(" Thank you for saving me.{WAIT_PRESS}\nI appreciate it〜♪")), TEXTBOX_CLEAR, @@ -13566,40 +13566,40 @@ static const struct ScriptCommand s_gs9_g84_s0_lives0_dlg0[] = { /* 0x81da9c8 */ MSG_NPC(2, _(" Ow, ow, ow...{WAIT_PRESS}\nMy body--it hurts all over even now...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000004), MSG_NPC(2, _(" ...But that dungeon...\nWhat is it about it?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT_REP(0x0002, 0x00000005), MSG_NPC(2, _(" They say it makes a wish\ncome true. So, I went...")), MSG_NPC(2, _(" But it was very hard in\nthere--most terribly so!")), MSG_NPC(2, _(" Kiiih!\nI never want to go again!\nSuch a terrible place!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(8), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" At first, I made an SOS Call\nbecause I did not want to lose this...")), PORTRAIT_REP(0x0002, 0x00000001), MSG_NPC(2, _(" But I will give it to you.{WAIT_PRESS}\nHere! Your reward for my rescue〜♪")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, WAIT(30), { 0x3c, 0x2c, 0x0000, 0x00000036, 0x00000000, NULL }, WAIT(30), JUMP_LABEL(4), LABEL(4), /* = 0x04 */ - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ROTATE(8, 10, DIRECTION_NORTH), + AWAIT_CUE(5), MSG_NPC(2, _(" They say if you take that\nstone to the {COLOR YELLOW_D}Wish Cave{RESET}...\nTo its very depths...")), PORTRAIT_REP(0x0002, 0x00000003), MSG_NPC(2, _(" Wonder of wonders!{WAIT_PRESS}\nA wish--it comes true!")), @@ -13611,7 +13611,7 @@ static const struct ScriptCommand s_gs9_g84_s0_lives0_dlg0[] = { /* 0x81da9c8 */ MSG_NPC(2, _(" For me, it was impossible.\nBut you must try〜♪")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -13621,34 +13621,34 @@ static const struct ScriptCommand s_gs9_g84_s0_lives0_dlg0[] = { /* 0x81da9c8 */ static const struct ScriptCommand s_gs9_g84_s0_lives1_dlg0[] = { /* 0x81db1f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x0002, 0x0000005c, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x04, 0x0002, 0x0000005c, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(ANGRY_START_FUNC), WAIT(60), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000020, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + WALK_RELATIVE(256, 0, 32), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000020, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTH), + WALK_RELATIVE(256, 0, -32), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), END_DELETE, }; @@ -13667,23 +13667,23 @@ static const struct ScriptCommand s_gs9_g84_s0_lives1_dlg2[] = { /* 0x81db3d8 */ static const struct ScriptCommand s_gs9_g84_s0_lives2_dlg0[] = { /* 0x81db4b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), END_DELETE, }; @@ -13703,7 +13703,7 @@ static const struct ScriptCommand s_gs9_g85_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -13712,7 +13712,7 @@ static const struct ScriptRef s_gs9_g85_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g85_s0_lives0_dlg0[] = { /* 0x81db740 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -13742,12 +13742,12 @@ static const struct ScriptCommand s_gs9_g85_s0_lives0_dlg0[] = { /* 0x81db740 */ CHOICE(/* label */ 3, _("*Yes.")), CHOICE(/* label */ 4, _("No.")), LABEL(3), /* = 0x03 */ - { 0x3d, 0x00, 0x0000, -0x00000001, 0x00000000, NULL }, + RENAME_ALLY(-1), LABEL(4), /* = 0x04 */ { 0x3b, 0x2c, 0x0001, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -13755,14 +13755,14 @@ static const struct ScriptCommand s_gs9_g85_s0_lives0_dlg0[] = { /* 0x81db740 */ static const struct ScriptCommand s_gs9_g85_s0_lives1_dlg0[] = { /* 0x81dba98 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g85_s0_lives2_dlg0[] = { /* 0x81dbad8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; @@ -13779,7 +13779,7 @@ static const struct ScriptCommand s_gs9_g86_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(87, 0), SELECT_EVENTS(0, 0), RET, @@ -13789,7 +13789,7 @@ static const struct ScriptRef s_gs9_g86_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -13810,7 +13810,7 @@ static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ WAIT(4), TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 2), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Keke! That's settled!\nYou have my trust!")), TEXTBOX_CLEAR, @@ -13823,7 +13823,7 @@ static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ TEXTBOX_CLEAR, WAIT(10), SELECT_ENTITIES(-1, 3), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0002, 0x00000044), MSG_NPC(2, _(" ............{WAIT_PRESS}\nI'd like to say that, but I need your help.")), @@ -13846,9 +13846,9 @@ static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ MSG_NPC(2, _(" I'll only tag along when you\ngo off to {COLOR YELLOW_D}Mt. Freeze{RESET}. Keke!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -13857,39 +13857,39 @@ static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ static const struct ScriptCommand s_gs9_g86_s1_lives0_dlg0[] = { /* 0x81dc418 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g86_s2_lives0_dlg0[] = { /* 0x81dc458 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g86_s3_lives0_dlg0[] = { /* 0x81dc4d8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x89, 0x30, 0x0080, 0x00000000, 0x00000000, NULL }, WAIT(90), - { 0x91, 0x06, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_NORTH), WAIT(30), { 0x89, 0x18, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs9_g87_s0_lives0_dlg2[] = { /* 0x81dc588 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT_REP(0x0002, 0x00000000), @@ -13905,7 +13905,7 @@ static const struct ScriptCommand s_gs9_g88_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -13916,7 +13916,7 @@ static const struct ScriptRef s_gs9_g88_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g88_s0_lives0_dlg0[] = { /* 0x81dc6c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -13925,16 +13925,16 @@ static const struct ScriptCommand s_gs9_g88_s0_lives0_dlg0[] = { /* 0x81dc6c4 */ 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!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs9_g88_s0_lives1_dlg0[] = { /* 0x81dc828 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), END_DELETE, }; @@ -13962,7 +13962,7 @@ static const struct ScriptCommand s_gs9_g89_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(90, 0), SELECT_EVENTS(0, 0), RET, @@ -13972,7 +13972,7 @@ static const struct ScriptRef s_gs9_g89_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), @@ -13984,15 +13984,15 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ WAIT(4), TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(2, _(" Keke! Then, we'll go!\nTo the {COLOR YELLOW_D}Murky Cave{RESET}!")), PORTRAIT_REP(0x0002, 0x00000044), MSG_NPC(2, _(" Gardevoir's physical form...\nThat's where it is.")), MSG_NPC(2, _(" For my sake, Gardevoir...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" ...Nah, that's not important.{WAIT_PRESS}\nI just feel like going! Keke!")), @@ -14005,7 +14005,7 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ MSG_NPC(2, _(" See you around!\nKeke!")), TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 2), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000044), MSG_NPC(2, _(" ............{WAIT_PRESS}\nI thought that, but I need your help.")), MSG_NPC(2, _(" I have to go to the\n{COLOR YELLOW_D}Murky Cave{RESET}.\nI'm prepared to do whatever it takes.")), @@ -14029,9 +14029,9 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ MSG_NPC(2, _(" I'll only tag along when you\ngo off to the {COLOR YELLOW_D}Murky Cave{RESET}. Keke!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -14040,44 +14040,44 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ static const struct ScriptCommand s_gs9_g89_s0_lives1_dlg0[] = { /* 0x81dd114 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs9_g89_s1_lives0_dlg0[] = { /* 0x81dd154 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs9_g89_s2_lives0_dlg0[] = { /* 0x81dd224 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x89, 0x30, 0x0080, 0x00000000, 0x00000000, NULL }, WAIT(90), - { 0x91, 0x06, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_NORTH), WAIT(30), { 0x89, 0x18, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs9_g90_s0_lives0_dlg2[] = { /* 0x81dd2d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT_REP(0x0001, 0x00000000), @@ -14093,7 +14093,7 @@ static const struct ScriptCommand s_gs9_g91_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(5), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -14104,7 +14104,7 @@ static const struct ScriptRef s_gs9_g91_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs9_g91_s0_lives0_dlg0[] = { /* 0x81dd410 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -14119,14 +14119,14 @@ static const struct ScriptCommand s_gs9_g91_s0_lives0_dlg0[] = { /* 0x81dd410 */ MSG_NPC(2, _(" ............{WAIT_PRESS}\nGood for you, {NAME_3}.")), TEXTBOX_CLEAR, WAIT(45), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_EAST), MSG_NPC(2, _(" Hey, {NAME_0}.\nThanks for getting me through this.")), MSG_NPC(2, _(" This is my thanks.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(30), { 0x3c, 0x2c, 0x0000, 0x00000009, 0x00000000, NULL }, TEXTBOX_CLEAR, @@ -14135,15 +14135,15 @@ static const struct ScriptCommand s_gs9_g91_s0_lives0_dlg0[] = { /* 0x81dd410 */ TEXTBOX_CLEAR, WAIT(15), BGM_FADEOUT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(20), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), MSG_NPC(3, _(" Oh, wait, please!")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" What is it now?")), TEXTBOX_CLEAR, WAIT(10), @@ -14159,7 +14159,7 @@ static const struct ScriptCommand s_gs9_g91_s0_lives0_dlg0[] = { /* 0x81dd410 */ MSG_NPC(3, _(" My name is {NAME_3}.{WAIT_PRESS}\nI am also glad to meet you.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -14174,32 +14174,32 @@ static const struct ScriptCommand s_gs9_g91_s0_lives0_dlg0[] = { /* 0x81dd410 */ static const struct ScriptCommand s_gs9_g91_s0_lives1_dlg0[] = { /* 0x81dd9c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x89, 0x18, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x89, 0x28, 0x0080, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(7), END_DELETE, }; static const struct ScriptCommand s_gs9_g91_s0_lives2_dlg0[] = { /* 0x81ddad8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(8), END_DELETE, }; diff --git a/src/data/ground/ground_data_b01p02a_station.h b/src/data/ground/ground_data_b01p02a_station.h index b863b7838..748488b0f 100644 --- a/src/data/ground/ground_data_b01p02a_station.h +++ b/src/data/ground/ground_data_b01p02a_station.h @@ -91,7 +91,7 @@ static const struct ScriptRef s_gs12_g0_s0_evt0_sref = { 357, 2, NULL /* GETOUT_ static const struct ScriptCommand s_gs12_g0_s0_evt1_sref_script[] = { /* 0x81e1dec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3a, 0x00, 0x0000, 0x00000000, -0x00000001, _("Would you like to save your adventure?") }, JUMP_SCRIPT(END_TALK), @@ -145,28 +145,28 @@ static const struct ScriptCommand s_gs12_g0_s0_obj0_dlg2[] = { /* 0x81e1f40 */ static const struct ScriptCommand s_gs12_g0_s1_lives0_dlg0[] = { /* 0x81e20d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs12_g0_s1_lives1_dlg0[] = { /* 0x81e2110 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs12_g0_s2_lives0_dlg0[] = { /* 0x81e2150 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs12_g0_s2_lives1_dlg0[] = { /* 0x81e2190 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -183,14 +183,14 @@ static const struct ScriptRef s_gs12_g1_s0_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs12_g1_s0_lives0_dlg0[] = { /* 0x81e222c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x5f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs12_g1_s0_lives1_dlg0[] = { /* 0x81e226c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x5f, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, HALT, }; @@ -208,7 +208,7 @@ static const struct ScriptRef s_gs12_g1_s1_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs12_g1_s1_lives0_dlg0[] = { /* 0x81e2318 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x5e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAIT_START_FUNC), RET, @@ -216,7 +216,7 @@ static const struct ScriptCommand s_gs12_g1_s1_lives0_dlg0[] = { /* 0x81e2318 */ static const struct ScriptCommand s_gs12_g1_s1_lives1_dlg0[] = { /* 0x81e2368 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x5e, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, CALL_SCRIPT(WAIT_START_FUNC), RET, @@ -228,7 +228,7 @@ static const struct ScriptCommand s_gs12_g2_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_STOP, { 0x27, 0x01, 0x000d, 0x0000003c, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x000d, 0x0000003c, 0x00000000, NULL }, RET, }; @@ -240,7 +240,7 @@ static const struct ScriptCommand s_gs12_g2_s0_lives0_dlg0[] = { /* 0x81e2444 */ CALL_SCRIPT(INIT_SLEEP_FUNC), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(120), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -262,7 +262,7 @@ static const struct ScriptCommand s_gs12_g3_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -276,7 +276,7 @@ static const struct ScriptCommand s_gs12_g3_s0_lives0_dlg0[] = { /* 0x81e2608 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -291,7 +291,7 @@ static const struct ScriptCommand s_gs12_g4_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -305,7 +305,7 @@ static const struct ScriptCommand s_gs12_g4_s0_lives0_dlg0[] = { /* 0x81e2764 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -341,7 +341,7 @@ static const struct ScriptCommand s_gs12_g6_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -355,7 +355,7 @@ static const struct ScriptCommand s_gs12_g6_s0_lives0_dlg0[] = { /* 0x81e29cc */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -369,7 +369,7 @@ static const struct ScriptCommand s_gs12_g7_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -383,7 +383,7 @@ static const struct ScriptCommand s_gs12_g7_s0_lives0_dlg0[] = { /* 0x81e2b18 */ { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -398,7 +398,7 @@ static const struct ScriptCommand s_gs12_g8_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -407,14 +407,14 @@ static const struct ScriptRef s_gs12_g8_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs12_g8_s0_lives0_dlg0[] = { /* 0x81e2c74 */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(60), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -429,7 +429,7 @@ static const struct ScriptCommand s_gs12_g9_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -447,26 +447,26 @@ static const struct ScriptCommand s_gs12_g9_s0_eff0_script[] = { /* 0x81e2e60 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000028, NULL }, + AWAIT_CUE(4), + WALK_RELATIVE(256, 0, 40), HALT, }; static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(-1, _(" Wh-where...?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" It's {NAME_0}'s house.")), @@ -477,15 +477,15 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ VARIANT_DEFAULT(_(" It's also our rescue team's\nbase.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(-1, _(" Oh!\n...Did you maybe rescue me?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(5), MSG_NPC(-1, _(" Th-thank you...")), TEXTBOX_CLEAR, WAIT(30), @@ -497,7 +497,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ VARIANT_DEFAULT(_(" Rather than that...{WAIT_PRESS}\nWhat happened?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(-1, _(" Y-yes...")), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), PORTRAIT_POS(2, -1, 0), @@ -511,23 +511,23 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ MSG_NPC(2, _(" It was on my travels that\nI heard rumors of a mirage Pokémon...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), MSG_NPC(1, _(" A mirage Pokémon?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Yes! That!{WAIT_PRESS}\nIsn't it exciting?")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" Ever since then, I've been\ntraveling all over in hopes of seeing\nthe mirage Pokémon...")), MSG_NPC(2, _(" But I've had no luck...{WAIT_PRESS}\nFinally, I became dizzy from fatigue...{WAIT_PRESS}\nAnd I must have passed out.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), PORTRAIT_REP(0x0002, 0x00000041), @@ -535,22 +535,22 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ MSG_NPC(2, _(" I'm simply worn out...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" But I...{WAIT_PRESS}\nI've reached my physical limit...")), MSG_NPC(2, _(" If I push myself any\nfurther, I will collapse again.\nIt's not good for my health...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" ...Please, I want you to\nhave this.")), TEXTBOX_CLEAR, @@ -561,20 +561,20 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + WALK_RELATIVE(256, 0, -24), + ROTATE(4, 1, DIRECTION_NORTHEAST), WAIT(30), SELECT_EFFECTS(9, 1), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), MSG_NPC(1, _(" What is this?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(7), + ROTATE(4, 1, DIRECTION_NORTHEAST), MSG_NPC(2, _(" It's a...{WAIT_PRESS}\n{COLOR GREEN_I}Clear Wing{RESET}...")), TEXTBOX_CLEAR, WAIT(10), @@ -586,12 +586,12 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ TEXTBOX_CLEAR, WAIT(10), CANCEL_EFFECTS(9, 1), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(5), MSG_NPC(2, _(" See? Depending on the light,\nit takes on many different colors.")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), CANCEL_EFFECTS(9, 2), MSG_NPC(2, _(" At first I thought it\nwas just pretty to look at...")), MSG_NPC(2, _(" But after checking around,\nit appears to be related to the mirage\nPokémon somehow.")), @@ -599,44 +599,44 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ MSG_NPC(2, _(" ...Sniff...\nIt's very disappointing, but I'm giving up...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(5), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), MSG_NPC(2, _(" Oh, no.\nWhen I walk, I always totter.{WAIT_PRESS}\nBye.")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 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), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But you are interested in\nthe mirage Pokémon, right?")), @@ -648,7 +648,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ VARIANT_DEFAULT(_(" Xatu should be at the peak\nof the {COLOR YELLOW_D}Great Canyon{RESET}.")), VARIANT_DEFAULT(_(" We should go!\nTo the {COLOR YELLOW_D}Great Canyon{RESET}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -671,160 +671,160 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ static const struct ScriptCommand s_gs12_g9_s0_lives1_dlg0[] = { /* 0x81e4480 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, 0x00000000, -0x00000018, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(512, 0, -24), + ROTATE(4, 2, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000028, NULL }, + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), + ALERT_CUE(4), + WALK_RELATIVE(256, 0, 40), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), HALT, }; static const struct ScriptCommand s_gs12_g9_s0_lives2_dlg0[] = { /* 0x81e4720 */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(2), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, WAIT(20), FANFARE_PLAY2(812), - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + AWAIT_CUE(7), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(7), FANFARE_PLAY2(470), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(510), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000010, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTHEAST), + SELECT_ANIMATION(5), WAIT(60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + SELECT_ANIMATION(7), SELECT_EFFECTS(9, 2), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + SELECT_ANIMATION(5), WAIT(60), - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000020, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, 32), + ALERT_CUE(5), FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), WAIT(30), - { 0x6a, 0x00, 0x0100, -0x00000020, 0x00000010, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, -32, 16), + ROTATE(4, 2, DIRECTION_SOUTH), FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(30), - { 0x6a, 0x00, 0x0100, 0x00000040, 0x00000010, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 64, 16), + ROTATE(4, 1, DIRECTION_SOUTH), FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(30), - { 0x6a, 0x00, 0x0100, -0x00000020, 0x00000018, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, -32, 24), + ROTATE(4, 2, DIRECTION_SOUTH), FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000010, 0x00000010, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(7), + WALK_RELATIVE(256, 16, 16), FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), WAIT(60), - { 0x6a, 0x00, 0x0100, -0x00000010, 0x00000010, NULL }, + WALK_RELATIVE(256, -16, 16), FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000010, NULL }, + ALERT_CUE(5), + WALK_RELATIVE(256, 0, 16), { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; @@ -836,7 +836,7 @@ static const struct ScriptCommand s_gs12_g9_s1_eff0_script[] = { /* 0x81e4e10 */ static const struct ScriptCommand s_gs12_g9_s1_lives0_dlg0[] = { /* 0x81e4e40 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x58, 0x01, 0x0000, 0x000000f0, 0x00000120, NULL }, @@ -866,7 +866,7 @@ static const struct ScriptCommand s_gs12_g10_s0_station_sref_script[] = { /* 0x8 { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -889,7 +889,7 @@ static const struct ScriptCommand s_gs12_g10_s0_lives0_dlg0[] = { /* 0x81e507c * { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Gggwwooooooooooooaahhhhh!") }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(20), - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTH), CALL_SCRIPT(LOOK_AROUND_FUNC), TEXTBOX_CLEAR, WAIT(10), @@ -897,9 +897,9 @@ static const struct ScriptCommand s_gs12_g10_s0_lives0_dlg0[] = { /* 0x81e507c * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Wha...{WAIT_PRESS} What is it?!") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("What...{WAIT_PRESS}\nWhat's happening outside?!") }, TEXTBOX_CLEAR, - { 0x6a, 0x00, 0x0200, 0x00000000, 0x00000020, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, 0x00000000, 0x00000040, NULL }, + WALK_RELATIVE(512, 0, 32), + ALERT_CUE(3), + WALK_RELATIVE(512, 0, 64), { 0x97, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, HALT, }; @@ -930,7 +930,7 @@ static const struct ScriptCommand s_gs12_g11_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(120), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -954,19 +954,19 @@ static const struct ScriptCommand s_gs12_g11_s0_lives0_dlg0[] = { /* 0x81e5528 * VARIANT_DEFAULT(_(" There's some sort of a\ncommotion down at the square.")), VARIANT_DEFAULT(_(" Let's take a look!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000050, NULL }, + ALERT_CUE(6), + ALERT_CUE(3), + WALK_RELATIVE(256, 0, 80), HALT, }; static const struct ScriptCommand s_gs12_g11_s0_lives1_dlg0[] = { /* 0x81e5718 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000050, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(256, 0, 80), HALT, }; @@ -983,7 +983,7 @@ static const struct ScriptCommand s_gs12_g12_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(30), RET, @@ -1000,8 +1000,8 @@ static const struct ScriptCommand s_gs12_g12_s0_lives0_dlg0[] = { /* 0x81e5884 * CALL_SCRIPT(WAKEUP_FUNC), WAIT(15), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}!\nGreat news!")), @@ -1030,21 +1030,21 @@ static const struct ScriptCommand s_gs12_g12_s0_lives0_dlg0[] = { /* 0x81e5884 * LABEL(2), /* = 0x02 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" OK! That's settled!")), VARIANT_DEFAULT(_(" Great!\nThat's that!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, LABEL(3), /* = 0x03 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah?! Are you sure?\nThat Pokémon came to us...")), @@ -1070,11 +1070,11 @@ static const struct ScriptCommand s_gs12_g12_s0_lives0_dlg0[] = { /* 0x81e5884 * VARIANT(/* == */ 1, _(" I'll go tell {NAME_2} no.")), VARIANT_DEFAULT(_(" I'll let {NAME_2} know\nhe hasn't been accepted.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), { 0x3b, 0x2c, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -1083,34 +1083,34 @@ static const struct ScriptCommand s_gs12_g12_s0_lives0_dlg0[] = { /* 0x81e5884 * static const struct ScriptCommand s_gs12_g12_s0_lives1_dlg0[] = { /* 0x81e6294 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 1), WAIT(15), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), COND_EQUAL(1, /* to label */ 1), LABEL(0), /* = 0x00 */ CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), RET, LABEL(1), /* = 0x01 */ CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), COND_EQUAL(2, /* to label */ 2), LABEL(2), /* = 0x02 */ - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000064, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, 100), + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -1127,7 +1127,7 @@ static const struct ScriptCommand s_gs12_g13_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(30), RET, @@ -1143,8 +1143,8 @@ static const struct ScriptCommand s_gs12_g13_s0_lives0_dlg0[] = { /* 0x81e6580 * CALL_SCRIPT(WAKEUP_FUNC), WAIT(15), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}!\nGreat news!")), @@ -1174,7 +1174,7 @@ static const struct ScriptCommand s_gs12_g13_s0_lives0_dlg0[] = { /* 0x81e6580 * VARIANT_DEFAULT(_(" But since he ended up here,\nhe thinks it must be for a good reason.\nWe're getting that new rescue rank crest!")), VARIANT_DEFAULT(_(" It's awesome!{WAIT_PRESS}\nI guess it's kind of unfair, but...{WAIT_PRESS}\nWell, anyway!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I've never said no to a gift!")), VARIANT_DEFAULT(_(" If it's a gift, we have\nto accept!")), @@ -1186,11 +1186,11 @@ static const struct ScriptCommand s_gs12_g13_s0_lives0_dlg0[] = { /* 0x81e6580 * TEXTBOX_CLEAR2, { 0x3b, 0x2e, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 2), - { 0xe3, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(0), LABEL(2), /* = 0x02 */ TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -1198,19 +1198,19 @@ static const struct ScriptCommand s_gs12_g13_s0_lives0_dlg0[] = { /* 0x81e6580 * static const struct ScriptCommand s_gs12_g13_s0_lives1_dlg0[] = { /* 0x81e6dd0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 1), WAIT(15), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), HALT, }; @@ -1227,7 +1227,7 @@ static const struct ScriptCommand s_gs12_g14_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(30), RET, @@ -1243,8 +1243,8 @@ static const struct ScriptCommand s_gs12_g14_s0_lives0_dlg0[] = { /* 0x81e6fcc * CALL_SCRIPT(WAKEUP_FUNC), WAIT(15), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}!\nGreat news!")), @@ -1256,7 +1256,7 @@ static const struct ScriptCommand s_gs12_g14_s0_lives0_dlg0[] = { /* 0x81e6fcc * VARIANT_DEFAULT(_(" I don't have the foggiest\nnotion why they'd send it...")), VARIANT_DEFAULT(_(" But why worry about it?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I never turn down\nsomeone's generosity!")), VARIANT_DEFAULT(_(" If they're in a giving mood,\nwe shouldn't refuse!")), @@ -1265,25 +1265,25 @@ static const struct ScriptCommand s_gs12_g14_s0_lives0_dlg0[] = { /* 0x81e6fcc * { 0x3c, 0x2b, 0x0000, 0x00000009, 0x00000064, NULL }, TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs12_g14_s0_lives1_dlg0[] = { /* 0x81e7334 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 1), WAIT(15), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), HALT, }; @@ -1304,7 +1304,7 @@ static const struct ScriptCommand s_gs12_g15_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 16, 0), RET, }; @@ -1333,7 +1333,7 @@ static const struct ScriptCommand s_gs12_g15_s0_lives0_dlg0[] = { /* 0x81e7560 - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Not feeling well...{WAIT_PRESS}\nI need more sleep...") }, TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1348,12 +1348,12 @@ static const struct ScriptRef s_gs12_g16_s0_station_sref = { 403, 8, NULL /* STA static const struct ScriptCommand s_gs12_g16_s0_evt0_sref_script[] = { /* 0x81e7800 - Likely door event/nearby trigger */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Now, I only want to sleep...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I'll rest in bed...") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1362,7 +1362,7 @@ static const struct ScriptRef s_gs12_g16_s0_evt0_sref = { 357, 2, NULL /* GETOUT static const struct ScriptCommand s_gs12_g16_s0_evt1_sref_script[] = { /* 0x81e78c4 - PART 1 0:22:53-0:23:04 - Bed, sleep trigger */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3a, 0x00, 0x0000, 0x00000000, -0x00000001, _("Would you like to save your adventure?") }, JUMP_SCRIPT(END_TALK), @@ -1390,7 +1390,7 @@ static const struct ScriptCommand s_gs12_g16_s1_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(-1, 0), RET, }; @@ -1404,7 +1404,7 @@ static const struct ScriptCommand s_gs12_g16_s1_lives0_dlg0[] = { /* 0x81e7a8c * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1419,7 +1419,7 @@ static const struct ScriptCommand s_gs12_g17_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1444,7 +1444,7 @@ static const struct ScriptCommand s_gs12_g17_s0_lives0_dlg0[] = { /* 0x81e7be8 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I wonder what {NAME_1} is doing?{WAIT_PRESS}\nI should go out.") }, TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1464,7 +1464,7 @@ static const struct ScriptCommand s_gs12_g18_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1478,7 +1478,7 @@ static const struct ScriptCommand s_gs12_g18_s0_lives0_dlg0[] = { /* 0x81e7f38 * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1493,7 +1493,7 @@ static const struct ScriptCommand s_gs12_g19_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1516,7 +1516,7 @@ static const struct ScriptCommand s_gs12_g19_s0_lives0_dlg0[] = { /* 0x81e8094 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I wonder if I have any mail?\nBetter check the Mailbox.") }, TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1536,8 +1536,8 @@ static const struct ScriptCommand s_gs12_g20_s0_station_sref_script[] = { /* 0x8 { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1551,7 +1551,7 @@ static const struct ScriptCommand s_gs12_g20_s0_lives0_dlg0[] = { /* 0x81e8394 * { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, { 0x2d, 0x09, 0x0004, 0x00000045, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), MSG_NPC(-1, _(" Uhh... Hello?")), @@ -1590,7 +1590,7 @@ static const struct ScriptCommand s_gs12_g20_s0_lives0_dlg0[] = { /* 0x81e8394 * SELECT_ENTITIES(-1, 1), WAIT(20), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), BGM_FADEIN(60, 1), MSG_NPC(-1, _(" We're pleased to meet you.\nWe are {NAME_2}.")), @@ -1600,14 +1600,14 @@ static const struct ScriptCommand s_gs12_g20_s0_lives0_dlg0[] = { /* 0x81e8394 * MSG_NPC(2, _(" We couldn't possibly climb\nsomewhere so high up...")), MSG_NPC(2, _(" That is why we must call\nupon you for your help, {NAME_0}.")), MSG_NPC(2, _(" {NAME_3} was abducted\nby a Pokémon named {NAME_4}.")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" It's a vilely vicious ruffian!\nPlease do be careful.")), MSG_NPC(2, _(" Please, we need your help!{WAIT_PRESS}\nWe must go!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(50), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), @@ -1617,7 +1617,7 @@ static const struct ScriptCommand s_gs12_g20_s0_lives0_dlg0[] = { /* 0x81e8394 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("It's too bad. I'd better go.") }, TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1629,23 +1629,23 @@ static const struct ScriptCommand s_gs12_g20_s1_lives0_dlg0[] = { /* 0x81e8ac8 * { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(45), - { 0x91, 0x0a, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 2, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(ANGRY_START_FUNC), WAIT(30), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), WAIT(8), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), { 0x57, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, END_DELETE, }; @@ -1665,7 +1665,7 @@ static const struct ScriptCommand s_gs12_g21_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1680,7 +1680,7 @@ static const struct ScriptCommand s_gs12_g21_s0_lives0_dlg0[] = { /* 0x81e8d54 * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1702,7 +1702,7 @@ static const struct ScriptCommand s_gs12_g22_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1716,7 +1716,7 @@ static const struct ScriptCommand s_gs12_g22_s0_lives0_dlg0[] = { /* 0x81e8f30 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1738,7 +1738,7 @@ static const struct ScriptCommand s_gs12_g23_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1752,7 +1752,7 @@ static const struct ScriptCommand s_gs12_g23_s0_lives0_dlg0[] = { /* 0x81e90fc * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1774,7 +1774,7 @@ static const struct ScriptCommand s_gs12_g24_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1788,7 +1788,7 @@ static const struct ScriptCommand s_gs12_g24_s0_lives0_dlg0[] = { /* 0x81e92c8 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1802,7 +1802,7 @@ static const struct ScriptCommand s_gs12_g25_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1816,7 +1816,7 @@ static const struct ScriptCommand s_gs12_g25_s0_lives0_dlg0[] = { /* 0x81e9414 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1838,7 +1838,7 @@ static const struct ScriptCommand s_gs12_g26_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1852,7 +1852,7 @@ static const struct ScriptCommand s_gs12_g26_s0_lives0_dlg0[] = { /* 0x81e95e0 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1866,7 +1866,7 @@ static const struct ScriptCommand s_gs12_g27_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1880,7 +1880,7 @@ static const struct ScriptCommand s_gs12_g27_s0_lives0_dlg0[] = { /* 0x81e972c * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1902,7 +1902,7 @@ static const struct ScriptCommand s_gs12_g28_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1916,7 +1916,7 @@ static const struct ScriptCommand s_gs12_g28_s0_lives0_dlg0[] = { /* 0x81e98f8 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1930,7 +1930,7 @@ static const struct ScriptCommand s_gs12_g29_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1944,7 +1944,7 @@ static const struct ScriptCommand s_gs12_g29_s0_lives0_dlg0[] = { /* 0x81e9a44 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1966,7 +1966,7 @@ static const struct ScriptCommand s_gs12_g30_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1980,7 +1980,7 @@ static const struct ScriptCommand s_gs12_g30_s0_lives0_dlg0[] = { /* 0x81e9c10 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -1994,7 +1994,7 @@ static const struct ScriptCommand s_gs12_g31_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -2008,7 +2008,7 @@ static const struct ScriptCommand s_gs12_g31_s0_lives0_dlg0[] = { /* 0x81e9d5c * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -2030,7 +2030,7 @@ static const struct ScriptCommand s_gs12_g32_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -2044,7 +2044,7 @@ static const struct ScriptCommand s_gs12_g32_s0_lives0_dlg0[] = { /* 0x81e9f28 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -2060,7 +2060,7 @@ static const struct ScriptCommand s_gs12_g33_s0_station_sref_script[] = { /* 0x8 { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -2088,7 +2088,7 @@ static const struct ScriptCommand s_gs12_g33_s0_lives0_dlg0[] = { /* 0x81ea094 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("It was {NAME_2}!") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("Yesterday, {NAME_3} said...") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -2104,7 +2104,7 @@ static const struct ScriptCommand s_gs12_g34_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_STOP, { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), BGM_SWITCH(1), RET, @@ -2114,7 +2114,7 @@ static const struct ScriptRef s_gs12_g34_s0_station_sref = { 402, 7, NULL /* EVE static const struct ScriptCommand s_gs12_g34_s0_lives0_dlg0[] = { /* 0x81ea3c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000052, 0x00000000, NULL }, @@ -2129,7 +2129,7 @@ static const struct ScriptCommand s_gs12_g34_s0_lives0_dlg0[] = { /* 0x81ea3c4 * TEXTBOX_CLEAR, WAIT(60), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -2152,7 +2152,7 @@ static const struct ScriptCommand s_gs12_g35_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -2166,7 +2166,7 @@ static const struct ScriptCommand s_gs12_g35_s0_lives0_dlg0[] = { /* 0x81ea6f0 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -2182,7 +2182,7 @@ static const struct ScriptCommand s_gs12_g36_s0_station_sref_script[] = { /* 0x8 { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -2207,7 +2207,7 @@ static const struct ScriptCommand s_gs12_g36_s0_lives0_dlg0[] = { /* 0x81ea85c * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("That's it!{WAIT_PRESS}\nShe did say something!") }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -2223,7 +2223,7 @@ static const struct ScriptCommand s_gs12_g37_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_STOP, { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), BGM_SWITCH(1), RET, @@ -2233,7 +2233,7 @@ static const struct ScriptRef s_gs12_g37_s0_station_sref = { 402, 7, NULL /* EVE static const struct ScriptCommand s_gs12_g37_s0_lives0_dlg0[] = { /* 0x81eab48 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2244,7 +2244,7 @@ static const struct ScriptCommand s_gs12_g37_s0_lives0_dlg0[] = { /* 0x81eab48 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("She also said something about a role...{WAIT_PRESS}\nWhat did she mean by that?") }, TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -2266,7 +2266,7 @@ static const struct ScriptCommand s_gs12_g38_s0_station_sref_script[] = { /* 0x8 { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -2299,7 +2299,7 @@ static const struct ScriptCommand s_gs12_g38_s0_lives0_dlg0[] = { /* 0x81eaddc * TEXTBOX_CLEAR, BGM_SWITCH(1), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -2316,7 +2316,7 @@ static const struct ScriptCommand s_gs12_g39_s0_station_sref_script[] = { /* 0x8 { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -2347,10 +2347,10 @@ static const struct ScriptCommand s_gs12_g39_s0_lives0_dlg0[] = { /* 0x81eb100 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("I wonder when they'll settle down...") }, TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), @@ -2358,10 +2358,10 @@ static const struct ScriptCommand s_gs12_g39_s0_lives0_dlg0[] = { /* 0x81eb100 * MSG_NPC(1, _(" A lot of Pokémon have\nalready gathered there.")), MSG_NPC(1, _(" Let's go to the square right\nnow!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(5), { 0x89, 0x50, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -2369,16 +2369,16 @@ static const struct ScriptCommand s_gs12_g39_s0_lives0_dlg0[] = { /* 0x81eb100 * static const struct ScriptCommand s_gs12_g39_s1_lives0_dlg0[] = { /* 0x81eb468 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x89, 0x30, 0x0200, 0x00000004, 0x00000000, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x89, 0x30, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), HALT, }; @@ -2400,7 +2400,7 @@ static const struct ScriptCommand s_gs12_g40_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -2414,7 +2414,7 @@ static const struct ScriptCommand s_gs12_g40_s0_lives0_dlg0[] = { /* 0x81eb674 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -2435,7 +2435,7 @@ static const struct ScriptCommand s_gs12_g41_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -2449,7 +2449,7 @@ static const struct ScriptCommand s_gs12_g41_s0_lives0_dlg0[] = { /* 0x81eb830 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -2459,7 +2459,7 @@ static const struct ScriptCommand s_gs12_g42_s0_station_sref_script[] = { /* 0x8 { 0x3b, 0x48, 0x0002, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), { 0x27, 0x01, 0x000d, 0x0000003c, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), FANFARE_FADEOUT2(90, 484), { 0x28, 0x01, 0x000d, 0x0000003c, 0x00000000, NULL }, { 0x3b, 0x48, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2484,24 +2484,24 @@ static const struct ScriptCommand s_gs12_g42_s0_lives0_dlg0[] = { /* 0x81eb95c * TEXTBOX_CLEAR, WAIT(90), FANFARE_PLAY2(464), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000044), MSG_NPC(1, _(" Hm?!{WAIT_PRESS}\nSomething's coming!")), TEXTBOX_CLEAR, FANFARE_PLAY2(484), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" What? What is that light?{WAIT_PRESS}\nIt's coming closer?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(90), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(60), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -2509,37 +2509,37 @@ static const struct ScriptCommand s_gs12_g42_s0_lives0_dlg0[] = { /* 0x81eb95c * static const struct ScriptCommand s_gs12_g42_s0_lives1_dlg0[] = { /* 0x81ebd04 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x06, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_NORTHWEST), WAIT(15), - { 0x91, 0x06, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_NORTHEAST), WAIT(15), - { 0x91, 0x06, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(12, 10, DIRECTION_NORTH), { 0x62, 0x00, 0x0080, 0x00000000, 0x0000000a, NULL }, WAIT(30), { 0x89, 0x40, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs12_g42_s0_eff1_script[] = { /* 0x81ebe54 */ DEBUGINFO, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000010a, 0x00000000, NULL }, { 0x84, 0x00, 0x0066, -0x00000030, 0x00000040, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x84, 0x00, 0x004c, -0x00000048, 0x00000010, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; @@ -2561,7 +2561,7 @@ static const struct ScriptCommand s_gs12_g43_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -2575,7 +2575,7 @@ static const struct ScriptCommand s_gs12_g43_s0_lives0_dlg0[] = { /* 0x81ec030 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -2589,7 +2589,7 @@ static const struct ScriptCommand s_gs12_g44_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -2603,7 +2603,7 @@ static const struct ScriptCommand s_gs12_g44_s0_lives0_dlg0[] = { /* 0x81ec17c * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -2638,7 +2638,7 @@ static const struct ScriptCommand s_gs12_g45_s0_station_sref_script[] = { /* 0x8 BGM_SWITCH(1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x39, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x3b, 0x3a, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(46, 0), RET, @@ -2653,8 +2653,8 @@ static const struct ScriptCommand s_gs12_g45_s0_lives0_dlg0[] = { /* 0x81ec59c * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nDid you just get up?")), VARIANT(/* == */ 1, _(" I just went by the Pelipper\nPost Office.")), @@ -2668,20 +2668,20 @@ static const struct ScriptCommand s_gs12_g45_s0_lives0_dlg0[] = { /* 0x81ec59c * VARIANT_DEFAULT(_(" {NAME_0}!{WAIT_PRESS}\nLet's keep on doing our best as always!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs12_g45_s0_lives1_dlg0[] = { /* 0x81ec950 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0x60, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -2704,7 +2704,7 @@ static const struct ScriptRef s_gs12_g46_s0_evt0_sref = { 357, 2, NULL /* GETOUT static const struct ScriptCommand s_gs12_g46_s0_evt1_sref_script[] = { /* 0x81eca58 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3a, 0x00, 0x0000, 0x00000000, -0x00000001, _("Would you like to save the game?") }, JUMP_SCRIPT(END_TALK), @@ -2742,8 +2742,8 @@ static const struct ScriptCommand s_gs12_g46_s1_lives0_dlg0[] = { /* 0x81ecc04 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Morning, {NAME_0}!")), VARIANT(/* == */ 1, _(" Let's keep on giving it our\nbest for our rescue team!")), @@ -2751,20 +2751,20 @@ static const struct ScriptCommand s_gs12_g46_s1_lives0_dlg0[] = { /* 0x81ecc04 * VARIANT_DEFAULT(_(" Let's keep doing our best\nfor our rescue team!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs12_g46_s1_lives1_dlg0[] = { /* 0x81ecdd0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0x60, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; diff --git a/src/data/ground/ground_data_d01p01_station.h b/src/data/ground/ground_data_d01p01_station.h index 07e1ba81f..66d7ba929 100644 --- a/src/data/ground/ground_data_d01p01_station.h +++ b/src/data/ground/ground_data_d01p01_station.h @@ -62,7 +62,7 @@ static const struct ScriptCommand s_gs178_g1_s0_station_sref_script[] = { /* 0x8 BGM_FADEIN(60, 101), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x39, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(30), NEXT_DUNGEON(30, SCRIPT_DUNGEON_TINY_WOODS), RET, @@ -80,8 +80,8 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), CALL_SCRIPT(WAKEUP_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, good! You finally came to!")), VARIANT_DEFAULT(_(" You're finally awake! Great!")), @@ -90,20 +90,20 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Wh-where is this...?)") }, TEXTBOX_CLEAR, FANFARE_PLAY2(468), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), WAIT(20), FANFARE_PLAY2(468), - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), WAIT(20), FANFARE_PLAY2(468), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), WAIT(50), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" You were passed out here.\nI'm glad you woke up!")), VARIANT(/* == */ 3, _(" I found you passed out here.\nI'm glad you came to!")), VARIANT_DEFAULT(_(" You were passed out here.\nI'm glad to see you awake!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I'm {NAME_1}.\nGlad to meet you!")), @@ -118,12 +118,12 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - VARIANT_DEFAULT(_(" ...And, you are?{WAIT_PRESS}\nI've never seen you around before.")), TEXTBOX_CLEAR, WAIT(30), - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(45), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah?{WAIT_PRESS}\nYou say you're a human?")), @@ -151,8 +151,8 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...But why?\nI don't remember anything...)") }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" You're...{WAIT_PRESS}\nSome kind of weird...")), VARIANT(/* == */ 1, _(" So, what's your name?\nWhat do you call yourself?")), @@ -165,7 +165,7 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - TEXTBOX_CLEAR, WAIT(20), { 0x3b, 0x16, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x3d, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, + RENAME_ALLY(1), WAIT(20), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, PORTRAIT_REP(0x0001, 0x00000000), @@ -173,31 +173,31 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - VARIANT(/* == */ 1, _(" Uh-huh... {NAME_0}.{WAIT_PRESS}\nThat's...")), VARIANT(/* == */ 3, _(" OK.\nYou're named {NAME_0}?{WAIT_PRESS}\nWell...")), VARIANT_DEFAULT(_(" Oh.\n{NAME_0}'s your name?{WAIT_PRESS}\nWell...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000a), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" A funny name!")), VARIANT(/* == */ 3, _(" Isn't it a funny name!")), VARIANT_DEFAULT(_(" It's a funny name!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), - { 0x91, 0x06, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_SOUTH), WAIT(15), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), WAIT(45), - { 0x91, 0x06, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_EAST), BGM_FADEOUT(60), WAIT(60), MSG_NPC(-1, _(" Somebody!\nPlease! Help me!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), FANFARE_PLAY2(466), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), WAIT(30), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -205,9 +205,9 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - VARIANT_DEFAULT(_(" Huh? I hear shouts from\nover there...")), TEXTBOX_CLEAR, SELECT_LIVES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ROTATE(10, 1, DIRECTION_NORTH), + AWAIT_CUE(5), WAIT(20), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What's the matter?")), @@ -215,14 +215,14 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - TEXTBOX_CLEAR, WAIT(20), BGM_SWITCH(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), MSG_NPC(2, _(" It's horrible!\nMy {NAME_3} fell into a cavern!\nMy poor baby!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" What?!")), TEXTBOX_CLEAR, @@ -239,23 +239,23 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - MSG_NPC(2, _(" I'm not strong enough to\nfend off those wild Pokémon...{WAIT_PRESS}\nWhat will become of my baby?")), MSG_NPC(2, _(" Oh! What am I to do?!\nOh dear, oh dear...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We can't just do nothing!\nLet's go help this kid!")), VARIANT_DEFAULT(_(" This sounds bad!\nWe have to go help!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(1), - { 0x6b, 0x00, 0x0180, 0x00000008, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x00000009, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x0000000a, 0x00000000, NULL }, + WALK_GRID(384, 8), + WALK_GRID(384, 9), + ALERT_CUE(3), + WALK_GRID(384, 10), HALT, }; @@ -271,82 +271,82 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - static const struct ScriptCommand s_gs178_g1_s0_lives1_dlg0[] = { /* 0x822d950 - PART 1 0:04:23-0:06:38 - Partner script */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), WAIT(1), FANFARE_STOP2(465), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), WAIT(5), FANFARE_STOP2(469), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), { 0xe2, 0x00, 0x01d6, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), WAIT(5), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(466), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), { 0xe2, 0x00, 0x01d2, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(10, 1, DIRECTION_NORTH), + AWAIT_CUE(6), FANFARE_PLAY2(463), CALL_SCRIPT(SHOCK_FUNC), { 0xe2, 0x00, 0x01cf, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x0000000b, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x0000000c, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x0000000d, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_GRID(384, 11), + WALK_GRID(384, 12), + WALK_GRID(384, 13), HALT, }; static const struct ScriptCommand s_gs178_g1_s1_lives0_dlg0[] = { /* 0x822dc90 - PART 1 0:05:55-0:06:38 - Butterfree */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000036, 0x00000000, NULL }, FANFARE_PLAY2(450), - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000007, 0x00000000, NULL }, - { 0x91, 0x06, 0x0001, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 0), + WALK_GRID(256, 1), + WALK_GRID(256, 2), + WALK_GRID(256, 3), + WALK_GRID(256, 4), + WALK_GRID(256, 5), + ALERT_CUE(5), + ALERT_CUE(6), + WALK_GRID(256, 6), + WALK_GRID(256, 7), + ROTATE(6, 1, DIRECTION_SOUTH), FANFARE_STOP2(450), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), LABEL(0), /* = 0x00 */ { 0x8b, 0x1e, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x1e, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -368,7 +368,7 @@ static const struct ScriptCommand s_gs178_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x39, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_TINY_WOODS), RET, }; @@ -385,28 +385,28 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(1), CALL_SCRIPT(WAKEUP_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(8, 2, DIRECTION_EAST), FANFARE_PLAY2(468), WAIT(1), - { 0x91, 0x08, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_WEST), FANFARE_PLAY2(468), WAIT(1), - { 0x91, 0x08, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_EAST), FANFARE_PLAY2(468), WAIT(50), FANFARE_STOP2(468), MSG_NPC(2, _(" Oh, my goodness!\nI'm so glad you came to!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(8, 2, DIRECTION_NORTH), + AWAIT_CUE(5), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), MSG_NPC(1, _(" Wh-where...?")), TEXTBOX_CLEAR, @@ -419,37 +419,37 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - VARIANT(/* == */ 1, _(" ...We ended up back here...")), VARIANT_DEFAULT(_(" ...We somehow ended up\nback here...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(8, 1, DIRECTION_EAST), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" I guess if we're defeated\nin there, we don't get to advance.")), MSG_NPC(1, _(" It's a mysterious dungeon,\nI guess.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" Ohh!\nIs my poor {NAME_3} safe?!\nOh dear, oh dear...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's right!\nWe have to help that kid, and now!")), VARIANT_DEFAULT(_(" That's right!\nWe've got to hurry!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_EAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's roll, {NAME_0}!")), VARIANT_DEFAULT(_(" {NAME_0}! Let's go!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(1), - { 0x6b, 0x00, 0x0180, 0x00000008, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x00000009, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x0000000a, 0x00000000, NULL }, + WALK_GRID(384, 8), + WALK_GRID(384, 9), + ALERT_CUE(3), + WALK_GRID(384, 10), HALT, }; @@ -458,54 +458,54 @@ static const struct ScriptCommand s_gs178_g2_s0_lives1_dlg0[] = { /* 0x822e5fc - DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(8, 1, DIRECTION_WEST), FANFARE_PLAY2(468), WAIT(1), - { 0x91, 0x08, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_EAST), FANFARE_PLAY2(468), WAIT(1), - { 0x91, 0x08, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_WEST), FANFARE_PLAY2(468), WAIT(50), FANFARE_STOP2(468), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(8, 1, DIRECTION_NORTH), WAIT(60), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(5), { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(8, 2, DIRECTION_WEST), WAIT(20), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x0000000b, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x0000000c, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x0000000d, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_GRID(384, 11), + WALK_GRID(384, 12), + WALK_GRID(384, 13), HALT, }; static const struct ScriptCommand s_gs178_g2_s0_lives2_dlg0[] = { /* 0x822e89c - PART 1 0:11:39-0:12:15 - Butterfree */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), LABEL(0), /* = 0x00 */ { 0x8b, 0x1e, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x1e, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -521,7 +521,7 @@ static const struct ScriptCommand s_gs178_g3_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(103), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(30), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -532,7 +532,7 @@ static const struct ScriptRef s_gs178_g3_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - PART 1 0:17:17-0:18:51 - Player */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -559,20 +559,20 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - VARIANT(/* == */ 1, _(" I'm {NAME_1}.")), VARIANT(/* == */ 3, _(" I'm {NAME_1}.")), VARIANT_DEFAULT(_(" I'm {NAME_1}.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" And this is {NAME_0}.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0003, 0x00000041), MSG_NPC(3, _(" ............{WAIT_PRESS}\nCool...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(1), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), @@ -586,17 +586,17 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Helping Pokémon in trouble might be\na good experience.)") }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Thank you!\n{NAME_1} and {NAME_0}!")), TEXTBOX_CLEAR, WAIT(20), MSG_NPC(2, _(" I know it isn't really\nenough, but this is a token of our\nthanks. Please accept it.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + AWAIT_CUE(5), { 0x3c, 0x2c, 0x0000, 0x00000037, 0x00000000, NULL }, WAIT(10), { 0x3c, 0x2c, 0x0000, 0x00000042, 0x00000001, NULL }, @@ -604,23 +604,23 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - { 0x3c, 0x2c, 0x0000, 0x0000003f, 0x00000001, NULL }, TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Thank you so much.\nGood-bye.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(10, 1, DIRECTION_EAST), + AWAIT_CUE(5), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, thanks for helping me\nout.")), VARIANT_DEFAULT(_(" Thank you for helping!")), - { 0x91, 0x08, 0x0001, 0x00000002, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_EAST), WAIT(10), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -639,12 +639,12 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - VARIANT(/* == */ 1, _(" ...{WAIT_PRESS}Say, {NAME_0}.{WAIT_PRESS}\nIf you don't have anywhere to stay,\nwhy don't you come with me?")), VARIANT_DEFAULT(_(" ...{WAIT_PRESS}Listen, {NAME_0}.{WAIT_PRESS}\nIf you don't have a place to stay, you\nshould come with me.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(8, 10, DIRECTION_EAST), WAIT(10), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, + ALERT_CUE(3), + WALK_GRID(256, 16), HALT, }; @@ -661,66 +661,66 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - static const struct ScriptCommand s_gs178_g3_s0_lives1_dlg0[] = { /* 0x822f68c - PART 1 0:17:17-0:18:51 - Partner */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(10, 1, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_WEST), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), + ALERT_CUE(5), WAIT(1), - { 0x6b, 0x00, 0x0100, 0x00000011, 0x00000000, NULL }, + WALK_GRID(256, 17), HALT, }; static const struct ScriptCommand s_gs178_g3_s0_lives2_dlg0[] = { /* 0x822f84c - PART 1 0:17:17-0:18:34 - Butterfree */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, 0x00000000, 0x00000008, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + WALK_RELATIVE(128, 0, 8), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x62, 0x00, 0x0080, 0x00000000, -0x00000008, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x95, 0x08, 0x000a, 0x0000000e, 0x00000000, NULL }, FANFARE_PLAY2(450), - { 0x6b, 0x00, 0x0100, 0x0000000e, 0x00000000, NULL }, + WALK_GRID(256, 14), FANFARE_STOP2(450), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs178_g3_s0_lives3_dlg0[] = { /* 0x822f94c - PART 1 0:17:17-0:18:34 - Caterpie */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), WAIT(20), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x95, 0x08, 0x000a, 0x0000000f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000000f, 0x00000000, NULL }, + WALK_GRID(256, 15), END_DELETE, }; diff --git a/src/data/ground/ground_data_d01p02_station.h b/src/data/ground/ground_data_d01p02_station.h index 4c91d648d..afd4bf2c3 100644 --- a/src/data/ground/ground_data_d01p02_station.h +++ b/src/data/ground/ground_data_d01p02_station.h @@ -23,7 +23,7 @@ static const struct ScriptCommand s_gs179_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(30), RET, @@ -33,41 +33,41 @@ static const struct ScriptRef s_gs179_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs179_g1_s0_lives0_dlg0[] = { /* 0x822fdd0 - PART 1 0:16:37-0:17:16 - Player */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 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), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000042), MSG_NPC(2, _(" Waaaaah...")), MSG_NPC(2, _(" Mommy...\nWhere are you...? Sniffle...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 0), WAIT(30), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" We came to rescue you.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Huh?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(1, _(" Your mom's waiting.\nLet's get you out!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" OK.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -78,30 +78,30 @@ static const struct ScriptCommand s_gs179_g1_s0_lives0_dlg0[] = { /* 0x822fdd0 - static const struct ScriptCommand s_gs179_g1_s0_lives1_dlg0[] = { /* 0x82300a8 - PART 1 0:16:37-0:17:16 - Partner */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 1), HALT, }; static const struct ScriptCommand s_gs179_g1_s0_lives2_dlg0[] = { /* 0x8230108 - PART 1 0:16:37-0:17:16 - Caterpie */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000003e, 0x00000000, NULL }, FANFARE_PLAY2(457), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe2, 0x00, 0x01c9, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; diff --git a/src/data/ground/ground_data_d02p01_station.h b/src/data/ground/ground_data_d02p01_station.h index ccc82d33c..1ac3035d2 100644 --- a/src/data/ground/ground_data_d02p01_station.h +++ b/src/data/ground/ground_data_d02p01_station.h @@ -25,7 +25,7 @@ static const struct ScriptCommand s_gs180_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(14), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), NEXT_DUNGEON(0, SCRIPT_DUNGEON_THUNDERWAVE_CAVE), RET, }; @@ -36,86 +36,86 @@ static const struct ScriptCommand s_gs180_g1_s0_eff0_script[] = { /* 0x82303fc * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), WAIT(30), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs180_g1_s0_lives0_dlg0[] = { /* 0x823047c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x59, 0x00, 0x0000, 0x00000064, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000064, NULL }, + ALERT_CUE(6), + WALK_RELATIVE(256, 0, -100), WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), { 0x2d, 0x0a, 0x0000, 0x00000001, 0x00000000, NULL }, PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 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!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, WAIT(30), { 0x54, 0x00, 0x002f, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(15), - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTH), WAIT(15), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), WAIT(30), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000000, 0x00000000, NULL }, + WALK_GRID(153, 0), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs180_g1_s0_lives1_dlg0[] = { /* 0x8230758 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x59, 0x00, 0x0000, 0x00000064, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000064, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(256, 0, -100), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x54, 0x00, 0x002f, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(15), - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTH), WAIT(15), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(15), - { 0x6b, 0x00, 0x0099, 0x00000000, 0x00000000, NULL }, + WALK_GRID(153, 0), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs180_g1_s0_lives2_dlg0[] = { /* 0x82308a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x62, 0x00, 0x0080, -0x00000010, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000041, 0x00000000, NULL }, HALT, @@ -123,11 +123,11 @@ static const struct ScriptCommand s_gs180_g1_s0_lives2_dlg0[] = { /* 0x82308a8 * static const struct ScriptCommand s_gs180_g1_s0_lives3_dlg0[] = { /* 0x8230948 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(8), { 0x62, 0x00, 0x0080, 0x00000010, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000040, 0x00000000, NULL }, HALT, @@ -139,7 +139,7 @@ static const struct ScriptCommand s_gs180_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(14), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), NEXT_DUNGEON(0, SCRIPT_DUNGEON_THUNDERWAVE_CAVE), RET, }; @@ -150,88 +150,88 @@ static const struct ScriptCommand s_gs180_g2_s0_eff0_script[] = { /* 0x8230a64 * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), WAIT(30), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs180_g2_s0_lives0_dlg0[] = { /* 0x8230ae4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000003c, 0x00000000, NULL }, { 0x59, 0x00, 0x0000, 0x00000064, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000064, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_RELATIVE(256, 0, -100), + AWAIT_CUE(5), WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" The {NAME_2} are in\nthere somewhere.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's give it our best\nand rescue them {NAME_0}!")), VARIANT_DEFAULT(_(" Let's do our best to rescue\nthem, {NAME_0}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000001, 0x00000000, NULL }, + WALK_GRID(153, 1), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs180_g2_s0_lives1_dlg0[] = { /* 0x8230d64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x59, 0x00, 0x0000, 0x00000064, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000064, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(256, 0, -100), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(15), - { 0x6b, 0x00, 0x0099, 0x00000001, 0x00000000, NULL }, + WALK_GRID(153, 1), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs180_g2_s0_lives2_dlg0[] = { /* 0x8230e64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x14, 0x0002, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(20, 2, DIRECTION_NORTHEAST), HALT, }; static const struct ScriptCommand s_gs180_g2_s0_lives3_dlg0[] = { /* 0x8230ef4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x14, 0x0001, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(8), + ROTATE(20, 1, DIRECTION_NORTHWEST), HALT, }; @@ -242,7 +242,7 @@ static const struct ScriptCommand s_gs180_g3_s0_station_sref_script[] = { /* 0x8 BGM_SWITCH(103), WAIT(30), { 0x27, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), RET, @@ -252,47 +252,47 @@ static const struct ScriptRef s_gs180_g3_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs180_g3_s0_lives0_dlg0[] = { /* 0x8231020 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 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), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(4, _(" OUR BODIES SEPARATED.\nBZBZBZZ. REJOICE! BZBZBZZT!")), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(5, _(" YAY! BZBZBZZT!")), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), MSG_NPC(4, _(" YAY! BZBZBZZT!")), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" BE THANKFUL, YOU TWO.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" YOU ARE OUR HERO.\nTHANK YOU. BZBZBZZ!")), TEXTBOX_CLEAR, @@ -302,15 +302,15 @@ static const struct ScriptCommand s_gs180_g3_s0_lives0_dlg0[] = { /* 0x8231020 * { 0x3c, 0x2c, 0x0000, 0x0000003f, 0x00000001, NULL }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(8, 2, DIRECTION_SOUTH), WAIT(90), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -319,103 +319,103 @@ static const struct ScriptCommand s_gs180_g3_s0_lives0_dlg0[] = { /* 0x8231020 * static const struct ScriptCommand s_gs180_g3_s0_lives1_dlg0[] = { /* 0x8231478 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(8, 1, DIRECTION_SOUTH), HALT, }; static const struct ScriptCommand s_gs180_g3_s0_lives2_dlg0[] = { /* 0x8231518 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), + WALK_GRID(256, 3), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs180_g3_s0_lives3_dlg0[] = { /* 0x82315e8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(8), + WALK_GRID(256, 3), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs180_g3_s0_lives4_dlg0[] = { /* 0x8231718 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(SMILE_START_FUNC), - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTH), + ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE(4, 1, DIRECTION_NORTH), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(9), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), CALL_SCRIPT(SMILE_START_FUNC), - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTH), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(9), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(9), + WALK_GRID(256, 2), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs180_g3_s0_lives5_dlg0[] = { /* 0x82318d8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CALL_SCRIPT(SMILE_START_FUNC), - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTH), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(10), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(10), + WALK_GRID(256, 2), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d02p02_station.h b/src/data/ground/ground_data_d02p02_station.h index f6703d128..b6e345ea8 100644 --- a/src/data/ground/ground_data_d02p02_station.h +++ b/src/data/ground/ground_data_d02p02_station.h @@ -25,7 +25,7 @@ static const struct ScriptCommand s_gs181_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(120), { 0x28, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, RET, @@ -35,48 +35,48 @@ static const struct ScriptRef s_gs181_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs181_g1_s0_lives0_dlg0[] = { /* 0x8231d84 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 0), WAIT(15), PORTRAIT(PLACEMENT_RIGHT, 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.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(3), WAIT(1), - { 0x6b, 0x00, 0x00cc, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + WALK_GRID(204, 1), + ROTATE(4, 10, DIRECTION_NORTHEAST), HALT, }; static const struct ScriptCommand s_gs181_g1_s0_lives1_dlg0[] = { /* 0x8231f0c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00cc, 0x00000003, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 2), + AWAIT_CUE(6), + WALK_GRID(204, 3), + ROTATE(4, 10, DIRECTION_NORTHWEST), HALT, }; static const struct ScriptCommand s_gs181_g1_s0_lives2_dlg0[] = { /* 0x8231f9c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs181_g1_s0_lives3_dlg0[] = { /* 0x8231fdc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d03p01_station.h b/src/data/ground/ground_data_d03p01_station.h index 0bfcc6926..6c0997505 100644 --- a/src/data/ground/ground_data_d03p01_station.h +++ b/src/data/ground/ground_data_d03p01_station.h @@ -22,9 +22,9 @@ static const struct ScriptCommand s_gs182_g1_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(182), SELECT_ENTITIES(-1, 0), BGM_SWITCH(120), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -32,14 +32,14 @@ static const struct ScriptRef s_gs182_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, { 0x59, 0x00, 0x0000, 0x00000064, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000064, NULL }, + ALERT_CUE(3), + ALERT_CUE(6), + WALK_RELATIVE(256, 0, -100), WAIT(15), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -53,23 +53,23 @@ static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 * TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 1), WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), CALL_SCRIPT(SHOCK_FUNC), WAIT(60), { 0x2d, 0x0a, 0x0000, 0x00000002, 0x00000000, NULL }, PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" The peak is {VALUE_0}F!\nThank you for helping! Farewell!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, WAIT(30), PORTRAIT_REP(0x0001, 0x00000004), @@ -77,15 +77,15 @@ static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 * VARIANT(/* == */ 1, _(" ......{WAIT_PRESS}\nWell, I guess we go...")), VARIANT_DEFAULT(_(" ......{WAIT_PRESS}\nUh... Let's go.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), WAIT(45), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00b3, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 0), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -94,25 +94,25 @@ static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 * static const struct ScriptCommand s_gs182_g1_s0_lives1_dlg0[] = { /* 0x82326cc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x59, 0x00, 0x0000, 0x00000064, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000064, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(256, 0, -100), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), WAIT(15), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00b3, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 0), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; @@ -122,14 +122,14 @@ static const struct ScriptCommand s_gs182_g1_s1_lives0_dlg0[] = { /* 0x823282c * { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), { 0x57, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, END_DELETE, }; @@ -140,7 +140,7 @@ static const struct ScriptCommand s_gs182_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(120), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -148,18 +148,18 @@ static const struct ScriptRef s_gs182_g2_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, { 0x59, 0x00, 0x0000, 0x00000064, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000064, NULL }, + ALERT_CUE(3), + ALERT_CUE(6), + WALK_RELATIVE(256, 0, -100), WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We'll take another shot at\n{COLOR YELLOW_D}Mt. Steel{RESET}.")), @@ -172,23 +172,23 @@ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 * TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 1), WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), CALL_SCRIPT(SHOCK_FUNC), WAIT(60), { 0x2d, 0x0a, 0x0000, 0x00000002, 0x00000000, NULL }, PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" The peak is {VALUE_0}F!\nThank you for helping! Farewell!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, WAIT(30), PORTRAIT_REP(0x0001, 0x00000004), @@ -196,15 +196,15 @@ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 * VARIANT(/* == */ 1, _(" ......{WAIT_PRESS}\nWell, here we go...")), VARIANT_DEFAULT(_(" ......{WAIT_PRESS}\nUh... Let's go.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), WAIT(45), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00b3, 0x00000001, 0x00000000, NULL }, + WALK_GRID(179, 1), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -213,28 +213,28 @@ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 * static const struct ScriptCommand s_gs182_g2_s0_lives1_dlg0[] = { /* 0x8232e30 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x59, 0x00, 0x0000, 0x00000064, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000064, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(256, 0, -100), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), WAIT(15), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00b3, 0x00000001, 0x00000000, NULL }, + WALK_GRID(179, 1), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; @@ -244,14 +244,14 @@ static const struct ScriptCommand s_gs182_g2_s1_lives0_dlg0[] = { /* 0x8232fc0 * { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), { 0x57, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, END_DELETE, }; diff --git a/src/data/ground/ground_data_d03p02_station.h b/src/data/ground/ground_data_d03p02_station.h index d69bf6949..ad194f735 100644 --- a/src/data/ground/ground_data_d03p02_station.h +++ b/src/data/ground/ground_data_d03p02_station.h @@ -26,7 +26,7 @@ static const struct ScriptCommand s_gs183_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), WAIT(30), RET, }; @@ -37,71 +37,71 @@ static const struct ScriptCommand s_gs183_g1_s0_eff0_script[] = { /* 0x823335c * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x1c, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" Grr... I can't keep up!{WAIT_PRESS}\nI'll flee for now!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(90), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), WAIT(5), - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, -24), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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!")), VARIANT_DEFAULT(_(" Hey there!\nWe chased {NAME_3} off!")), VARIANT_DEFAULT(_(" It's OK now.\nCome down over here.")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000041), MSG_NPC(2, _(" I can't...\nI'm too scared to move...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" OK, no sweat.{WAIT_PRESS}\nWe'll go to you. Just wait.")), VARIANT_DEFAULT(_(" OK, no problem.{WAIT_PRESS}\nWe'll come to you. Just wait.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" ...Whoa.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wow. This is some cliff...\nI can't see the bottom.")), VARIANT_DEFAULT(_(" Sheesh! Look at this cliff...\nI can't see the bottom.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" {NAME_0}, what'll\nwe do?\nWe can't get across this.")), TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000000), MSG_NPC(-1, _(" BZBZBZZ!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey! It's those {NAME_4}\nfrom that rescue!")), @@ -112,17 +112,17 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * MSG_NPC(4, _(" WE GOT WORD OF THIS.{WAIT_PRESS}\nWE CAN RESCUE DIGLETT FROM THE\nSKY. BZBZBZZ!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(4, _(" HOLD ON TO US TIGHT.\nBZBZBZZZ!")), PORTRAIT(PLACEMENT_TOP_RIGHT, 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, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -135,82 +135,82 @@ static const struct ScriptCommand s_gs183_g1_s0_lives0_dlg0[] = { /* 0x82333ec * static const struct ScriptCommand s_gs183_g1_s0_lives1_dlg0[] = { /* 0x8233bec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(256, 0, -24), + AWAIT_CUE(6), + WALK_GRID(128, 0), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0x62, 0x00, 0x0080, 0x00000000, 0x00000008, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, 0x00000000, -0x00000008, NULL }, - { 0x54, 0x00, 0x0028, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_RELATIVE(128, 0, -8), + SELECT_ANIMATION(40), FANFARE_PLAY2(463), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs183_g1_s0_lives2_dlg0[] = { /* 0x8233d8c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(9), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs183_g1_s0_lives3_dlg0[] = { /* 0x8233e3c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), FANFARE_PLAY2(459), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000045, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs183_g1_s1_lives0_dlg0[] = { /* 0x8233eec */ DEBUGINFO, - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, + WARP_WAYPOINT(0, 2), { 0x60, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(483), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + WALK_GRID(128, 4), { 0x93, 0x04, 0x000a, 0x00000044, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x52, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x004c, 0x00000000, -0x00000010, NULL }, + WALK_RELATIVE(76, 0, -16), { 0x93, 0x04, 0x000a, 0x00000044, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, @@ -218,21 +218,21 @@ static const struct ScriptCommand s_gs183_g1_s1_lives0_dlg0[] = { /* 0x8233eec * static const struct ScriptCommand s_gs183_g1_s1_lives1_dlg0[] = { /* 0x823405c */ DEBUGINFO, - { 0x5b, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, + WARP_WAYPOINT(0, 1), { 0x60, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(8), + WALK_GRID(128, 3), { 0x93, 0x04, 0x000a, 0x00000044, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x52, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x004c, 0x00000000, -0x00000010, NULL }, + WALK_RELATIVE(76, 0, -16), { 0x93, 0x04, 0x000a, 0x00000044, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, diff --git a/src/data/ground/ground_data_d04p01_station.h b/src/data/ground/ground_data_d04p01_station.h index 3818f94c2..4d0f7ece6 100644 --- a/src/data/ground/ground_data_d04p01_station.h +++ b/src/data/ground/ground_data_d04p01_station.h @@ -23,7 +23,7 @@ static const struct ScriptCommand s_gs184_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(15), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_SINISTER_WOODS), RET, }; @@ -32,13 +32,13 @@ static const struct ScriptRef s_gs184_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs184_g1_s0_lives0_dlg0[] = { /* 0x82343f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000005e, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000005b, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, WAIT(20), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), @@ -53,24 +53,24 @@ static const struct ScriptCommand s_gs184_g1_s0_lives0_dlg0[] = { /* 0x82343f8 * VARIANT_DEFAULT(_(" {NAME_3}'s gang should\nbe in there already.")), VARIANT_DEFAULT(_(" We need to hurry.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x003c, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_GRID(384, 0), + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs184_g1_s0_lives1_dlg0[] = { /* 0x8234714 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x00000001, 0x00000000, NULL }, + WALK_GRID(384, 1), HALT, }; @@ -80,7 +80,7 @@ static const struct ScriptCommand s_gs184_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(15), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_SINISTER_WOODS), RET, }; @@ -89,7 +89,7 @@ static const struct ScriptRef s_gs184_g2_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs184_g2_s0_lives0_dlg0[] = { /* 0x8234830 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000005b, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -106,22 +106,22 @@ static const struct ScriptCommand s_gs184_g2_s0_lives0_dlg0[] = { /* 0x8234830 * VARIANT_DEFAULT(_(" We're still stuck back here\nwhile {NAME_2}'s gang is...")), VARIANT_DEFAULT(_(" Come on, hurry!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x003c, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_GRID(384, 0), + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs184_g2_s0_lives1_dlg0[] = { /* 0x8234ae8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x00000001, 0x00000000, NULL }, + WALK_GRID(384, 1), HALT, }; diff --git a/src/data/ground/ground_data_d04p02_station.h b/src/data/ground/ground_data_d04p02_station.h index f5c15747e..70c208796 100644 --- a/src/data/ground/ground_data_d04p02_station.h +++ b/src/data/ground/ground_data_d04p02_station.h @@ -25,7 +25,7 @@ static const struct ScriptCommand s_gs185_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -34,29 +34,29 @@ static const struct ScriptRef s_gs185_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000005e, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000043), MSG_NPC(3, _(" Owowowow...{WAIT_PRESS}\nYou'll pay for this!\nDon't you forget it!")), TEXTBOX_CLEAR, WAIT(16), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(11), + ROTATE(10, 2, DIRECTION_WEST), + AWAIT_CUE(5), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(11), + ROTATE(4, 1, DIRECTION_EAST), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -67,35 +67,35 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * MSG_NPC(-1, _(" Um, excuse me...")), TEXTBOX_CLEAR, WAIT(16), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + ALERT_CUE(11), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x0002, 0x0000005e, 0x00000000, NULL }, { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_LEFT, 0x0002, 0x00000000), PORTRAIT_POS(2, 0, -3), MSG_NPC(2, _(" Did you maybe come looking\nfor me?")), TEXTBOX_CLEAR, WAIT(16), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_RIGHT, 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, WAIT(16), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Yay!")), MSG_NPC(2, _(" I was scared, so I kept my\nshell hardened...and waited and waited.")), MSG_NPC(2, _(" Thank you!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(3), HALT, }; @@ -106,113 +106,113 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * static const struct ScriptCommand s_gs185_g1_s0_lives1_dlg0[] = { /* 0x823531c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(10, 2, DIRECTION_WEST), + AWAIT_CUE(6), { 0x93, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x0001, 0x0000005e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), HALT, }; static const struct ScriptCommand s_gs185_g1_s0_lives2_dlg0[] = { /* 0x82353ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 0), + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), FANFARE_PLAY2(455), CALL_SCRIPT(SMILE_END_FUNC), WAIT(10), CALL_SCRIPT(JUMP_HAPPY_FUNC), WAIT(16), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs185_g1_s0_lives3_dlg0[] = { /* 0x823550c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, FANFARE_PLAY2(457), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe2, 0x00, 0x01c9, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(512, 1), + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs185_g1_s0_lives4_dlg0[] = { /* 0x82355ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000002, 0x00000000, NULL }, + WALK_GRID(512, 2), HALT, }; static const struct ScriptCommand s_gs185_g1_s0_lives5_dlg0[] = { /* 0x823565c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000003, 0x00000000, NULL }, + WALK_GRID(512, 3), HALT, }; static const struct ScriptCommand s_gs185_g1_s0_lives6_dlg0[] = { /* 0x82356cc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(11), + ROTATE(10, 10, DIRECTION_WEST), + AWAIT_CUE(11), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(11), { 0x93, 0x04, 0x000a, 0x0000005e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs185_g1_s0_lives7_dlg0[] = { /* 0x823576c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(11), + ROTATE(8, 10, DIRECTION_WEST), + AWAIT_CUE(11), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(11), { 0x93, 0x04, 0x000a, 0x0000005e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs185_g1_s0_lives8_dlg0[] = { /* 0x823580c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs185_g1_s0_lives9_dlg0[] = { /* 0x823583c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; diff --git a/src/data/ground/ground_data_d05p01_station.h b/src/data/ground/ground_data_d05p01_station.h index eb65677c1..4ceca4a49 100644 --- a/src/data/ground/ground_data_d05p01_station.h +++ b/src/data/ground/ground_data_d05p01_station.h @@ -24,7 +24,7 @@ static const struct ScriptCommand s_gs186_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(113), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, NEXT_DUNGEON(0, SCRIPT_DUNGEON_SILENT_CHASM), RET, @@ -36,17 +36,17 @@ static const struct ScriptCommand s_gs186_g1_s0_eff0_script[] = { /* 0x8235b18 * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 2), + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000005b, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -56,12 +56,12 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * VARIANT(/* == */ 1, _(" Whew, this is some cliff.")), VARIANT_DEFAULT(_(" Wow! This cliff is steep!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_NORTH), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" So your friend {NAME_2}\nis somewhere deep in this canyon?")), @@ -75,24 +75,24 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, no problem.")), VARIANT_DEFAULT(_(" It'll be fine.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's roll, {NAME_0}!")), VARIANT_DEFAULT(_(" Let's go, {NAME_0}!")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x89, 0x10, 0x0100, 0x00000004, 0x00000000, NULL }, FANFARE_PLAY2(464), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ...Wait!")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHEAST), FANFARE_PLAY2(463), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah? What's up?")), VARIANT_DEFAULT(_(" Yes? What is it?")), @@ -104,33 +104,33 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * MSG_NPC(2, _(" It's rumored that an amazing\nmonster sleeps here.")), TEXTBOX_CLEAR, FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" M...{WAIT_PRESS}monster?!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Yes, but!{WAIT_PRESS}\nIt's only folklore!")), MSG_NPC(2, _(" It's also true that\nShiftry hasn't returned...")), MSG_NPC(2, _(" I just thought I should\nlet you know...")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000006), MSG_NPC(1, _(" Owowow!\nMy stomach! It hurts...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ROTATE(4, 2, DIRECTION_NORTHWEST), PORTRAIT_REP(0x0002, 0x00000041), MSG_NPC(2, _(" Oh!{WAIT_PRESS}\nWhat's wrong?!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" My stomach suddenly started\ncramping up! Owowow...")), @@ -138,7 +138,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * VARIANT_DEFAULT(_(" It's my stomach!\nIt suddenly cramped up! Owowow...")), VARIANT_DEFAULT(_(" I think my breakfast was\nspoiled or something...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}, you too,\nright?")), @@ -157,8 +157,8 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, { 0x54, 0x00, 0x002d, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -168,8 +168,8 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * VARIANT_DEFAULT(_(" I'm sorry, but we won't\nbe able to handle this rescue...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000041), MSG_NPC(2, _(" Is that so?")), MSG_NPC(2, _(" But {NAME_0}...")), @@ -178,17 +178,17 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * TEXTBOX_CLEAR, WAIT(60), FANFARE_PLAY2(470), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(20), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(20), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" Owowow...{WAIT_PRESS}\nI guess the cramping settled down...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(45), CALL_SCRIPT(SMILE_END_FUNC), @@ -201,11 +201,11 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" Huh...?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), FANFARE_PLAY2(457), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What's wrong with you,\n{NAME_0}?!\nBack me up here!")), @@ -217,22 +217,22 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * MSG_NPC(2, _(" Wh-why this sudden\noutburst, {NAME_1}?")), MSG_NPC(2, _(" Don't you have a\nstomachache?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_NORTHEAST), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" Huh?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Uh, yeah...")), VARIANT(/* == */ 1, _(" Owowow...{WAIT_PRESS}\nI guess the cramping settled down...")), VARIANT_DEFAULT(_(" Uh, yes...")), VARIANT_DEFAULT(_(" Owowow...{WAIT_PRESS}\nI guess the cramping settled down...")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHWEST), + ALERT_CUE(6), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), PORTRAIT_REP(0x0001, 0x00000001), @@ -240,9 +240,9 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * TEXTBOX_CLEAR, WAIT(45), LABEL(16), /* = 0x10 */ - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(20), - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTHEAST), WAIT(15), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -250,8 +250,8 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * VARIANT_DEFAULT(_(" So, anyway, you said there\nmay be a monster.\nWhat is it like?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" I don't know very much\nat all...")), MSG_NPC(2, _(" It is an old folktale.\nI wouldn't know if it existed or not.")), @@ -273,17 +273,17 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" You bet we will!")), VARIANT_DEFAULT(_(" OK! Gotcha!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_NORTHWEST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's roll, {NAME_0}!")), VARIANT_DEFAULT(_(" Let's get going,\n{NAME_0}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x005f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_DIRECT(95, 0), + ALERT_CUE(3), HALT, }; @@ -309,111 +309,111 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * static const struct ScriptCommand s_gs186_g1_s0_lives1_dlg0[] = { /* 0x8237410 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, WAIT(16), - { 0x91, 0x08, 0x0001, 0x00000005, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_NORTHWEST), WAIT(12), - { 0x91, 0x08, 0x0002, 0x00000007, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_SOUTHWEST), WAIT(12), - { 0x91, 0x08, 0x0001, 0x00000005, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_NORTHWEST), WAIT(12), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_NORTHEAST), WAIT(8), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x89, 0x0a, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_NORTHEAST), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + SELECT_ANIMATION(8), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x54, 0x00, 0x002d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(2), + ROTATE(4, 11, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), WAIT(30), - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(45), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 1), LABEL(0), /* = 0x00 */ FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_ANGRY_FUNC), CALL_SCRIPT(ANGRY_START_FUNC), WAIT(45), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_SOUTHEAST), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), LABEL(1), /* = 0x01 */ - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHEAST), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_GRID(128, 1), HALT, }; static const struct ScriptCommand s_gs186_g1_s0_lives2_dlg0[] = { /* 0x8237920 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), { 0x89, 0x04, 0x0100, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(7), LABEL(0), /* = 0x00 */ - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; diff --git a/src/data/ground/ground_data_d05p02_station.h b/src/data/ground/ground_data_d05p02_station.h index a46e6543a..a4ffb5005 100644 --- a/src/data/ground/ground_data_d05p02_station.h +++ b/src/data/ground/ground_data_d05p02_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs187_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -34,19 +34,19 @@ static const struct ScriptCommand s_gs187_g1_s0_eff0_script[] = { /* 0x8237c9c * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x44, 0x01cc, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(12), { 0x89, 0x50, 0x0100, 0x00000004, 0x00000000, NULL }, WAIT(32), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), @@ -54,17 +54,17 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * 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?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Oh, hey!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(12), { 0x89, 0x20, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTHEAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" We came for you!\nAre you all right?")), TEXTBOX_CLEAR, @@ -83,23 +83,23 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Huh? {NAME_3}?")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), WAIT(5), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(12), WAIT(40), - { 0x91, 0x02, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(2, 1, DIRECTION_EAST), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" Let's go!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(12), + ALERT_CUE(4), { 0x89, 0x3c, 0x01cc, 0x00000004, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTHEAST), WAIT(30), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -158,34 +158,34 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Gyaooooh!") }, WAIT(90), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), { 0x27, 0x00, 0x0005, 0x00000010, 0x00ffffff, NULL }, WAIT(64), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(12), WAIT(8), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(30), MSG_NPC(1, _(" Shi-{NAME_3}'s gone!")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(6), + ALERT_CUE(12), WAIT(15), BGM_SWITCH(9), MSG_NPC(-1, _(" I am {NAME_6}!\nThe embodiment of lightning!")), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0006, 0x00000000), MSG_NPC(6, _(" If you wish to save\n{NAME_3}, then scale {COLOR YELLOW_D}Mt. Thunder{RESET}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" {NAME_6}...")), MSG_NPC(1, _(" So that's the legendary\nmonster...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -203,113 +203,113 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * static const struct ScriptCommand s_gs187_g1_s0_lives1_dlg0[] = { /* 0x82389a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0x50, 0x0100, 0x00000004, 0x00000000, NULL }, CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x89, 0x20, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x89, 0x3c, 0x01cc, 0x00000004, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), FANFARE_PLAY2(466), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(8, 1, DIRECTION_NORTH), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs187_g1_s0_lives2_dlg0[] = { /* 0x8238b68 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x89, 0x58, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x89, 0x20, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(12), { 0x89, 0x3c, 0x01cc, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(4, 10, DIRECTION_WEST), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(12), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(12), HALT, }; static const struct ScriptCommand s_gs187_g1_s0_lives3_dlg0[] = { /* 0x8238cb8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x89, 0x58, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x89, 0x20, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(12), { 0x89, 0x3c, 0x01cc, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(7), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(12), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(12), HALT, }; static const struct ScriptCommand s_gs187_g1_s0_lives4_dlg0[] = { /* 0x8238e18 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x89, 0x60, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), + AWAIT_CUE(7), WAIT(20), - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x89, 0x46, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs187_g1_s0_lives5_dlg0[] = { /* 0x8238ee8 */ DEBUGINFO, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), END_DELETE, }; static const struct ScriptCommand s_gs187_g1_s1_lives0_dlg0[] = { /* 0x8238f38 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x70, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, WAIT(16), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Gyaoooooooh!") }, @@ -317,7 +317,7 @@ static const struct ScriptCommand s_gs187_g1_s1_lives0_dlg0[] = { /* 0x8238f38 * { 0x70, 0x00, 0x0400, 0x00000080, 0x00000000, NULL }, WAIT(90), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; diff --git a/src/data/ground/ground_data_d06p01_station.h b/src/data/ground/ground_data_d06p01_station.h index 858fd4736..ed28e084f 100644 --- a/src/data/ground/ground_data_d06p01_station.h +++ b/src/data/ground/ground_data_d06p01_station.h @@ -24,7 +24,7 @@ static const struct ScriptCommand s_gs188_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(111), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, NEXT_DUNGEON(0, SCRIPT_DUNGEON_MT_THUNDER), RET, @@ -35,21 +35,21 @@ static const struct ScriptRef s_gs188_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs188_g1_s0_eff0_script[] = { /* 0x823928c */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), HALT, }; static const struct ScriptCommand s_gs188_g1_s0_lives0_dlg0[] = { /* 0x82392cc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000060, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000058, 0x00000000, NULL }, { 0x2d, 0x09, 0x0004, 0x00000055, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 0), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This must be the foot of\n{COLOR YELLOW_D}Mt. Thunder{RESET}...")), @@ -61,13 +61,13 @@ static const struct ScriptCommand s_gs188_g1_s0_lives0_dlg0[] = { /* 0x82392cc * MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_2}, huh...{WAIT_PRESS}\nIt sounds really tough.")), VARIANT_DEFAULT(_(" {NAME_2}...{WAIT_PRESS}\nIt sounds very tough...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000005), MSG_NPC(1, _(" Brr... I'm shaking...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But I can't be spooked\nby this.")), @@ -81,34 +81,34 @@ static const struct ScriptCommand s_gs188_g1_s0_lives0_dlg0[] = { /* 0x82392cc * VARIANT_DEFAULT(_(" {NAME_0}, let's try\nour best!")), TEXTBOX_CLEAR, { 0x23, 0x00, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(15), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 2), + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs188_g1_s0_lives1_dlg0[] = { /* 0x8239824 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 1), + ROTATE(4, 2, DIRECTION_NORTH), WAIT(8), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(9), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + WALK_GRID(256, 2), HALT, }; @@ -118,7 +118,7 @@ static const struct ScriptCommand s_gs188_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(111), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, NEXT_DUNGEON(0, SCRIPT_DUNGEON_MT_THUNDER), RET, @@ -135,14 +135,14 @@ static const struct ScriptCommand s_gs188_g2_s0_eff0_script[] = { /* 0x82399f0 * static const struct ScriptCommand s_gs188_g2_s0_lives0_dlg0[] = { /* 0x8239a30 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000055, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 0), + AWAIT_CUE(5), + ROTATE(4, 1, DIRECTION_EAST), WAIT(20), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -152,27 +152,27 @@ static const struct ScriptCommand s_gs188_g2_s0_lives0_dlg0[] = { /* 0x8239a30 * VARIANT_DEFAULT(_(" Let's work hard at it!")), TEXTBOX_CLEAR, { 0x23, 0x00, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(15), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 2), + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs188_g2_s0_lives1_dlg0[] = { /* 0x8239c48 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 1), + ROTATE(4, 2, DIRECTION_WEST), WAIT(8), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + WALK_GRID(256, 2), HALT, }; diff --git a/src/data/ground/ground_data_d06p02_station.h b/src/data/ground/ground_data_d06p02_station.h index 5e0028ba0..1e9f783c1 100644 --- a/src/data/ground/ground_data_d06p02_station.h +++ b/src/data/ground/ground_data_d06p02_station.h @@ -85,28 +85,28 @@ static const struct ScriptCommand s_gs189_g0_s0_obj0_dlg2[] = { /* 0x823a27c */ static const struct ScriptCommand s_gs189_g0_s1_lives0_dlg0[] = { /* 0x823a29c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs189_g0_s1_lives1_dlg0[] = { /* 0x823a2dc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs189_g0_s3_lives0_dlg0[] = { /* 0x823a31c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs189_g0_s3_lives1_dlg0[] = { /* 0x823a35c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -134,7 +134,7 @@ static const struct ScriptCommand s_gs189_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(111), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -146,10 +146,10 @@ static const struct ScriptCommand s_gs189_g1_s0_lives0_dlg0[] = { /* 0x823a4d8 * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(10), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -161,9 +161,9 @@ static const struct ScriptCommand s_gs189_g1_s0_lives0_dlg0[] = { /* 0x823a4d8 * VARIANT_DEFAULT(_(" But we shouldn't be far.{WAIT_PRESS}\nLet's keep doing our best!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -171,12 +171,12 @@ static const struct ScriptCommand s_gs189_g1_s0_lives1_dlg0[] = { /* 0x823a72c * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; diff --git a/src/data/ground/ground_data_d06p03_station.h b/src/data/ground/ground_data_d06p03_station.h index 5b222f260..4b8a908be 100644 --- a/src/data/ground/ground_data_d06p03_station.h +++ b/src/data/ground/ground_data_d06p03_station.h @@ -28,7 +28,7 @@ static const struct ScriptCommand s_gs190_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), RET, @@ -41,22 +41,22 @@ static const struct ScriptCommand s_gs190_g1_s0_eff0_script[] = { /* 0x823ab28 * { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x48, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x50, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x40, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x89, 0x20, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), WAIT(1), END_DELETE, }; static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0006, 0x00000055, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -65,113 +65,113 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * MSG_NPC(2, _("Gyaoooh!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(10), + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), MSG_NPC(3, _(" Wh-what is going on...")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(2, _(" Urrggh!{WAIT_PRESS}\nUwoah!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + ALERT_CUE(13), + ALERT_CUE(9), + ALERT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), FANFARE_PLAY2(479), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + ALERT_CUE(13), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), MSG_NPC(4, _(" You want more?\nI'll take you on!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(30), MSG_NPC(2, _(" Enough!{WAIT_PRESS}\nThat's enough fighting.")), MSG_NPC(2, _(" I've calmed down.\nTake {NAME_6} back.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" You kids...\nYou've impressed me.")), MSG_NPC(2, _(" But...{WAIT_PRESS}\nThings won't be this easy next time.")), MSG_NPC(2, _(" I will go all out next time,\nso you'd best be prepared!")), MSG_NPC(2, _(" Until then, you'd better\nhone your skills!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(90), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(60), FANFARE_PLAY2(481), - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), + AWAIT_CUE(5), SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(13), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), CALL_SCRIPT(NOTICE_FUNC), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), MSG_NPC(1, _(" Look!\nThere's {NAME_6}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0020, 0x00000000, 0x00000000, NULL }, + WALK_DIRECT(32, 0), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, WAIT(16), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000000), MSG_NPC(4, _(" Are you OK?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0006, 0x00000000), MSG_NPC(6, _(" Ungh... Uh, yeah...{WAIT_PRESS}\nSomehow, I am...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000001), MSG_NPC(1, _(" I'm glad you're safe!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0005, 0x00000000), MSG_NPC(5, _(" But that was an eye-opener.")), MSG_NPC(5, _(" Driving off that\n{NAME_2}.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(4, _(" I agree.")), MSG_NPC(4, _(" You're awfully strong for\na plain {POKEMON_0}.")), TEXTBOX_CLEAR, WAIT(32), - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTHWEST), WAIT(32), PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), MSG_NPC(3, _(" ......")), @@ -179,19 +179,19 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * MSG_NPC(3, _(" Perhaps...{WAIT_PRESS}\nYou aren't a Pokémon, are you?")), TEXTBOX_CLEAR, FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(13), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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.")), TEXTBOX_CLEAR, FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0006, 0x00000041), MSG_NPC(6, _(" What?!")), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000041), @@ -211,8 +211,8 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * TEXTBOX_CLEAR, WAIT(45), FANFARE_PLAY2(463), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, that's right!{WAIT_PRESS}\nLombre was saying something in the\nsquare.")), VARIANT(/* == */ 1, _(" He said {NAME_3}\nknows everything.")), @@ -222,8 +222,8 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * VARIANT_DEFAULT(_(" {NAME_3}, could you\nfigure out why {NAME_0} became a\nPokémon?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" ......")), MSG_NPC(3, _(" No...{WAIT_PRESS}\nI can't determine that.")), TEXTBOX_CLEAR, @@ -249,61 +249,61 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * MSG_NPC(1, _(" OK!\nSo we should go see Xatu.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(13), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_NORTHEAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, let's roll!\nWe're going to the {COLOR CYAN}Hill of the Ancients{RESET}!")), VARIANT(/* == */ 1, _(" There's no time to lose!\nWe'd better go back quick!")), VARIANT_DEFAULT(_(" {NAME_0}, let's go!\nOff to the {COLOR CYAN}Hill of the Ancients{RESET}!")), VARIANT_DEFAULT(_(" We can't waste any time!\nLet's go back quick!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(13), + AWAIT_CUE(5), MSG_NPC(1, _(" Shiftry, you too.{WAIT_PRESS}\nLet's hurry back.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0006, 0x00000000), MSG_NPC(6, _(" Uh... Yeah...{WAIT_PRESS}\nI guess we should...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), WAIT(45), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(6), + ALERT_CUE(13), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!")), VARIANT_DEFAULT(_(" {NAME_0}!")), - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(13), FANFARE_PLAY2(464), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHEAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Don't just stand around.\nLet's go back.")), VARIANT_DEFAULT(_(" Don't just stand there.\nLet's go home.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(13), + ALERT_CUE(11), WAIT(30), BGM_FADEOUT(120), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), { 0x89, 0xb8, 0x0080, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(20), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000000), MSG_NPC(4, _(" Alakazam.{WAIT_PRESS}\nI know you.")), @@ -316,7 +316,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * MSG_NPC(3, _(" ...For their sake...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -344,102 +344,102 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * static const struct ScriptCommand s_gs190_g1_s0_lives1_dlg0[] = { /* 0x823c670 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0020, 0x00000001, 0x00000000, NULL }, + WALK_DIRECT(32, 1), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_GRID(128, 6), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x89, 0x90, 0x0080, 0x00000000, 0x00000000, NULL }, END_DELETE, }; static const struct ScriptCommand s_gs190_g1_s0_lives2_dlg0[] = { /* 0x823c940 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000010, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(13), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(13), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(13), { 0x89, 0x60, 0x0080, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(13), { 0x89, 0x90, 0x0080, 0x00000000, 0x00000000, NULL }, END_DELETE, }; static const struct ScriptCommand s_gs190_g1_s0_lives3_dlg0[] = { /* 0x823cac0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000010, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(13), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(13), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(13), { 0x89, 0x60, 0x0080, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(13), { 0x89, 0x90, 0x0080, 0x00000000, 0x00000000, NULL }, END_DELETE, }; @@ -448,173 +448,173 @@ static const struct ScriptCommand s_gs190_g1_s0_lives4_dlg0[] = { /* 0x823cc40 * DEBUGINFO, { 0x54, 0x00, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), FANFARE_PLAY2(479), { 0x56, 0x00, 0x0000, 0x00000062, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(491), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0x56, 0x00, 0x0000, 0x00000061, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_STOP2(491), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 11, DIRECTION_SOUTH), + SELECT_ANIMATION(5), WAIT(32), - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x70, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, WAIT(8), FANFARE_PLAY2(459), { 0x70, 0x00, 0x0400, 0x00000080, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs190_g1_s0_lives5_dlg0[] = { /* 0x823ce70 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x89, 0x58, 0x0100, 0x00000004, 0x00000000, NULL }, WAIT(8), FANFARE_PLAY2(466), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0020, 0x00000002, 0x00000000, NULL }, + WALK_DIRECT(32, 2), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 11, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 11, DIRECTION_SOUTHEAST), + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs190_g1_s0_lives6_dlg0[] = { /* 0x823d050 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x89, 0x58, 0x0100, 0x00000004, 0x00000000, NULL }, WAIT(8), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(7), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x84, 0x00, 0x0180, 0x00000022, -0x0000001a, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0020, 0x00000003, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + WALK_DIRECT(32, 3), + ROTATE(4, 1, DIRECTION_SOUTHEAST), + AWAIT_CUE(9), + ROTATE(4, 1, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs190_g1_s0_lives7_dlg0[] = { /* 0x823d280 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x89, 0x58, 0x0100, 0x00000004, 0x00000000, NULL }, WAIT(8), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CALL_SCRIPT(SHOCK_FUNC), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0020, 0x00000004, 0x00000000, NULL }, + WALK_DIRECT(32, 4), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 1, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs190_g1_s0_eff1_script[] = { /* 0x823d460 */ DEBUGINFO, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x56, 0x00, 0x0000, 0x0000001b, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs190_g1_s1_lives0_dlg0[] = { /* 0x823d4c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), + SELECT_ANIMATION(2), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(11), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(11), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + WALK_GRID(128, 5), + AWAIT_CUE(11), { 0x89, 0x90, 0x0080, 0x00000000, 0x00000000, NULL }, END_DELETE, }; diff --git a/src/data/ground/ground_data_d07p01_station.h b/src/data/ground/ground_data_d07p01_station.h index f3fc975e1..d608a901e 100644 --- a/src/data/ground/ground_data_d07p01_station.h +++ b/src/data/ground/ground_data_d07p01_station.h @@ -26,7 +26,7 @@ static const struct ScriptCommand s_gs191_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(20), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), NEXT_DUNGEON(0, SCRIPT_DUNGEON_GREAT_CANYON), RET, }; @@ -35,23 +35,23 @@ static const struct ScriptRef s_gs191_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs191_g1_s0_lives0_dlg0[] = { /* 0x823d8e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000058, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000061, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, + WALK_GRID(256, 1), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" This is the {COLOR YELLOW_D}Great Canyon{RESET}...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" The peak is called the\n{COLOR CYAN}Hill of the Ancients{RESET}.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(10), - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTHEAST), { 0x2d, 0x0a, 0x0000, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_2} said that\nthe {COLOR CYAN}Hill of the Ancients{RESET} is on {VALUE_0}F.")), @@ -59,31 +59,31 @@ static const struct ScriptCommand s_gs191_g1_s0_lives0_dlg0[] = { /* 0x823d8e0 * VARIANT_DEFAULT(_(" According to {NAME_2},\nthe {COLOR CYAN}Hill of the Ancients{RESET} is on {VALUE_0}F.")), VARIANT_DEFAULT(_(" {NAME_3} should be\nthere.{WAIT_PRESS}\n{NAME_0}, let's do our best!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x0028, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(3), + WALK_GRID(128, 2), HALT, }; static const struct ScriptCommand s_gs191_g1_s0_lives1_dlg0[] = { /* 0x823dc10 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 0), WAIT(20), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x69, 0x00, 0x0100, 0x000000e8, 0x00000068, NULL }, CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(20), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + WALK_GRID(128, 3), HALT, }; @@ -93,7 +93,7 @@ static const struct ScriptCommand s_gs191_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(20), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), NEXT_DUNGEON(0, SCRIPT_DUNGEON_GREAT_CANYON), RET, }; @@ -102,15 +102,15 @@ static const struct ScriptRef s_gs191_g2_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs191_g2_s0_lives0_dlg0[] = { /* 0x823ddac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000058, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000061, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, + WALK_GRID(256, 1), WAIT(30), - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_EAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nThis time we'll make it to the peak,\nall right?")), @@ -120,25 +120,25 @@ static const struct ScriptCommand s_gs191_g2_s0_lives0_dlg0[] = { /* 0x823ddac * VARIANT_DEFAULT(_(" We have to meet\n{NAME_3} and get some information\non you, {NAME_0}.")), VARIANT_DEFAULT(_(" Let's do our best!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x0028, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(3), + WALK_GRID(128, 2), HALT, }; static const struct ScriptCommand s_gs191_g2_s0_lives1_dlg0[] = { /* 0x823e038 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 0), WAIT(30), - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00cc, 0x00000004, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00cc, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(6), + WALK_GRID(204, 4), + WALK_GRID(204, 3), HALT, }; diff --git a/src/data/ground/ground_data_d07p02_station.h b/src/data/ground/ground_data_d07p02_station.h index 90eadba3d..b3382bb76 100644 --- a/src/data/ground/ground_data_d07p02_station.h +++ b/src/data/ground/ground_data_d07p02_station.h @@ -35,7 +35,7 @@ static const struct ScriptCommand s_gs192_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -46,33 +46,33 @@ static const struct ScriptRef s_gs192_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 0), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" ............{WAIT_PRESS}\nWhat is it?{WAIT_PRESS}\nHave you reason to see me?")), TEXTBOX_CLEAR, WAIT(10), - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, -8), + SELECT_ANIMATION(5), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(20), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, WAIT(45), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Hm! This...{WAIT_PRESS}\nThis is a {COLOR GREEN_I}Clear Wing{RESET}...")), MSG_NPC(2, _(" ...{WAIT_PRESS}I see.{WAIT_PRESS}\nAbout the mirage Pokémon...{WAIT_PRESS}\nThat is what you wish to know?")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _(" {COLOR YELLOW}{RESET}Kwaaaaah!") }, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), TEXTBOX_CLEAR, CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(60), @@ -88,8 +88,8 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), { 0xe2, 0x00, 0x01d6, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), MSG_NPC(2, _(" However!")), @@ -101,17 +101,17 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * WAIT(15), MSG_NPC(2, _(" They are said to be\nshadows.\nShadows of the mirage Pokémon.")), MSG_NPC(2, _(" To the northwest, there lies\na large island.")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(20), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), WAIT(30), MSG_NPC(2, _(" An island known as the\n“Three Fields.”")), MSG_NPC(2, _(" There is one such field.\nThe {COLOR YELLOW_D}Fiery Field{RESET}!")), MSG_NPC(2, _(" One of the Pokémon...\nA shadow of the mirage...is there.")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTH), MSG_NPC(2, _(" Go.\nYou must go to the {COLOR YELLOW_D}Fiery Field{RESET}.")), MSG_NPC(2, _(" The answers you seek...\nPerhaps they await you there.")), TEXTBOX_CLEAR, @@ -122,35 +122,35 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs192_g1_s0_lives1_dlg0[] = { /* 0x823ec7c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(474), - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + ROTATE(8, 1, DIRECTION_NORTH), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), HALT, }; @@ -160,7 +160,7 @@ static const struct ScriptCommand s_gs192_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(90), RET, @@ -172,59 +172,59 @@ static const struct ScriptCommand s_gs192_g2_s0_eff0_script[] = { /* 0x823ee98 * DEBUGINFO, WAIT(1), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x86, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(80), { 0x86, 0x00, 0x0200, 0x0000000c, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x86, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x86, 0x00, 0x0200, 0x0000000d, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), PORTRAIT(PLACEMENT_RIGHT, 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}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(10), - { 0x91, 0x08, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_NORTH), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" So this is the {COLOR CYAN}Hill of\nthe Ancients{RESET}...")), VARIANT_DEFAULT(_(" This is the {COLOR CYAN}Hill of the\nAncients{RESET}...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Look!\nOver there!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHEAST), WAIT(10), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" {NAME_0}!{WAIT_PRESS}\nIs that {NAME_2} over there?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x003c, 0x00000002, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(9), + ALERT_CUE(4), + WALK_DIRECT(60, 2), + ROTATE(4, 1, DIRECTION_NORTHEAST), WAIT(20), MSG_NPC(1, _(" Excuse me?{WAIT_PRESS}\nAre you maybe {NAME_2}?")), TEXTBOX_CLEAR, @@ -232,8 +232,8 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(-1, _(" ......")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), MSG_NPC(1, _(" Hello?")), TEXTBOX_CLEAR, @@ -241,27 +241,27 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(-1, _(" ............")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_NPC(1, _(" Maybe he doesn't hear me?\nHello?!")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" ..................")), TEXTBOX_CLEAR, WAIT(40), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 2, DIRECTION_NORTH), MSG_NPC(1, _(" Hellooooooooooooooo?!")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" ........................")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 1, DIRECTION_NORTHEAST), + AWAIT_CUE(5), + ROTATE(4, 1, DIRECTION_EAST), MSG_NPC(1, _(" It's useless.\nHe's not responding at all.")), MSG_NPC(1, _(" Maybe he's sleeping while\non his feet?")), { 0x2e, 0x15, 0x0001, -0x00000002, 0x00000000, NULL }, @@ -278,12 +278,12 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * 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.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(20), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), TEXTBOX_AUTO_PRESS(30, 30), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Tickle, tickle, tickle.")), @@ -293,7 +293,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(-1, _(" ............")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(10), TEXTBOX_AUTO_PRESS(30, 30), MSG_NPC(1, _(" Tickle, tickle, tickle, tickle,\ntickle, tickle.")), @@ -303,7 +303,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(-1, _(" ....................................")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(20), TEXTBOX_AUTO_PRESS(20, 20), MSG_NPC(1, _(" Tickle, tickle, tickle, tickle,\ntickle, tickle, tickle, tickle, tickle, tickle,\ntickle, tickle, tickle, tickle, tickle, tickle.")), @@ -313,48 +313,48 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(-1, _(" ................................................\n............................................................\n............................................................")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), TEXTBOX_AUTO_PRESS(30, 30), MSG_NPC(1, _(" Tickle, tickle, tickle......")), TEXTBOX_AUTO_PRESS(-1, -1), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000002), MSG_NPC(1, _(" Gasp, gasp...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 1, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" It's useless, {NAME_0}.\nI'm not getting any response.")), VARIANT_DEFAULT(_(" It's no good, {NAME_0}.\nHe's not responding.")), TEXTBOX_CLEAR, WAIT(90), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(-1, _(" Snort...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), MSG_NPC(1, _(" Huh?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(-1, _(" Snort...{WAIT_PRESS} Giggle...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(-1, _(" Bufufufufufufufufu...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" He finally started laughing...")), @@ -364,14 +364,14 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * TEXTBOX_CLEAR, WAIT(90), BGM_STOP, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(10), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Kwaaaaaaaaah!") }, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(9), CALL_SCRIPT(JUMP_SURPRISE_FUNC), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), MSG_NPC(1, _(" Yikes!")), @@ -382,20 +382,20 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000007), MSG_NPC(1, _(" Uh, no!\nNo way!")), MSG_NPC(1, _(" I mean, he's kind of creepy!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" It'd be scary for\nsure!")), TEXTBOX_CLEAR, WAIT(60), @@ -412,10 +412,10 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * TEXTBOX_CLEAR, WAIT(30), BGM_FADEOUT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x05, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(5, 2, DIRECTION_NORTHEAST), + AWAIT_CUE(5), WAIT(30), TEXTBOX_AUTO_PRESS(45, 60), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000003), @@ -425,14 +425,14 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * TEXTBOX_CLEAR, WAIT(10), TEXTBOX_AUTO_PRESS(-1, -1), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(10), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Kwaaaaaaaaah!") }, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(9), CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0x8b, 0x0a, 0x0003, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), @@ -446,15 +446,15 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * TEXTBOX_CLEAR, WAIT(10), BGM_FADEIN(60, 6), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(-1, _(" Indeed.")), MSG_NPC(-1, _(" I am {NAME_2}.")), MSG_NPC(2, _(" You discerned my true\nidentity...{WAIT_PRESS}\nYou are not an ordinary sort...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(9), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), WAIT(30), @@ -463,14 +463,14 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * TEXTBOX_CLEAR, WAIT(10), MSG_NPC(2, _(" ...No.\nI can tell this.")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" You there.")), MSG_NPC(2, _(" You are no ordinary\nPokémon.")), MSG_NPC(2, _(" You are...{WAIT_PRESS}\nhuman, yes?")), TEXTBOX_CLEAR, WAIT(4), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(9), FANFARE_PLAY2(466), CALL_SCRIPT(NOTICE_FUNC), WAIT(30), @@ -478,19 +478,19 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(1, _(" Huh?!\nHow can you tell that?!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" All day...\nI stare at the sun unblinking.")), MSG_NPC(2, _(" It gives me sight for\nall things.")), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" The past and the future, too.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ALERT_CUE(7), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -498,8 +498,8 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * VARIANT_DEFAULT(_(" If you know, please tell us,\n{NAME_2}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is my friend\n{NAME_0}...")), VARIANT(/* == */ 1, _(" My friend woke up one\nmorning as a Pokémon.")), @@ -508,9 +508,9 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * VARIANT_DEFAULT(_(" My friend woke up one\nmorning as a Pokémon.")), VARIANT_DEFAULT(_(" And, without any memory as\na human.")), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_2}, you can tell,\ncan't you?{WAIT_PRESS}\nCan't you tell us?")), VARIANT_DEFAULT(_(" {NAME_2}, you can tell,\ncan't you?{WAIT_PRESS}\nPlease tell us.")), @@ -519,8 +519,8 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(2, _(" ..................")), MSG_NPC(2, _(" The calamities of nature.\nThere have been many in recent times.")), MSG_NPC(2, _(" They occur because the\nworld's balance is upset.")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(7), + ROTATE(4, 1, DIRECTION_NORTHEAST), MSG_NPC(2, _(" And your becoming a\nPokémon...")), MSG_NPC(2, _(" They are tied together.\nInseparably so.")), TEXTBOX_CLEAR, @@ -535,8 +535,8 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(2, _(" ........................")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What is it?! Hey?!")), @@ -545,15 +545,15 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * VARIANT_DEFAULT(_(" Why did you clam up?!\nPlease, tell us! Please!")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" There are bigger concerns...{WAIT_PRESS}\nI am afraid...")), MSG_NPC(2, _(" The world's balance...\nIt must be restored.")), MSG_NPC(2, _(" Or the unthinkable shall\nbefall our world.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wh-{WAIT_PRESS}what did you say?")), @@ -565,8 +565,8 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(2, _(" Every day I see it.\nThe same future every day...")), MSG_NPC(2, _(" I dread it...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000005), MSG_NPC(1, _(" Xa-{NAME_2}...")), TEXTBOX_CLEAR, @@ -578,22 +578,22 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(1, _(" The world's destruction...?")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), BGM_FADEOUT(150), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(3, _(" Kekeh!\nIsn't that a surprise!")), PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000044), MSG_NPC(3, _(" That {NAME_0}...\nwas human...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000041), MSG_NPC(3, _(" That's going to be useful!\nThis should be interesting! Kekeh!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), + ALERT_CUE(3), HALT, }; @@ -601,289 +601,289 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * static const struct ScriptCommand s_gs192_g2_s0_lives1_dlg0[] = { /* 0x8241890 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, 0x00000000, -0x00000010, NULL }, + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), + WALK_RELATIVE(128, 0, -16), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(463), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x003c, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0028, 0x00000005, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + WALK_DIRECT(60, 1), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + WALK_DIRECT(40, 5), + ROTATE(4, 1, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), WAIT(10), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0028, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_DIRECT(40, 6), WAIT(15), FANFARE_PLAY2(468), - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_WEST), WAIT(60), - { 0x7a, 0x00, 0x0028, 0x00000007, 0x00000000, NULL }, + WALK_DIRECT(40, 7), WAIT(30), - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), + ALERT_CUE(5), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0028, 0x00000008, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_DIRECT(40, 8), WAIT(30), FANFARE_PLAY2(468), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), WAIT(60), - { 0x7a, 0x00, 0x0028, 0x00000009, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000020, 0x00000003, NULL }, + WALK_DIRECT(40, 9), + ALERT_CUE(5), + WALK_RELATIVE(256, 32, 3), WAIT(15), - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0028, 0x00000006, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_DIRECT(40, 6), + ROTATE(4, 2, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(469), - { 0x6a, 0x00, 0x0100, -0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, -4, 0), + SELECT_ANIMATION(9), WAIT(10), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x62, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(469), - { 0x6a, 0x00, 0x0100, -0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, -4, 0), + SELECT_ANIMATION(9), WAIT(30), FANFARE_PLAY2(469), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x62, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(469), - { 0x6a, 0x00, 0x0100, -0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, -4, 0), + SELECT_ANIMATION(9), WAIT(30), FANFARE_PLAY2(469), WAIT(30), FANFARE_PLAY2(469), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x62, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(469), - { 0x6a, 0x00, 0x0100, -0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, -4, 0), + SELECT_ANIMATION(9), WAIT(10), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x62, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), WAIT(60), - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000012, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, 18), + ALERT_CUE(5), + ROTATE(4, 1, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHWEST), + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 1), LABEL(0), /* = 0x00 */ FANFARE_PLAY2(473), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0f, 0x0001, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(15, 1, DIRECTION_NORTHWEST), WAIT(60), - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_WEST), FANFARE_PLAY2(457), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0028, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_DIRECT(40, 5), { 0x8b, 0x0a, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(100), - { 0x54, 0x00, 0x0029, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(41), WAIT(100), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0x6a, 0x00, 0x0100, 0x00000018, 0x00000002, NULL }, + WALK_RELATIVE(256, 24, 2), { 0x8b, 0x0a, 0x0005, 0x00000000, 0x00000000, NULL }, LABEL(1), /* = 0x01 */ - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0014, 0x00000005, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_DIRECT(20, 5), + ROTATE(4, 1, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), { 0xe2, 0x00, 0x01c9, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(473), CALL_SCRIPT(SHOCK_FUNC), { 0xe2, 0x00, 0x01d9, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs192_g2_s0_lives2_dlg0[] = { /* 0x82422c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x003c, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(9), + WALK_DIRECT(60, 3), + AWAIT_CUE(9), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), CALL_SCRIPT(JUMP_SURPRISE_FUNC), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 1), LABEL(0), /* = 0x00 */ CALL_SCRIPT(JUMP_SURPRISE_FUNC), LABEL(1), /* = 0x01 */ - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs192_g2_s0_lives3_dlg0[] = { /* 0x82423f0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x003c, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(9), + WALK_DIRECT(60, 4), + AWAIT_CUE(9), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), CALL_SCRIPT(JUMP_SURPRISE_FUNC), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 1), LABEL(0), /* = 0x00 */ CALL_SCRIPT(JUMP_SURPRISE_FUNC), LABEL(1), /* = 0x01 */ - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs192_g2_s0_lives4_dlg0[] = { /* 0x8242520 */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), { 0x62, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, -0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, -0x00000001, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, -0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(24), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), WAIT(100), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), LABEL(0), /* = 0x00 */ FANFARE_PLAY2(474), - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(10, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(7), + SELECT_ANIMATION(24), WAIT(60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs192_g2_s1_lives0_dlg0[] = { /* 0x8242850 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(24), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(SMILE_END_FUNC), WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000000b, 0x00000000, NULL }, + ALERT_CUE(5), + WALK_GRID(256, 11), HALT, }; diff --git a/src/data/ground/ground_data_d08p01_station.h b/src/data/ground/ground_data_d08p01_station.h index 6e8a84dcc..65d103a2f 100644 --- a/src/data/ground/ground_data_d08p01_station.h +++ b/src/data/ground/ground_data_d08p01_station.h @@ -60,42 +60,42 @@ static const struct ScriptCommand s_gs193_g0_s0_obj0_dlg2[] = { /* 0x8242e60 */ static const struct ScriptCommand s_gs193_g0_s1_lives0_dlg0[] = { /* 0x8242e80 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs193_g0_s1_lives1_dlg0[] = { /* 0x8242ec0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs193_g0_s2_lives0_dlg0[] = { /* 0x8242f00 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs193_g0_s2_lives1_dlg0[] = { /* 0x8242f40 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs193_g0_s3_lives0_dlg0[] = { /* 0x8242f80 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs193_g0_s3_lives1_dlg0[] = { /* 0x8242fc0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -128,7 +128,7 @@ static const struct ScriptCommand s_gs193_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(24), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, NEXT_DUNGEON(0, SCRIPT_DUNGEON_LAPIS_CAVE), RET, @@ -138,19 +138,19 @@ static const struct ScriptRef s_gs193_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs193_g1_s0_lives0_dlg0[] = { /* 0x824313c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(30), WAIT(120), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 0), PORTRAIT(PLACEMENT_RIGHT_FLIP, 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(102), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But I was thinking...\nWhile we were on the way...")), @@ -165,19 +165,19 @@ static const struct ScriptCommand s_gs193_g1_s0_lives0_dlg0[] = { /* 0x824313c * VARIANT_DEFAULT(_(" I wish we could get back to\ndoing our rescue work...")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000002), MSG_NPC(1, _(" Sorry, I shouldn't complain.\nWe have to get away now, period.")), TEXTBOX_CLEAR, WAIT(30), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Huh? I hear voices...")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), WAIT(20), MSG_NPC(-1, _(" I think they went this way.")), MSG_NPC(-1, _(" They can't get away.\nNot from all of us.")), @@ -185,8 +185,8 @@ static const struct ScriptCommand s_gs193_g1_s0_lives0_dlg0[] = { /* 0x824313c * TEXTBOX_CLEAR, WAIT(30), FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Whoa!\nThey're catching up to us already?")), @@ -194,10 +194,10 @@ static const struct ScriptCommand s_gs193_g1_s0_lives0_dlg0[] = { /* 0x824313c * VARIANT_DEFAULT(_(" Aww, no!\nAre they catching up to us?")), VARIANT_DEFAULT(_(" {NAME_0}, we'd better\ngo.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -206,27 +206,27 @@ static const struct ScriptCommand s_gs193_g1_s0_lives0_dlg0[] = { /* 0x824313c * static const struct ScriptCommand s_gs193_g1_s0_lives1_dlg0[] = { /* 0x824389c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 1), + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x02, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x91, 0x02, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0x91, 0x02, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0x91, 0x02, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(2, 1, DIRECTION_NORTHWEST), + ROTATE(2, 2, DIRECTION_SOUTHWEST), + ROTATE(2, 1, DIRECTION_NORTHWEST), + ROTATE(2, 2, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x86, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, HALT, }; @@ -237,7 +237,7 @@ static const struct ScriptCommand s_gs193_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(102), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), CALL_STATION( 3, 0), RET, @@ -250,18 +250,18 @@ static const struct ScriptCommand s_gs193_g2_s0_lives0_dlg0[] = { /* 0x8243ab8 * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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...")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I think we got cocky and\ncareless, {NAME_0}.")), @@ -272,7 +272,7 @@ static const struct ScriptCommand s_gs193_g2_s0_lives0_dlg0[] = { /* 0x8243ab8 * VARIANT_DEFAULT(_(" We sure don't want to run\ninto them.\nLet's get through this quickly.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -281,15 +281,15 @@ static const struct ScriptCommand s_gs193_g2_s0_lives1_dlg0[] = { /* 0x8243e64 * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -326,7 +326,7 @@ static const struct ScriptCommand s_gs193_g3_s1_station_sref_script[] = { /* 0x8 DEBUGINFO, SELECT_ENTITIES(-1, 1), CANCEL_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -334,7 +334,7 @@ static const struct ScriptRef s_gs193_g3_s1_station_sref = { 401, 7, NULL /* EVE static const struct ScriptCommand s_gs193_g3_s1_lives0_dlg0[] = { /* 0x8244078 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x8e, 0x01, 0x0000, 0x00000022, 0x00000000, NULL }, @@ -367,15 +367,15 @@ static const struct ScriptCommand s_gs193_g3_s1_lives0_dlg0[] = { /* 0x8244078 * COND_EQUAL(5, /* to label */ 4), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x23, 0x00, 0x0046, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 2), JUMP_LABEL(5), LABEL(4), /* = 0x04 */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x0046, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + WALK_GRID(256, 2), LABEL(5), /* = 0x05 */ { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x07, 0x00, 0x001e, 0x0000000a, 0x00000000, NULL }, @@ -394,16 +394,16 @@ static const struct ScriptCommand s_gs193_g3_s1_lives0_dlg0[] = { /* 0x8244078 * { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, BGM_FADEOUT(60), { 0x23, 0x00, 0x0046, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 2), JUMP_LABEL(7), LABEL(6), /* = 0x06 */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), BGM_FADEOUT(60), { 0x23, 0x00, 0x0046, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + WALK_GRID(256, 2), LABEL(7), /* = 0x07 */ { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x06, 0x00, 0x001e, 0x0000004e, 0x00000000, NULL }, @@ -413,22 +413,22 @@ static const struct ScriptCommand s_gs193_g3_s1_lives0_dlg0[] = { /* 0x8244078 * static const struct ScriptCommand s_gs193_g3_s1_lives1_dlg0[] = { /* 0x8244648 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CJUMP_UNK_C8(0), COND_EQUAL(0, /* to label */ 0), COND_EQUAL(1, /* to label */ 0), COND_EQUAL(7, /* to label */ 0), COND_EQUAL(6, /* to label */ 0), - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHEAST), + WALK_GRID(256, 2), HALT, LABEL(0), /* = 0x00 */ - { 0x91, 0x04, 0x000b, 0x00000003, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHEAST), + WALK_GRID(256, 2), HALT, }; @@ -438,7 +438,7 @@ static const struct ScriptCommand s_gs193_g4_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(102), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), CALL_STATION( 3, 0), RET, @@ -448,25 +448,25 @@ static const struct ScriptRef s_gs193_g4_s0_station_sref = { 402, 7, NULL /* EVE static const struct ScriptCommand s_gs193_g4_s0_lives0_dlg0[] = { /* 0x8244804 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x20, 0x0100, 0x00000007, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), MSG_NPC(1, _(" What the...?{WAIT_PRESS}\nIsn't this where we started from?!")), TEXTBOX_CLEAR, FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(15), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nI guess that path just loops back to the\nstart.")), @@ -478,24 +478,24 @@ static const struct ScriptCommand s_gs193_g4_s0_lives0_dlg0[] = { /* 0x8244804 * TEXTBOX_CLEAR, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs193_g4_s0_lives1_dlg0[] = { /* 0x8244bb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x89, 0x30, 0x0100, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -505,7 +505,7 @@ static const struct ScriptCommand s_gs193_g5_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(102), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), CALL_STATION( 3, 0), RET, @@ -518,18 +518,18 @@ static const struct ScriptCommand s_gs193_g5_s0_lives0_dlg0[] = { /* 0x8244d30 * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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...")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We have to get through this\nfast, or they'll catch up to us.")), @@ -538,7 +538,7 @@ static const struct ScriptCommand s_gs193_g5_s0_lives0_dlg0[] = { /* 0x8244d30 * VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -546,15 +546,15 @@ static const struct ScriptCommand s_gs193_g5_s0_lives1_dlg0[] = { /* 0x8244f58 * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; diff --git a/src/data/ground/ground_data_d08p02_station.h b/src/data/ground/ground_data_d08p02_station.h index 52d9e7ed2..23f7ed5e3 100644 --- a/src/data/ground/ground_data_d08p02_station.h +++ b/src/data/ground/ground_data_d08p02_station.h @@ -23,7 +23,7 @@ static const struct ScriptCommand s_gs194_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(10), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, MSG_NPC(-1, _(" Stop right there!\nDon't let them get away!")), TEXTBOX_CLEAR, @@ -42,17 +42,17 @@ static const struct ScriptRef s_gs194_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs194_g1_s0_lives0_dlg0[] = { /* 0x8245734 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(15), - { 0x6b, 0x00, 0x0099, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, + WALK_GRID(153, 0), + ROTATE(4, 11, DIRECTION_NORTHWEST), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(45), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -61,24 +61,24 @@ static const struct ScriptCommand s_gs194_g1_s0_lives0_dlg0[] = { /* 0x8245734 * VARIANT_DEFAULT(_(" Whew!\nFinally, we made it through that cave.")), VARIANT_DEFAULT(_(" Where's the Pokémon mob\nthat's after us?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(10), MSG_NPC(-1, _(" Hey, look! There they are!\nOver there!")), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), MSG_NPC(-1, _(" Catch {NAME_0}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 11, DIRECTION_NORTHWEST), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Whoa! Here they come!\nRun!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(5), { 0x89, 0x50, 0x0200, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -87,24 +87,24 @@ static const struct ScriptCommand s_gs194_g1_s0_lives0_dlg0[] = { /* 0x8245734 * static const struct ScriptCommand s_gs194_g1_s0_lives1_dlg0[] = { /* 0x8245ab0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, + WALK_GRID(153, 1), + ROTATE(4, 11, DIRECTION_NORTHWEST), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(6), { 0x89, 0x50, 0x0200, 0x00000002, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d09p01_station.h b/src/data/ground/ground_data_d09p01_station.h index d94052d0d..f787fc4ea 100644 --- a/src/data/ground/ground_data_d09p01_station.h +++ b/src/data/ground/ground_data_d09p01_station.h @@ -70,42 +70,42 @@ static const struct ScriptCommand s_gs195_g0_s0_obj0_dlg2[] = { /* 0x8245f90 */ static const struct ScriptCommand s_gs195_g0_s1_lives0_dlg0[] = { /* 0x8245fb0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs195_g0_s1_lives1_dlg0[] = { /* 0x8245ff0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs195_g0_s2_lives0_dlg0[] = { /* 0x8246030 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs195_g0_s2_lives1_dlg0[] = { /* 0x8246070 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs195_g0_s3_lives0_dlg0[] = { /* 0x82460b0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs195_g0_s3_lives1_dlg0[] = { /* 0x82460f0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -164,8 +164,8 @@ static const struct ScriptCommand s_gs195_g1_s0_station_sref_script[] = { /* 0x8 BGM_SWITCH(25), { 0x3b, 0x3a, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -183,76 +183,76 @@ static const struct ScriptCommand s_gs195_g1_s0_eff0_script[] = { /* 0x8246504 * static const struct ScriptCommand s_gs195_g1_s0_lives0_dlg0[] = { /* 0x8246544 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(1), - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, + WALK_GRID(256, 0), + WALK_GRID(256, 1), WAIT(30), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(20), - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + WALK_GRID(256, 2), WAIT(10), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTH), WAIT(20), PORTRAIT(PLACEMENT_RIGHT, 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.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_EAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But...{WAIT_PRESS}\nThere's no point hiding out here.")), VARIANT_DEFAULT(_(" But...{WAIT_PRESS}\nThere isn't any point hiding here.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_NORTH), MSG_NPC(1, _(" We have to get over this\nmountain to get away.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(10), - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_EAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, we need to\nroll as soon as we're ready.")), VARIANT_DEFAULT(_(" Let's go as soon as we're\nready, {NAME_0}.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs195_g1_s0_lives1_dlg0[] = { /* 0x824696c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x014c, 0x00000003, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(332, 3), + WALK_GRID(256, 4), WAIT(15), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(15), - { 0x6b, 0x00, 0x0100, 0x00000005, 0x00000000, NULL }, + WALK_GRID(256, 5), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -282,7 +282,7 @@ static const struct ScriptCommand s_gs195_g2_s1_station_sref_script[] = { /* 0x8 DEBUGINFO, SELECT_ENTITIES(-1, 1), CANCEL_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -290,7 +290,7 @@ static const struct ScriptRef s_gs195_g2_s1_station_sref = { 401, 7, NULL /* EVE static const struct ScriptCommand s_gs195_g2_s1_lives0_dlg0[] = { /* 0x8246bd0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x8e, 0x01, 0x0000, 0x00000022, 0x00000000, NULL }, @@ -327,16 +327,16 @@ static const struct ScriptCommand s_gs195_g2_s1_lives0_dlg0[] = { /* 0x8246bd0 * WAIT(20), { 0x23, 0x00, 0x003c, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(153, 6), JUMP_LABEL(8), LABEL(7), /* = 0x07 */ WAIT(20), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(15), - { 0x6b, 0x00, 0x0099, 0x00000006, 0x00000000, NULL }, + WALK_GRID(153, 6), LABEL(8), /* = 0x08 */ { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x07, 0x00, 0x001e, 0x0000000b, 0x00000000, NULL }, @@ -355,17 +355,17 @@ static const struct ScriptCommand s_gs195_g2_s1_lives0_dlg0[] = { /* 0x8246bd0 * BGM_FADEOUT(60), { 0x23, 0x00, 0x003c, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(153, 6), JUMP_LABEL(10), LABEL(9), /* = 0x09 */ WAIT(20), BGM_FADEOUT(60), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(15), - { 0x6b, 0x00, 0x0099, 0x00000006, 0x00000000, NULL }, + WALK_GRID(153, 6), LABEL(10), /* = 0x0a */ { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x06, 0x00, 0x001e, 0x0000004e, 0x00000000, NULL }, @@ -378,24 +378,24 @@ static const struct ScriptCommand s_gs195_g2_s1_lives0_dlg0[] = { /* 0x8246bd0 * static const struct ScriptCommand s_gs195_g2_s1_lives1_dlg0[] = { /* 0x8247300 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CJUMP_UNK_C8(0), COND_EQUAL(0, /* to label */ 0), COND_EQUAL(1, /* to label */ 0), COND_EQUAL(7, /* to label */ 0), WAIT(15), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000006, 0x00000000, NULL }, + WALK_GRID(153, 6), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, LABEL(0), /* = 0x00 */ - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHWEST), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000006, 0x00000000, NULL }, + WALK_GRID(153, 6), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; @@ -407,7 +407,7 @@ static const struct ScriptCommand s_gs195_g3_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(25), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -419,10 +419,10 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), @@ -430,15 +430,15 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * TEXTBOX_CLEAR, WAIT(30), FANFARE_PLAY2(463), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_EAST), PORTRAIT(PLACEMENT_RIGHT_FLIP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Ssh!{WAIT_PRESS}\nSomeone's coming.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x86, 0x00, 0x0200, 0x00000007, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000008, 0x00000000, NULL }, + WALK_GRID(512, 8), WAIT(30), MSG_NPC(-1, _(" Where are they?\n{NAME_0} and that sidekick.")), TEXTBOX_CLEAR, @@ -464,25 +464,25 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * MSG_NPC(1, _(" ............")), MSG_NPC(1, _(" ........................")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(15), - { 0x6b, 0x00, 0x0200, 0x00000007, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + WALK_GRID(512, 7), + WALK_GRID(256, 2), WAIT(10), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHWEST), WAIT(20), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" ...Whew.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 11, DIRECTION_EAST), PORTRAIT(PLACEMENT_RIGHT, 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.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -492,26 +492,26 @@ static const struct ScriptCommand s_gs195_g3_s0_lives1_dlg0[] = { /* 0x8247b14 * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x86, 0x00, 0x0200, 0x00000009, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000009, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000005, 0x00000000, NULL }, + WALK_GRID(512, 10), + AWAIT_CUE(6), + WALK_GRID(512, 9), + WALK_GRID(256, 5), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_WEST), + AWAIT_CUE(6), HALT, }; @@ -522,7 +522,7 @@ static const struct ScriptCommand s_gs195_g4_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(25), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -531,24 +531,24 @@ static const struct ScriptRef s_gs195_g4_s0_station_sref = { 402, 7, NULL /* EVE static const struct ScriptCommand s_gs195_g4_s0_lives0_dlg0[] = { /* 0x8247d30 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x20, 0x0080, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x0000000c), MSG_NPC(1, _(" What the...?{WAIT_PRESS}\nIsn't this where we started from?!")), TEXTBOX_CLEAR, FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(15), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nI guess that path just loops back to the\nstart.")), @@ -559,24 +559,24 @@ static const struct ScriptCommand s_gs195_g4_s0_lives0_dlg0[] = { /* 0x8247d30 * VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs195_g4_s0_lives1_dlg0[] = { /* 0x82480b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x89, 0x40, 0x0080, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -587,7 +587,7 @@ static const struct ScriptCommand s_gs195_g5_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(25), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -599,18 +599,18 @@ static const struct ScriptCommand s_gs195_g5_s0_lives0_dlg0[] = { /* 0x8248230 * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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...")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We have to get through this\nfast, or they'll catch up to us.")), @@ -619,7 +619,7 @@ static const struct ScriptCommand s_gs195_g5_s0_lives0_dlg0[] = { /* 0x8248230 * VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -627,15 +627,15 @@ static const struct ScriptCommand s_gs195_g5_s0_lives1_dlg0[] = { /* 0x8248458 * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; diff --git a/src/data/ground/ground_data_d09p02_station.h b/src/data/ground/ground_data_d09p02_station.h index c742715ce..93ff294dd 100644 --- a/src/data/ground/ground_data_d09p02_station.h +++ b/src/data/ground/ground_data_d09p02_station.h @@ -101,28 +101,28 @@ static const struct ScriptCommand s_gs196_g0_s0_obj0_dlg2[] = { /* 0x8248f88 */ static const struct ScriptCommand s_gs196_g0_s1_lives0_dlg0[] = { /* 0x8248fa8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs196_g0_s1_lives1_dlg0[] = { /* 0x8248fe8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs196_g0_s3_lives0_dlg0[] = { /* 0x8249028 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs196_g0_s3_lives1_dlg0[] = { /* 0x8249068 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -150,7 +150,7 @@ static const struct ScriptCommand s_gs196_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(25), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -162,10 +162,10 @@ static const struct ScriptCommand s_gs196_g1_s0_lives0_dlg0[] = { /* 0x82491e4 * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nWell, that didn't go well.")), @@ -176,9 +176,9 @@ static const struct ScriptCommand s_gs196_g1_s0_lives0_dlg0[] = { /* 0x82491e4 * VARIANT_DEFAULT(_(" But we came close.{WAIT_PRESS}\nLet's keep doing our best!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -186,13 +186,13 @@ static const struct ScriptCommand s_gs196_g1_s0_lives1_dlg0[] = { /* 0x8249404 * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; diff --git a/src/data/ground/ground_data_d09p03_station.h b/src/data/ground/ground_data_d09p03_station.h index 1f1f69ee3..10cd4a0e4 100644 --- a/src/data/ground/ground_data_d09p03_station.h +++ b/src/data/ground/ground_data_d09p03_station.h @@ -22,7 +22,7 @@ static const struct ScriptCommand s_gs197_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -33,19 +33,19 @@ static const struct ScriptCommand s_gs197_g1_s0_eff0_script[] = { /* 0x8249800 * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x18, 0x0200, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x30, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -54,10 +54,10 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * MSG_NPC(2, _(" I'm not done!\nI'm not finished yet!")), TEXTBOX_CLEAR, FANFARE_PLAY2(460), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000007), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -87,8 +87,8 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * VARIANT_DEFAULT(_(" But we want to help other\nPokémon that are suffering from these\nnatural disasters.")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ..................{WAIT_PRESS}\nDo you say that sincerely?")), TEXTBOX_CLEAR, WAIT(15), @@ -114,14 +114,14 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * MSG_NPC(1, _(" ....................................")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Gyaaaaaah!") }, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), FANFARE_PLAY2(492), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), { 0x28, 0x01, 0x0005, 0x00000005, 0x00ffffff, NULL }, { 0x27, 0x01, 0x0005, 0x0000000a, 0x00ffffff, NULL }, WAIT(10), @@ -129,7 +129,7 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * { 0x27, 0x01, 0x0005, 0x0000000a, 0x00ffffff, NULL }, WAIT(90), TEXTBOX_CLEAR2, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(5), CALL_SCRIPT(SPREE_START_FUNC), PORTRAIT_REP(0x0001, 0x0000000c), @@ -140,10 +140,10 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * MSG_NPC(2, _(" ............{WAIT_PRESS}Fine.")), MSG_NPC(2, _(" I trust that you aren't lying.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), FANFARE_PLAY2(470), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), PORTRAIT_REP(0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -169,14 +169,14 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * VARIANT_DEFAULT(_(" OK. I promise.")), VARIANT_DEFAULT(_(" ...Of course, that's not\npossible right now, but...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Gyaaaaah!") }, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), FANFARE_PLAY2(492), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), { 0x28, 0x01, 0x0005, 0x00000005, 0x00ffffff, NULL }, { 0x27, 0x01, 0x0005, 0x0000000a, 0x00ffffff, NULL }, WAIT(10), @@ -185,7 +185,7 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * WAIT(90), TEXTBOX_CLEAR2, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000007), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Whoa, whoa, whoa!\nWe'll get to it! Right away!")), @@ -204,23 +204,23 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * VARIANT_DEFAULT(_(" We'll investigate what's\nbehind the natural calamities.{WAIT_PRESS}\nI promise.")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ............{WAIT_PRESS}\nI will hold you to that promise.")), MSG_NPC(2, _(" You've made me believe that\nyou will honor that promise.")), MSG_NPC(2, _(" If you do not forget...{WAIT_PRESS}\nthe courage you showed in facing me.")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), FANFARE_PLAY2(474), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Gyaaaaaaaaaah!") }, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(80), TEXTBOX_CLEAR2, WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Waaaah!\nIs...is there anything else?")), TEXTBOX_CLEAR, @@ -230,7 +230,7 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * MSG_NPC(2, _(" I was only preparing to\ntake off.")), TEXTBOX_CLEAR, FANFARE_PLAY2(470), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), WAIT(15), PORTRAIT_REP(0x0001, 0x00000002), @@ -239,26 +239,26 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * WAIT(30), MSG_NPC(2, _(" Farewell!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Gyaaaaaaaah!") }, FANFARE_PLAY2(459), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(4), WAIT(100), TEXTBOX_CLEAR2, WAIT(90), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(30), FANFARE_PLAY2(470), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_WEST), PORTRAIT_REP(0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), MSG_NPC(1, _(" Whew...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000007), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Awww, sheesh, that was\nscary!")), @@ -276,11 +276,11 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * WAIT(15), BGM_FADEOUT(150), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(10), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 0), + ALERT_CUE(3), HALT, }; @@ -305,80 +305,80 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * static const struct ScriptCommand s_gs197_g1_s0_lives1_dlg0[] = { /* 0x824b53c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SPREE_START_FUNC), WAIT(15), CALL_SCRIPT(SPREE_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), WAIT(30), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 0), HALT, }; static const struct ScriptCommand s_gs197_g1_s0_lives2_dlg0[] = { /* 0x824b75c */ DEBUGINFO, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(24), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(25), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(24), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(25), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(24), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(25), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, FANFARE_PLAY2(475), - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(45), FANFARE_PLAY2(475), { 0x70, 0x00, 0x0099, 0x00000010, 0x00000000, NULL }, WAIT(16), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(459), { 0x70, 0x00, 0x0400, 0x00000080, 0x00000000, NULL }, END_DELETE, @@ -386,25 +386,25 @@ static const struct ScriptCommand s_gs197_g1_s0_lives2_dlg0[] = { /* 0x824b75c * static const struct ScriptCommand s_gs197_g1_s0_eff1_script[] = { /* 0x824b9ec */ DEBUGINFO, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x00000172, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x00000172, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs197_g1_s0_eff2_script[] = { /* 0x824ba7c */ DEBUGINFO, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x00000172, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x00000172, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), HALT, }; diff --git a/src/data/ground/ground_data_d10p01_station.h b/src/data/ground/ground_data_d10p01_station.h index 4b54b7a51..88fd33cce 100644 --- a/src/data/ground/ground_data_d10p01_station.h +++ b/src/data/ground/ground_data_d10p01_station.h @@ -60,45 +60,45 @@ static const struct ScriptCommand s_gs198_g0_s0_obj0_dlg2[] = { /* 0x824bec4 */ static const struct ScriptCommand s_gs198_g0_s1_lives0_dlg0[] = { /* 0x824bee4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs198_g0_s1_lives1_dlg0[] = { /* 0x824bf24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs198_g0_s2_lives0_dlg0[] = { /* 0x824bf64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs198_g0_s2_lives1_dlg0[] = { /* 0x824bfa4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs198_g0_s3_lives0_dlg0[] = { /* 0x824bfe4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs198_g0_s3_lives1_dlg0[] = { /* 0x824c024 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -136,7 +136,7 @@ static const struct ScriptCommand s_gs198_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -148,17 +148,17 @@ static const struct ScriptCommand s_gs198_g1_s0_eff0_script[] = { /* 0x824c210 * { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0xc8, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), WAIT(1), END_DELETE, }; static const struct ScriptCommand s_gs198_g1_s0_lives0_dlg0[] = { /* 0x824c290 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...So, we do have to get\nthrough this, huh?")), @@ -169,27 +169,27 @@ static const struct ScriptCommand s_gs198_g1_s0_lives0_dlg0[] = { /* 0x824c290 * VARIANT(/* == */ 1, _(" It's going to be awfully cold.\nIt's not anywhere I really want to go...")), VARIANT_DEFAULT(_(" It will be horribly cold.\nI'd rather not go if I didn't have to...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But there's no point in us\nsticking around here forever...")), VARIANT(/* == */ 1, _(" We can only go forward!{WAIT_PRESS}\nWe'll just have to go for it and get\nthrough this, {NAME_0}!")), VARIANT_DEFAULT(_(" But hiding out in this area\nisn't the answer either...")), VARIANT_DEFAULT(_(" We can only go forward.{WAIT_PRESS}\nWe'll just have to keep our spirits up\nand keep going, {NAME_0}!")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_WEST), WAIT(10), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs198_g1_s0_lives1_dlg0[] = { /* 0x824c670 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), HALT, }; @@ -219,7 +219,7 @@ static const struct ScriptCommand s_gs198_g2_s1_station_sref_script[] = { /* 0x8 DEBUGINFO, SELECT_ENTITIES(-1, 1), CANCEL_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -227,7 +227,7 @@ static const struct ScriptRef s_gs198_g2_s1_station_sref = { 401, 7, NULL /* EVE static const struct ScriptCommand s_gs198_g2_s1_lives0_dlg0[] = { /* 0x824c7d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x8e, 0x01, 0x0000, 0x00000022, 0x00000000, NULL }, @@ -261,14 +261,14 @@ static const struct ScriptCommand s_gs198_g2_s1_lives0_dlg0[] = { /* 0x824c7d4 * COND_EQUAL(4, /* to label */ 7), COND_EQUAL(3, /* to label */ 7), COND_EQUAL(5, /* to label */ 7), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x0032, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, BGM_FADEOUT(120), { 0x86, 0x00, 0x0080, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(8), LABEL(7), /* = 0x07 */ - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x0040, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -288,14 +288,14 @@ static const struct ScriptCommand s_gs198_g2_s1_lives0_dlg0[] = { /* 0x824c7d4 * COND_EQUAL(4, /* to label */ 9), COND_EQUAL(3, /* to label */ 9), COND_EQUAL(5, /* to label */ 9), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x0032, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, BGM_FADEOUT(120), { 0x86, 0x00, 0x0080, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(10), LABEL(9), /* = 0x09 */ - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x0040, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -313,11 +313,11 @@ static const struct ScriptCommand s_gs198_g2_s1_lives0_dlg0[] = { /* 0x824c7d4 * static const struct ScriptCommand s_gs198_g2_s1_lives1_dlg0[] = { /* 0x824cea4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CJUMP_UNK_C8(0), COND_EQUAL(0, /* to label */ 0), COND_EQUAL(1, /* to label */ 0), @@ -345,7 +345,7 @@ static const struct ScriptCommand s_gs198_g3_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -357,16 +357,16 @@ static const struct ScriptCommand s_gs198_g3_s0_lives0_dlg0[] = { /* 0x824d0c0 * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 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...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is a tough place...")), VARIANT_DEFAULT(_(" This is as tough as we\nexpected...")), @@ -376,7 +376,7 @@ static const struct ScriptCommand s_gs198_g3_s0_lives0_dlg0[] = { /* 0x824d0c0 * VARIANT_DEFAULT(_(" But let's keep trying our\nbest and get through this, {NAME_0}!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -385,14 +385,14 @@ static const struct ScriptCommand s_gs198_g3_s0_lives1_dlg0[] = { /* 0x824d364 * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_EAST), + AWAIT_CUE(6), HALT, }; @@ -407,7 +407,7 @@ static const struct ScriptCommand s_gs198_g4_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -416,12 +416,12 @@ static const struct ScriptRef s_gs198_g4_s0_station_sref = { 402, 7, NULL /* EVE static const struct ScriptCommand s_gs198_g4_s0_lives0_dlg0[] = { /* 0x824d500 */ DEBUGINFO, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(8), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ROTATE(4, 1, DIRECTION_WEST), WAIT(30), { 0x2d, 0x09, 0x0002, 0x00000066, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), @@ -439,18 +439,18 @@ static const struct ScriptCommand s_gs198_g4_s0_lives0_dlg0[] = { /* 0x824d500 * VARIANT_DEFAULT(_(" It makes no difference.\n{NAME_0}, let's try our best!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs198_g4_s0_lives1_dlg0[] = { /* 0x824d834 */ DEBUGINFO, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(8), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ROTATE(4, 2, DIRECTION_EAST), HALT, }; @@ -465,7 +465,7 @@ static const struct ScriptCommand s_gs198_g5_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -474,24 +474,24 @@ static const struct ScriptRef s_gs198_g5_s0_station_sref = { 402, 7, NULL /* EVE static const struct ScriptCommand s_gs198_g5_s0_lives0_dlg0[] = { /* 0x824d980 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x10, 0x0080, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" What the...?{WAIT_PRESS}\nIsn't this where we started from?!")), TEXTBOX_CLEAR, FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(15), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nI guess that path just loops back to the\nstart.")), @@ -502,24 +502,24 @@ static const struct ScriptCommand s_gs198_g5_s0_lives0_dlg0[] = { /* 0x824d980 * VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs198_g5_s0_lives1_dlg0[] = { /* 0x824dd18 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x89, 0x20, 0x0080, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -534,7 +534,7 @@ static const struct ScriptCommand s_gs198_g6_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -546,10 +546,10 @@ static const struct ScriptCommand s_gs198_g6_s0_lives0_dlg0[] = { /* 0x824ded4 * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -557,15 +557,15 @@ static const struct ScriptCommand s_gs198_g6_s0_lives0_dlg0[] = { /* 0x824ded4 * VARIANT_DEFAULT(_(" Ouch...{WAIT_PRESS}\nWe couldn't break through...")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is one harsh place,\nbut let's bear down and get through,\n{NAME_0}!")), VARIANT_DEFAULT(_(" This is a harsh place,\nso let's do our best to get through,\n{NAME_0}!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -573,15 +573,15 @@ static const struct ScriptCommand s_gs198_g6_s0_lives1_dlg0[] = { /* 0x824e0f8 * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; diff --git a/src/data/ground/ground_data_d10p02_station.h b/src/data/ground/ground_data_d10p02_station.h index 388c7c356..ffeb4c083 100644 --- a/src/data/ground/ground_data_d10p02_station.h +++ b/src/data/ground/ground_data_d10p02_station.h @@ -101,28 +101,28 @@ static const struct ScriptCommand s_gs199_g0_s0_obj0_dlg2[] = { /* 0x824ec48 */ static const struct ScriptCommand s_gs199_g0_s1_lives0_dlg0[] = { /* 0x824ec68 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs199_g0_s1_lives1_dlg0[] = { /* 0x824eca8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs199_g0_s3_lives0_dlg0[] = { /* 0x824ece8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs199_g0_s3_lives1_dlg0[] = { /* 0x824ed28 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -150,7 +150,7 @@ static const struct ScriptCommand s_gs199_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(104), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -162,18 +162,18 @@ static const struct ScriptCommand s_gs199_g1_s0_lives0_dlg0[] = { /* 0x824eea4 * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0x2d, 0x09, 0x0002, 0x00000066, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 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...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is a tough place...")), @@ -184,9 +184,9 @@ static const struct ScriptCommand s_gs199_g1_s0_lives0_dlg0[] = { /* 0x824eea4 * VARIANT_DEFAULT(_(" But let's keep trying our\nbest and get through this, {NAME_0}!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -195,14 +195,14 @@ static const struct ScriptCommand s_gs199_g1_s0_lives1_dlg0[] = { /* 0x824f190 * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_EAST), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -218,7 +218,7 @@ static const struct ScriptCommand s_gs199_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(104), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -230,18 +230,18 @@ static const struct ScriptCommand s_gs199_g2_s0_lives0_dlg0[] = { /* 0x824f33c * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0x2d, 0x09, 0x0002, 0x00000066, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 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, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That {NAME_2}...\nHe's one tough customer.")), @@ -252,9 +252,9 @@ static const struct ScriptCommand s_gs199_g2_s0_lives0_dlg0[] = { /* 0x824f33c * VARIANT_DEFAULT(_(" It makes no difference.\n{NAME_0}, let's try our best!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -263,14 +263,14 @@ static const struct ScriptCommand s_gs199_g2_s0_lives1_dlg0[] = { /* 0x824f6ac * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_EAST), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; diff --git a/src/data/ground/ground_data_d10p03_station.h b/src/data/ground/ground_data_d10p03_station.h index 53945e077..0e39db252 100644 --- a/src/data/ground/ground_data_d10p03_station.h +++ b/src/data/ground/ground_data_d10p03_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs200_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x3b, 0x39, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(60), @@ -45,7 +45,7 @@ static const struct ScriptRef s_gs200_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -61,8 +61,8 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * VARIANT_DEFAULT(_(" We have to get through.\nNo matter what it takes.")), VARIANT_DEFAULT(_(" Please, let us pass!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), PORTRAIT_POS(2, 3, 0), MSG_NPC(2, _(" No!\nI cannot allow your passage!")), @@ -73,8 +73,8 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * VARIANT(/* == */ 1, _(" Why?{WAIT_PRESS}\nWhy can't we pass?")), VARIANT_DEFAULT(_(" Why?{WAIT_PRESS}\nWhy can't we pass?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" The frigid forest's air...")), MSG_NPC(2, _(" It has warmed considerably\nin recent times.")), TEXTBOX_CLEAR, @@ -91,13 +91,13 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * MSG_NPC(2, _(" This has never happened,\neven once.")), MSG_NPC(2, _(" Then you appeared in the\nforest.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Is this not your doing?!")), TEXTBOX_CLEAR, FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" W-we don't have anything\nto do with that!\nIt's a coincidence!")), @@ -121,15 +121,15 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * WAIT(10), MSG_NPC(2, _(" Is that all?{WAIT_PRESS}\nYou expect me to believe that?!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), FANFARE_PLAY2(685), { 0x28, 0x01, 0x0005, 0x00000002, 0x00ccccff, NULL }, { 0x27, 0x01, 0x0005, 0x00000002, 0x00ccccff, NULL }, WAIT(4), { 0x28, 0x00, 0x0005, 0x00000002, 0x00ccccff, NULL }, { 0x27, 0x01, 0x0005, 0x00000002, 0x00ccccff, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Waaaaaaaah!")), @@ -138,18 +138,18 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * MSG_NPC(2, _(" Enough of your foolish talk!{WAIT_PRESS}\nPrepare for your end!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), FANFARE_PLAY2(685), { 0x28, 0x01, 0x0005, 0x00000002, 0x00ccccff, NULL }, { 0x27, 0x01, 0x0005, 0x00000002, 0x00ccccff, NULL }, WAIT(4), { 0x28, 0x00, 0x0005, 0x00000002, 0x00ccccff, NULL }, { 0x27, 0x01, 0x0005, 0x00000002, 0x00ccccff, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), WAIT(15), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), FANFARE_PLAY2(685), { 0x28, 0x01, 0x0005, 0x00000002, 0x00ffffff, NULL }, { 0x27, 0x01, 0x0005, 0x00000002, 0x00ffffff, NULL }, @@ -158,16 +158,16 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * { 0x27, 0x01, 0x0005, 0x00000002, 0x00ffffff, NULL }, WAIT(4), { 0x28, 0x01, 0x0005, 0x00000002, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), BGM_FADEOUT(120), MSG_NPC(-1, _(" Stop it!")), TEXTBOX_CLEAR, BGM_FADEOUT(120), { 0x27, 0x00, 0x0005, 0x00000028, 0x00ffffff, NULL }, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" A-Absol!")), TEXTBOX_CLEAR, WAIT(10), @@ -189,8 +189,8 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * MSG_NPC(2, _(" ............{WAIT_PRESS}\nSo, there are calamities besides this...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ..................{WAIT_PRESS}Fine.{WAIT_PRESS}\nI will choose to believe you.")), MSG_NPC(2, _(" You may pass.")), TEXTBOX_CLEAR, @@ -199,11 +199,11 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * MSG_NPC(1, _(" {NAME_2}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" However!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), PORTRAIT_REP(0x0001, 0x0000000c), @@ -218,22 +218,22 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * MSG_NPC(1, _(" Yup! We promise,\n{NAME_2}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(120), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000002), MSG_NPC(1, _(" Whew...\nThat was too close...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_NPC(1, _(" Thank you.{WAIT_PRESS}\nYou saved us.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(8), + ROTATE(4, 1, DIRECTION_NORTHEAST), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), MSG_NPC(3, _(" ..................")), @@ -249,34 +249,34 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * MSG_NPC(3, _(" I was led here by my\nfeelings of foreboding...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(60), MSG_NPC(3, _(" ............{WAIT_PRESS}\nI think it would be best if we combined\nforces...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(30), MSG_NPC(3, _(" I will join you.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), FANFARE_PLAY2(463), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Huh?{WAIT_PRESS}\nYou will? Really?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Really.")), MSG_NPC(3, _(" To put an end to the\ncalamities, cooperation is vital.")), MSG_NPC(3, _(" Let me lend you my powers.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000b), MSG_NPC(1, _(" Sniffle...\nThank you, {NAME_3}.")), TEXTBOX_CLEAR, @@ -291,12 +291,12 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * CHOICE(/* label */ 29, _("*Yes.")), CHOICE(/* label */ 30, _("No.")), LABEL(29), /* = 0x1d */ - { 0x3d, 0x00, 0x0000, -0x00000001, 0x00000000, NULL }, + RENAME_ALLY(-1), LABEL(30), /* = 0x1e */ { 0x3b, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -331,32 +331,32 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * static const struct ScriptCommand s_gs200_g1_s0_lives1_dlg0[] = { /* 0x825174c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x54, 0x00, 0x002d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(2), + ROTATE(4, 2, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(458), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -364,60 +364,60 @@ static const struct ScriptCommand s_gs200_g1_s0_lives2_dlg0[] = { /* 0x825190c * DEBUGINFO, { 0x54, 0x00, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x54, 0x00, 0x0800, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), WAIT(46), FANFARE_PLAY2(475), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(24), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(475), - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(25), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(25), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(25), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(25), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(24), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(475), - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(25), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(24), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), FANFARE_PLAY2(475), WAIT(32), { 0x70, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, WAIT(8), FANFARE_PLAY2(459), { 0x70, 0x00, 0x0400, 0x00000080, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; @@ -425,26 +425,26 @@ static const struct ScriptCommand s_gs200_g1_s1_lives0_dlg0[] = { /* 0x8251cac * DEBUGINFO, { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x60, 0x01, 0x0000, 0x000000a0, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0x70, 0x00, 0x0800, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(505), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), WAIT(32), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ROTATE(8, 2, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(8), + ROTATE(8, 1, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(8), HALT, }; diff --git a/src/data/ground/ground_data_d11p01_station.h b/src/data/ground/ground_data_d11p01_station.h index 4cfa0c072..0b21ebf2c 100644 --- a/src/data/ground/ground_data_d11p01_station.h +++ b/src/data/ground/ground_data_d11p01_station.h @@ -62,42 +62,42 @@ static const struct ScriptCommand s_gs201_g0_s0_obj0_dlg2[] = { /* 0x825221c */ static const struct ScriptCommand s_gs201_g0_s1_lives0_dlg0[] = { /* 0x825223c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs201_g0_s1_lives1_dlg0[] = { /* 0x825227c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs201_g0_s2_lives0_dlg0[] = { /* 0x82522bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs201_g0_s2_lives1_dlg0[] = { /* 0x82522fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs201_g0_s3_lives0_dlg0[] = { /* 0x825233c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs201_g0_s3_lives1_dlg0[] = { /* 0x825237c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -136,7 +136,7 @@ static const struct ScriptCommand s_gs201_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -145,7 +145,7 @@ static const struct ScriptRef s_gs201_g1_s0_station_sref = { 402, 7, NULL /* EVE static const struct ScriptCommand s_gs201_g1_s0_lives0_dlg0[] = { /* 0x8252548 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000052, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000063, 0x00000000, NULL }, @@ -160,20 +160,20 @@ static const struct ScriptCommand s_gs201_g1_s0_lives0_dlg0[] = { /* 0x8252548 * VARIANT_DEFAULT(_(" {NAME_2} appeared to\nyou...")), VARIANT_DEFAULT(_(" That's why you were\nlooking so stunned earlier.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But, wow...\n{NAME_3} isn't just a legend.\nIt really exists...")), VARIANT_DEFAULT(_(" I'm amazed, though...\n{NAME_3} isn't just a legend.\nIt really exists...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" And that {NAME_3} is\nat the peak way up there.")), VARIANT_DEFAULT(_(" And that {NAME_3} is up\nat the peak...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000008), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Sniffle...{WAIT_PRESS}\n{NAME_0}!")), @@ -212,7 +212,7 @@ static const struct ScriptCommand s_gs201_g1_s0_lives0_dlg0[] = { /* 0x8252548 * LABEL(4), /* = 0x04 */ PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Hmm...?{WAIT_PRESS} Well, there was\na time when I had some doubts...{WAIT_PRESS}\nBut now...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" ...I wonder why?{WAIT_PRESS}\nI really don't know why.")), TEXTBOX_CLEAR, @@ -240,19 +240,19 @@ static const struct ScriptCommand s_gs201_g1_s0_lives0_dlg0[] = { /* 0x8252548 * VARIANT_DEFAULT(_(" It is strange, isn't it?{WAIT_PRESS}\nBut, {NAME_0}, I believe in you.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Anyway, we'll know the\ntruth when we get to the peak.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, let's give it\nour best!")), VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), + ALERT_CUE(3), RET, }; @@ -262,30 +262,30 @@ static const struct ScriptCommand s_gs201_g1_s0_lives0_dlg0[] = { /* 0x8252548 * static const struct ScriptCommand s_gs201_g1_s0_lives1_dlg0[] = { /* 0x825366c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, WAIT(100), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -315,7 +315,7 @@ static const struct ScriptCommand s_gs201_g2_s1_station_sref_script[] = { /* 0x8 DEBUGINFO, SELECT_ENTITIES(-1, 1), CANCEL_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -323,7 +323,7 @@ static const struct ScriptRef s_gs201_g2_s1_station_sref = { 401, 7, NULL /* EVE static const struct ScriptCommand s_gs201_g2_s1_lives0_dlg0[] = { /* 0x8253910 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x8e, 0x01, 0x0000, 0x00000022, 0x00000000, NULL }, @@ -355,14 +355,14 @@ static const struct ScriptCommand s_gs201_g2_s1_lives0_dlg0[] = { /* 0x8253910 * COND_EQUAL(3, /* to label */ 7), COND_EQUAL(5, /* to label */ 7), COND_EQUAL(2, /* to label */ 7), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), BGM_FADEOUT(120), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(8), LABEL(7), /* = 0x07 */ - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), BGM_FADEOUT(120), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, WAIT(15), @@ -383,14 +383,14 @@ static const struct ScriptCommand s_gs201_g2_s1_lives0_dlg0[] = { /* 0x8253910 * COND_EQUAL(3, /* to label */ 9), COND_EQUAL(5, /* to label */ 9), COND_EQUAL(2, /* to label */ 9), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), BGM_FADEOUT(120), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, JUMP_LABEL(10), LABEL(9), /* = 0x09 */ - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), BGM_FADEOUT(120), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, WAIT(15), @@ -408,24 +408,24 @@ static const struct ScriptCommand s_gs201_g2_s1_lives0_dlg0[] = { /* 0x8253910 * static const struct ScriptCommand s_gs201_g2_s1_lives1_dlg0[] = { /* 0x8253f50 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CJUMP_UNK_C8(0), COND_EQUAL(0, /* to label */ 0), COND_EQUAL(1, /* to label */ 0), COND_EQUAL(7, /* to label */ 0), COND_EQUAL(6, /* to label */ 0), WAIT(15), - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, LABEL(0), /* = 0x00 */ - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -444,7 +444,7 @@ static const struct ScriptCommand s_gs201_g3_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -456,16 +456,16 @@ static const struct ScriptCommand s_gs201_g3_s0_lives0_dlg0[] = { /* 0x82541ac * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 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.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is one seriously\nrough neighborhood...")), @@ -474,7 +474,7 @@ static const struct ScriptCommand s_gs201_g3_s0_lives0_dlg0[] = { /* 0x82541ac * VARIANT_DEFAULT(_(" Let's be sure to reach the\npeak, {NAME_0}!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -483,15 +483,15 @@ static const struct ScriptCommand s_gs201_g3_s0_lives1_dlg0[] = { /* 0x8254430 * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -507,7 +507,7 @@ static const struct ScriptCommand s_gs201_g4_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -516,24 +516,24 @@ static const struct ScriptRef s_gs201_g4_s0_station_sref = { 402, 7, NULL /* EVE static const struct ScriptCommand s_gs201_g4_s0_lives0_dlg0[] = { /* 0x82545ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x30, 0x0080, 0x00000007, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" What the...?{WAIT_PRESS}\nIsn't this where we started from?!")), TEXTBOX_CLEAR, FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(15), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nI guess that path just loops back to the\nstart.")), @@ -544,24 +544,24 @@ static const struct ScriptCommand s_gs201_g4_s0_lives0_dlg0[] = { /* 0x82545ec * VARIANT_DEFAULT(_(" {NAME_0}, let's do our\nbest!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs201_g4_s0_lives1_dlg0[] = { /* 0x825492c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x89, 0x20, 0x0080, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -577,7 +577,7 @@ static const struct ScriptCommand s_gs201_g5_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(36), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 2, 0), RET, }; @@ -589,25 +589,25 @@ static const struct ScriptCommand s_gs201_g5_s0_lives0_dlg0[] = { /* 0x8254af8 * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 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...")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is one harsh place,\nbut let's bear down and get through,\n{NAME_0}!")), VARIANT_DEFAULT(_(" This is a harsh place,\nso let's do our best to get through,\n{NAME_0}!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; @@ -615,15 +615,15 @@ static const struct ScriptCommand s_gs201_g5_s0_lives1_dlg0[] = { /* 0x8254d64 * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -633,7 +633,7 @@ static const struct ScriptCommand s_gs201_g6_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(115), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -643,30 +643,30 @@ static const struct ScriptCommand s_gs201_g6_s0_eff0_script[] = { /* 0x8254eb0 * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), WAIT(30), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs201_g6_s0_lives0_dlg0[] = { /* 0x8254f30 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x89, 0x40, 0x0080, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_SOUTHWEST), MSG_NPC(2, _(" You're going to {COLOR YELLOW_D}Mt. Freeze{RESET}?")), MSG_NPC(2, _(" Don't forget to take me,\nkekeh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(7), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_GRID(128, 0), + ALERT_CUE(3), HALT, }; @@ -674,13 +674,13 @@ static const struct ScriptCommand s_gs201_g6_s0_lives1_dlg0[] = { /* 0x825508c * DEBUGINFO, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x86, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(7), WAIT(15), - { 0x6b, 0x00, 0x0080, 0x00000000, 0x00000000, NULL }, + WALK_GRID(128, 0), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d11p02_station.h b/src/data/ground/ground_data_d11p02_station.h index db603efd7..c597e509b 100644 --- a/src/data/ground/ground_data_d11p02_station.h +++ b/src/data/ground/ground_data_d11p02_station.h @@ -108,28 +108,28 @@ static const struct ScriptCommand s_gs202_g0_s0_obj0_dlg2[] = { /* 0x8255c44 */ static const struct ScriptCommand s_gs202_g0_s1_lives0_dlg0[] = { /* 0x8255c64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs202_g0_s1_lives1_dlg0[] = { /* 0x8255ca4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs202_g0_s3_lives0_dlg0[] = { /* 0x8255ce4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs202_g0_s3_lives1_dlg0[] = { /* 0x8255d24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -163,7 +163,7 @@ static const struct ScriptCommand s_gs202_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(115), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -175,16 +175,16 @@ static const struct ScriptCommand s_gs202_g1_s0_lives0_dlg0[] = { /* 0x8255f00 * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 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...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But we didn't have far to\ngo!")), @@ -193,10 +193,10 @@ static const struct ScriptCommand s_gs202_g1_s0_lives0_dlg0[] = { /* 0x8255f00 * VARIANT_DEFAULT(_(" Let's be sure to reach the\npeak this time, {NAME_0}!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), RET, }; @@ -205,15 +205,15 @@ static const struct ScriptCommand s_gs202_g1_s0_lives1_dlg0[] = { /* 0x82561ac * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; diff --git a/src/data/ground/ground_data_d11p03_station.h b/src/data/ground/ground_data_d11p03_station.h index 843b655cd..3f3c10a7f 100644 --- a/src/data/ground/ground_data_d11p03_station.h +++ b/src/data/ground/ground_data_d11p03_station.h @@ -35,7 +35,7 @@ static const struct ScriptCommand s_gs203_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_STOP, { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), RET, @@ -47,32 +47,32 @@ static const struct ScriptCommand s_gs203_g1_s0_eff0_script[] = { /* 0x8256648 * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x28, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x30, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0004, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + WALK_GRID(256, 0), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000041), MSG_NPC(2, _(" Kekeh! Here at last!\nWe're at the peak!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Hey, Ninetales!{WAIT_PRESS}\nWhere are you?! Come out!")), TEXTBOX_CLEAR, @@ -84,22 +84,22 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * { 0x27, 0x01, 0x0005, 0x0000003c, 0x00ffffff, NULL }, BGM_SWITCH(6), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_NORTHWEST), MSG_NPC(2, _(" Kekeh!\nLong time, Ninetales!")), MSG_NPC(2, _(" Recognize me?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" ............{WAIT_PRESS}What do you want?")), TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000042), MSG_NPC(2, _(" Kekeh!\nYou want to know what I want?!")), MSG_NPC(2, _(" Look at me!\nIsn't it your fault that I look like this?!")), @@ -123,8 +123,8 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(464), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" You...{WAIT_PRESS}\nYou have the nerve to ask that?")), TEXTBOX_CLEAR, WAIT(10), @@ -135,29 +135,29 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * MSG_NPC(2, _(" Turn me down, and I'll\nKO you!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" ...Well, it won't be me\ndoing the fighting, but those behind me...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000044), MSG_NPC(2, _(" I'll see this curse lifted\neven if it means taking you on!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Humph. I regret to inform...{WAIT_PRESS}\nEven if you could defeat me, the curse\nwould remain.")), MSG_NPC(3, _(" I don't have the power to\nlift curses.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000046), MSG_NPC(2, _(" Gegeh!\nWhat are you saying?!")), TEXTBOX_CLEAR, @@ -170,23 +170,23 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * MSG_NPC(3, _(" Take this with you.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(30), FANFARE_PLAY(212), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_2} received the\n{CENTER_ALIGN}{COLOR GREEN_I}9-Tail Crest{RESET} from {NAME_3}.")), { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Gardevoir's physical form\nis sealed within the {COLOR YELLOW_D}Murky Cave{RESET}.")), MSG_NPC(3, _(" The seal can be broken\nby that stone.{WAIT_PRESS}\nThe {COLOR GREEN_I}9-Tail Crest{RESET}.")), TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Gotcha!")), MSG_NPC(2, _(" We just go to this\n{COLOR YELLOW_D}Murky Cave{RESET} and plunk down that rock...")), @@ -196,21 +196,21 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * MSG_NPC(2, _(" There was a way to lift\nthe curse after all!{WAIT_PRESS}\nYou had me scared! Kekeke!")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(7), + ROTATE(12, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Hey!\nI kept you waiting!\nLet's get home! Kekeh!")), TEXTBOX_CLEAR, BGM_FADEOUT(150), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(15), { 0x89, 0xc0, 0x0100, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(30), MSG_NPC(3, _(" That oaf...{WAIT_PRESS}\nHe has changed in many ways...")), MSG_NPC(3, _(" But he is wavering...{WAIT_PRESS}\nHis old and new emotions are clashing\nwithin his heart...")), @@ -218,7 +218,7 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * TEXTBOX_CLEAR, WAIT(30), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -237,73 +237,73 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * static const struct ScriptCommand s_gs203_g1_s0_lives1_dlg0[] = { /* 0x8257a0c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 1), + AWAIT_CUE(7), { 0x89, 0x18, 0x0080, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(20), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(8, 10, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x89, 0x28, 0x0100, 0x00000000, 0x00000000, NULL }, WAIT(45), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x78, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs203_g1_s1_lives0_dlg0[] = { /* 0x8257c8c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(8, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(8), + ROTATE(8, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x84, 0x00, 0x0100, -0x00000011, 0x00000020, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x84, 0x00, 0x0100, 0x00000011, -0x00000020, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(8), HALT, }; @@ -313,7 +313,7 @@ static const struct ScriptCommand s_gs203_g2_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(203), SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -322,18 +322,18 @@ static const struct ScriptRef s_gs203_g2_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs203_g2_s0_eff0_script[] = { /* 0x8257ea8 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0005, 0x00000063, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x89, 0x68, 0x0100, 0x00000004, 0x00000000, NULL }, PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -344,19 +344,19 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * VARIANT_DEFAULT(_(" This is the summit.{WAIT_PRESS}\n...Isn't it?")), VARIANT_DEFAULT(_(" I wonder where\n{NAME_5} is?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(-1, _(" There they are!{WAIT_PRESS}\nI've spotted {NAME_0}!")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" All right!\nI see them!")), TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTH), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), BGM_SWITCH(10), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" A-{NAME_2}!")), @@ -373,17 +373,17 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * MSG_NPC(3, _(" I can barely contain myself.\nI'm itching for a fight.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), + ALERT_CUE(6), PORTRAIT_REP(0x0003, 0x00000000), MSG_NPC(3, _(" {NAME_1}.{WAIT_PRESS}\nDon't think badly of me.")), MSG_NPC(3, _(" I don't know how to show\nmercy.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), + ALERT_CUE(6), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" {NAME_0}...{WAIT_PRESS}\nI didn't wish for this conclusion...")), MSG_NPC(2, _(" But this, too, is fate.")), @@ -391,64 +391,64 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * MSG_NPC(2, _(" We will...{WAIT_PRESS}\ncrush you with every shred of our power!")), MSG_NPC(2, _(" Get them!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), WAIT(5), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000005, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, 0x00000000, 0x00000010, NULL }, + WALK_RELATIVE(512, 0, 16), WAIT(5), FANFARE_PLAY2(497), { 0x28, 0x01, 0x0005, 0x00000002, 0x00ffffff, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + WARP_WAYPOINT(0, 2), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), { 0x27, 0x00, 0x0005, 0x00000003, 0x00ffffff, NULL }, { 0x62, 0x00, 0x0400, 0x00000040, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, { 0x62, 0x00, 0x0080, 0x00000008, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0300, -0x00000020, 0x00000000, NULL }, + ALERT_CUE(7), + WALK_RELATIVE(768, -32, 0), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0300, -0x00000038, 0x00000000, NULL }, + WALK_RELATIVE(768, -56, 0), FANFARE_PLAY2(497), { 0x28, 0x01, 0x0005, 0x00000002, 0x00ffffff, NULL }, { 0xe5, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000003, 0x00000000, NULL }, + WARP_WAYPOINT(0, 3), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0x27, 0x00, 0x0005, 0x00000003, 0x00ffffff, NULL }, { 0x7e, 0x00, 0x0400, -0x00000020, 0x00000040, NULL }, { 0x7e, 0x00, 0x0100, -0x00000008, 0x00000010, NULL }, { 0x7e, 0x00, 0x0080, -0x00000004, 0x00000008, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x7e, 0x00, 0x0300, 0x00000018, -0x00000038, NULL }, BGM_FADEOUT(150), FANFARE_PLAY2(506), @@ -456,7 +456,7 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * { 0x54, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0x72, 0x00, 0x005a, 0x00000008, -0x00000018, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -467,172 +467,172 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * static const struct ScriptCommand s_gs203_g2_s0_lives1_dlg0[] = { /* 0x8258a00 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0x68, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTH), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(6), WAIT(3), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000005, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, 0x00000000, 0x00000010, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000005, 0x00000000, NULL }, + WALK_RELATIVE(512, 0, 16), + AWAIT_CUE(6), + WARP_WAYPOINT(0, 5), { 0x8b, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0400, 0x00000010, 0x00000040, NULL }, { 0x62, 0x00, 0x0100, 0x00000004, 0x00000010, NULL }, { 0x62, 0x00, 0x0080, 0x00000004, 0x00000008, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), { 0x86, 0x00, 0x004c, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs203_g2_s0_lives2_dlg0[] = { /* 0x8258c30 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0x68, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTH), CALL_SCRIPT(NOTICE_FUNC), { 0x62, 0x00, 0x0080, 0x00000000, -0x00000028, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + AWAIT_CUE(6), + AWAIT_CUE(6), WAIT(3), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000005, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0400, 0x00000000, 0x00000020, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x0000000b, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(1024, 0, 32), + AWAIT_CUE(6), + WARP_WAYPOINT(0, 11), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x62, 0x00, 0x0400, 0x00000000, 0x00000050, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, 0x00000018, NULL }, { 0x62, 0x00, 0x0080, 0x00000000, 0x00000010, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), { 0x86, 0x00, 0x004c, 0x0000000c, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs203_g2_s1_lives0_dlg0[] = { /* 0x8258e20 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x89, 0x50, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, + SELECT_ANIMATION(18), + AWAIT_CUE(7), + AWAIT_CUE(7), + WARP_WAYPOINT(0, 2), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x62, 0x00, 0x0400, -0x00000040, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, -0x00000010, 0x00000000, NULL }, { 0x62, 0x00, 0x0080, -0x00000008, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + AWAIT_CUE(7), { 0x7e, 0x00, 0x0300, 0x00000050, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(7), + WARP_WAYPOINT(0, 3), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ALERT_CUE(5), { 0x7e, 0x00, 0x0400, 0x00000020, -0x00000040, NULL }, { 0x7e, 0x00, 0x0100, 0x00000008, -0x00000010, NULL }, { 0x7e, 0x00, 0x0080, 0x00000004, -0x00000008, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + AWAIT_CUE(7), { 0x7e, 0x00, 0x0300, -0x00000018, 0x00000038, NULL }, { 0x54, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0x72, 0x00, 0x005a, -0x00000008, 0x00000018, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs203_g2_s1_lives1_dlg0[] = { /* 0x8259080 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x89, 0x50, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(8), + WARP_WAYPOINT(0, 7), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0400, -0x00000020, -0x00000040, NULL }, { 0x62, 0x00, 0x0100, -0x00000008, -0x00000010, NULL }, { 0x62, 0x00, 0x0080, -0x00000004, -0x00000008, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(8), { 0x86, 0x00, 0x004c, 0x00000008, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs203_g2_s1_lives2_dlg0[] = { /* 0x8259250 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x89, 0x50, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000009, 0x00000000, NULL }, + AWAIT_CUE(8), + WARP_WAYPOINT(0, 9), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0400, 0x00000020, -0x00000040, NULL }, { 0x62, 0x00, 0x0100, 0x00000008, -0x00000010, NULL }, { 0x62, 0x00, 0x0080, -0x00000004, -0x00000008, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), { 0x86, 0x00, 0x004c, 0x0000000a, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), HALT, }; @@ -640,7 +640,7 @@ static const struct ScriptCommand s_gs203_g3_s0_station_sref_script[] = { /* 0x8 DEBUGINFO, SELECT_MAP(203), SELECT_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x3b, 0x39, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, BGM_FADEOUT(60), @@ -668,7 +668,7 @@ static const struct ScriptRef s_gs203_g3_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0006, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -679,26 +679,26 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * TEXTBOX_CLEAR, { 0x27, 0x00, 0x0001, 0x0000001e, 0x00ffffff, NULL }, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0032, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(7), + SELECT_ANIMATION(50), { 0x62, 0x00, 0x0200, -0x00000010, 0x00000010, NULL }, CALL_SCRIPT(SHOCK_FUNC), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000041), PORTRAIT_POS(2, 0, 3), MSG_NPC(2, _(" Wuh!")), TEXTBOX_CLEAR, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000041), MSG_NPC(2, _(" ...!{WAIT_PRESS}\n{NAME_5}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(12), + ROTATE(4, 1, DIRECTION_NORTHEAST), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0003, 0x00000041), @@ -713,23 +713,23 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * MSG_NPC(4, _(" The legend...\nIt was real...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0005, 0x00000000), PORTRAIT_POS(5, 1, -1), BGM_SWITCH(6), MSG_NPC(5, _(" Cease fighting at once,\n{NAME_2}.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(5, _(" They are...{WAIT_PRESS}\nmy guests.")), TEXTBOX_CLEAR, WAIT(10), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Tell us, {NAME_5}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(2, _(" Who was the human that\nappeared in your legend?")), MSG_NPC(2, _(" No, even before that, was\nthe legend itself a true event?")), MSG_NPC(2, _(" Depending on your reply...{WAIT_PRESS}\nI may have no choice but to eliminate\nthem!")), @@ -746,28 +746,28 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * MSG_NPC(5, _(" The human eventually\nbecame a Pokémon.")), MSG_NPC(5, _(" Transformed into a\nPokémon, the human...{WAIT_PRESS}\nThe human lives on.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), BGM_FADEOUT(150), MSG_NPC(2, _(" ...And that human would be?")), MSG_NPC(2, _(" Who is the human that you\nspeak of?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(5, _(" {NAME_0}...")), MSG_NPC(5, _(" You may relax.\nIt is not you.")), TEXTBOX_CLEAR, BGM_SWITCH(24), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000b), MSG_NPC(1, _(" ............{WAIT_PRESS}Just now...{WAIT_PRESS}\n...What did you just say?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(5, _(" {NAME_0} is not the\nhuman that appears in the legend.\nThat is what I said.")), TEXTBOX_CLEAR, WAIT(10), @@ -775,8 +775,8 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * MSG_NPC(2, _(" ...Wh-{WAIT_PRESS}what...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000008), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nWhat's wrong with me?{WAIT_PRESS}\nI'm too tensed up to move...")), @@ -784,14 +784,14 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * VARIANT_DEFAULT(_(" ............{WAIT_PRESS}\nWhat's happening to me...?{WAIT_PRESS}\nI'm too tensed up to move...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_NPC(1, _(" Oo-oof...")), { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_NPC(1, _(" ...Oof...")), { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Deep breaths...\nIn... Out... In... Out... In... Out...")), @@ -800,25 +800,25 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * VARIANT_DEFAULT(_(" ..................{WAIT_PRESS}Whew...")), TEXTBOX_CLEAR, { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000a), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, wow, awesome!")), VARIANT_DEFAULT(_(" Oh, wow, fantastic!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(15), - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), WAIT(20), - { 0x91, 0x08, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_SOUTH), WAIT(20), - { 0x91, 0x08, 0x0001, 0x00000004, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_NORTH), WAIT(20), - { 0x91, 0x08, 0x0002, 0x00000006, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_WEST), WAIT(20), - { 0x91, 0x08, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_EAST), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000a), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's great!{WAIT_PRESS}\nI knew {NAME_0} wasn't the one!")), @@ -828,16 +828,16 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * VARIANT_DEFAULT(_(" That's great!{WAIT_PRESS}\nI knew that {NAME_0} wasn't involved!")), VARIANT_DEFAULT(_(" I knew it!{WAIT_PRESS}\nThere's no way that {NAME_0} would\ndo those terrible things!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(5, _(" I have another thing to say.")), MSG_NPC(5, _(" It is true that I foretold\nof the world's balance becoming unstable...")), MSG_NPC(5, _(" However, that human\nbecoming a Pokémon and the world's\nbalance are not linked in any way.")), MSG_NPC(5, _(" The cause of the natural\ncalamities...{WAIT_PRESS}\nIt exists elsewhere.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000003), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey! You lot!{WAIT_PRESS}\nYou were wrong!")), @@ -846,11 +846,11 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * VARIANT_DEFAULT(_(" You were wrong to hound\nand harass {NAME_0}!")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" ...Uh...er...{WAIT_PRESS}\nWe...uh...apologize.")), TEXTBOX_CLEAR, @@ -869,16 +869,16 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * VARIANT_DEFAULT(_(" If only that were true...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" But I must say...")), MSG_NPC(2, _(" You are to be commended\nfor prevailing through this cruel\njourney and discovering the truth.")), MSG_NPC(2, _(" Impressive, {NAME_0}.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 1, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hahaha! Isn't this great?\nI was convinced I was right!")), @@ -887,8 +887,8 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...Hah?{WAIT_PRESS}\nBut wait a second.")), @@ -907,18 +907,18 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * WAIT(10), FANFARE_PLAY2(453), { 0x97, 0x00, 0x0002, 0x00000001, 0x00000003, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(12), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), WAIT(15), - { 0x91, 0x06, 0x0001, 0x00000003, 0x00000000, NULL }, + ROTATE(6, 1, DIRECTION_NORTHEAST), WAIT(20), - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTHWEST), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Waah! The ground's heaving!")), TEXTBOX_CLEAR, @@ -935,12 +935,12 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * MSG_NPC(5, _(" Groudon will be awakened!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(12), + ROTATE(4, 10, DIRECTION_NORTH), WAIT(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" What?!\nGroudon is rising?!")), @@ -950,15 +950,15 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * MSG_NPC(4, _(" Groudon?!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000004), MSG_NPC(1, _(" What is that?{WAIT_PRESS}\nWhat's a Groudon?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" A legendary Pokémon that\nhas been spoken of only in myths.")), MSG_NPC(2, _(" It is the Pokémon that\nraised the land masses and created\ncontinents...")), @@ -998,10 +998,10 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * TEXTBOX_CLEAR, WAIT(10), FANFARE_STOP2(453), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(3), HALT, }; @@ -1042,35 +1042,35 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * static const struct ScriptCommand s_gs203_g3_s0_lives1_dlg0[] = { /* 0x825bcb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(9), + AWAIT_CUE(6), { 0x89, 0x10, 0x0080, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + AWAIT_CUE(6), { 0x89, 0x10, 0x0080, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTH), { 0x54, 0x00, 0x002e, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ROTATE(4, 1, DIRECTION_WEST), + AWAIT_CUE(6), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x62, 0x00, 0x0080, -0x00000004, 0x00000000, NULL }, { 0x62, 0x00, 0x0400, -0x00000010, 0x00000000, NULL }, WAIT(4), @@ -1113,68 +1113,68 @@ static const struct ScriptCommand s_gs203_g3_s0_lives1_dlg0[] = { /* 0x825bcb4 * { 0x8b, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), CALL_SCRIPT(ANGRY_START_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(20), - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTH), WAIT(18), - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs203_g3_s0_lives2_dlg0[] = { /* 0x825c2f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(24), { 0x62, 0x00, 0x0200, 0x00000008, -0x00000008, NULL }, CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTHWEST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x62, 0x00, 0x004c, -0x00000008, 0x00000008, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(7), WAIT(3), - { 0x91, 0x06, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_WEST), WAIT(12), - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), WAIT(15), - { 0x91, 0x06, 0x0001, 0x00000005, 0x00000000, NULL }, + ROTATE(6, 1, DIRECTION_NORTHWEST), WAIT(5), - { 0x91, 0x06, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(6, 2, DIRECTION_WEST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x50, 0x0100, 0x00000000, 0x00000000, NULL }, HALT, @@ -1182,23 +1182,23 @@ static const struct ScriptCommand s_gs203_g3_s0_lives2_dlg0[] = { /* 0x825c2f4 * static const struct ScriptCommand s_gs203_g3_s0_lives3_dlg0[] = { /* 0x825c514 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_SOUTHEAST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(8), WAIT(6), - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTHEAST), WAIT(12), - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), WAIT(10), - { 0x91, 0x07, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(7, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x50, 0x0100, 0x00000000, 0x00000000, NULL }, HALT, @@ -1206,22 +1206,22 @@ static const struct ScriptCommand s_gs203_g3_s0_lives3_dlg0[] = { /* 0x825c514 * static const struct ScriptCommand s_gs203_g3_s0_lives4_dlg0[] = { /* 0x825c664 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 1, DIRECTION_SOUTHWEST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(9), + ROTATE(8, 10, DIRECTION_EAST), WAIT(7), - { 0x91, 0x06, 0x0002, 0x00000004, 0x00000000, NULL }, + ROTATE(6, 2, DIRECTION_NORTH), WAIT(10), - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_EAST), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(9), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x50, 0x0100, 0x00000000, 0x00000000, NULL }, HALT, @@ -1229,15 +1229,15 @@ static const struct ScriptCommand s_gs203_g3_s0_lives4_dlg0[] = { /* 0x825c664 * static const struct ScriptCommand s_gs203_g3_s0_lives5_dlg0[] = { /* 0x825c7a4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(12), + ROTATE(4, 10, DIRECTION_NORTH), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(12), HALT, }; @@ -1245,41 +1245,41 @@ static const struct ScriptCommand s_gs203_g3_s1_lives0_dlg0[] = { /* 0x825c854 * DEBUGINFO, { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x60, 0x01, 0x0000, 0x000000a0, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), WAIT(20), FANFARE_PLAY2(504), { 0x70, 0x00, 0x0800, 0x00000008, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), { 0x70, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + SELECT_ANIMATION(23), + AWAIT_CUE(10), + SELECT_ANIMATION(2), + ROTATE(4, 1, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(4, 1, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(4, 2, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_EAST), WAIT(10), - { 0x91, 0x06, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(6, 1, DIRECTION_WEST), WAIT(10), - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(10), HALT, }; diff --git a/src/data/ground/ground_data_d12p01_station.h b/src/data/ground/ground_data_d12p01_station.h index 57af47c26..e2c7fca7c 100644 --- a/src/data/ground/ground_data_d12p01_station.h +++ b/src/data/ground/ground_data_d12p01_station.h @@ -46,28 +46,28 @@ static const struct ScriptRef s_gs204_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs204_g0_s1_lives0_dlg0[] = { /* 0x825d03c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs204_g0_s1_lives1_dlg0[] = { /* 0x825d07c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs204_g0_s3_lives0_dlg0[] = { /* 0x825d0bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs204_g0_s3_lives1_dlg0[] = { /* 0x825d0fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -90,7 +90,7 @@ static const struct ScriptCommand s_gs204_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(108), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_MAGMA_CAVERN), RET, }; @@ -99,13 +99,13 @@ static const struct ScriptRef s_gs204_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs204_g1_s0_lives0_dlg0[] = { /* 0x825d228 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000067, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 0), WAIT(10), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(30), @@ -117,7 +117,7 @@ static const struct ScriptCommand s_gs204_g1_s0_lives0_dlg0[] = { /* 0x825d228 * VARIANT_DEFAULT(_(" Whew...\nLook at the streams of lava.")), VARIANT_DEFAULT(_(" It's going to be scorching\nhot in the dungeon, I think.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(5), { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, WAIT(15), @@ -129,26 +129,26 @@ static const struct ScriptCommand s_gs204_g1_s0_lives0_dlg0[] = { /* 0x825d228 * VARIANT_DEFAULT(_(" There should be other\nrescue teams making their way through\neven now.")), VARIANT_DEFAULT(_(" Let's try our best like\nalways!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0x6b, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 3), + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs204_g1_s0_lives1_dlg0[] = { /* 0x825d6dc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 1), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 2), HALT, }; @@ -158,7 +158,7 @@ static const struct ScriptCommand s_gs204_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(108), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_MAGMA_CAVERN), RET, }; @@ -167,35 +167,35 @@ static const struct ScriptRef s_gs204_g2_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs204_g2_s0_lives0_dlg0[] = { /* 0x825d818 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000058, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 0), { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, WAIT(15), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This time, we'll rescue\n{NAME_2}'s team!\nLet's get it done!")), VARIANT_DEFAULT(_(" This time, we have to\nrescue {NAME_2}'s team!\nLet's not blow it!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0x6b, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 3), + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs204_g2_s0_lives1_dlg0[] = { /* 0x825d9bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 1), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 2), HALT, }; diff --git a/src/data/ground/ground_data_d12p02_station.h b/src/data/ground/ground_data_d12p02_station.h index 36bc9ddb8..c0eafa2bf 100644 --- a/src/data/ground/ground_data_d12p02_station.h +++ b/src/data/ground/ground_data_d12p02_station.h @@ -85,28 +85,28 @@ static const struct ScriptCommand s_gs205_g0_s0_obj0_dlg2[] = { /* 0x825e0e8 */ static const struct ScriptCommand s_gs205_g0_s1_lives0_dlg0[] = { /* 0x825e108 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs205_g0_s1_lives1_dlg0[] = { /* 0x825e148 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs205_g0_s3_lives0_dlg0[] = { /* 0x825e188 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs205_g0_s3_lives1_dlg0[] = { /* 0x825e1c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -134,7 +134,7 @@ static const struct ScriptCommand s_gs205_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(108), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -146,10 +146,10 @@ static const struct ScriptCommand s_gs205_g1_s0_lives0_dlg0[] = { /* 0x825e344 * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmm...{WAIT_PRESS}\nWell, that didn't go well.")), @@ -160,9 +160,9 @@ static const struct ScriptCommand s_gs205_g1_s0_lives0_dlg0[] = { /* 0x825e344 * VARIANT_DEFAULT(_(" But we were very close!{WAIT_PRESS}\nLet's keep trying our best!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -170,12 +170,12 @@ static const struct ScriptCommand s_gs205_g1_s0_lives1_dlg0[] = { /* 0x825e570 * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; diff --git a/src/data/ground/ground_data_d12p04_station.h b/src/data/ground/ground_data_d12p04_station.h index 3cf3d618d..f7a7545ad 100644 --- a/src/data/ground/ground_data_d12p04_station.h +++ b/src/data/ground/ground_data_d12p04_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs206_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), FANFARE_FADEOUT2(60, 453), BGM_FADEOUT(60), { 0x3b, 0x39, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs206_g1_s0_eff0_script[] = { /* 0x825ead8 * static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -67,59 +67,59 @@ static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 * WAIT(5), { 0x27, 0x00, 0x0005, 0x00000004, 0x00ffffff, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(20), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Grgaaaaaah!") }, WAIT(120), TEXTBOX_CLEAR, WAIT(90), FANFARE_PLAY2(499), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(13), + AWAIT_CUE(5), SELECT_ENTITIES(-1, 1), WAIT(30), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_NORTHWEST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" Look! It's {NAME_3}!{WAIT_PRESS}\n{NAME_4} and {NAME_5} too!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000000), MSG_NPC(5, _(" Urrgggh!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + ALERT_CUE(9), + ALERT_CUE(8), + AWAIT_CUE(5), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), WAIT(10), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000043), MSG_NPC(4, _(" Did you do it?\n{NAME_2}?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Are you all right?")), VARIANT_DEFAULT(_(" Are you OK?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), WAIT(30), PORTRAIT(PLACEMENT_TOP_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Yes, fine.")), MSG_NPC(3, _(" We will be fine.\nBut we must get out immediately.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0005, 0x00000005), MSG_NPC(1, _(" What about {NAME_2}?{WAIT_PRESS}\nWill it be OK?")), TEXTBOX_CLEAR, @@ -131,10 +131,10 @@ static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 * FANFARE_PLAY2(453), { 0x97, 0x00, 0x0002, 0x00000001, 0x00000003, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(14), WAIT(30), PORTRAIT_REP(0x0005, 0x0000000c), MSG_NPC(1, _(" Waah...{WAIT_PRESS}\nAnother quake!")), @@ -142,45 +142,45 @@ static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 * WAIT(10), MSG_NPC(3, _(" Out! Quickly!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(14), { 0x89, 0x78, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs206_g1_s0_lives1_dlg0[] = { /* 0x825f2ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, 0x00000000, -0x00000008, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_RELATIVE(128, 0, -8), + ROTATE(4, 10, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(10, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x89, 0x78, 0x0100, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs206_g1_s0_lives2_dlg0[] = { /* 0x825f41c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(14), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x78, 0x0100, 0x00000000, 0x00000000, NULL }, HALT, @@ -188,10 +188,10 @@ static const struct ScriptCommand s_gs206_g1_s0_lives2_dlg0[] = { /* 0x825f41c * static const struct ScriptCommand s_gs206_g1_s0_lives3_dlg0[] = { /* 0x825f49c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(14), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x78, 0x0100, 0x00000000, 0x00000000, NULL }, HALT, @@ -199,10 +199,10 @@ static const struct ScriptCommand s_gs206_g1_s0_lives3_dlg0[] = { /* 0x825f49c * static const struct ScriptCommand s_gs206_g1_s0_lives4_dlg0[] = { /* 0x825f51c */ DEBUGINFO, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(23), WAIT(30), FANFARE_PLAY2(665), WAIT(60), @@ -210,34 +210,34 @@ static const struct ScriptCommand s_gs206_g1_s0_lives4_dlg0[] = { /* 0x825f51c * { 0x97, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x97, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs206_g1_s0_eff1_script[] = { /* 0x825f5fc */ DEBUGINFO, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x56, 0x00, 0x0000, 0x00000067, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs206_g1_s0_eff2_script[] = { /* 0x825f65c */ DEBUGINFO, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x56, 0x00, 0x0000, 0x00000067, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs206_g1_s0_eff3_script[] = { /* 0x825f6bc */ DEBUGINFO, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), { 0x56, 0x00, 0x0000, 0x00000067, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; @@ -245,7 +245,7 @@ static const struct ScriptCommand s_gs206_g1_s1_lives0_dlg0[] = { /* 0x825f71c * DEBUGINFO, { 0x54, 0x00, 0x001a, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x62, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, -0x00000001, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, @@ -258,29 +258,29 @@ static const struct ScriptCommand s_gs206_g1_s1_lives0_dlg0[] = { /* 0x825f71c * { 0x62, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, -0x00000002, 0x00000000, NULL }, WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), - { 0x91, 0x0a, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(10, 2, DIRECTION_EAST), WAIT(20), - { 0x91, 0x0a, 0x0001, 0x00000007, 0x00000000, NULL }, + ROTATE(10, 1, DIRECTION_SOUTHWEST), WAIT(10), - { 0x91, 0x0a, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(8), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x89, 0x78, 0x0100, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs206_g1_s1_lives1_dlg0[] = { /* 0x825f91c */ DEBUGINFO, - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(25), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(10), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000001, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000001, NULL }, @@ -294,35 +294,35 @@ static const struct ScriptCommand s_gs206_g1_s1_lives1_dlg0[] = { /* 0x825f91c * { 0x62, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, -0x00000002, 0x00000000, NULL }, WAIT(25), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(45), - { 0x91, 0x0a, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(10, 2, DIRECTION_SOUTHEAST), WAIT(20), - { 0x91, 0x0a, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(9), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(9), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x89, 0x88, 0x0100, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs206_g1_s1_lives2_dlg0[] = { /* 0x825fb1c */ DEBUGINFO, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000001, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000001, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, 0x00000001, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000001, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, 0x00000001, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000001, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), WAIT(15), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000001, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000001, NULL }, @@ -336,23 +336,23 @@ static const struct ScriptCommand s_gs206_g1_s1_lives2_dlg0[] = { /* 0x825fb1c * { 0x62, 0x00, 0x0100, 0x00000000, 0x00000002, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000002, NULL }, WAIT(40), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(40), - { 0x91, 0x0a, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(10, 1, DIRECTION_WEST), WAIT(10), - { 0x91, 0x0a, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(10, 2, DIRECTION_SOUTHEAST), WAIT(5), - { 0x91, 0x0a, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 1, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(10), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(10), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(10), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x89, 0x88, 0x0100, 0x00000000, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d13p01_station.h b/src/data/ground/ground_data_d13p01_station.h index 2d0825f64..2d5cb5b17 100644 --- a/src/data/ground/ground_data_d13p01_station.h +++ b/src/data/ground/ground_data_d13p01_station.h @@ -24,7 +24,7 @@ static const struct ScriptCommand s_gs207_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(22), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -34,14 +34,14 @@ static const struct ScriptRef s_gs207_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs207_g1_s0_lives0_dlg0[] = { /* 0x826008c */ DEBUGINFO, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0030, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(48), { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x00000088, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), FANFARE_PLAY2(509), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), { 0x70, 0x00, 0x0a00, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x52, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, @@ -58,31 +58,31 @@ static const struct ScriptCommand s_gs207_g1_s0_lives0_dlg0[] = { /* 0x826008c * VARIANT_DEFAULT(_(" Owowow...{WAIT_PRESS}\nWhere are we?")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + SELECT_ANIMATION(2), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Wah!\n{NAME_0}, this is cool!{WAIT_PRESS}\nWe're on clouds!")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(7), + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(5), MSG_NPC(1, _(" Oh, wow!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(5), MSG_NPC(1, _(" {NAME_0}, look up there!")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(7), WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -90,10 +90,10 @@ static const struct ScriptCommand s_gs207_g1_s0_lives0_dlg0[] = { /* 0x826008c * static const struct ScriptCommand s_gs207_g1_s0_lives1_dlg0[] = { /* 0x8260458 */ DEBUGINFO, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0030, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(48), { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x00000088, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), { 0x70, 0x00, 0x0a00, 0x00000000, 0x00000000, NULL }, WAIT(1), @@ -103,36 +103,36 @@ static const struct ScriptCommand s_gs207_g1_s0_lives1_dlg0[] = { /* 0x8260458 * WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x002c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + SELECT_ANIMATION(2), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), WAIT(30), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0031, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(49), { 0x84, 0x00, 0x0080, -0x00000018, 0x00000000, NULL }, WAIT(20), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), WAIT(30), { 0x84, 0x00, 0x0080, 0x00000018, 0x00000010, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(20), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), WAIT(15), FANFARE_PLAY2(458), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x84, 0x00, 0x0099, 0x00000000, -0x00000010, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; @@ -140,7 +140,7 @@ static const struct ScriptCommand s_gs207_g1_s0_lives2_dlg0[] = { /* 0x8260738 * DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x000000c8, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(15), { 0x70, 0x00, 0x0a00, 0x00000000, 0x00000000, NULL }, WAIT(1), @@ -149,16 +149,16 @@ static const struct ScriptCommand s_gs207_g1_s0_lives2_dlg0[] = { /* 0x8260738 * { 0x70, 0x00, 0x0200, 0x0000000c, 0x00000000, NULL }, WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(10), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ROTATE(4, 10, DIRECTION_NORTH), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(7), HALT, }; @@ -168,7 +168,7 @@ static const struct ScriptCommand s_gs207_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(22), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_SKY_TOWER), RET, }; @@ -177,7 +177,7 @@ static const struct ScriptRef s_gs207_g2_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs207_g2_s0_lives0_dlg0[] = { /* 0x8260934 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000006c, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -188,42 +188,42 @@ static const struct ScriptCommand s_gs207_g2_s0_lives0_dlg0[] = { /* 0x8260934 * VARIANT_DEFAULT(_(" It's at the top of this\ntower...")), VARIANT_DEFAULT(_(" That's where {NAME_2}\nis...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nLet's give it our best!")), VARIANT_DEFAULT(_(" {NAME_0}!\nLet's do our best on the climb!")), TEXTBOX_CLEAR, { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00b3, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + WALK_GRID(179, 0), + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs207_g2_s0_lives1_dlg0[] = { /* 0x8260b8c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(10), - { 0x6b, 0x00, 0x00b3, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 0), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs207_g2_s0_lives2_dlg0[] = { /* 0x8260c3c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00b3, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 0), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; @@ -234,7 +234,7 @@ static const struct ScriptCommand s_gs207_g3_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(22), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_SKY_TOWER), RET, }; @@ -244,14 +244,14 @@ static const struct ScriptRef s_gs207_g3_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs207_g3_s0_lives0_dlg0[] = { /* 0x8260d38 */ DEBUGINFO, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0030, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(48), { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x00000088, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(509), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), { 0x70, 0x00, 0x0a00, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x52, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, @@ -259,27 +259,27 @@ static const struct ScriptCommand s_gs207_g3_s0_lives0_dlg0[] = { /* 0x8260d38 * { 0x70, 0x00, 0x0200, 0x0000000c, 0x00000000, NULL }, WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" All right.\nWe're up in the sky again.")), VARIANT_DEFAULT(_(" OK.\nHere we are in the sky again.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ROTATE(4, 10, DIRECTION_WEST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's storm our way to\nthe top floor!")), VARIANT_DEFAULT(_(" Let's head for the top!\nThis is it!")), TEXTBOX_CLEAR, { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00b3, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + WALK_GRID(179, 0), + ALERT_CUE(3), HALT, }; @@ -287,10 +287,10 @@ static const struct ScriptCommand s_gs207_g3_s0_lives0_dlg0[] = { /* 0x8260d38 * static const struct ScriptCommand s_gs207_g3_s0_lives1_dlg0[] = { /* 0x826104c */ DEBUGINFO, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0030, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(48), { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x00000088, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), { 0x70, 0x00, 0x0a00, 0x00000000, 0x00000000, NULL }, WAIT(1), @@ -299,15 +299,15 @@ static const struct ScriptCommand s_gs207_g3_s0_lives1_dlg0[] = { /* 0x826104c * { 0x70, 0x00, 0x0200, 0x0000000c, 0x00000000, NULL }, WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(10), - { 0x6b, 0x00, 0x00b3, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 0), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; @@ -316,7 +316,7 @@ static const struct ScriptCommand s_gs207_g3_s0_lives2_dlg0[] = { /* 0x82611dc * DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x000000c8, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(15), { 0x70, 0x00, 0x0a00, 0x00000000, 0x00000000, NULL }, WAIT(1), @@ -325,12 +325,12 @@ static const struct ScriptCommand s_gs207_g3_s0_lives2_dlg0[] = { /* 0x82611dc * { 0x70, 0x00, 0x0200, 0x0000000c, 0x00000000, NULL }, WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00b3, 0x00000000, 0x00000000, NULL }, + WALK_GRID(179, 0), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d13p02_station.h b/src/data/ground/ground_data_d13p02_station.h index 32fa487cb..535f67a7d 100644 --- a/src/data/ground/ground_data_d13p02_station.h +++ b/src/data/ground/ground_data_d13p02_station.h @@ -85,28 +85,28 @@ static const struct ScriptCommand s_gs208_g0_s0_obj0_dlg2[] = { /* 0x8261928 */ static const struct ScriptCommand s_gs208_g0_s1_lives0_dlg0[] = { /* 0x8261948 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs208_g0_s1_lives1_dlg0[] = { /* 0x8261988 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs208_g0_s3_lives0_dlg0[] = { /* 0x82619c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs208_g0_s3_lives1_dlg0[] = { /* 0x8261a08 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -134,7 +134,7 @@ static const struct ScriptCommand s_gs208_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(22), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -146,10 +146,10 @@ static const struct ScriptCommand s_gs208_g1_s0_lives0_dlg0[] = { /* 0x8261b84 * CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(10), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -161,9 +161,9 @@ static const struct ScriptCommand s_gs208_g1_s0_lives0_dlg0[] = { /* 0x8261b84 * VARIANT_DEFAULT(_(" But we were very close!{WAIT_PRESS}\nLet's keep trying our best!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -171,12 +171,12 @@ static const struct ScriptCommand s_gs208_g1_s0_lives1_dlg0[] = { /* 0x8261dc0 * DEBUGINFO, CALL_SCRIPT(INIT_SLEEP_FUNC), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; diff --git a/src/data/ground/ground_data_d13p03_station.h b/src/data/ground/ground_data_d13p03_station.h index 1cd330e4a..1098d6b34 100644 --- a/src/data/ground/ground_data_d13p03_station.h +++ b/src/data/ground/ground_data_d13p03_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs209_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(26), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, FANFARE_FADEOUT2(16, 512), RET, @@ -33,16 +33,16 @@ static const struct ScriptCommand s_gs209_g1_s0_eff0_script[] = { /* 0x82621bc * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x20, 0x0500, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs209_g1_s0_lives0_dlg0[] = { /* 0x826223c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(5), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Gyaaaaaaaaaaaaaaaah!") }, @@ -59,18 +59,18 @@ static const struct ScriptCommand s_gs209_g1_s0_lives0_dlg0[] = { /* 0x826223c * WAIT(120), TEXTBOX_CLEAR2, FANFARE_PLAY2(848), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), { 0x2e, 0x0f, 0x0002, -0x00000002, 0x00000000, NULL }, { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...Gwaargh!") }, WAIT(90), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + ALERT_CUE(10), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0x28, 0x01, 0x0005, 0x0000001e, 0x00ffffff, NULL }, WAIT(30), FANFARE_PLAY2(512), @@ -80,8 +80,8 @@ static const struct ScriptCommand s_gs209_g1_s0_lives0_dlg0[] = { /* 0x826223c * { 0x97, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(15), { 0x97, 0x00, 0x0002, 0x00000001, 0x00000001, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), WAIT(60), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), @@ -93,26 +93,26 @@ static const struct ScriptCommand s_gs209_g1_s0_lives0_dlg0[] = { /* 0x826223c * TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" These are shock waves!{WAIT_PRESS}\nAnd they're huge!")), TEXTBOX_CLEAR, WAIT(30), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's it! I get it now!{WAIT_PRESS}\nLook straight up, {NAME_2}!")), VARIANT_DEFAULT(_(" That's it! I got it!{WAIT_PRESS}\nLook straight up, {NAME_2}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(10), + ROTATE(4, 10, DIRECTION_NORTH), WAIT(20), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(3), HALT, }; @@ -122,61 +122,61 @@ static const struct ScriptCommand s_gs209_g1_s0_lives0_dlg0[] = { /* 0x826223c * static const struct ScriptCommand s_gs209_g1_s0_lives1_dlg0[] = { /* 0x826282c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs209_g1_s0_lives2_dlg0[] = { /* 0x826290c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(10), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs209_g1_s0_lives3_dlg0[] = { /* 0x82629ac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(10), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs209_g1_s0_lives4_dlg0[] = { /* 0x8262a4c */ DEBUGINFO, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), + AWAIT_CUE(7), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), FANFARE_PLAY2(652), { 0x97, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, WAIT(8), { 0x97, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(672), { 0x62, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, WAIT(2), @@ -199,29 +199,29 @@ static const struct ScriptCommand s_gs209_g1_s0_lives4_dlg0[] = { /* 0x8262a4c * { 0x62, 0x00, 0x0100, -0x00000002, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(774), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Gyaaaaaaaaaaaaaah!") }, { 0x28, 0x01, 0x0005, 0x00000008, 0x00ffffff, NULL }, WAIT(5), { 0x27, 0x00, 0x0005, 0x00000008, 0x00ffffff, NULL }, WAIT(90), TEXTBOX_CLEAR2, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(24), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(517), { 0x28, 0x01, 0x0005, 0x00000004, 0x00ffffff, NULL }, WAIT(3), { 0x27, 0x00, 0x0005, 0x00000004, 0x00ffffff, NULL }, - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(25), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x54, 0x00, 0x001b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; @@ -233,7 +233,7 @@ static const struct ScriptCommand s_gs209_g2_s0_station_sref_script[] = { /* 0x8 { 0x97, 0x00, 0x0002, 0x00000001, 0x00000001, NULL }, WAIT(15), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x0005, 0x00000010, 0x00ffffff, NULL }, RET, }; @@ -244,23 +244,23 @@ static const struct ScriptCommand s_gs209_g2_s0_eff0_script[] = { /* 0x8262ebc * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), WAIT(10), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x14, 0x0500, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs209_g2_s0_lives0_dlg0[] = { /* 0x8262f4c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" What is that?!")), TEXTBOX_CLEAR, @@ -277,8 +277,8 @@ static const struct ScriptCommand s_gs209_g2_s0_lives0_dlg0[] = { /* 0x8262f4c * VARIANT_DEFAULT(_(" That's why we came,\n{NAME_2}.\nPlease, destroy the falling star!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(15), MSG_NPC(2, _(" ...So, that is why...")), TEXTBOX_CLEAR, @@ -302,21 +302,21 @@ static const struct ScriptCommand s_gs209_g2_s0_lives0_dlg0[] = { /* 0x8262f4c * MSG_NPC(2, _(" Well said!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), BGM_FADEOUT(120), FANFARE_PLAY2(664), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(2, _(" Take charge of your destiny!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), FANFARE_PLAY2(513), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(4), WAIT(10), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -329,22 +329,22 @@ static const struct ScriptCommand s_gs209_g2_s0_lives0_dlg0[] = { /* 0x8262f4c * static const struct ScriptCommand s_gs209_g2_s0_lives1_dlg0[] = { /* 0x8263660 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs209_g2_s0_lives2_dlg0[] = { /* 0x82636a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs209_g2_s0_lives3_dlg0[] = { /* 0x82636e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(10), HALT, }; @@ -352,43 +352,43 @@ static const struct ScriptCommand s_gs209_g2_s0_lives4_dlg0[] = { /* 0x8263720 * DEBUGINFO, { 0x54, 0x00, 0x001b, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(24), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ALERT_CUE(8), { 0x54, 0x00, 0x001a, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs209_g2_s0_eff1_script[] = { /* 0x8263860 */ DEBUGINFO, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000006f, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x00000070, 0x00000000, NULL }, WAIT(120), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x59, 0x00, 0x0000, -0x0000001a, 0x00000000, NULL }, WAIT(1), { 0x56, 0x00, 0x0000, 0x00000133, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x00000134, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), HALT, }; @@ -400,7 +400,7 @@ static const struct ScriptCommand s_gs209_g3_s0_station_sref_script[] = { /* 0x8 { 0x97, 0x00, 0x0002, 0x00000005, 0x00000002, NULL }, WAIT(15), { 0x27, 0x00, 0x0005, 0x00000010, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x28, 0x01, 0x0005, 0x0000003c, 0x00ffffff, NULL }, WAIT(120), @@ -414,7 +414,7 @@ static const struct ScriptRef s_gs209_g3_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs209_g3_s0_lives0_dlg0[] = { /* 0x8263a7c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -422,27 +422,27 @@ static const struct ScriptCommand s_gs209_g3_s0_lives0_dlg0[] = { /* 0x8263a7c * TEXTBOX_AUTO_PRESS(15, 15), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" Waaaaaaaaaaaaaaaaaah!")), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs209_g3_s0_lives1_dlg0[] = { /* 0x8263b44 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs209_g3_s0_lives2_dlg0[] = { /* 0x8263b84 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs209_g3_s0_lives3_dlg0[] = { /* 0x8263bb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; diff --git a/src/data/ground/ground_data_d14p01_station.h b/src/data/ground/ground_data_d14p01_station.h index 579d2a524..df0917b24 100644 --- a/src/data/ground/ground_data_d14p01_station.h +++ b/src/data/ground/ground_data_d14p01_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs210_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(10), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -30,17 +30,17 @@ static const struct ScriptRef s_gs210_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs210_g1_s0_lives0_dlg0[] = { /* 0x8263fe8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs210_g1_s0_lives1_dlg0[] = { /* 0x8264058 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d15p01_station.h b/src/data/ground/ground_data_d15p01_station.h index 9f0fab930..d37d4f784 100644 --- a/src/data/ground/ground_data_d15p01_station.h +++ b/src/data/ground/ground_data_d15p01_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs211_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(10), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -30,7 +30,7 @@ static const struct ScriptRef s_gs211_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs211_g1_s0_lives0_dlg0[] = { /* 0x826425c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -60,7 +60,7 @@ static const struct ScriptCommand s_gs211_g1_s0_lives0_dlg0[] = { /* 0x826425c * MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Northwind Field{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -71,7 +71,7 @@ static const struct ScriptCommand s_gs211_g1_s0_lives0_dlg0[] = { /* 0x826425c * static const struct ScriptCommand s_gs211_g1_s0_lives1_dlg0[] = { /* 0x8264734 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d16p01_station.h b/src/data/ground/ground_data_d16p01_station.h index e349a2d17..5158614cf 100644 --- a/src/data/ground/ground_data_d16p01_station.h +++ b/src/data/ground/ground_data_d16p01_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs212_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -32,7 +32,7 @@ static const struct ScriptRef s_gs212_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs212_g1_s0_eff0_script[] = { /* 0x8264958 */ DEBUGINFO, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x000000ab, 0x00000000, NULL }, HALT, }; @@ -45,37 +45,37 @@ static const struct ScriptCommand s_gs212_g1_s0_obj0_dlg0[] = { /* 0x8264998 */ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(497), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x28, 0x01, 0x0005, 0x00000005, 0x00fa7d7d, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00fa7d7d, NULL }, { 0xe2, 0x00, 0x01f1, 0x00000000, 0x00000000, NULL }, WAIT(20), FANFARE_PLAY2(497), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x28, 0x01, 0x0005, 0x00000005, 0x00550000, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00550000, NULL }, { 0xe2, 0x00, 0x01f1, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Gwooooooh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" Urghgh...{WAIT_PRESS}\nI... I lost...")), MSG_NPC(2, _(" You...{WAIT_PRESS}\nWhat do you wish?")), TEXTBOX_CLEAR, WAIT(10), - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, + WALK_RELATIVE(256, 0, -24), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000018, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" ...Wh-what?! This is...\nthe {COLOR GREEN_I}Clear Wing{RESET}...")), MSG_NPC(2, _(" ...I understand now.{WAIT_PRESS}\nTo meet that Pokémon...")), MSG_NPC(2, _(" ............{WAIT_PRESS}Stand aside.")), @@ -83,18 +83,18 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * WAIT(10), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, BGM_FADEOUT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), SELECT_OBJECTS(1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x28, 0x01, 0x0005, 0x00000004, 0x00550000, NULL }, WAIT(1), { 0x27, 0x01, 0x0005, 0x00000004, 0x00550000, NULL }, WAIT(10), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(8), MSG_INSTANT(_("{CENTER_ALIGN}Entei's fiery blast made\n{CENTER_ALIGN}the {COLOR GREEN_I}Clear Wing{RESET} flare!")), MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR GREEN_I}Clear Wing{RESET}...{WAIT_PRESS}\n{CENTER_ALIGN}transformed into the {COLOR GREEN_I}Red Wing{RESET}!")), TEXTBOX_CLEAR, @@ -131,7 +131,7 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -142,37 +142,37 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * static const struct ScriptCommand s_gs212_g1_s0_lives1_dlg0[] = { /* 0x826518c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, WAIT(10), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(19), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(9), WAIT(30), FANFARE_PLAY2(663), { 0x56, 0x00, 0x0000, 0x0000004e, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe2, 0x00, 0x0297, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), WAIT(30), FANFARE_PLAY2(653), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + SELECT_ANIMATION(2), HALT, }; @@ -187,8 +187,8 @@ static const struct ScriptCommand s_gs212_g1_s1_obj0_dlg0[] = { /* 0x82653cc */ { 0x56, 0x00, 0x0000, 0x0000004c, 0x00000000, NULL }, WAIT(10), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), FANFARE_PLAY2(739), diff --git a/src/data/ground/ground_data_d17p01_station.h b/src/data/ground/ground_data_d17p01_station.h index 002693dc0..9810dc692 100644 --- a/src/data/ground/ground_data_d17p01_station.h +++ b/src/data/ground/ground_data_d17p01_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs213_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -32,7 +32,7 @@ static const struct ScriptRef s_gs213_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs213_g1_s0_eff0_script[] = { /* 0x8265764 */ DEBUGINFO, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x000000ac, 0x00000000, NULL }, HALT, }; @@ -45,55 +45,55 @@ static const struct ScriptCommand s_gs213_g1_s0_obj0_dlg0[] = { /* 0x82657a4 */ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(497), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x28, 0x01, 0x0005, 0x00000005, 0x00707000, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00707000, NULL }, { 0xe2, 0x00, 0x01f1, 0x00000000, 0x00000000, NULL }, WAIT(20), FANFARE_PLAY2(497), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x28, 0x01, 0x0005, 0x00000005, 0x00505000, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00505000, NULL }, { 0xe2, 0x00, 0x01f1, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), FANFARE_PLAY2(685), MSG_NPC(2, _(" Gwooooooooooh!{WAIT_PRESS}\n...H-how dare you!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" How...{WAIT_PRESS}\nHow did this happen...?")), MSG_NPC(2, _(" But regardless, you have\nwon.{WAIT_PRESS}\nLet me hear your wish.")), TEXTBOX_CLEAR, WAIT(10), - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, + WALK_RELATIVE(256, 0, -24), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000018, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" ...Hm?! This...{WAIT_PRESS}\nThis is the {COLOR GREEN_I}Red Wing{RESET}...")), MSG_NPC(2, _(" ............{WAIT_PRESS}You...{WAIT_PRESS}\nStand back!")), TEXTBOX_CLEAR, WAIT(10), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, BGM_FADEOUT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), SELECT_OBJECTS(1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(10), { 0x28, 0x00, 0x0005, 0x00000003, 0x00505000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(1), { 0x27, 0x01, 0x0005, 0x00000003, 0x00505000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), MSG_INSTANT(_("{CENTER_ALIGN}Raikou's thunderbolt\n{CENTER_ALIGN}electrified the {COLOR GREEN_I}Red Wing{RESET}!")), MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR GREEN_I}Red Wing{RESET}...{WAIT_PRESS}\n{CENTER_ALIGN}transformed into\n{CENTER_ALIGN}the {COLOR GREEN_I}Sunset Wing{RESET}!")), TEXTBOX_CLEAR, @@ -133,7 +133,7 @@ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 * { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -144,38 +144,38 @@ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 * static const struct ScriptCommand s_gs213_g1_s0_lives1_dlg0[] = { /* 0x826604c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, WAIT(10), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(19), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(9), WAIT(30), FANFARE_PLAY2(708), { 0x56, 0x00, 0x0000, 0x00000062, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe2, 0x00, 0x02c4, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), WAIT(15), FANFARE_PLAY2(479), { 0xe2, 0x00, 0x01df, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + SELECT_ANIMATION(2), HALT, }; @@ -190,8 +190,8 @@ static const struct ScriptCommand s_gs213_g1_s1_obj0_dlg0[] = { /* 0x826629c */ FANFARE_PLAY2(662), { 0x56, 0x00, 0x0000, 0x000000b1, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x000000b2, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), diff --git a/src/data/ground/ground_data_d18p01_station.h b/src/data/ground/ground_data_d18p01_station.h index b6d550cd5..1b0cfa91f 100644 --- a/src/data/ground/ground_data_d18p01_station.h +++ b/src/data/ground/ground_data_d18p01_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs214_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -38,44 +38,44 @@ static const struct ScriptCommand s_gs214_g1_s0_eff0_script[] = { /* 0x82665f4 * static const struct ScriptCommand s_gs214_g1_s0_eff1_script[] = { /* 0x8266624 */ DEBUGINFO, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x000000ad, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(497), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x28, 0x01, 0x0005, 0x00000005, 0x00005077, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00005077, NULL }, { 0xe2, 0x00, 0x01f1, 0x00000000, 0x00000000, NULL }, WAIT(20), FANFARE_PLAY2(497), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x28, 0x01, 0x0005, 0x00000005, 0x00005077, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00005077, NULL }, { 0xe2, 0x00, 0x01f1, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Gwoooooooh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" I have lost...")), MSG_NPC(2, _(" I admit it.\nYou are strong.")), TEXTBOX_CLEAR, WAIT(10), - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000018, NULL }, + WALK_RELATIVE(256, 0, -24), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000018, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" This!{WAIT_PRESS}\nThe {COLOR GREEN_I}Sunset Wing{RESET}!")), MSG_NPC(2, _(" ...I see.{WAIT_PRESS}\nYou came seeking the mirage Pokémon...")), MSG_NPC(2, _(" ...{WAIT_PRESS}Step back.")), @@ -83,19 +83,19 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * WAIT(10), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, BGM_FADEOUT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" Kyuuuuuuuuhn!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), SELECT_OBJECTS(1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + SELECT_ANIMATION(9), { 0x28, 0x00, 0x0005, 0x00000004, 0x00005077, NULL }, { 0x27, 0x01, 0x0005, 0x00000004, 0x00005077, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(20), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), MSG_INSTANT(_("{CENTER_ALIGN}The north wind swirled\n{CENTER_ALIGN}around the {COLOR GREEN_I}Sunset Wing{RESET}!")), MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR GREEN_I}Sunset Wing{RESET}...{WAIT_PRESS}\n{CENTER_ALIGN}transformed into the {COLOR GREEN_I}Rainbow Wing{RESET}!")), TEXTBOX_CLEAR, @@ -136,7 +136,7 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -147,38 +147,38 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * static const struct ScriptCommand s_gs214_g1_s0_lives1_dlg0[] = { /* 0x8266f30 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, WAIT(10), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(19), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(9), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(664), { 0x56, 0x00, 0x0000, 0x00000053, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe2, 0x00, 0x0298, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), WAIT(10), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + SELECT_ANIMATION(2), HALT, }; @@ -188,8 +188,8 @@ static const struct ScriptCommand s_gs214_g1_s1_obj0_dlg0[] = { /* 0x8267150 */ { 0x56, 0x00, 0x0000, 0x00000170, 0x00000000, NULL }, WAIT(10), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x00000056, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), diff --git a/src/data/ground/ground_data_d19p01_station.h b/src/data/ground/ground_data_d19p01_station.h index db25ac7e1..e33bdf64a 100644 --- a/src/data/ground/ground_data_d19p01_station.h +++ b/src/data/ground/ground_data_d19p01_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs215_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(10), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -30,7 +30,7 @@ static const struct ScriptRef s_gs215_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs215_g1_s0_lives0_dlg0[] = { /* 0x82674cc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -60,7 +60,7 @@ static const struct ScriptCommand s_gs215_g1_s0_lives0_dlg0[] = { /* 0x82674cc * MSG_INSTANT(_("{CENTER_ALIGN}And...")), MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}{COLOR YELLOW_D}Mt. Faraway{RESET}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -71,7 +71,7 @@ static const struct ScriptCommand s_gs215_g1_s0_lives0_dlg0[] = { /* 0x82674cc * static const struct ScriptCommand s_gs215_g1_s0_lives1_dlg0[] = { /* 0x82679c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d20p01_station.h b/src/data/ground/ground_data_d20p01_station.h index 9d53e351b..3261ad5d0 100644 --- a/src/data/ground/ground_data_d20p01_station.h +++ b/src/data/ground/ground_data_d20p01_station.h @@ -32,7 +32,7 @@ static const struct ScriptCommand s_gs216_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(10), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x0002, 0x0000003c, 0x00ffffff, NULL }, WAIT(1), { 0x28, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -46,11 +46,11 @@ static const struct ScriptRef s_gs216_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 0), { 0x93, 0x04, 0x0001, 0x00000068, 0x00000000, NULL }, WAIT(30), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, @@ -58,8 +58,8 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * MSG_NPC(0, _(" Hey!{WAIT_PRESS}\nGet a move on!")), TEXTBOX_CLEAR, { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000003), @@ -74,8 +74,8 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * MSG_NPC(1, _(" Yeah...{WAIT_PRESS}\nI just happened to be swimming by in\nthe sea when I spotted this cave...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" I didn't expect it to be\na dungeon this rough...\nGasp, gasp...")), TEXTBOX_CLEAR, WAIT(10), @@ -84,8 +84,8 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(472), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000002), MSG_NPC(1, _(" Wh-what!{WAIT_PRESS}\nCall me pathetic, will you?!")), PORTRAIT_REP(0x0001, 0x00000003), @@ -95,8 +95,8 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * MSG_NPC(1, _(" Wroooooooaaaaar!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, PORTRAIT_REP(0x0000, 0x00000002), MSG_NPC(0, _(" Hahaha!{WAIT_PRESS}\nThere! You're still feeling frisky!")), @@ -112,8 +112,8 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * MSG_NPC(0, _(" Hey, no problem.\nLet's move!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000020, NULL }, + ALERT_CUE(6), + WALK_RELATIVE(256, 0, -32), BGM_FADEOUT(30), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), @@ -145,7 +145,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * MSG_NPC(-1, _(" ......Who...disturbs...my sleep...{WAIT_PRESS}\nIs it{WAIT_PRESS} you?!\n")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x92, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, WAIT(15), { 0x92, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, @@ -194,8 +194,8 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x22, 0x01, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(6), WAIT(60), { 0x28, 0x01, 0x0005, 0x00000078, 0x00ffffff, NULL }, TEXTBOX_AUTO_PRESS(60, 60), @@ -211,7 +211,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * TEXTBOX_AUTO_PRESS(-1, -1), BGM_FADEOUT(60), WAIT(60), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -232,67 +232,67 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * static const struct ScriptCommand s_gs216_g1_s0_lives1_dlg0[] = { /* 0x8268c90 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x004c, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(76, 1), { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_NORTHEAST), WAIT(30), - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHEAST), WAIT(30), { 0x93, 0x08, 0x000a, 0x00000059, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005e, 0x00000000, NULL }, WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(9), WAIT(120), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ROTATE(4, 10, DIRECTION_NORTH), WAIT(15), - { 0x54, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(18), { 0x56, 0x00, 0x0000, 0x00000054, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(610), FANFARE_PLAY2(862), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(6), + SELECT_ANIMATION(2), + ROTATE(4, 10, DIRECTION_SOUTHEAST), WAIT(15), - { 0x54, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(18), { 0x56, 0x00, 0x0000, 0x00000054, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(610), FANFARE_PLAY2(862), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(6), + SELECT_ANIMATION(2), + ROTATE(4, 10, DIRECTION_SOUTHWEST), WAIT(15), - { 0x54, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(18), { 0x56, 0x00, 0x0000, 0x00000054, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(610), FANFARE_PLAY2(862), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(6), + SELECT_ANIMATION(2), { 0x93, 0x08, 0x000a, 0x00000059, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), { 0x92, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, WAIT(15), { 0x92, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, @@ -300,7 +300,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives1_dlg0[] = { /* 0x8268c90 * { 0x92, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, WAIT(15), { 0x92, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(786), { 0xe2, 0x00, 0x0312, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(831), @@ -320,38 +320,38 @@ static const struct ScriptCommand s_gs216_g1_s0_lives1_dlg0[] = { /* 0x8268c90 * static const struct ScriptCommand s_gs216_g1_s0_eff1_script[] = { /* 0x82691d0 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x59, 0x00, 0x0004, -0x00000018, 0x00000000, NULL }, { 0x8b, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x00000150, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, 0x00000000, -0x00000078, NULL }, + WALK_RELATIVE(512, 0, -120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + WARP_WAYPOINT(0, 2), + ALERT_CUE(6), + AWAIT_CUE(7), { 0x59, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x00000150, 0x00000000, NULL }, { 0x8b, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, 0x00000078, 0x00000078, NULL }, + WALK_RELATIVE(512, 120, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + WARP_WAYPOINT(0, 2), + ALERT_CUE(6), + AWAIT_CUE(7), { 0x59, 0x00, -0x000c, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x00000150, 0x00000000, NULL }, { 0x8b, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, -0x00000078, 0x00000078, NULL }, + WALK_RELATIVE(512, -120, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + WARP_WAYPOINT(0, 2), + ALERT_CUE(6), + AWAIT_CUE(7), RET, }; static const struct ScriptCommand s_gs216_g1_s0_eff2_script[] = { /* 0x8269390 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), FANFARE_PLAY2(786), { 0x56, 0x00, 0x0000, 0x0000004a, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -378,7 +378,7 @@ static const struct ScriptCommand s_gs216_g1_s0_eff2_script[] = { /* 0x8269390 * static const struct ScriptCommand s_gs216_g1_s0_eff3_script[] = { /* 0x8269510 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(15), FANFARE_PLAY2(831), { 0x56, 0x00, 0x0000, 0x00000042, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d21p01_station.h b/src/data/ground/ground_data_d21p01_station.h index 78bc016c7..151ce5b5d 100644 --- a/src/data/ground/ground_data_d21p01_station.h +++ b/src/data/ground/ground_data_d21p01_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs217_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -32,56 +32,56 @@ static const struct ScriptRef s_gs217_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs217_g1_s0_lives0_dlg0[] = { /* 0x8269878 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), FANFARE_PLAY2(475), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(10), { 0x28, 0x01, 0x0005, 0x00000005, 0x00ffffff, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00ffffff, NULL }, { 0xe2, 0x00, 0x01db, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Urghgh...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ............{WAIT_PRESS}Please...\nPlease let me go...")), MSG_NPC(2, _(" I have to go...{WAIT_PRESS}\nThere's somewhere that I have to go...")), MSG_NPC(2, _(" If...I don't hurry...{WAIT_PRESS}\nM-my little sister...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(30), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x00cc, 0x00000000, -0x00000030, NULL }, + ALERT_CUE(3), + WALK_RELATIVE(204, 0, -48), HALT, }; static const struct ScriptCommand s_gs217_g1_s0_lives1_dlg0[] = { /* 0x8269b04 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(25), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0021, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(33), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x54, 0x00, 0x001d, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(475), - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), { 0xe2, 0x00, 0x01db, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(779), { 0x54, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -90,7 +90,7 @@ static const struct ScriptCommand s_gs217_g1_s0_lives1_dlg0[] = { /* 0x8269b04 * WAIT(40), FANFARE_PLAY2(682), { 0xe2, 0x00, 0x02aa, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; diff --git a/src/data/ground/ground_data_d22p01_station.h b/src/data/ground/ground_data_d22p01_station.h index abb4d1ebe..58c7c733b 100644 --- a/src/data/ground/ground_data_d22p01_station.h +++ b/src/data/ground/ground_data_d22p01_station.h @@ -22,7 +22,7 @@ static const struct ScriptCommand s_gs218_g1_s0_station_sref_script[] = { /* 0x8 BGM_STOP, SELECT_MAP(218), SELECT_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, WAIT(60), RET, @@ -32,7 +32,7 @@ static const struct ScriptRef s_gs218_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs218_g1_s0_eff1_script[] = { /* 0x8269e78 */ DEBUGINFO, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x000000a5, 0x00000000, NULL }, WAIT(180), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -40,49 +40,49 @@ static const struct ScriptCommand s_gs218_g1_s0_eff1_script[] = { /* 0x8269e78 * { 0x56, 0x00, 0x0000, 0x000000a6, 0x00000000, NULL }, WAIT(120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs218_g1_s0_eff2_script[] = { /* 0x8269f38 */ DEBUGINFO, { 0x59, 0x00, 0x0000, -0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x000000a0, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x000000a1, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x56, 0x00, 0x0000, 0x000000a4, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), RET, }; static const struct ScriptCommand s_gs218_g1_s0_eff3_script[] = { /* 0x826a028 */ DEBUGINFO, { 0x59, 0x00, 0x0000, -0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x56, 0x00, 0x0000, 0x000000a0, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x000000a1, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x56, 0x00, 0x0000, 0x000000a4, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs218_g1_s0_lives0_dlg0[] = { /* 0x826a108 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -95,42 +95,42 @@ static const struct ScriptCommand s_gs218_g1_s0_lives0_dlg0[] = { /* 0x826a108 * { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, + WALK_GRID(256, 1), WAIT(30), PORTRAIT(PLACEMENT_TOP_RIGHT, 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, WAIT(10), - { 0x6a, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + WALK_RELATIVE(256, 8, 0), + WALK_GRID(256, 0), + ALERT_CUE(7), + ROTATE(4, 2, DIRECTION_WEST), WAIT(30), BGM_FADEOUT(90), FANFARE_PLAY2(500), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), { 0x59, 0x00, 0x0000, -0x000000c8, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs218_g1_s0_lives1_dlg0[] = { /* 0x826a408 */ DEBUGINFO, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_EAST), WAIT(30), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x59, 0x00, 0x0000, -0x000000c8, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d23p01_station.h b/src/data/ground/ground_data_d23p01_station.h index 1270e68d8..72f55aeae 100644 --- a/src/data/ground/ground_data_d23p01_station.h +++ b/src/data/ground/ground_data_d23p01_station.h @@ -25,7 +25,7 @@ static const struct ScriptCommand s_gs219_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(120), { 0x28, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, RET, @@ -35,41 +35,41 @@ static const struct ScriptRef s_gs219_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs219_g1_s0_lives0_dlg0[] = { /* 0x826a6b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 0), WAIT(15), PORTRAIT(PLACEMENT_RIGHT, 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.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(3), WAIT(1), - { 0x6b, 0x00, 0x00cc, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + WALK_GRID(204, 1), + ROTATE(4, 10, DIRECTION_NORTHEAST), HALT, }; static const struct ScriptCommand s_gs219_g1_s0_lives1_dlg0[] = { /* 0x826a84c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00cc, 0x00000003, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 2), + AWAIT_CUE(6), + WALK_GRID(204, 3), + ROTATE(4, 10, DIRECTION_NORTHWEST), HALT, }; static const struct ScriptCommand s_gs219_g1_s0_lives2_dlg0[] = { /* 0x826a8dc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d24p01_station.h b/src/data/ground/ground_data_d24p01_station.h index 12afaec4a..7d1052f7f 100644 --- a/src/data/ground/ground_data_d24p01_station.h +++ b/src/data/ground/ground_data_d24p01_station.h @@ -24,7 +24,7 @@ static const struct ScriptCommand s_gs220_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(90), { 0x23, 0x01, 0x005a, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -37,45 +37,45 @@ static const struct ScriptCommand s_gs220_g1_s0_eff0_script[] = { /* 0x826ab30 * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x48, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x89, 0x78, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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, WAIT(30), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000041), MSG_NPC(2, _(" Oh, look!{WAIT_PRESS}\nThere's a dais!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(7), + WALK_GRID(256, 0), WAIT(15), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" There's a hollow spot.\nI guess that stone goes in there.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), FANFARE_PLAY2(348), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_2} placed the {COLOR GREEN_I}9-Tail Crest{RESET}\n{CENTER_ALIGN}in the hollow spot.")), TEXTBOX_CLEAR, @@ -90,7 +90,7 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0x28, 0x01, 0x0005, 0x00000004, 0x00ffffff, NULL }, WAIT(4), { 0x27, 0x00, 0x0005, 0x00000004, 0x00ffffff, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(45), FANFARE_PLAY2(506), { 0x28, 0x01, 0x0005, 0x0000001e, 0x00ffffff, NULL }, @@ -105,29 +105,29 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * TEXTBOX_CLEAR, WAIT(60), FANFARE_PLAY2(463), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ............?{WAIT_PRESS}\nHuh? I thought I heard something...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Kekeh!\nDid you just say something?")), TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(468), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT(5), FANFARE_PLAY2(468), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000044), MSG_NPC(2, _(" That's odd...\nI could've sworn I heard something...")), TEXTBOX_CLEAR, @@ -141,13 +141,13 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Welcome to\n{CENTER_ALIGN}the Murky Cave!") }, TEXTBOX_CLEAR, FANFARE_PLAY2(469), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(7), + ROTATE(8, 1, DIRECTION_EAST), WAIT(10), FANFARE_PLAY2(469), - { 0x91, 0x08, 0x0002, 0x00000006, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_WEST), WAIT(10), - { 0x91, 0x08, 0x0001, 0x00000004, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_NORTH), MSG_NPC(2, _(" What? What?!\nWhere is that voice coming from?")), MSG_NPC(2, _(" Who are you?")), TEXTBOX_CLEAR, @@ -188,38 +188,38 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * WAIT(4), { 0x27, 0x00, 0x0005, 0x00000004, 0x00ffffff, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000046), MSG_NPC(2, _(" Gegeh?! What the...?!{WAIT_PRESS}\nI can't move!")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2}, you will not\n{CENTER_ALIGN}be doing the answering...") }, { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0}.") }, TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), WAIT(30), { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0}.\n{CENTER_ALIGN}You will answer.") }, TEXTBOX_CLEAR, WAIT(60), - { 0x6b, 0x00, 0x0080, 0x00000001, 0x00000000, NULL }, + WALK_GRID(128, 1), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Gegegeh!\nWhat are you saying?!")), MSG_NPC(2, _(" Why is someone else\nspeaking for me?!")), MSG_NPC(2, _(" Let me do it!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2}.{WAIT_PRESS}\n{CENTER_ALIGN}Your heart is interwoven\n{CENTER_ALIGN}with conflicting emotions.") }, { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}You will probably never show\n{CENTER_ALIGN}the truth within your heart.") }, TEXTBOX_CLEAR, @@ -230,7 +230,7 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0} will enter\n{CENTER_ALIGN}{NAME_2}'s heart.") }, { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Please navigate carefully\n{CENTER_ALIGN}through {NAME_2}'s emotions.") }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -252,60 +252,60 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * static const struct ScriptCommand s_gs220_g1_s0_lives1_dlg0[] = { /* 0x826be2c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x89, 0x70, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x89, 0x18, 0x0080, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + WALK_GRID(256, 1), + AWAIT_CUE(7), { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000010, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000018, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), FANFARE_PLAY2(623), { 0x56, 0x00, 0x0000, 0x000001a2, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(20), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(SHOCK_FUNC), - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), WAIT(15), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(20), - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; @@ -314,7 +314,7 @@ static const struct ScriptCommand s_gs220_g2_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(220), SELECT_ENTITIES(-1, 0), { 0x27, 0x01, 0x0005, 0x0000005a, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x0078, 0x00000000, 0x00000000, NULL }, WAIT(60), RET, @@ -325,13 +325,13 @@ static const struct ScriptRef s_gs220_g2_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs220_g2_s0_eff0_script[] = { /* 0x826c238 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), HALT, }; static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0004, 0x00000021, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000052, 0x00000000, NULL }, @@ -344,9 +344,9 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The curse...{WAIT_PRESS}\n{CENTER_ALIGN}could not be lifted.") }, TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_SOUTH), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000043), MSG_NPC(2, _(" W-wait...")), TEXTBOX_CLEAR, @@ -358,12 +358,12 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * TEXTBOX_CLEAR, WAIT(30), FANFARE_PLAY2(666), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(120), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000018, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(7), + WALK_RELATIVE(256, -24, 0), + ROTATE(4, 10, DIRECTION_SOUTHEAST), WAIT(20), MSG_NPC(2, _(" Let me...{WAIT_PRESS}\nLet me say something!")), TEXTBOX_CLEAR, @@ -393,7 +393,7 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * TEXTBOX_CLEAR, WAIT(120), BGM_STOP, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), FANFARE_PLAY2(686), WAIT(15), FANFARE_PLAY2(686), @@ -411,8 +411,8 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * FANFARE_PLAY2(686), WAIT(15), FANFARE_PLAY2(631), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(15), { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}The lock bearing the curse...{WAIT_PRESS}\n{CENTER_ALIGN}It has opened.") }, @@ -425,24 +425,24 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * { 0x27, 0x01, 0x0005, 0x0000001e, 0x00ffffff, NULL }, WAIT(30), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_NORTHEAST), PORTRAIT_REP(0x0002, 0x00000046), MSG_NPC(2, _(" Ga-{NAME_3}!")), TEXTBOX_CLEAR, WAIT(10), BGM_FADEIN(60, 5), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(5, _(" It worked, {NAME_2}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000044), MSG_NPC(2, _(" N-{NAME_5}!")), MSG_NPC(2, _(" ...But...\nI don't know what you're saying...")), @@ -454,8 +454,8 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * MSG_NPC(5, _(" The final key to break the\ncurse...{WAIT_PRESS}\nwas your sense of gratitude.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Then, Gardevoir...?")), TEXTBOX_CLEAR, WAIT(10), @@ -468,7 +468,7 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * MSG_NPC(2, _(" {NAME_3} is back.{WAIT_PRESS}\nThat's enough for me...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -485,69 +485,69 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * static const struct ScriptCommand s_gs220_g2_s0_lives1_dlg0[] = { /* 0x826d210 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(9), WAIT(15), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(20), - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(9), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x000001a2, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x000001a3, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(45), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x89, 0x20, 0x0080, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(12), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x89, 0x10, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs220_g2_s0_eff1_script[] = { /* 0x826d470 */ DEBUGINFO, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x56, 0x00, 0x0000, 0x000001a4, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs220_g2_s1_lives0_dlg0[] = { /* 0x826d4d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs220_g2_s1_lives1_dlg0[] = { /* 0x826d510 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00b3, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + WALK_GRID(179, 2), + ALERT_CUE(5), + AWAIT_CUE(10), HALT, }; diff --git a/src/data/ground/ground_data_d24p02_station.h b/src/data/ground/ground_data_d24p02_station.h index c221e6349..2641b9e87 100644 --- a/src/data/ground/ground_data_d24p02_station.h +++ b/src/data/ground/ground_data_d24p02_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs221_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(21), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -31,7 +31,7 @@ static const struct ScriptCommand s_gs221_g1_s0_eff0_script[] = { /* 0x826d828 * DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), WAIT(20), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, END_DELETE, @@ -39,29 +39,29 @@ static const struct ScriptCommand s_gs221_g1_s0_eff0_script[] = { /* 0x826d828 * static const struct ScriptCommand s_gs221_g1_s0_lives0_dlg0[] = { /* 0x826d898 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x89, 0x50, 0x0099, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_SOUTH), MSG_NPC(2, _(" You're going to the\n{COLOR YELLOW_D}Murky Cave{RESET}?")), MSG_NPC(2, _(" Don't forget to take me,\nkekeh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(7), { 0x89, 0x50, 0x0080, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs221_g1_s0_lives1_dlg0[] = { /* 0x826d9d8 */ DEBUGINFO, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x89, 0x58, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x89, 0x40, 0x0080, 0x00000004, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d25p01_station.h b/src/data/ground/ground_data_d25p01_station.h index bb0eb9c7c..62eb42b6e 100644 --- a/src/data/ground/ground_data_d25p01_station.h +++ b/src/data/ground/ground_data_d25p01_station.h @@ -25,7 +25,7 @@ static const struct ScriptCommand s_gs222_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), BGM_SWITCH(114), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(120), { 0x28, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, RET, @@ -35,41 +35,41 @@ static const struct ScriptRef s_gs222_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs222_g1_s0_lives0_dlg0[] = { /* 0x826dc2c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 0), WAIT(15), PORTRAIT(PLACEMENT_RIGHT, 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.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(3), WAIT(1), - { 0x6b, 0x00, 0x00cc, 0x00000001, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + WALK_GRID(204, 1), + ROTATE(4, 10, DIRECTION_NORTHEAST), HALT, }; static const struct ScriptCommand s_gs222_g1_s0_lives1_dlg0[] = { /* 0x826ddc0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00cc, 0x00000003, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 2), + AWAIT_CUE(6), + WALK_GRID(204, 3), + ROTATE(4, 10, DIRECTION_NORTHWEST), HALT, }; static const struct ScriptCommand s_gs222_g1_s0_lives2_dlg0[] = { /* 0x826de50 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_h01p01_station.h b/src/data/ground/ground_data_h01p01_station.h index d5f5be77f..fdf5cde3d 100644 --- a/src/data/ground/ground_data_h01p01_station.h +++ b/src/data/ground/ground_data_h01p01_station.h @@ -49,28 +49,28 @@ static const struct ScriptRef s_gs105_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs105_g0_s1_lives0_dlg0[] = { /* 0x81ee400 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs105_g0_s1_lives1_dlg0[] = { /* 0x81ee440 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs105_g0_s3_lives0_dlg0[] = { /* 0x81ee480 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs105_g0_s3_lives1_dlg0[] = { /* 0x81ee4c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h01p02_station.h b/src/data/ground/ground_data_h01p02_station.h index 9161a812c..d82fdefef 100644 --- a/src/data/ground/ground_data_h01p02_station.h +++ b/src/data/ground/ground_data_h01p02_station.h @@ -60,28 +60,28 @@ static const struct ScriptRef s_gs106_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs106_g0_s1_lives0_dlg0[] = { /* 0x81eed98 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs106_g0_s1_lives1_dlg0[] = { /* 0x81eedd8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs106_g0_s3_lives0_dlg0[] = { /* 0x81eee18 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs106_g0_s3_lives1_dlg0[] = { /* 0x81eee58 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h01p03_station.h b/src/data/ground/ground_data_h01p03_station.h index 5338f58ac..fcae09b2c 100644 --- a/src/data/ground/ground_data_h01p03_station.h +++ b/src/data/ground/ground_data_h01p03_station.h @@ -54,28 +54,28 @@ static const struct ScriptRef s_gs107_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs107_g0_s1_lives0_dlg0[] = { /* 0x81ef7c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs107_g0_s1_lives1_dlg0[] = { /* 0x81ef800 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs107_g0_s3_lives0_dlg0[] = { /* 0x81ef840 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs107_g0_s3_lives1_dlg0[] = { /* 0x81ef880 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h02p01_station.h b/src/data/ground/ground_data_h02p01_station.h index 54807c7d3..883be11b8 100644 --- a/src/data/ground/ground_data_h02p01_station.h +++ b/src/data/ground/ground_data_h02p01_station.h @@ -62,28 +62,28 @@ static const struct ScriptRef s_gs108_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs108_g0_s1_lives0_dlg0[] = { /* 0x81eff48 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs108_g0_s1_lives1_dlg0[] = { /* 0x81eff88 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs108_g0_s3_lives0_dlg0[] = { /* 0x81effc8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs108_g0_s3_lives1_dlg0[] = { /* 0x81f0008 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h02p02_station.h b/src/data/ground/ground_data_h02p02_station.h index 9cc610587..88b091248 100644 --- a/src/data/ground/ground_data_h02p02_station.h +++ b/src/data/ground/ground_data_h02p02_station.h @@ -51,28 +51,28 @@ static const struct ScriptRef s_gs109_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs109_g0_s1_lives0_dlg0[] = { /* 0x81f0a50 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs109_g0_s1_lives1_dlg0[] = { /* 0x81f0a90 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs109_g0_s3_lives0_dlg0[] = { /* 0x81f0ad0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs109_g0_s3_lives1_dlg0[] = { /* 0x81f0b10 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h02p03_station.h b/src/data/ground/ground_data_h02p03_station.h index dae42bf1f..60bb2e424 100644 --- a/src/data/ground/ground_data_h02p03_station.h +++ b/src/data/ground/ground_data_h02p03_station.h @@ -51,28 +51,28 @@ static const struct ScriptRef s_gs110_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs110_g0_s1_lives0_dlg0[] = { /* 0x81f1088 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs110_g0_s1_lives1_dlg0[] = { /* 0x81f10c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs110_g0_s3_lives0_dlg0[] = { /* 0x81f1108 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs110_g0_s3_lives1_dlg0[] = { /* 0x81f1148 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h03p01_station.h b/src/data/ground/ground_data_h03p01_station.h index 061059786..a295c09f7 100644 --- a/src/data/ground/ground_data_h03p01_station.h +++ b/src/data/ground/ground_data_h03p01_station.h @@ -56,28 +56,28 @@ static const struct ScriptRef s_gs111_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs111_g0_s1_lives0_dlg0[] = { /* 0x81f16c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs111_g0_s1_lives1_dlg0[] = { /* 0x81f1700 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs111_g0_s3_lives0_dlg0[] = { /* 0x81f1740 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs111_g0_s3_lives1_dlg0[] = { /* 0x81f1780 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h04p01_station.h b/src/data/ground/ground_data_h04p01_station.h index cc6d3e983..599f699e2 100644 --- a/src/data/ground/ground_data_h04p01_station.h +++ b/src/data/ground/ground_data_h04p01_station.h @@ -62,28 +62,28 @@ static const struct ScriptRef s_gs112_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs112_g0_s1_lives0_dlg0[] = { /* 0x81f1f28 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs112_g0_s1_lives1_dlg0[] = { /* 0x81f1f68 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs112_g0_s3_lives0_dlg0[] = { /* 0x81f1fa8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs112_g0_s3_lives1_dlg0[] = { /* 0x81f1fe8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h04p02_station.h b/src/data/ground/ground_data_h04p02_station.h index 93a6744dd..2a975fa7c 100644 --- a/src/data/ground/ground_data_h04p02_station.h +++ b/src/data/ground/ground_data_h04p02_station.h @@ -59,28 +59,28 @@ static const struct ScriptRef s_gs113_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs113_g0_s1_lives0_dlg0[] = { /* 0x81f2a0c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs113_g0_s1_lives1_dlg0[] = { /* 0x81f2a4c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs113_g0_s3_lives0_dlg0[] = { /* 0x81f2a8c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs113_g0_s3_lives1_dlg0[] = { /* 0x81f2acc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h05p01_station.h b/src/data/ground/ground_data_h05p01_station.h index df9c21e80..9745b8800 100644 --- a/src/data/ground/ground_data_h05p01_station.h +++ b/src/data/ground/ground_data_h05p01_station.h @@ -56,28 +56,28 @@ static const struct ScriptRef s_gs114_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs114_g0_s1_lives0_dlg0[] = { /* 0x81f33ac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs114_g0_s1_lives1_dlg0[] = { /* 0x81f33ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs114_g0_s3_lives0_dlg0[] = { /* 0x81f342c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs114_g0_s3_lives1_dlg0[] = { /* 0x81f346c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h05p02_station.h b/src/data/ground/ground_data_h05p02_station.h index b645ab620..e9306483b 100644 --- a/src/data/ground/ground_data_h05p02_station.h +++ b/src/data/ground/ground_data_h05p02_station.h @@ -51,28 +51,28 @@ static const struct ScriptRef s_gs115_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs115_g0_s1_lives0_dlg0[] = { /* 0x81f3bf0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs115_g0_s1_lives1_dlg0[] = { /* 0x81f3c30 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs115_g0_s3_lives0_dlg0[] = { /* 0x81f3c70 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs115_g0_s3_lives1_dlg0[] = { /* 0x81f3cb0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h06p01_station.h b/src/data/ground/ground_data_h06p01_station.h index 0285cdb6d..6f7716cc0 100644 --- a/src/data/ground/ground_data_h06p01_station.h +++ b/src/data/ground/ground_data_h06p01_station.h @@ -63,28 +63,28 @@ static const struct ScriptRef s_gs116_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs116_g0_s1_lives0_dlg0[] = { /* 0x81f4228 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs116_g0_s1_lives1_dlg0[] = { /* 0x81f4268 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs116_g0_s3_lives0_dlg0[] = { /* 0x81f42a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs116_g0_s3_lives1_dlg0[] = { /* 0x81f42e8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h06p02_station.h b/src/data/ground/ground_data_h06p02_station.h index c4c633bd1..f1833b83c 100644 --- a/src/data/ground/ground_data_h06p02_station.h +++ b/src/data/ground/ground_data_h06p02_station.h @@ -62,28 +62,28 @@ static const struct ScriptRef s_gs117_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs117_g0_s1_lives0_dlg0[] = { /* 0x81f4da0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs117_g0_s1_lives1_dlg0[] = { /* 0x81f4de0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs117_g0_s3_lives0_dlg0[] = { /* 0x81f4e20 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs117_g0_s3_lives1_dlg0[] = { /* 0x81f4e60 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h06p03_station.h b/src/data/ground/ground_data_h06p03_station.h index 35319336a..1e8a07dc4 100644 --- a/src/data/ground/ground_data_h06p03_station.h +++ b/src/data/ground/ground_data_h06p03_station.h @@ -63,28 +63,28 @@ static const struct ScriptRef s_gs118_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs118_g0_s1_lives0_dlg0[] = { /* 0x81f58a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs118_g0_s1_lives1_dlg0[] = { /* 0x81f58e8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs118_g0_s3_lives0_dlg0[] = { /* 0x81f5928 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs118_g0_s3_lives1_dlg0[] = { /* 0x81f5968 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h06p04_station.h b/src/data/ground/ground_data_h06p04_station.h index 12f314ec9..f97e90ab1 100644 --- a/src/data/ground/ground_data_h06p04_station.h +++ b/src/data/ground/ground_data_h06p04_station.h @@ -65,28 +65,28 @@ static const struct ScriptRef s_gs119_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs119_g0_s1_lives0_dlg0[] = { /* 0x81f6420 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs119_g0_s1_lives1_dlg0[] = { /* 0x81f6460 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs119_g0_s3_lives0_dlg0[] = { /* 0x81f64a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs119_g0_s3_lives1_dlg0[] = { /* 0x81f64e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h06p05_station.h b/src/data/ground/ground_data_h06p05_station.h index 42b575b8d..8c6fbc467 100644 --- a/src/data/ground/ground_data_h06p05_station.h +++ b/src/data/ground/ground_data_h06p05_station.h @@ -60,28 +60,28 @@ static const struct ScriptRef s_gs120_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs120_g0_s1_lives0_dlg0[] = { /* 0x81f7078 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs120_g0_s1_lives1_dlg0[] = { /* 0x81f70b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs120_g0_s3_lives0_dlg0[] = { /* 0x81f70f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs120_g0_s3_lives1_dlg0[] = { /* 0x81f7138 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h06p06_station.h b/src/data/ground/ground_data_h06p06_station.h index a6a8cf40b..b78c4e218 100644 --- a/src/data/ground/ground_data_h06p06_station.h +++ b/src/data/ground/ground_data_h06p06_station.h @@ -53,28 +53,28 @@ static const struct ScriptRef s_gs121_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs121_g0_s1_lives0_dlg0[] = { /* 0x81f7aa0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs121_g0_s1_lives1_dlg0[] = { /* 0x81f7ae0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs121_g0_s3_lives0_dlg0[] = { /* 0x81f7b20 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs121_g0_s3_lives1_dlg0[] = { /* 0x81f7b60 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h07p01_station.h b/src/data/ground/ground_data_h07p01_station.h index 1be3c1b61..b8ff999ff 100644 --- a/src/data/ground/ground_data_h07p01_station.h +++ b/src/data/ground/ground_data_h07p01_station.h @@ -64,28 +64,28 @@ static const struct ScriptRef s_gs122_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs122_g0_s1_lives0_dlg0[] = { /* 0x81f81b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs122_g0_s1_lives1_dlg0[] = { /* 0x81f81f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs122_g0_s3_lives0_dlg0[] = { /* 0x81f8238 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs122_g0_s3_lives1_dlg0[] = { /* 0x81f8278 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h07p02_station.h b/src/data/ground/ground_data_h07p02_station.h index 89b4e3398..4e5452d4f 100644 --- a/src/data/ground/ground_data_h07p02_station.h +++ b/src/data/ground/ground_data_h07p02_station.h @@ -62,28 +62,28 @@ static const struct ScriptRef s_gs123_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs123_g0_s1_lives0_dlg0[] = { /* 0x81f8da0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs123_g0_s1_lives1_dlg0[] = { /* 0x81f8de0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs123_g0_s3_lives0_dlg0[] = { /* 0x81f8e20 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs123_g0_s3_lives1_dlg0[] = { /* 0x81f8e60 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h07p03_station.h b/src/data/ground/ground_data_h07p03_station.h index f88fb7dde..9725736bf 100644 --- a/src/data/ground/ground_data_h07p03_station.h +++ b/src/data/ground/ground_data_h07p03_station.h @@ -59,28 +59,28 @@ static const struct ScriptRef s_gs124_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs124_g0_s1_lives0_dlg0[] = { /* 0x81f9890 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs124_g0_s1_lives1_dlg0[] = { /* 0x81f98d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs124_g0_s3_lives0_dlg0[] = { /* 0x81f9910 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs124_g0_s3_lives1_dlg0[] = { /* 0x81f9950 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h07p04_station.h b/src/data/ground/ground_data_h07p04_station.h index 9222d46dd..4e681cdef 100644 --- a/src/data/ground/ground_data_h07p04_station.h +++ b/src/data/ground/ground_data_h07p04_station.h @@ -66,28 +66,28 @@ static const struct ScriptRef s_gs125_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs125_g0_s1_lives0_dlg0[] = { /* 0x81fa224 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs125_g0_s1_lives1_dlg0[] = { /* 0x81fa264 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs125_g0_s3_lives0_dlg0[] = { /* 0x81fa2a4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs125_g0_s3_lives1_dlg0[] = { /* 0x81fa2e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h07p05_station.h b/src/data/ground/ground_data_h07p05_station.h index 84059acdb..31047663c 100644 --- a/src/data/ground/ground_data_h07p05_station.h +++ b/src/data/ground/ground_data_h07p05_station.h @@ -55,28 +55,28 @@ static const struct ScriptRef s_gs126_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs126_g0_s1_lives0_dlg0[] = { /* 0x81fae98 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs126_g0_s1_lives1_dlg0[] = { /* 0x81faed8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs126_g0_s3_lives0_dlg0[] = { /* 0x81faf18 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs126_g0_s3_lives1_dlg0[] = { /* 0x81faf58 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h07p06_station.h b/src/data/ground/ground_data_h07p06_station.h index f3da57968..854c89f6f 100644 --- a/src/data/ground/ground_data_h07p06_station.h +++ b/src/data/ground/ground_data_h07p06_station.h @@ -65,28 +65,28 @@ static const struct ScriptRef s_gs127_g0_s0_evt2_sref = { 358, 2, NULL /* GETOUT static const struct ScriptCommand s_gs127_g0_s1_lives0_dlg0[] = { /* 0x81fb7c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs127_g0_s1_lives1_dlg0[] = { /* 0x81fb808 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs127_g0_s3_lives0_dlg0[] = { /* 0x81fb848 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs127_g0_s3_lives1_dlg0[] = { /* 0x81fb888 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h07p07_station.h b/src/data/ground/ground_data_h07p07_station.h index e01fe4c9c..b6a594ecc 100644 --- a/src/data/ground/ground_data_h07p07_station.h +++ b/src/data/ground/ground_data_h07p07_station.h @@ -70,28 +70,28 @@ static const struct ScriptRef s_gs128_g0_s0_evt3_sref = { 358, 2, NULL /* GETOUT static const struct ScriptCommand s_gs128_g0_s1_lives0_dlg0[] = { /* 0x81fbe58 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs128_g0_s1_lives1_dlg0[] = { /* 0x81fbe98 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs128_g0_s3_lives0_dlg0[] = { /* 0x81fbed8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs128_g0_s3_lives1_dlg0[] = { /* 0x81fbf18 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h07p08_station.h b/src/data/ground/ground_data_h07p08_station.h index 5254f31ec..effe31782 100644 --- a/src/data/ground/ground_data_h07p08_station.h +++ b/src/data/ground/ground_data_h07p08_station.h @@ -59,28 +59,28 @@ static const struct ScriptRef s_gs129_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs129_g0_s1_lives0_dlg0[] = { /* 0x81fc690 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs129_g0_s1_lives1_dlg0[] = { /* 0x81fc6d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs129_g0_s3_lives0_dlg0[] = { /* 0x81fc710 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs129_g0_s3_lives1_dlg0[] = { /* 0x81fc750 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h08p01_station.h b/src/data/ground/ground_data_h08p01_station.h index 7662ae4d6..7b3a12106 100644 --- a/src/data/ground/ground_data_h08p01_station.h +++ b/src/data/ground/ground_data_h08p01_station.h @@ -58,7 +58,7 @@ static const struct ScriptRef s_gs130_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs130_g0_s1_lives0_dlg0[] = { /* 0x81fd048 */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00004000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -66,7 +66,7 @@ static const struct ScriptCommand s_gs130_g0_s1_lives0_dlg0[] = { /* 0x81fd048 * static const struct ScriptCommand s_gs130_g0_s1_lives1_dlg0[] = { /* 0x81fd098 */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00004000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -74,7 +74,7 @@ static const struct ScriptCommand s_gs130_g0_s1_lives1_dlg0[] = { /* 0x81fd098 * static const struct ScriptCommand s_gs130_g0_s3_lives0_dlg0[] = { /* 0x81fd0e8 */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00004000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -82,7 +82,7 @@ static const struct ScriptCommand s_gs130_g0_s3_lives0_dlg0[] = { /* 0x81fd0e8 * static const struct ScriptCommand s_gs130_g0_s3_lives1_dlg0[] = { /* 0x81fd138 */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00004000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h09p01_station.h b/src/data/ground/ground_data_h09p01_station.h index 3720c9c65..319038642 100644 --- a/src/data/ground/ground_data_h09p01_station.h +++ b/src/data/ground/ground_data_h09p01_station.h @@ -59,28 +59,28 @@ static const struct ScriptRef s_gs131_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs131_g0_s1_lives0_dlg0[] = { /* 0x81fd9f0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs131_g0_s1_lives1_dlg0[] = { /* 0x81fda30 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs131_g0_s3_lives0_dlg0[] = { /* 0x81fda70 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs131_g0_s3_lives1_dlg0[] = { /* 0x81fdab0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h09p02_station.h b/src/data/ground/ground_data_h09p02_station.h index f2a5c8a9a..935e3a8c9 100644 --- a/src/data/ground/ground_data_h09p02_station.h +++ b/src/data/ground/ground_data_h09p02_station.h @@ -60,28 +60,28 @@ static const struct ScriptRef s_gs132_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs132_g0_s1_lives0_dlg0[] = { /* 0x81fe384 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs132_g0_s1_lives1_dlg0[] = { /* 0x81fe3c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs132_g0_s3_lives0_dlg0[] = { /* 0x81fe404 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs132_g0_s3_lives1_dlg0[] = { /* 0x81fe444 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h10p01_station.h b/src/data/ground/ground_data_h10p01_station.h index 4452d2b25..d589de92d 100644 --- a/src/data/ground/ground_data_h10p01_station.h +++ b/src/data/ground/ground_data_h10p01_station.h @@ -54,28 +54,28 @@ static const struct ScriptRef s_gs133_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs133_g0_s1_lives0_dlg0[] = { /* 0x81fedac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs133_g0_s1_lives1_dlg0[] = { /* 0x81fedec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs133_g0_s3_lives0_dlg0[] = { /* 0x81fee2c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs133_g0_s3_lives1_dlg0[] = { /* 0x81fee6c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h10p02_station.h b/src/data/ground/ground_data_h10p02_station.h index 2da5c34d4..b226b4404 100644 --- a/src/data/ground/ground_data_h10p02_station.h +++ b/src/data/ground/ground_data_h10p02_station.h @@ -55,7 +55,7 @@ static const struct ScriptRef s_gs134_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs134_g0_s1_lives0_dlg0[] = { /* 0x81ff510 */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00004000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -63,7 +63,7 @@ static const struct ScriptCommand s_gs134_g0_s1_lives0_dlg0[] = { /* 0x81ff510 * static const struct ScriptCommand s_gs134_g0_s1_lives1_dlg0[] = { /* 0x81ff560 */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00004000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -71,7 +71,7 @@ static const struct ScriptCommand s_gs134_g0_s1_lives1_dlg0[] = { /* 0x81ff560 * static const struct ScriptCommand s_gs134_g0_s3_lives0_dlg0[] = { /* 0x81ff5b0 */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00004000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -79,7 +79,7 @@ static const struct ScriptCommand s_gs134_g0_s3_lives0_dlg0[] = { /* 0x81ff5b0 * static const struct ScriptCommand s_gs134_g0_s3_lives1_dlg0[] = { /* 0x81ff600 */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00004000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h11p01_station.h b/src/data/ground/ground_data_h11p01_station.h index e553bd483..2e82debf5 100644 --- a/src/data/ground/ground_data_h11p01_station.h +++ b/src/data/ground/ground_data_h11p01_station.h @@ -57,28 +57,28 @@ static const struct ScriptRef s_gs135_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs135_g0_s1_lives0_dlg0[] = { /* 0x81ffd38 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs135_g0_s1_lives1_dlg0[] = { /* 0x81ffd78 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs135_g0_s3_lives0_dlg0[] = { /* 0x81ffdb8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs135_g0_s3_lives1_dlg0[] = { /* 0x81ffdf8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h12p01_station.h b/src/data/ground/ground_data_h12p01_station.h index ea81d90c7..931630f0d 100644 --- a/src/data/ground/ground_data_h12p01_station.h +++ b/src/data/ground/ground_data_h12p01_station.h @@ -56,28 +56,28 @@ static const struct ScriptRef s_gs136_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs136_g0_s1_lives0_dlg0[] = { /* 0x8200610 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs136_g0_s1_lives1_dlg0[] = { /* 0x8200650 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs136_g0_s3_lives0_dlg0[] = { /* 0x8200690 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs136_g0_s3_lives1_dlg0[] = { /* 0x82006d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h13p01_station.h b/src/data/ground/ground_data_h13p01_station.h index 6b9d87bd2..a8176949f 100644 --- a/src/data/ground/ground_data_h13p01_station.h +++ b/src/data/ground/ground_data_h13p01_station.h @@ -61,28 +61,28 @@ static const struct ScriptRef s_gs137_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs137_g0_s1_lives0_dlg0[] = { /* 0x8200e78 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs137_g0_s1_lives1_dlg0[] = { /* 0x8200eb8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs137_g0_s3_lives0_dlg0[] = { /* 0x8200ef8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs137_g0_s3_lives1_dlg0[] = { /* 0x8200f38 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h13p02_station.h b/src/data/ground/ground_data_h13p02_station.h index b45da8199..2cac5c00b 100644 --- a/src/data/ground/ground_data_h13p02_station.h +++ b/src/data/ground/ground_data_h13p02_station.h @@ -51,28 +51,28 @@ static const struct ScriptRef s_gs138_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs138_g0_s1_lives0_dlg0[] = { /* 0x8201910 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs138_g0_s1_lives1_dlg0[] = { /* 0x8201950 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs138_g0_s3_lives0_dlg0[] = { /* 0x8201990 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs138_g0_s3_lives1_dlg0[] = { /* 0x82019d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h13p03_station.h b/src/data/ground/ground_data_h13p03_station.h index 5ca3d0093..3e36fa6aa 100644 --- a/src/data/ground/ground_data_h13p03_station.h +++ b/src/data/ground/ground_data_h13p03_station.h @@ -54,28 +54,28 @@ static const struct ScriptRef s_gs139_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs139_g0_s1_lives0_dlg0[] = { /* 0x8201f48 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs139_g0_s1_lives1_dlg0[] = { /* 0x8201f88 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs139_g0_s3_lives0_dlg0[] = { /* 0x8201fc8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs139_g0_s3_lives1_dlg0[] = { /* 0x8202008 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h13p04_station.h b/src/data/ground/ground_data_h13p04_station.h index f3fefb69f..72d37037b 100644 --- a/src/data/ground/ground_data_h13p04_station.h +++ b/src/data/ground/ground_data_h13p04_station.h @@ -54,28 +54,28 @@ static const struct ScriptRef s_gs140_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs140_g0_s1_lives0_dlg0[] = { /* 0x82026d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs140_g0_s1_lives1_dlg0[] = { /* 0x8202710 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs140_g0_s3_lives0_dlg0[] = { /* 0x8202750 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs140_g0_s3_lives1_dlg0[] = { /* 0x8202790 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h14p01_station.h b/src/data/ground/ground_data_h14p01_station.h index 5de68fc10..e37ead357 100644 --- a/src/data/ground/ground_data_h14p01_station.h +++ b/src/data/ground/ground_data_h14p01_station.h @@ -63,28 +63,28 @@ static const struct ScriptRef s_gs141_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs141_g0_s1_lives0_dlg0[] = { /* 0x8202e40 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs141_g0_s1_lives1_dlg0[] = { /* 0x8202e80 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs141_g0_s3_lives0_dlg0[] = { /* 0x8202ec0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs141_g0_s3_lives1_dlg0[] = { /* 0x8202f00 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h15p01_station.h b/src/data/ground/ground_data_h15p01_station.h index ec5464f4d..366f6c148 100644 --- a/src/data/ground/ground_data_h15p01_station.h +++ b/src/data/ground/ground_data_h15p01_station.h @@ -57,28 +57,28 @@ static const struct ScriptRef s_gs142_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs142_g0_s1_lives0_dlg0[] = { /* 0x82039b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs142_g0_s1_lives1_dlg0[] = { /* 0x82039f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs142_g0_s3_lives0_dlg0[] = { /* 0x8203a38 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs142_g0_s3_lives1_dlg0[] = { /* 0x8203a78 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h16p01_station.h b/src/data/ground/ground_data_h16p01_station.h index c96db5174..6ce97199e 100644 --- a/src/data/ground/ground_data_h16p01_station.h +++ b/src/data/ground/ground_data_h16p01_station.h @@ -61,28 +61,28 @@ static const struct ScriptRef s_gs143_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs143_g0_s1_lives0_dlg0[] = { /* 0x820426c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs143_g0_s1_lives1_dlg0[] = { /* 0x82042ac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs143_g0_s3_lives0_dlg0[] = { /* 0x82042ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs143_g0_s3_lives1_dlg0[] = { /* 0x820432c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h17p01_station.h b/src/data/ground/ground_data_h17p01_station.h index 0d61a9588..d9218d6db 100644 --- a/src/data/ground/ground_data_h17p01_station.h +++ b/src/data/ground/ground_data_h17p01_station.h @@ -61,28 +61,28 @@ static const struct ScriptRef s_gs144_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs144_g0_s1_lives0_dlg0[] = { /* 0x8204d04 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs144_g0_s1_lives1_dlg0[] = { /* 0x8204d44 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs144_g0_s3_lives0_dlg0[] = { /* 0x8204d84 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs144_g0_s3_lives1_dlg0[] = { /* 0x8204dc4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h18p01_station.h b/src/data/ground/ground_data_h18p01_station.h index 8fc4679a4..7a72c1b0c 100644 --- a/src/data/ground/ground_data_h18p01_station.h +++ b/src/data/ground/ground_data_h18p01_station.h @@ -57,28 +57,28 @@ static const struct ScriptRef s_gs145_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs145_g0_s1_lives0_dlg0[] = { /* 0x820579c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs145_g0_s1_lives1_dlg0[] = { /* 0x82057dc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs145_g0_s3_lives0_dlg0[] = { /* 0x820581c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs145_g0_s3_lives1_dlg0[] = { /* 0x820585c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h19p01_station.h b/src/data/ground/ground_data_h19p01_station.h index 21722ea34..ec64843a5 100644 --- a/src/data/ground/ground_data_h19p01_station.h +++ b/src/data/ground/ground_data_h19p01_station.h @@ -57,28 +57,28 @@ static const struct ScriptRef s_gs146_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs146_g0_s1_lives0_dlg0[] = { /* 0x8206074 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs146_g0_s1_lives1_dlg0[] = { /* 0x82060b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs146_g0_s3_lives0_dlg0[] = { /* 0x82060f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs146_g0_s3_lives1_dlg0[] = { /* 0x8206134 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h20p01_station.h b/src/data/ground/ground_data_h20p01_station.h index 27a75378d..b95ed1a6e 100644 --- a/src/data/ground/ground_data_h20p01_station.h +++ b/src/data/ground/ground_data_h20p01_station.h @@ -57,28 +57,28 @@ static const struct ScriptRef s_gs147_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs147_g0_s1_lives0_dlg0[] = { /* 0x820694c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs147_g0_s1_lives1_dlg0[] = { /* 0x820698c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs147_g0_s3_lives0_dlg0[] = { /* 0x82069cc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs147_g0_s3_lives1_dlg0[] = { /* 0x8206a0c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h21p01_station.h b/src/data/ground/ground_data_h21p01_station.h index 23dc62a3f..5ae380e79 100644 --- a/src/data/ground/ground_data_h21p01_station.h +++ b/src/data/ground/ground_data_h21p01_station.h @@ -64,28 +64,28 @@ static const struct ScriptRef s_gs148_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs148_g0_s1_lives0_dlg0[] = { /* 0x8207224 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs148_g0_s1_lives1_dlg0[] = { /* 0x8207264 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs148_g0_s3_lives0_dlg0[] = { /* 0x82072a4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs148_g0_s3_lives1_dlg0[] = { /* 0x82072e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h21p02_station.h b/src/data/ground/ground_data_h21p02_station.h index 5e16c2b8f..3f36abef5 100644 --- a/src/data/ground/ground_data_h21p02_station.h +++ b/src/data/ground/ground_data_h21p02_station.h @@ -64,28 +64,28 @@ static const struct ScriptRef s_gs149_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs149_g0_s1_lives0_dlg0[] = { /* 0x8207df4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs149_g0_s1_lives1_dlg0[] = { /* 0x8207e34 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs149_g0_s3_lives0_dlg0[] = { /* 0x8207e74 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs149_g0_s3_lives1_dlg0[] = { /* 0x8207eb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h22p01_station.h b/src/data/ground/ground_data_h22p01_station.h index b8cd966c9..2baf809ed 100644 --- a/src/data/ground/ground_data_h22p01_station.h +++ b/src/data/ground/ground_data_h22p01_station.h @@ -56,28 +56,28 @@ static const struct ScriptRef s_gs150_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs150_g0_s1_lives0_dlg0[] = { /* 0x82089c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs150_g0_s1_lives1_dlg0[] = { /* 0x8208a04 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs150_g0_s3_lives0_dlg0[] = { /* 0x8208a44 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs150_g0_s3_lives1_dlg0[] = { /* 0x8208a84 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h23p01_station.h b/src/data/ground/ground_data_h23p01_station.h index 6253c84d4..bff820740 100644 --- a/src/data/ground/ground_data_h23p01_station.h +++ b/src/data/ground/ground_data_h23p01_station.h @@ -63,28 +63,28 @@ static const struct ScriptRef s_gs151_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs151_g0_s1_lives0_dlg0[] = { /* 0x820922c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs151_g0_s1_lives1_dlg0[] = { /* 0x820926c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs151_g0_s3_lives0_dlg0[] = { /* 0x82092ac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs151_g0_s3_lives1_dlg0[] = { /* 0x82092ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h24p01_station.h b/src/data/ground/ground_data_h24p01_station.h index 8a66a0535..6499e3590 100644 --- a/src/data/ground/ground_data_h24p01_station.h +++ b/src/data/ground/ground_data_h24p01_station.h @@ -57,28 +57,28 @@ static const struct ScriptRef s_gs152_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs152_g0_s1_lives0_dlg0[] = { /* 0x8209da4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs152_g0_s1_lives1_dlg0[] = { /* 0x8209de4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs152_g0_s3_lives0_dlg0[] = { /* 0x8209e24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs152_g0_s3_lives1_dlg0[] = { /* 0x8209e64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h25p01_station.h b/src/data/ground/ground_data_h25p01_station.h index 203c63649..648908c03 100644 --- a/src/data/ground/ground_data_h25p01_station.h +++ b/src/data/ground/ground_data_h25p01_station.h @@ -56,28 +56,28 @@ static const struct ScriptRef s_gs153_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs153_g0_s1_lives0_dlg0[] = { /* 0x820a67c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs153_g0_s1_lives1_dlg0[] = { /* 0x820a6bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs153_g0_s3_lives0_dlg0[] = { /* 0x820a6fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs153_g0_s3_lives1_dlg0[] = { /* 0x820a73c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h26p01_station.h b/src/data/ground/ground_data_h26p01_station.h index 61aba7883..31de61b71 100644 --- a/src/data/ground/ground_data_h26p01_station.h +++ b/src/data/ground/ground_data_h26p01_station.h @@ -51,28 +51,28 @@ static const struct ScriptRef s_gs154_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs154_g0_s1_lives0_dlg0[] = { /* 0x820aee4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs154_g0_s1_lives1_dlg0[] = { /* 0x820af24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs154_g0_s3_lives0_dlg0[] = { /* 0x820af64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs154_g0_s3_lives1_dlg0[] = { /* 0x820afa4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h27p01_station.h b/src/data/ground/ground_data_h27p01_station.h index 551f85eec..cb573fda1 100644 --- a/src/data/ground/ground_data_h27p01_station.h +++ b/src/data/ground/ground_data_h27p01_station.h @@ -51,28 +51,28 @@ static const struct ScriptRef s_gs155_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs155_g0_s1_lives0_dlg0[] = { /* 0x820b51c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs155_g0_s1_lives1_dlg0[] = { /* 0x820b55c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs155_g0_s3_lives0_dlg0[] = { /* 0x820b59c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs155_g0_s3_lives1_dlg0[] = { /* 0x820b5dc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h28p01_station.h b/src/data/ground/ground_data_h28p01_station.h index eff12cc5e..685e52f91 100644 --- a/src/data/ground/ground_data_h28p01_station.h +++ b/src/data/ground/ground_data_h28p01_station.h @@ -56,28 +56,28 @@ static const struct ScriptRef s_gs156_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs156_g0_s1_lives0_dlg0[] = { /* 0x820bb54 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs156_g0_s1_lives1_dlg0[] = { /* 0x820bb94 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs156_g0_s3_lives0_dlg0[] = { /* 0x820bbd4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs156_g0_s3_lives1_dlg0[] = { /* 0x820bc14 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h28p02_station.h b/src/data/ground/ground_data_h28p02_station.h index f20d46781..4f2c5e551 100644 --- a/src/data/ground/ground_data_h28p02_station.h +++ b/src/data/ground/ground_data_h28p02_station.h @@ -54,28 +54,28 @@ static const struct ScriptRef s_gs157_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs157_g0_s1_lives0_dlg0[] = { /* 0x820c3bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs157_g0_s1_lives1_dlg0[] = { /* 0x820c3fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs157_g0_s3_lives0_dlg0[] = { /* 0x820c43c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs157_g0_s3_lives1_dlg0[] = { /* 0x820c47c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h29p01_station.h b/src/data/ground/ground_data_h29p01_station.h index 3b16c7065..9a2b07fcf 100644 --- a/src/data/ground/ground_data_h29p01_station.h +++ b/src/data/ground/ground_data_h29p01_station.h @@ -69,28 +69,28 @@ static const struct ScriptRef s_gs158_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs158_g0_s1_lives0_dlg0[] = { /* 0x820cb80 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs158_g0_s1_lives1_dlg0[] = { /* 0x820cbc0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs158_g0_s3_lives0_dlg0[] = { /* 0x820cc00 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs158_g0_s3_lives1_dlg0[] = { /* 0x820cc40 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -115,15 +115,15 @@ static const struct ScriptCommand s_gs158_g1_s0_lives0_dlg1[] = { /* 0x820cce0 * COND_EQUAL(146, /* to label */ 2), END_DELETE, LABEL(0), /* = 0x00 */ - { 0x5b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + WARP_WAYPOINT(0, 0), { 0x51, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(HABITAT_MOVE1), LABEL(1), /* = 0x01 */ - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, + WARP_WAYPOINT(0, 2), { 0x51, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(HABITAT_MOVE1), LABEL(2), /* = 0x02 */ - { 0x5b, 0x00, 0x0000, 0x00000004, 0x00000000, NULL }, + WARP_WAYPOINT(0, 4), { 0x51, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(HABITAT_MOVE1), }; @@ -141,15 +141,15 @@ static const struct ScriptCommand s_gs158_g1_s0_lives1_dlg1[] = { /* 0x820ce20 * COND_EQUAL(146, /* to label */ 2), END_DELETE, LABEL(0), /* = 0x00 */ - { 0x5b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + WARP_WAYPOINT(0, 0), { 0x51, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(HABITAT_MOVE1), LABEL(1), /* = 0x01 */ - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, + WARP_WAYPOINT(0, 2), { 0x51, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(HABITAT_MOVE1), LABEL(2), /* = 0x02 */ - { 0x5b, 0x00, 0x0000, 0x00000004, 0x00000000, NULL }, + WARP_WAYPOINT(0, 4), { 0x51, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(HABITAT_MOVE1), }; @@ -167,15 +167,15 @@ static const struct ScriptCommand s_gs158_g1_s0_lives2_dlg1[] = { /* 0x820cf60 * COND_EQUAL(146, /* to label */ 2), END_DELETE, LABEL(0), /* = 0x00 */ - { 0x5b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + WARP_WAYPOINT(0, 0), { 0x51, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(HABITAT_MOVE1), LABEL(1), /* = 0x01 */ - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, + WARP_WAYPOINT(0, 2), { 0x51, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(HABITAT_MOVE1), LABEL(2), /* = 0x02 */ - { 0x5b, 0x00, 0x0000, 0x00000004, 0x00000000, NULL }, + WARP_WAYPOINT(0, 4), { 0x51, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(HABITAT_MOVE1), }; @@ -191,7 +191,7 @@ static const struct ScriptCommand s_gs158_g2_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), BGM_SWITCH(117), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), WAIT(60), BGM_FADEOUT(30), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -204,82 +204,82 @@ static const struct ScriptRef s_gs158_g2_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs158_g2_s0_eff0_script[] = { /* 0x820d15c */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x0000000a, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x0000000b, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x0000000c, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + WARP_WAYPOINT(0, 10), + ALERT_CUE(5), + AWAIT_CUE(4), + WARP_WAYPOINT(0, 11), + ALERT_CUE(5), + AWAIT_CUE(4), + WARP_WAYPOINT(0, 12), + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs158_g2_s0_lives0_dlg0[] = { /* 0x820d22c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00040000, 0x00000000, NULL }, { 0x89, 0x30, 0x0100, 0x00000004, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_WEST), WAIT(30), - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_EAST), WAIT(30), - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTH), WAIT(60), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(60), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), { 0x28, 0x01, 0x0001, 0x00000005, 0x00ff1010, NULL }, FANFARE_PLAY2(502), { 0x27, 0x01, 0x0001, 0x00000005, 0x00ff1010, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), { 0x28, 0x01, 0x0001, 0x00000005, 0x00ffff10, NULL }, FANFARE_PLAY2(502), { 0x27, 0x01, 0x0001, 0x00000005, 0x00ffff10, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), FANFARE_PLAY2(506), { 0x28, 0x01, 0x0001, 0x00000005, 0x00ffffff, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(10), WAIT(60), { 0x27, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), WAIT(60), - { 0x6b, 0x00, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 6), + ALERT_CUE(7), + ALERT_CUE(8), WAIT(60), PORTRAIT(PLACEMENT_TOP, 0x0001, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), @@ -311,8 +311,8 @@ static const struct ScriptCommand s_gs158_g2_s0_lives0_dlg0[] = { /* 0x820d22c * MSG_NPC(3, _(" Now go.\nThe guardian of the sea awaits you.")), TEXTBOX_CLEAR, WAIT(30), - { 0x6a, 0x00, 0x0080, 0x00000000, -0x00000010, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(128, 0, -16), + ALERT_CUE(10), WAIT(30), BGM_STOP, FANFARE_PLAY(212), @@ -323,42 +323,42 @@ static const struct ScriptCommand s_gs158_g2_s0_lives0_dlg0[] = { /* 0x820d22c * MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Silver Trench{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs158_g2_s0_lives1_dlg0[] = { /* 0x820db5c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x59, 0x00, -0x0004, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(497), - { 0x54, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(18), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(2), { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x70, 0x00, 0x0080, 0x0000000a, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0100, 0x00000014, 0x00000000, NULL }, { 0x70, 0x00, 0x0300, 0x00000064, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs158_g2_s0_lives2_dlg0[] = { /* 0x820dccc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(60), { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0080, 0x0000000a, 0x00000000, NULL }, @@ -366,38 +366,38 @@ static const struct ScriptCommand s_gs158_g2_s0_lives2_dlg0[] = { /* 0x820dccc * { 0x70, 0x00, 0x0100, 0x00000014, 0x00000000, NULL }, FANFARE_PLAY2(504), { 0x70, 0x00, 0x0300, 0x00000064, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000007, 0x00000000, NULL }, + WARP_WAYPOINT(0, 7), { 0x8b, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0100, 0x00000014, 0x00000000, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0080, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(7), { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(497), - { 0x54, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(18), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs158_g2_s0_lives3_dlg0[] = { /* 0x820df0c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(60), { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0080, 0x0000000a, 0x00000000, NULL }, @@ -405,40 +405,40 @@ static const struct ScriptCommand s_gs158_g2_s0_lives3_dlg0[] = { /* 0x820df0c * { 0x70, 0x00, 0x0100, 0x00000014, 0x00000000, NULL }, FANFARE_PLAY2(504), { 0x70, 0x00, 0x0300, 0x00000064, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000008, 0x00000000, NULL }, + WARP_WAYPOINT(0, 8), { 0x8b, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0100, 0x00000014, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0080, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(497), - { 0x54, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(18), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs158_g2_s0_eff1_script[] = { /* 0x820e14c */ DEBUGINFO, { 0x59, 0x00, -0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), FANFARE_PLAY2(485), { 0x56, 0x00, 0x0000, 0x00000173, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x56, 0x00, 0x0000, 0x00000174, 0x00000000, NULL }, @@ -447,10 +447,10 @@ static const struct ScriptCommand s_gs158_g2_s0_eff1_script[] = { /* 0x820e14c * WAIT(1), { 0x56, 0x00, 0x0000, 0x00000175, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00020000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), RET, }; @@ -481,15 +481,15 @@ static const struct ScriptCommand s_gs158_g2_s0_lives4_dlg1[] = { /* 0x820e37c * COND_EQUAL(146, /* to label */ 2), END_DELETE, LABEL(0), /* = 0x00 */ - { 0x5b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + WARP_WAYPOINT(0, 0), { 0x51, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(HABITAT_MOVE1), LABEL(1), /* = 0x01 */ - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, + WARP_WAYPOINT(0, 2), { 0x51, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(HABITAT_MOVE1), LABEL(2), /* = 0x02 */ - { 0x5b, 0x00, 0x0000, 0x00000004, 0x00000000, NULL }, + WARP_WAYPOINT(0, 4), { 0x51, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, JUMP_SCRIPT(HABITAT_MOVE1), }; diff --git a/src/data/ground/ground_data_h29p02_station.h b/src/data/ground/ground_data_h29p02_station.h index 9a017c026..3af481888 100644 --- a/src/data/ground/ground_data_h29p02_station.h +++ b/src/data/ground/ground_data_h29p02_station.h @@ -52,28 +52,28 @@ static const struct ScriptRef s_gs159_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs159_g0_s1_lives0_dlg0[] = { /* 0x820eca0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs159_g0_s1_lives1_dlg0[] = { /* 0x820ece0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs159_g0_s3_lives0_dlg0[] = { /* 0x820ed20 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs159_g0_s3_lives1_dlg0[] = { /* 0x820ed60 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h29p03_station.h b/src/data/ground/ground_data_h29p03_station.h index 1fcc7bdb7..769af775e 100644 --- a/src/data/ground/ground_data_h29p03_station.h +++ b/src/data/ground/ground_data_h29p03_station.h @@ -51,28 +51,28 @@ static const struct ScriptRef s_gs160_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs160_g0_s1_lives0_dlg0[] = { /* 0x820f348 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs160_g0_s1_lives1_dlg0[] = { /* 0x820f388 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs160_g0_s3_lives0_dlg0[] = { /* 0x820f3c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs160_g0_s3_lives1_dlg0[] = { /* 0x820f408 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_h29p04_station.h b/src/data/ground/ground_data_h29p04_station.h index edb7d806e..b76be6158 100644 --- a/src/data/ground/ground_data_h29p04_station.h +++ b/src/data/ground/ground_data_h29p04_station.h @@ -51,28 +51,28 @@ static const struct ScriptRef s_gs161_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs161_g0_s1_lives0_dlg0[] = { /* 0x820f980 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs161_g0_s1_lives1_dlg0[] = { /* 0x820f9c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs161_g0_s3_lives0_dlg0[] = { /* 0x820fa00 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs161_g0_s3_lives1_dlg0[] = { /* 0x820fa40 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_s02_station.h b/src/data/ground/ground_data_s02_station.h index 8a6177b86..b61eabefc 100644 --- a/src/data/ground/ground_data_s02_station.h +++ b/src/data/ground/ground_data_s02_station.h @@ -28,12 +28,12 @@ static const struct ScriptRef s_gs224_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs224_g1_s0_obj0_dlg1[] = { /* 0x826e314 */ DEBUGINFO, - { 0x54, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(7), + AWAIT_CUE(4), LABEL(0), /* = 0x00 */ - { 0x5b, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, + WARP_WAYPOINT(0, 1), WAIT(10), - { 0x5b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + WARP_WAYPOINT(0, 0), WAIT(10), JUMP_LABEL(0), }; @@ -63,11 +63,11 @@ static const struct ScriptCommand s_gs224_g3_s0_station_sref_script[] = { /* 0x8 { 0x27, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, SELECT_ENTITIES(-1, 1), SELECT_ENTITIES(-1, 2), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), { 0x3b, 0x40, 0x0001, 0x00000000, 0x00000000, NULL }, WAIT(120), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), { 0xe0, 0x00, 0x002b, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -79,11 +79,11 @@ static const struct ScriptRef s_gs224_g3_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs224_g3_s0_eff0_script[] = { /* 0x826e57c */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), LABEL(0), /* = 0x00 */ - { 0x5b, 0x00, 0x0000, 0x00000003, 0x00000000, NULL }, + WARP_WAYPOINT(0, 3), WAIT(10), - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, + WARP_WAYPOINT(0, 2), WAIT(10), JUMP_LABEL(0), }; @@ -94,13 +94,13 @@ static const struct ScriptCommand s_gs224_g3_s1_lives0_dlg0[] = { /* 0x826e60c * { 0x53, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00020000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x80, 0x00, 0x0200, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), END_DELETE, }; @@ -110,9 +110,9 @@ static const struct ScriptCommand s_gs224_g3_s1_obj0_dlg0[] = { /* 0x826e6dc */ { 0x52, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00020000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(7), { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(32), { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, { 0x54, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, @@ -123,7 +123,7 @@ static const struct ScriptCommand s_gs224_g3_s1_obj0_dlg0[] = { /* 0x826e6dc */ { 0x80, 0x00, 0x0600, 0x00000007, 0x00000000, NULL }, { 0x54, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, { 0x80, 0x00, 0x0700, 0x00000008, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), END_DELETE, }; @@ -133,9 +133,9 @@ static const struct ScriptCommand s_gs224_g3_s2_obj0_dlg0[] = { /* 0x826e81c */ { 0x52, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00040000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(8), { 0x80, 0x00, 0x0033, 0x00000009, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), { 0x80, 0x00, 0x0033, 0x0000000a, 0x00000000, NULL }, END_DELETE, }; @@ -148,7 +148,7 @@ static const struct ScriptCommand s_gs224_g4_s0_station_sref_script[] = { /* 0x8 BGM_SWITCH(43), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(120), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), { 0xe0, 0x00, 0x002b, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -160,11 +160,11 @@ static const struct ScriptRef s_gs224_g4_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs224_g4_s0_eff0_script[] = { /* 0x826e988 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), LABEL(0), /* = 0x00 */ - { 0x5b, 0x00, 0x0000, 0x00000003, 0x00000000, NULL }, + WARP_WAYPOINT(0, 3), WAIT(10), - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, + WARP_WAYPOINT(0, 2), WAIT(10), JUMP_LABEL(0), }; diff --git a/src/data/ground/ground_data_s03_station.h b/src/data/ground/ground_data_s03_station.h index 522da06ac..615dd54cb 100644 --- a/src/data/ground/ground_data_s03_station.h +++ b/src/data/ground/ground_data_s03_station.h @@ -34,12 +34,12 @@ static const struct ScriptCommand s_gs225_g1_s0_station_sref_script[] = { /* 0x8 BGM_SWITCH(40), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(4), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(20), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), WAIT(40), { 0x3b, 0x38, 0x0000, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, { 0xe0, 0x00, 0x0028, 0x00000000, 0x00000000, NULL }, RET, @@ -50,8 +50,8 @@ static const struct ScriptRef s_gs225_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs225_g1_s0_eff0_script[] = { /* 0x826edcc */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0040, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_GRID(64, 0), HALT, }; @@ -62,27 +62,27 @@ static const struct ScriptCommand s_gs225_g1_s0_obj0_dlg0[] = { /* 0x826ee1c */ { 0x52, 0x00, 0x0000, 0x00040000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x54, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0x80, 0x00, 0x0033, 0x00000001, 0x00000000, NULL }, { 0x80, 0x00, 0x0066, 0x00000002, 0x00000000, NULL }, WAIT(20), { 0x54, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, { 0x80, 0x00, 0x0180, 0x00000003, 0x00000000, NULL }, - { 0x54, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(16), { 0x80, 0x00, 0x0200, 0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(17), { 0x80, 0x00, 0x0300, 0x00000005, 0x00000000, NULL }, - { 0x54, 0x00, 0x0012, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(18), { 0x80, 0x00, 0x0400, 0x00000006, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(19), { 0x80, 0x00, 0x0500, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + SELECT_ANIMATION(20), { 0x80, 0x00, 0x0600, 0x00000008, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0015, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), + SELECT_ANIMATION(21), { 0x80, 0x00, 0x0800, 0x00000009, 0x00000000, NULL }, - { 0x54, 0x00, 0x0015, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(21), { 0x80, 0x00, 0x0800, 0x0000000a, 0x00000000, NULL }, END_DELETE, }; @@ -93,9 +93,9 @@ static const struct ScriptCommand s_gs225_g1_s0_obj1_dlg0[] = { /* 0x826efec */ { 0x52, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00020000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(8), { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, { 0x80, 0x00, 0x0033, 0x0000000b, 0x00000000, NULL }, HALT, diff --git a/src/data/ground/ground_data_s04_station.h b/src/data/ground/ground_data_s04_station.h index 0705048f1..422881338 100644 --- a/src/data/ground/ground_data_s04_station.h +++ b/src/data/ground/ground_data_s04_station.h @@ -23,16 +23,16 @@ static const struct ScriptCommand s_gs226_g1_s0_station_sref_script[] = { /* 0x8 BGM_STOP, SELECT_MAP(226), SELECT_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), WAIT(20), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(3), WAIT(20), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(3), WAIT(20), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(3), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(4), RET, @@ -46,25 +46,25 @@ static const struct ScriptCommand s_gs226_g1_s0_eff0_script[] = { /* 0x826f348 * { 0x22, 0x01, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x23, 0x01, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), + AWAIT_CUE(4), + WARP_WAYPOINT(0, 0), { 0x22, 0x01, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x23, 0x01, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(3), + AWAIT_CUE(4), + WARP_WAYPOINT(0, 1), { 0x22, 0x01, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x23, 0x01, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(3), + AWAIT_CUE(4), + WARP_WAYPOINT(0, 2), { 0x22, 0x01, 0x0014, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x23, 0x01, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; diff --git a/src/data/ground/ground_data_s05_station.h b/src/data/ground/ground_data_s05_station.h index 7dd43e366..d7ea238b4 100644 --- a/src/data/ground/ground_data_s05_station.h +++ b/src/data/ground/ground_data_s05_station.h @@ -24,7 +24,7 @@ static const struct ScriptCommand s_gs227_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(180), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), { 0x3b, 0x40, 0x0001, 0x00000000, 0x00000000, NULL }, WAIT(3600), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -36,11 +36,11 @@ static const struct ScriptRef s_gs227_g1_s0_station_sref = { 400, 7, NULL /* EVE static const struct ScriptCommand s_gs227_g1_s0_eff0_script[] = { /* 0x826f6e8 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), LABEL(0), /* = 0x00 */ - { 0x5b, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, + WARP_WAYPOINT(0, 1), WAIT(20), - { 0x5b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + WARP_WAYPOINT(0, 0), WAIT(20), JUMP_LABEL(0), }; diff --git a/src/data/ground/ground_data_t00p01_station.h b/src/data/ground/ground_data_t00p01_station.h index 0fcabad43..27ff58b5e 100644 --- a/src/data/ground/ground_data_t00p01_station.h +++ b/src/data/ground/ground_data_t00p01_station.h @@ -68,56 +68,56 @@ static const struct ScriptRef s_gs0_g0_s0_evt2_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs0_g0_s1_lives0_dlg0[] = { /* 0x81329a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs0_g0_s1_lives1_dlg0[] = { /* 0x81329e8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs0_g0_s2_lives0_dlg0[] = { /* 0x8132a28 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs0_g0_s2_lives1_dlg0[] = { /* 0x8132a68 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs0_g0_s3_lives0_dlg0[] = { /* 0x8132aa8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs0_g0_s3_lives1_dlg0[] = { /* 0x8132ae8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs0_g0_s7_lives0_dlg0[] = { /* 0x8132b28 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs0_g0_s7_lives1_dlg0[] = { /* 0x8132b68 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -136,7 +136,7 @@ static const struct ScriptCommand s_gs0_g0_s8_lives1_dlg0[] = { /* 0x8132bd8 */ static const struct ScriptCommand s_gs0_g1_s0_lives0_dlg2[] = { /* 0x8132c08 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -145,7 +145,7 @@ static const struct ScriptCommand s_gs0_g1_s0_lives0_dlg2[] = { /* 0x8132c08 */ static const struct ScriptCommand s_gs0_g1_s0_lives1_dlg2[] = { /* 0x8132c68 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -154,7 +154,7 @@ static const struct ScriptCommand s_gs0_g1_s0_lives1_dlg2[] = { /* 0x8132c68 */ static const struct ScriptCommand s_gs0_g1_s0_lives2_dlg2[] = { /* 0x8132cc8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -163,7 +163,7 @@ static const struct ScriptCommand s_gs0_g1_s0_lives2_dlg2[] = { /* 0x8132cc8 */ static const struct ScriptCommand s_gs0_g1_s0_lives3_dlg2[] = { /* 0x8132d28 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -172,7 +172,7 @@ static const struct ScriptCommand s_gs0_g1_s0_lives3_dlg2[] = { /* 0x8132d28 */ static const struct ScriptCommand s_gs0_g1_s0_lives4_dlg2[] = { /* 0x8132d88 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -181,7 +181,7 @@ static const struct ScriptCommand s_gs0_g1_s0_lives4_dlg2[] = { /* 0x8132d88 */ static const struct ScriptCommand s_gs0_g1_s0_lives5_dlg2[] = { /* 0x8132de8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1a, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -190,7 +190,7 @@ static const struct ScriptCommand s_gs0_g1_s0_lives5_dlg2[] = { /* 0x8132de8 */ static const struct ScriptCommand s_gs0_g1_s0_lives6_dlg2[] = { /* 0x8132e48 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1c, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -203,7 +203,7 @@ static const struct ScriptCommand s_gs0_g1_s0_lives6_dlg2[] = { /* 0x8132e48 */ static const struct ScriptCommand s_gs0_g1_s0_lives7_dlg2[] = { /* 0x8132ee8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1e, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -212,7 +212,7 @@ static const struct ScriptCommand s_gs0_g1_s0_lives7_dlg2[] = { /* 0x8132ee8 */ static const struct ScriptCommand s_gs0_g1_s0_lives8_dlg2[] = { /* 0x8132f48 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1d, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -233,7 +233,7 @@ static const struct ScriptCommand s_gs0_g1_s0_obj1_dlg2[] = { /* 0x8132fd8 */ static const struct ScriptCommand s_gs0_g1_s0_lives9_dlg2[] = { /* 0x8133008 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -242,7 +242,7 @@ static const struct ScriptCommand s_gs0_g1_s0_lives9_dlg2[] = { /* 0x8133008 */ static const struct ScriptCommand s_gs0_g1_s0_lives10_dlg2[] = { /* 0x8133068 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x23, 0x01, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -909,7 +909,7 @@ static const struct ScriptCommand s_gs0_g1_s0_lives10_dlg2[] = { /* 0x8133068 */ static const struct ScriptCommand s_gs0_g1_s0_lives11_dlg2[] = { /* 0x8136060 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x23, 0x01, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -1231,7 +1231,7 @@ static const struct ScriptCommand s_gs0_g1_s0_lives13_dlg0[] = { /* 0x81376c8 */ static const struct ScriptCommand s_gs0_g1_s0_lives13_dlg2[] = { /* 0x81376f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3(FALSE, /*default*/ 0, /* speaker */ 1, _(" Which effect should I use?")), diff --git a/src/data/ground/ground_data_t01p01_station.h b/src/data/ground/ground_data_t01p01_station.h index 71c8656f5..8af06172b 100644 --- a/src/data/ground/ground_data_t01p01_station.h +++ b/src/data/ground/ground_data_t01p01_station.h @@ -387,104 +387,104 @@ static const struct ScriptRef s_gs1_g0_s0_evt3_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs1_g0_s0_obj0_dlg2[] = { /* 0x8138fc0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_INSTANT(_("{CENTER_ALIGN}Welcome!\n{CENTER_ALIGN}The fun and bustling Pokémon Square!")), MSG_INSTANT(_("Whiscash Pond ↑\n Pelipper Post Office →")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(2), RET, }; static const struct ScriptCommand s_gs1_g0_s0_obj1_dlg2[] = { /* 0x81390c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_INSTANT(_("{CENTER_ALIGN}↑\n{CENTER_ALIGN}Whiscash Pond")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(2), RET, }; static const struct ScriptCommand s_gs1_g0_s0_obj2_dlg2[] = { /* 0x8139158 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_INSTANT(_("\n{CENTER_ALIGN}Pelipper Post Office →")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(2), RET, }; static const struct ScriptCommand s_gs1_g0_s1_lives0_dlg0[] = { /* 0x81391f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs1_g0_s1_lives1_dlg0[] = { /* 0x8139234 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs1_g0_s2_lives0_dlg0[] = { /* 0x8139274 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs1_g0_s2_lives1_dlg0[] = { /* 0x81392b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs1_g0_s3_lives0_dlg0[] = { /* 0x81392f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs1_g0_s3_lives1_dlg0[] = { /* 0x8139334 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs1_g0_s4_lives0_dlg0[] = { /* 0x8139374 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs1_g0_s4_lives1_dlg0[] = { /* 0x81393b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs1_g0_s7_lives0_dlg0[] = { /* 0x81393f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs1_g0_s7_lives1_dlg0[] = { /* 0x8139434 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -512,7 +512,7 @@ static const struct ScriptRef s_gs1_g1_s0_station_sref = { 403, 8, NULL /* STATI static const struct ScriptCommand s_gs1_g1_s0_lives0_dlg2[] = { /* 0x8139520 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -521,7 +521,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives0_dlg2[] = { /* 0x8139520 */ static const struct ScriptCommand s_gs1_g1_s0_lives1_dlg2[] = { /* 0x8139580 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -530,7 +530,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives1_dlg2[] = { /* 0x8139580 */ static const struct ScriptCommand s_gs1_g1_s0_lives2_dlg2[] = { /* 0x81395e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -539,7 +539,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives2_dlg2[] = { /* 0x81395e0 */ static const struct ScriptCommand s_gs1_g1_s0_lives3_dlg2[] = { /* 0x8139640 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -548,7 +548,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives3_dlg2[] = { /* 0x8139640 */ static const struct ScriptCommand s_gs1_g1_s0_lives4_dlg2[] = { /* 0x81396a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -557,7 +557,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives4_dlg2[] = { /* 0x81396a0 */ static const struct ScriptCommand s_gs1_g1_s0_lives5_dlg2[] = { /* 0x8139700 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -566,7 +566,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives5_dlg2[] = { /* 0x8139700 */ static const struct ScriptCommand s_gs1_g1_s0_lives6_dlg2[] = { /* 0x8139760 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" What's your rescue rank?\nHow high'd you get it?")), @@ -576,7 +576,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives6_dlg2[] = { /* 0x8139760 */ static const struct ScriptCommand s_gs1_g1_s0_lives7_dlg2[] = { /* 0x8139840 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" It sounds like the natural\ndisasters were interfering with our ability\nto evolve.")), @@ -589,7 +589,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives7_dlg2[] = { /* 0x8139840 */ static const struct ScriptCommand s_gs1_g1_s0_lives8_dlg2[] = { /* 0x8139a3c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000050, 0x00000000, NULL }, WAIT(1), @@ -600,7 +600,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives8_dlg2[] = { /* 0x8139a3c */ static const struct ScriptCommand s_gs1_g1_s0_lives9_dlg2[] = { /* 0x8139b2c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Our team got the Gold Rank,\nbut...")), @@ -610,7 +610,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives9_dlg2[] = { /* 0x8139b2c */ static const struct ScriptCommand s_gs1_g1_s0_lives10_dlg2[] = { /* 0x8139bf4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I wonder what's higher than\nthe Gold Rank?{WAIT_PRESS}\nI can't imagine it.")), @@ -619,7 +619,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives10_dlg2[] = { /* 0x8139bf4 */ static const struct ScriptCommand s_gs1_g1_s0_lives11_dlg2[] = { /* 0x8139c9c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" For many years, countless\nPokémon have served on rescue teams.")), @@ -635,7 +635,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives11_dlg2[] = { /* 0x8139c9c */ static const struct ScriptCommand s_gs1_g1_s0_lives12_dlg2[] = { /* 0x8139ef4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" KEEP UP YOUR RESCUE\nWORK! BZBZBZZZ!")), @@ -644,7 +644,7 @@ static const struct ScriptCommand s_gs1_g1_s0_lives12_dlg2[] = { /* 0x8139ef4 */ static const struct ScriptCommand s_gs1_g1_s0_lives13_dlg2[] = { /* 0x8139f7c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" YOUR TEAM HAS MY\nSUPPORT! BZBZBZZT!")), @@ -761,7 +761,7 @@ static const struct ScriptRef s_gs1_g2_s0_station_sref = { 403, 8, NULL /* STATI static const struct ScriptCommand s_gs1_g3_s0_lives0_dlg2[] = { /* 0x813a610 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3( TRUE, /*default*/ 0, /* speaker */ -1, _(" Activate the subevent \"Munchlax\"?")), @@ -785,18 +785,18 @@ static const struct ScriptCommand s_gs1_g3_s0_lives0_dlg2[] = { /* 0x813a610 */ static const struct ScriptCommand s_gs1_g4_s0_lives0_dlg1[] = { /* 0x813a7a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), + WALK_GRID(256, 0), LABEL(0), /* = 0x00 */ { 0x3b, 0x11, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 1), { 0x3b, 0x15, 0x0000, 0x00000020, 0x00000000, NULL }, COND_EQUAL(1, /* to label */ 2), LABEL(1), /* = 0x01 */ - { 0x6a, 0x00, 0x0080, -0x00000001, 0x00000000, NULL }, + WALK_RELATIVE(128, -1, 0), CJUMP_DIR_TO_LINK(1), COND_EQUAL(6, /* to label */ 0), - { 0x6b, 0x00, 0x0080, 0x00000002, 0x00000000, NULL }, + WALK_GRID(128, 2), END_DELETE, LABEL(2), /* = 0x02 */ EXECUTE_STATION(-1, -1, 1), @@ -805,7 +805,7 @@ static const struct ScriptCommand s_gs1_g4_s0_lives0_dlg1[] = { /* 0x813a7a0 */ static const struct ScriptCommand s_gs1_g4_s0_lives0_dlg2[] = { /* 0x813a8b0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" ....................................")), @@ -816,7 +816,7 @@ static const struct ScriptCommand s_gs1_g4_s1_station_sref_script[] = { /* 0x813 DEBUGINFO, { 0xb2, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(-1, 3), SELECT_ENTITIES(1, 0), RET, @@ -826,13 +826,13 @@ static const struct ScriptRef s_gs1_g4_s1_station_sref = { 401, 7, NULL /* EVENT static const struct ScriptCommand s_gs1_g4_s1_lives0_dlg0[] = { /* 0x813a9b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + 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), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), FANFARE_PLAY2(515), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _(" ...Grrruummmmmbbbbblle...!") }, WAIT(60), @@ -840,7 +840,7 @@ static const struct ScriptCommand s_gs1_g4_s1_lives0_dlg0[] = { /* 0x813a9b4 */ WAIT(1), FANFARE_PLAY2(465), SELECT_ENTITIES(-1, 2), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -849,40 +849,40 @@ static const struct ScriptCommand s_gs1_g4_s1_lives0_dlg0[] = { /* 0x813a9b4 */ MSG_NPC(2, _(" ...Belly...rumbling...{WAIT_PRESS}\nHungry...")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs1_g4_s1_lives1_dlg0[] = { /* 0x813ac3c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs1_g4_s1_lives2_dlg0[] = { /* 0x813acdc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x3c, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs1_g4_s2_lives0_dlg0[] = { /* 0x813ad6c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -891,7 +891,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives0_dlg0[] = { /* 0x813ad6c */ static const struct ScriptCommand s_gs1_g4_s2_lives1_dlg0[] = { /* 0x813adcc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -900,7 +900,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives1_dlg0[] = { /* 0x813adcc */ static const struct ScriptCommand s_gs1_g4_s2_lives2_dlg0[] = { /* 0x813ae2c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -909,7 +909,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives2_dlg0[] = { /* 0x813ae2c */ static const struct ScriptCommand s_gs1_g4_s2_lives3_dlg0[] = { /* 0x813ae8c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -918,7 +918,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives3_dlg0[] = { /* 0x813ae8c */ static const struct ScriptCommand s_gs1_g4_s2_lives4_dlg0[] = { /* 0x813aeec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -927,7 +927,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives4_dlg0[] = { /* 0x813aeec */ static const struct ScriptCommand s_gs1_g4_s2_lives5_dlg0[] = { /* 0x813af4c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -936,7 +936,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives5_dlg0[] = { /* 0x813af4c */ static const struct ScriptCommand s_gs1_g4_s2_lives6_dlg0[] = { /* 0x813afac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -945,7 +945,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives6_dlg0[] = { /* 0x813afac */ static const struct ScriptCommand s_gs1_g4_s2_lives7_dlg0[] = { /* 0x813b00c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -954,7 +954,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives7_dlg0[] = { /* 0x813b00c */ static const struct ScriptCommand s_gs1_g4_s2_lives8_dlg0[] = { /* 0x813b06c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -963,7 +963,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives8_dlg0[] = { /* 0x813b06c */ static const struct ScriptCommand s_gs1_g4_s2_lives9_dlg0[] = { /* 0x813b0cc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -973,21 +973,21 @@ static const struct ScriptCommand s_gs1_g4_s2_lives9_dlg0[] = { /* 0x813b0cc */ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg0[] = { /* 0x813b12c */ DEBUGINFO, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg1[] = { /* 0x813b16c */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000002, 0x00000000, NULL }, + SELECT_ANIMATION(1), + WALK_GRID(128, 2), END_DELETE, }; static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ DEBUGINFO, CLEAR_ARRAY(EVENT_LOCAL), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), @@ -1004,7 +1004,7 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ COND_EQUAL(-1, /* to label */ 2), JUMP_LABEL(3), LABEL(2), /* = 0x02 */ - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), TEXTBOX_CLEAR, WAIT(10), PORTRAIT_REP(0x0001, 0x00000045), @@ -1013,7 +1013,7 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ JUMP_SCRIPT(END_TALK), LABEL(3), /* = 0x03 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), TEXTBOX_CLEAR, WAIT(10), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} gave Munchlax\n{CENTER_ALIGN}one {COLOR GREEN_I}{MOVE_ITEM_0}{RESET}.")), @@ -1021,22 +1021,22 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ WAIT(10), PORTRAIT_REP(0x0001, 0x00000041), MSG_NPC(1, _(" Th-this {COLOR GREEN_I}{MOVE_ITEM_0}{RESET}!{WAIT_PRESS}\nM-Munchlax big favorite!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), FANFARE_PLAY2(516), { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("Munch, munch, munch, munch, munch,\nmunch, munch, munch, munch, munch,\nmunch, munch, munch, munch, munch...") }, { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("Munch, munch, munch, munch, munch,\nmunch, munch, munch, munch, munch,\nmunch, munch, munch, munch, munch...") }, FANFARE_STOP2(516), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000044), MSG_NPC(1, _(" Nnnnnnnnn!{WAIT_PRESS}\nDeeeeelicious!")), TEXTBOX_CLEAR, PORTRAIT_REP(0x0001, 0x00000043), MSG_NPC(1, _(" Munchlax satisfied!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" ............{WAIT_PRESS}\nYou, good to Munchlax.")), MSG_NPC(1, _(" Munchlax say thank you\nwith this.")), @@ -1056,40 +1056,40 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg2[] = { /* 0x813b1ac */ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg3[] = { /* 0x813b7d8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(2), WAIT(12), RET, LABEL(0), /* = 0x00 */ - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x8b, 0x0a, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + SELECT_ANIMATION(2), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs1_g4_s4_lives0_dlg1[] = { /* 0x813b948 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000002, 0x00000000, NULL }, + SELECT_ANIMATION(1), + WALK_GRID(256, 2), END_DELETE, }; static const struct ScriptCommand s_gs1_g4_s4_lives0_dlg2[] = { /* 0x813b988 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000044), MSG_NPC(1, _(" ............{WAIT_PRESS}\nYou, good to Munchlax.")), @@ -1098,18 +1098,18 @@ static const struct ScriptCommand s_gs1_g4_s4_lives0_dlg2[] = { /* 0x813b988 */ static const struct ScriptCommand s_gs1_g5_s0_lives0_dlg1[] = { /* 0x813b9e8 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, + SELECT_ANIMATION(1), + WALK_GRID(256, 4), LABEL(0), /* = 0x00 */ { 0x3b, 0x11, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 1), { 0x3b, 0x15, 0x0000, 0x00000040, 0x00000000, NULL }, COND_EQUAL(1, /* to label */ 2), LABEL(1), /* = 0x01 */ - { 0x6a, 0x00, 0x0100, -0x00000001, 0x00000000, NULL }, + WALK_RELATIVE(256, -1, 0), CJUMP_DIR_TO_LINK(5), COND_EQUAL(6, /* to label */ 0), - { 0x6b, 0x00, 0x0100, 0x00000006, 0x00000000, NULL }, + WALK_GRID(256, 6), END_DELETE, LABEL(2), /* = 0x02 */ EXECUTE_STATION(-1, -1, 1), @@ -1118,7 +1118,7 @@ static const struct ScriptCommand s_gs1_g5_s0_lives0_dlg1[] = { /* 0x813b9e8 */ static const struct ScriptCommand s_gs1_g5_s0_lives0_dlg2[] = { /* 0x813baf8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" ........................")), @@ -1129,7 +1129,7 @@ static const struct ScriptCommand s_gs1_g5_s1_station_sref_script[] = { /* 0x813 DEBUGINFO, { 0xb2, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, SELECT_LIVES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(-1, 3), SELECT_ENTITIES(1, 0), RET, @@ -1139,24 +1139,24 @@ static const struct ScriptRef s_gs1_g5_s1_station_sref = { 401, 7, NULL /* EVENT static const struct ScriptCommand s_gs1_g5_s1_lives0_dlg0[] = { /* 0x813bbf0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + 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), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), FANFARE_PLAY2(400), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _(" Flump!") }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), FANFARE_PLAY2(900), SELECT_OBJECTS(-1, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), TEXTBOX_CLEAR, WAIT(1), FANFARE_PLAY2(465), SELECT_ENTITIES(-1, 2), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -1165,24 +1165,24 @@ static const struct ScriptCommand s_gs1_g5_s1_lives0_dlg0[] = { /* 0x813bbf0 */ MSG_NPC(2, _(" ....................................")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs1_g5_s1_lives1_dlg0[] = { /* 0x813be18 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -1190,30 +1190,30 @@ static const struct ScriptCommand s_gs1_g5_s1_lives1_dlg0[] = { /* 0x813be18 */ static const struct ScriptCommand s_gs1_g5_s1_lives2_dlg0[] = { /* 0x813beb8 */ DEBUGINFO, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(19), WAIT(4), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(8), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x54, 0x00, 0x001a, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs1_g5_s1_obj0_dlg0[] = { /* 0x813bfc8 */ DEBUGINFO, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(8), { 0x5d, 0x00, 0x0000, 0x0000007f, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, -0x00000020, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000008, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, -0x00000002, 0x00000000, NULL }, + WALK_RELATIVE(512, -32, 0), + WALK_RELATIVE(256, -8, 0), + WALK_RELATIVE(128, -2, 0), { 0x52, 0x00, 0x0000, 0x00000004, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00000040, 0x00000000, NULL }, RET, @@ -1221,7 +1221,7 @@ static const struct ScriptCommand s_gs1_g5_s1_obj0_dlg0[] = { /* 0x813bfc8 */ static const struct ScriptCommand s_gs1_g5_s1_obj0_dlg1[] = { /* 0x813c058 */ DEBUGINFO, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(8), HALT, }; @@ -1235,7 +1235,7 @@ static const struct ScriptCommand s_gs1_g5_s1_obj0_dlg2[] = { /* 0x813c088 */ static const struct ScriptCommand s_gs1_g5_s1_obj1_dlg0[] = { /* 0x813c0d8 */ DEBUGINFO, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(8), { 0x5d, 0x00, 0x0000, 0x0000007f, 0x00000000, NULL }, { 0x84, 0x00, 0x0200, -0x00000018, -0x00000004, NULL }, { 0x84, 0x00, 0x0100, -0x00000008, -0x00000002, NULL }, @@ -1247,7 +1247,7 @@ static const struct ScriptCommand s_gs1_g5_s1_obj1_dlg0[] = { /* 0x813c0d8 */ static const struct ScriptCommand s_gs1_g5_s1_obj1_dlg1[] = { /* 0x813c168 */ DEBUGINFO, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(8), HALT, }; @@ -1261,7 +1261,7 @@ static const struct ScriptCommand s_gs1_g5_s1_obj1_dlg2[] = { /* 0x813c198 */ static const struct ScriptCommand s_gs1_g5_s1_obj2_dlg0[] = { /* 0x813c1e8 */ DEBUGINFO, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(8), { 0x5d, 0x00, 0x0000, 0x0000007f, 0x00000000, NULL }, { 0x84, 0x00, 0x0200, -0x00000018, 0x00000004, NULL }, { 0x84, 0x00, 0x0100, -0x00000008, 0x00000002, NULL }, @@ -1273,7 +1273,7 @@ static const struct ScriptCommand s_gs1_g5_s1_obj2_dlg0[] = { /* 0x813c1e8 */ static const struct ScriptCommand s_gs1_g5_s1_obj2_dlg1[] = { /* 0x813c278 */ DEBUGINFO, - { 0x54, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(8), HALT, }; @@ -1287,7 +1287,7 @@ static const struct ScriptCommand s_gs1_g5_s1_obj2_dlg2[] = { /* 0x813c2a8 */ static const struct ScriptCommand s_gs1_g5_s2_lives0_dlg0[] = { /* 0x813c2f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -1296,7 +1296,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives0_dlg0[] = { /* 0x813c2f8 */ static const struct ScriptCommand s_gs1_g5_s2_lives1_dlg0[] = { /* 0x813c358 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -1305,7 +1305,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives1_dlg0[] = { /* 0x813c358 */ static const struct ScriptCommand s_gs1_g5_s2_lives2_dlg0[] = { /* 0x813c3b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -1314,7 +1314,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives2_dlg0[] = { /* 0x813c3b8 */ static const struct ScriptCommand s_gs1_g5_s2_lives3_dlg0[] = { /* 0x813c418 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -1323,7 +1323,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives3_dlg0[] = { /* 0x813c418 */ static const struct ScriptCommand s_gs1_g5_s2_lives4_dlg0[] = { /* 0x813c478 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -1332,7 +1332,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives4_dlg0[] = { /* 0x813c478 */ static const struct ScriptCommand s_gs1_g5_s2_lives5_dlg0[] = { /* 0x813c4d8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -1341,7 +1341,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives5_dlg0[] = { /* 0x813c4d8 */ static const struct ScriptCommand s_gs1_g5_s2_lives6_dlg0[] = { /* 0x813c538 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -1350,7 +1350,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives6_dlg0[] = { /* 0x813c538 */ static const struct ScriptCommand s_gs1_g5_s2_lives7_dlg0[] = { /* 0x813c598 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -1359,7 +1359,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives7_dlg0[] = { /* 0x813c598 */ static const struct ScriptCommand s_gs1_g5_s2_lives8_dlg0[] = { /* 0x813c5f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -1368,7 +1368,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives8_dlg0[] = { /* 0x813c5f8 */ static const struct ScriptCommand s_gs1_g5_s2_lives9_dlg0[] = { /* 0x813c658 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, @@ -1378,17 +1378,17 @@ static const struct ScriptCommand s_gs1_g5_s2_lives9_dlg0[] = { /* 0x813c658 */ static const struct ScriptCommand s_gs1_g5_s3_lives0_dlg1[] = { /* 0x813c6b8 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000008, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0040, -0x00000024, 0x00000000, NULL }, + SELECT_ANIMATION(1), + WALK_RELATIVE(64, -36, 0), CANCEL_OBJECTS(-1, 1), WAIT(30), - { 0x6b, 0x00, 0x0080, 0x00000006, 0x00000000, NULL }, + WALK_GRID(128, 6), END_DELETE, }; static const struct ScriptCommand s_gs1_g5_s3_lives0_dlg2[] = { /* 0x813c738 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" ........................")), @@ -1398,7 +1398,7 @@ static const struct ScriptCommand s_gs1_g5_s3_lives0_dlg2[] = { /* 0x813c738 */ static const struct ScriptCommand s_gs1_g5_s4_station_sref_script[] = { /* 0x813c798 */ DEBUGINFO, SELECT_ENTITIES(-1, -1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -1406,9 +1406,9 @@ static const struct ScriptRef s_gs1_g5_s4_station_sref = { 401, 7, NULL /* EVENT static const struct ScriptCommand s_gs1_g5_s4_lives0_dlg0[] = { /* 0x813c7e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0x93, 0x08, 0x000a, 0x0000007f, 0x00000000, NULL }, PORTRAIT_REP(0x0002, 0x00000000), ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" ............{WAIT_PRESS}Hey.{WAIT_PRESS}\nThat belong to Munchlax.{WAIT_PRESS}\nMunchlax want back.")), @@ -1438,37 +1438,37 @@ static const struct ScriptCommand s_gs1_g5_s4_lives0_dlg0[] = { /* 0x813c7e4 */ TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 5), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, LABEL(2), /* = 0x02 */ TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(30), PORTRAIT_REP(0x0002, 0x00000045), MSG_NPC(2, _(" Nnnnnnnnnnnn!{WAIT_PRESS}\nNnnnnnnnnnnnnnnnnnnnnnnnnnnnnn!")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ..................{WAIT_PRESS}\nMunchlax sad...")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(20), MSG_NPC(2, _(" ..................{WAIT_PRESS}\nMeanie...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), SELECT_ENTITIES(-1, 6), { 0x3b, 0x34, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -1478,9 +1478,9 @@ static const struct ScriptCommand s_gs1_g5_s4_lives0_dlg0[] = { /* 0x813c7e4 */ static const struct ScriptCommand s_gs1_g5_s4_lives1_dlg0[] = { /* 0x813cd90 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -1488,65 +1488,65 @@ static const struct ScriptCommand s_gs1_g5_s4_lives1_dlg0[] = { /* 0x813cd90 */ static const struct ScriptCommand s_gs1_g5_s4_lives2_dlg0[] = { /* 0x813cdf0 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), { 0xda, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(1, /* to label */ 0), COND_EQUAL(2, /* to label */ 1), LABEL(0), /* = 0x00 */ HALT, LABEL(1), /* = 0x01 */ - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x8b, 0x0a, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0020, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(32), + AWAIT_CUE(7), { 0x54, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(24), WAIT(30), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x95, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0x54, 0x00, 0x0021, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(33), { 0x53, 0x00, 0x0000, 0x00000004, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, 0x00000020, 0x00000000, NULL }, + WALK_RELATIVE(128, 32, 0), LABEL(2), /* = 0x02 */ { 0x3b, 0x15, 0x0000, 0x00000040, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 3), - { 0x6a, 0x00, 0x0080, 0x00000004, 0x00000000, NULL }, + WALK_RELATIVE(128, 4, 0), JUMP_LABEL(2), LABEL(3), /* = 0x03 */ { 0x54, 0x00, 0x0800, 0x00000000, 0x00000000, NULL }, WAIT(60), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(10), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x95, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs1_g5_s5_lives0_dlg1[] = { /* 0x813d100 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000006, 0x00000000, NULL }, + SELECT_ANIMATION(1), + WALK_GRID(256, 6), END_DELETE, }; static const struct ScriptCommand s_gs1_g5_s5_lives0_dlg2[] = { /* 0x813d140 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, MSG_NPC(1, _(" ............{WAIT_PRESS}\nYou, good to Munchlax.")), JUMP_SCRIPT(END_TALK), @@ -1554,14 +1554,14 @@ static const struct ScriptCommand s_gs1_g5_s5_lives0_dlg2[] = { /* 0x813d140 */ static const struct ScriptCommand s_gs1_g5_s6_lives0_dlg1[] = { /* 0x813d190 */ DEBUGINFO, - { 0x54, 0x00, 0x0021, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, + SELECT_ANIMATION(33), + WALK_GRID(256, 3), END_DELETE, }; static const struct ScriptCommand s_gs1_g5_s6_lives0_dlg2[] = { /* 0x813d1d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT_REP(0x0001, 0x00000045), @@ -1580,7 +1580,7 @@ static const struct ScriptCommand s_gs1_g6_s0_station_sref_script[] = { /* 0x813 SELECT_ENTITIES(7, 0), BGM_SWITCH(7), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -1590,55 +1590,55 @@ static const struct ScriptRef s_gs1_g6_s0_station_sref = { 402, 7, NULL /* EVENT static const struct ScriptCommand s_gs1_g6_s0_eff0_script[] = { /* 0x813d31c */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x86, 0x00, 0x0200, 0x00000009, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x86, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x86, 0x00, 0x0200, 0x0000000b, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x86, 0x00, 0x0200, 0x0000000c, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x86, 0x00, 0x0200, 0x0000000d, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs1_g6_s0_lives0_dlg0[] = { /* 0x813d45c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(128, 7), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" This is Pokémon Square.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's the {COLOR CYAN}Kecleon Shop{RESET}.{WAIT_PRESS}\nYou can buy and sell items there.")), VARIANT_DEFAULT(_(" That's the {COLOR CYAN}Kecleon Shop{RESET}.{WAIT_PRESS}\nYou can buy and sell items there.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's {COLOR CYAN}Felicity Bank{RESET}.")), VARIANT(/* == */ 1, _(" You can save your money\nthere.")), VARIANT_DEFAULT(_(" That's {COLOR CYAN}Felicity Bank{RESET}.")), VARIANT_DEFAULT(_(" You can save your money\nthere.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is the\n{COLOR CYAN}Gulpin Link Shop{RESET}.{WAIT_PRESS}\nGulpin will link moves for you.")), VARIANT(/* == */ 1, _(" Hah?{WAIT_PRESS} What's linking?{WAIT_PRESS}\nWell, if you link moves...{WAIT_PRESS}\nYou can use them at the same time.")), @@ -1650,30 +1650,30 @@ static const struct ScriptCommand s_gs1_g6_s0_lives0_dlg0[] = { /* 0x813d45c */ VARIANT_DEFAULT(_(" Huh?{WAIT_PRESS} What's linking?{WAIT_PRESS}\nWell, if you link moves...{WAIT_PRESS}\nYou can use them at the same time.")), VARIANT_DEFAULT(_(" I think you should ask Gulpin\nif you want to know more.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is {COLOR CYAN}Kangaskhan Storage{RESET}.\nStore items here so they'll never be\nlost.")), VARIANT(/* == */ 1, _(" If you have important\nitems, you should store them before you\nhead out to a dungeon.")), VARIANT_DEFAULT(_(" This is {COLOR CYAN}Kangaskhan Storage{RESET}.\nIf you store items here, they'll never go\nmissing.")), VARIANT_DEFAULT(_(" You should store important\nitems here before you go out on any\ndungeon adventure.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" How do you like it?\nThe shops are useful, huh?")), VARIANT_DEFAULT(_(" What do you think?\nThe businesses here help us.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, yeah, there's also the\n{COLOR CYAN}Pelipper Post Office{RESET}.\nIt's straight ahead past here.")), VARIANT_DEFAULT(_(" Oh, and there's also the\n{COLOR CYAN}Pelipper Post Office{RESET}.\nThat's up past here.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I'm sure you can get\ninformation on rescue jobs there.")), VARIANT(/* == */ 1, _(" So, let's start with a visit\nto the {COLOR CYAN}Pelipper Post Office{RESET}.")), @@ -1683,36 +1683,36 @@ static const struct ScriptCommand s_gs1_g6_s0_lives0_dlg0[] = { /* 0x813d45c */ VARIANT_DEFAULT(_(" Let's first go to the\n{COLOR CYAN}Pelipper Post Office{RESET}.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs1_g6_s0_lives1_dlg0[] = { /* 0x813df88 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000008, 0x00000000, NULL }, + WALK_GRID(128, 8), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x8e, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + SELECT_ANIMATION(2), + AWAIT_CUE(6), { 0x8e, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), RET, }; @@ -1726,7 +1726,7 @@ static const struct ScriptRef s_gs1_g7_s0_station_sref = { 403, 8, NULL /* STATI static const struct ScriptCommand s_gs1_g7_s0_lives0_dlg2[] = { /* 0x813e134 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1735,7 +1735,7 @@ static const struct ScriptCommand s_gs1_g7_s0_lives0_dlg2[] = { /* 0x813e134 */ static const struct ScriptCommand s_gs1_g7_s0_lives1_dlg2[] = { /* 0x813e194 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1744,7 +1744,7 @@ static const struct ScriptCommand s_gs1_g7_s0_lives1_dlg2[] = { /* 0x813e194 */ static const struct ScriptCommand s_gs1_g7_s0_lives2_dlg2[] = { /* 0x813e1f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1753,7 +1753,7 @@ static const struct ScriptCommand s_gs1_g7_s0_lives2_dlg2[] = { /* 0x813e1f4 */ static const struct ScriptCommand s_gs1_g7_s0_lives3_dlg2[] = { /* 0x813e254 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1762,7 +1762,7 @@ static const struct ScriptCommand s_gs1_g7_s0_lives3_dlg2[] = { /* 0x813e254 */ static const struct ScriptCommand s_gs1_g7_s0_lives4_dlg2[] = { /* 0x813e2b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1778,7 +1778,7 @@ static const struct ScriptCommand s_gs1_g7_s0_lives5_dlg1[] = { /* 0x813e314 */ static const struct ScriptCommand s_gs1_g7_s0_lives5_dlg2[] = { /* 0x813e354 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I don't know why, but\nthere've been many natural disasters\nlately.")), @@ -1796,7 +1796,7 @@ static const struct ScriptCommand s_gs1_g7_s0_lives6_dlg1[] = { /* 0x813e494 */ static const struct ScriptCommand s_gs1_g7_s0_lives6_dlg2[] = { /* 0x813e4d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" There was a forest fire not\nlong ago.\nIt was terrible.")), @@ -1807,30 +1807,30 @@ static const struct ScriptCommand s_gs1_g7_s0_lives6_dlg2[] = { /* 0x813e4d4 */ static const struct ScriptCommand s_gs1_g7_s0_lives7_dlg2[] = { /* 0x813e61c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Pardon?\nOh, the {COLOR CYAN}Pelipper Post Office{RESET}?")), MSG_NPC(1, _(" The {COLOR CYAN}Pelipper Post Office{RESET}\nwould be...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Straight down this path.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" It's out at the cape.\nYou can't miss it.")), JUMP_SCRIPT(END_TALK), }; static const struct ScriptCommand s_gs1_g7_s0_lives7_dlg3[] = { /* 0x813e794 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), CALL_SCRIPT(WAIT_END_TALK_FUNC), RET, }; @@ -1845,9 +1845,9 @@ static const struct ScriptRef s_gs1_g7_s1_station_sref = { 401, 7, NULL /* EVENT static const struct ScriptCommand s_gs1_g7_s1_lives0_dlg0[] = { /* 0x813e880 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(1), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" Huh?\nAre you going home already?")), @@ -1860,20 +1860,20 @@ static const struct ScriptCommand s_gs1_g7_s1_lives0_dlg0[] = { /* 0x813e880 */ VARIANT_DEFAULT(_(" We haven't gone to the\n{COLOR CYAN}Pelipper Post Office{RESET} yet.")), VARIANT_DEFAULT(_(" Let's go to the {COLOR CYAN}Pelipper\nPost Office{RESET} at least.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs1_g7_s1_lives1_dlg0[] = { /* 0x813ead4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -1893,7 +1893,7 @@ static const struct ScriptRef s_gs1_g8_s0_station_sref = { 403, 8, NULL /* STATI static const struct ScriptCommand s_gs1_g8_s0_lives0_dlg2[] = { /* 0x813ebe0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1902,7 +1902,7 @@ static const struct ScriptCommand s_gs1_g8_s0_lives0_dlg2[] = { /* 0x813ebe0 */ static const struct ScriptCommand s_gs1_g8_s0_lives1_dlg2[] = { /* 0x813ec40 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1911,7 +1911,7 @@ static const struct ScriptCommand s_gs1_g8_s0_lives1_dlg2[] = { /* 0x813ec40 */ static const struct ScriptCommand s_gs1_g8_s0_lives2_dlg2[] = { /* 0x813eca0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1920,7 +1920,7 @@ static const struct ScriptCommand s_gs1_g8_s0_lives2_dlg2[] = { /* 0x813eca0 */ static const struct ScriptCommand s_gs1_g8_s0_lives3_dlg2[] = { /* 0x813ed00 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1929,7 +1929,7 @@ static const struct ScriptCommand s_gs1_g8_s0_lives3_dlg2[] = { /* 0x813ed00 */ static const struct ScriptCommand s_gs1_g8_s0_lives4_dlg2[] = { /* 0x813ed60 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1938,7 +1938,7 @@ static const struct ScriptCommand s_gs1_g8_s0_lives4_dlg2[] = { /* 0x813ed60 */ static const struct ScriptCommand s_gs1_g8_s0_lives5_dlg2[] = { /* 0x813edc0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_SCENE_LT(SCENARIO_MAIN, 5, 4, /* to label */ 0), @@ -1958,7 +1958,7 @@ static const struct ScriptCommand s_gs1_g8_s0_lives6_dlg1[] = { /* 0x813ee60 */ static const struct ScriptCommand s_gs1_g8_s0_lives6_dlg2[] = { /* 0x813eea0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" There've been so many\nnatural disasters lately...")), @@ -1975,7 +1975,7 @@ static const struct ScriptCommand s_gs1_g8_s0_lives7_dlg1[] = { /* 0x813ef7c */ static const struct ScriptCommand s_gs1_g8_s0_lives7_dlg2[] = { /* 0x813efbc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004f, 0x00000000, NULL }, WAIT(1), @@ -1994,9 +1994,9 @@ static const struct ScriptRef s_gs1_g8_s1_station_sref = { 401, 7, NULL /* EVENT static const struct ScriptCommand s_gs1_g8_s1_lives0_dlg0[] = { /* 0x813f0dc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(1), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" Huh?\nYou want to go home already?")), @@ -2005,64 +2005,64 @@ static const struct ScriptCommand s_gs1_g8_s1_lives0_dlg0[] = { /* 0x813f0dc */ WAIT(10), MSG_NPC(1, _(" We're already here.\nLet me show you around a bit more.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs1_g8_s1_lives1_dlg0[] = { /* 0x813f23c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs1_g8_s2_lives0_dlg0[] = { /* 0x813f2bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET, }; static const struct ScriptCommand s_gs1_g8_s2_lives1_dlg0[] = { /* 0x813f2ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET, }; static const struct ScriptCommand s_gs1_g8_s2_lives2_dlg0[] = { /* 0x813f31c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET, }; static const struct ScriptCommand s_gs1_g8_s2_lives3_dlg0[] = { /* 0x813f34c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET, }; static const struct ScriptCommand s_gs1_g8_s2_lives4_dlg0[] = { /* 0x813f37c */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET, }; static const struct ScriptCommand s_gs1_g8_s2_lives5_dlg0[] = { /* 0x813f3bc */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET, }; static const struct ScriptCommand s_gs1_g8_s2_lives6_dlg0[] = { /* 0x813f3fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(1), RET, @@ -2070,7 +2070,7 @@ static const struct ScriptCommand s_gs1_g8_s2_lives6_dlg0[] = { /* 0x813f3fc */ static const struct ScriptCommand s_gs1_g8_s2_lives7_dlg0[] = { /* 0x813f44c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0009, 0x00000000, 0x00000000, NULL }, WAIT(1), RET, @@ -2078,7 +2078,7 @@ static const struct ScriptCommand s_gs1_g8_s2_lives7_dlg0[] = { /* 0x813f44c */ static const struct ScriptCommand s_gs1_g8_s2_lives8_dlg2[] = { /* 0x813f49c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2087,7 +2087,7 @@ static const struct ScriptCommand s_gs1_g8_s2_lives8_dlg2[] = { /* 0x813f49c */ static const struct ScriptCommand s_gs1_g8_s2_lives9_dlg2[] = { /* 0x813f4fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2105,7 +2105,7 @@ static const struct ScriptRef s_gs1_g8_s2_evt0_sref = { 57, 7, NULL /* NORMAL_EV static const struct ScriptCommand s_gs1_g9_s0_station_sref_script[] = { /* 0x813f598 */ DEBUGINFO, SELECT_ENTITIES(-1, -1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SCENARIO_CALC(SCENARIO_MAIN, 5, 4), CANCEL_LIVES(8, 0), SELECT_ENTITIES(8, 2), @@ -2116,12 +2116,12 @@ static const struct ScriptRef s_gs1_g9_s0_station_sref = { 401, 7, NULL /* EVENT static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000012, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 18), + ROTATE(4, 10, DIRECTION_NORTH), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(2, _(" Friends are my treasures!\nWelcome to {NAME_2} Club--a circle\nof friends! ")), @@ -2150,9 +2150,9 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ SELECT_ENTITIES(-1, 1), WAIT(1), WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(7), PORTRAIT(PLACEMENT_TOP_LEFT, 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?")), @@ -2162,10 +2162,10 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ MSG_NPC(2, _(" OK! Gotcha!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), MSG_NPC(2, _(" I'm giving it away today!{WAIT_PRESS}\nWigglytuff〜♪ Wigglytuff〜♪{WAIT_PRESS}\nLet's be friends... Taaaaaaah!")), TEXTBOX_CLEAR, FANFARE_PLAY2(603), @@ -2178,34 +2178,34 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ MSG_NPC(2, _(" Congratulations!{WAIT_PRESS}\nYou can go to the {COLOR GREEN_H}Power Plant{RESET} now.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000041), MSG_NPC(4, _(" YES!\nNOW I CAN JOIN THEIR TEAM!")), MSG_NPC(4, _(" YAY! BZBZBZZT!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), WAIT(15), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(7), + ROTATE(4, 10, DIRECTION_WEST), PORTRAIT_REP(0x0003, 0x00000000), MSG_NPC(3, _(" SORRY.{WAIT_PRESS}\nI KNOW MY FRIEND TURNED DOWN YOUR\nOFFER TO JOIN YOUR TEAM YESTERDAY...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" BUT AFTER MULLING IT\nOVER ALL LAST NIGHT...")), MSG_NPC(3, _(" MY FRIEND DEVELOPED AN\nOVERWHELMING DESIRE TO BECOME YOUR\nTEAM MEMBER.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + AWAIT_CUE(5), MSG_NPC(3, _(" I APOLOGIZE, BUT COULD\nYOU ALLOW MY FRIEND TO JOIN YOUR\nRESCUE TEAM?")), TEXTBOX_CLEAR, WAIT(10), @@ -2214,14 +2214,14 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ MSG_NPC(1, _(" So, yes, that'd be awesome!\nGlad to have your friend on board!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000041), MSG_NPC(3, _(" ALL RIGHT!\nGOOD ON YOU! BZBZBZZ!")), MSG_NPC(3, _(" DO YOUR BEST, AND TRY\nNOT TO HINDER YOUR RESCUE\nTEAMMATES! BZBZBZZT!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), PORTRAIT_REP(0x0004, 0x00000041), MSG_NPC(4, _(" YEAH! I'LL DO MY BEST!")), MSG_NPC(4, _(" YAY, BZBZBZZ!")), @@ -2237,80 +2237,80 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ CHOICE(/* label */ 0, _("*Yes.")), CHOICE(/* label */ 1, _("No.")), LABEL(0), /* = 0x00 */ - { 0x3d, 0x00, 0x0000, -0x00000001, 0x00000000, NULL }, + RENAME_ALLY(-1), LABEL(1), /* = 0x01 */ { 0x3b, 0x19, 0x0004, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), WAIT(10), PORTRAIT_REP(0x0004, 0x00000000), MSG_NPC(4, _(" I'LL BE RESTING UP IN THE\n{COLOR GREEN_H}POWER PLANT{RESET} FRIEND AREA.")), MSG_NPC(4, _(" IF YOU WANT ME ALONG\nFOR A RESCUE, COME GET ME AT THE\n{COLOR GREEN_H}POWER PLANT{RESET}.")), MSG_NPC(4, _(" OK! BZBZBZZ!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + AWAIT_CUE(5), + ALERT_CUE(7), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), MSG_NPC(2, _(" You can go to your Friend\nAreas by taking the left path from your\nrescue team base.")), MSG_NPC(2, _(" There's a sign on the path\nto the left of your rescue team base,\nso you shouldn't have any trouble.")), MSG_NPC(2, _(" That's all the giveaways\ntoday!{WAIT_PRESS} If you want more Friend Areas,\nyou'll have to buy them now.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs1_g9_s0_lives1_dlg0[] = { /* 0x81408d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000013, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 19), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), WAIT(7), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(6), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs1_g9_s0_lives2_dlg0[] = { /* 0x8140a10 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), + AWAIT_CUE(3), RET, }; static const struct ScriptCommand s_gs1_g9_s0_lives2_dlg2[] = { /* 0x8140ae0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_SCENE_LT(SCENARIO_MAIN, 5, 4, /* to label */ 0), @@ -2325,67 +2325,67 @@ static const struct ScriptCommand s_gs1_g9_s0_lives2_dlg2[] = { /* 0x8140ae0 */ static const struct ScriptCommand s_gs1_g9_s1_lives0_dlg0[] = { /* 0x8140ba0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x00000014, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + WALK_GRID(384, 20), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x89, 0x10, 0x0080, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x88, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(3), END_DELETE, }; static const struct ScriptCommand s_gs1_g9_s1_lives1_dlg0[] = { /* 0x8140dc0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0180, 0x00000015, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + WALK_GRID(384, 21), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(9), CALL_SCRIPT(SMILE_START_FUNC), WAIT(7), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTHEAST), CALL_SCRIPT(SMILE_START_FUNC), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(9), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x88, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), END_DELETE, }; @@ -2394,12 +2394,12 @@ static const struct ScriptCommand s_gs1_g10_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), CANCEL_ENTITIES(8, 0), BGM_SWITCH(7), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(-1, 1), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(3), SELECT_ENTITIES(-1, 2), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), EXECUTE_FUNCTION(EVENT_M01E03A_L003), @@ -2410,64 +2410,64 @@ static const struct ScriptRef s_gs1_g10_s0_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g10_s0_eff0_script[] = { /* 0x814104c */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x28, 0x0200, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x89, 0x28, 0x0200, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x89, 0x28, 0x0200, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x89, 0x20, 0x0300, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x30, 0x0200, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x88, 0x00, 0x0400, 0x00000059, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x88, 0x00, 0x0100, 0x0000005a, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x88, 0x00, 0x0100, 0x00000058, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), WAIT(30), - { 0x7a, 0x00, 0x00f0, 0x0000001b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + WALK_DIRECT(240, 27), + AWAIT_CUE(4), { 0x89, 0x18, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x88, 0x00, 0x0180, 0x0000005b, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x00000016, 0x00000000, NULL }, { 0x93, 0x04, 0x000b, 0x0000004e, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(30), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(15), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000041), MSG_NPC(2, _(" Please help my friend!\nPlease, I need help!")), @@ -2480,10 +2480,10 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ MSG_NPC(2, _(" But my friend needs a gust\nof wind! Please!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, what's up?")), @@ -2491,58 +2491,58 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ TEXTBOX_CLEAR, WAIT(10), { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 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, WAIT(4), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), MSG_NPC(4, _(" See that guy?")), TEXTBOX_CLEAR, WAIT(4), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x2e, 0x00, 0x0004, -0x00000002, 0x00000000, NULL }, MSG_NPC(4, _(" There, the one in the middle\nwith the pointy nose.")), MSG_NPC(4, _(" He's a Pokémon named\n{POKEMON_3}.\nHe's got his own rescue team.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(9), + ROTATE(4, 2, DIRECTION_SOUTH), + ALERT_CUE(6), PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 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, WAIT(30), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(6), MSG_NPC(-1, _(" Wait!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), WAIT(4), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(8), + ALERT_CUE(7), + ALERT_CUE(13), + ALERT_CUE(14), WAIT(20), { 0x93, 0x04, 0x000b, 0x00000058, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(1), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), WAIT(70), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(13), + ALERT_CUE(14), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000041), MSG_NPC(3, _(" Oh! Wh-what do you want?")), TEXTBOX_CLEAR, @@ -2551,11 +2551,11 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ MSG_NPC(-1, _(" That's {NAME_5}?!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + ALERT_CUE(7), + ALERT_CUE(13), + ALERT_CUE(14), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 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.")), @@ -2563,60 +2563,60 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ MSG_NPC(5, _(" It's an easy matter for you.{WAIT_PRESS}\nHelp that Pokémon out.")), TEXTBOX_CLEAR, WAIT(4), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_FLIP, 0x0003, 0x00000041), MSG_NPC(3, _(" Grr...{WAIT_PRESS}\nTch! OK, we'll do it.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(13), + ALERT_CUE(14), + AWAIT_CUE(5), WAIT(60), - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(13), + ALERT_CUE(14), MSG_NPC(-1, _(" Wow...")), MSG_NPC(-1, _(" That {NAME_3} agreed without\nany argument...")), TEXTBOX_CLEAR, WAIT(20), BGM_FADEIN(80, 7), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, who are those guys?")), VARIANT_DEFAULT(_(" Say, who are they?")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 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, WAIT(4), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(6), WAIT(20), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), { 0x2e, 0x00, 0x0004, -0x00000002, 0x00000000, NULL }, MSG_NPC(4, _(" That's {NAME_6}.{WAIT_PRESS}\nHis Flamethrower can melt mountains!")), TEXTBOX_CLEAR, WAIT(4), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), MSG_NPC(4, _(" That's {NAME_7}.{WAIT_PRESS}\nHe takes great pride in his armored\nbody and amazing strength.")), TEXTBOX_CLEAR, WAIT(4), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), MSG_NPC(4, _(" And that's the leader,\n{NAME_5}.")), MSG_NPC(4, _(" {NAME_5} doesn't like\nphysical attacks.\nHe fights with his psychic powers.")), MSG_NPC(4, _(" He's endowed with an\namazing brain and an IQ of 5,000.")), @@ -2624,8 +2624,8 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ MSG_NPC(4, _(" {NAME_5} does all the\ncommanding in the team.{WAIT_PRESS}\nHe's clearly in charge.")), TEXTBOX_CLEAR, WAIT(16), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Th-thank you.")), TEXTBOX_CLEAR, @@ -2636,45 +2636,45 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ TEXTBOX_CLEAR, WAIT(30), WAIT(1), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(4), + ALERT_CUE(12), + ALERT_CUE(11), + ALERT_CUE(10), + ALERT_CUE(13), + ALERT_CUE(14), WAIT(46), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("{COLOR YELLOW}{SPEECH_BUBBLE}{RESET}: C-cool...") }, WAIT(60), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("{COLOR YELLOW}{SPEECH_BUBBLE}{RESET}: I wouldn't expect less from a Gold\nRank rescue team.") }, WAIT(40), - { 0x91, 0x0a, 0x000b, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 11, DIRECTION_EAST), + ALERT_CUE(6), + ALERT_CUE(9), WAIT(70), TEXTBOX_CLEAR, BGM_FADEOUT(30), WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" ...!")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(9), + ALERT_CUE(7), WAIT(24), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), MSG_NPC(4, _(" Wah! What's wrong?")), TEXTBOX_CLEAR, WAIT(4), - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0006, 0x00000000), MSG_NPC(6, _(" What's up?")), TEXTBOX_CLEAR, @@ -2682,29 +2682,29 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0005, 0x00000000), MSG_NPC(5, _(" ......{WAIT_PRESS}\nIt's fine. Nothing.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), WAIT(64), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0005, 0x00000000), MSG_NPC(5, _(" Let's go.")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), WAIT(94), WAIT(30), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), BGM_FADEIN(60, 7), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), MSG_NPC(4, _(" Whew!\nThat was scary! Sheesh!")), TEXTBOX_CLEAR, WAIT(10), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0001, 0x0000000b), MSG_NPC(1, _(" ...C-cool...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Whew, {NAME_0}...{WAIT_PRESS}\nThat's what we've got to become.")), @@ -2715,19 +2715,19 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ VARIANT_DEFAULT(_(" Let's recruit more members\nand make our rescue team first-class!")), TEXTBOX_CLEAR, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), + ALERT_CUE(4), + AWAIT_CUE(5), { 0x2d, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT, 0x0005, 0x00000000), WAIT(32), MSG_NPC(-1, _(" Not if I can help it!\nKekeh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), BGM_FADEOUT(120), WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -2757,41 +2757,41 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ static const struct ScriptCommand s_gs1_g10_s0_lives3_dlg0[] = { /* 0x8142cf4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x0000004e, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x86, 0x00, 0x0100, 0x00000017, 0x00000000, NULL }, { 0x8e, 0x01, 0x0000, 0x0000004e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(6), WAIT(3), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000058, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000058, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(10, 2, DIRECTION_EAST), + AWAIT_CUE(6), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x90, 0x20, 0x0000, 0x0000001c, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, @@ -2799,309 +2799,309 @@ static const struct ScriptCommand s_gs1_g10_s0_lives3_dlg0[] = { /* 0x8142cf4 */ static const struct ScriptCommand s_gs1_g10_s0_lives4_dlg0[] = { /* 0x8142f64 */ DEBUGINFO, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0x2d, 0x07, 0x0009, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), { 0x93, 0x04, 0x000b, 0x00000058, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), + ROTATE(4, 11, DIRECTION_SOUTHWEST), + AWAIT_CUE(14), + ROTATE(4, 11, DIRECTION_SOUTH), + AWAIT_CUE(14), CALL_SCRIPT(SHOCK_FUNC), - { 0x91, 0x01, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_WEST), { 0x61, 0x00, 0x0400, 0x00000230, 0x00000108, NULL }, WAIT(30), - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(14), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(14), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(14), WAIT(150), - { 0x91, 0x08, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_SOUTHEAST), WAIT(60), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), HALT, }; static const struct ScriptCommand s_gs1_g10_s0_lives5_dlg0[] = { /* 0x8143104 */ DEBUGINFO, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0x2d, 0x07, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), + ROTATE(4, 11, DIRECTION_WEST), + AWAIT_CUE(14), + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(14), + ROTATE(4, 11, DIRECTION_NORTH), + AWAIT_CUE(14), WAIT(10), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), + ROTATE(4, 11, DIRECTION_NORTH), + AWAIT_CUE(14), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(14), WAIT(150), - { 0x91, 0x08, 0x0001, 0x00000003, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_NORTHEAST), WAIT(60), - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_EAST), HALT, }; static const struct ScriptCommand s_gs1_g10_s0_lives6_dlg0[] = { /* 0x8143254 */ DEBUGINFO, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0x2d, 0x07, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), { 0x93, 0x04, 0x000b, 0x00000058, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), + ROTATE(4, 11, DIRECTION_SOUTHWEST), + AWAIT_CUE(13), + ROTATE(4, 11, DIRECTION_SOUTH), + AWAIT_CUE(13), CALL_SCRIPT(SHOCK_FUNC), WAIT(65), - { 0x91, 0x01, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(1, 2, DIRECTION_EAST), { 0x61, 0x00, 0x0400, 0x000001d0, 0x00000108, NULL }, WAIT(30), - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(13), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(13), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(13), WAIT(120), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), HALT, }; static const struct ScriptCommand s_gs1_g10_s0_lives7_dlg0[] = { /* 0x81433e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + AWAIT_CUE(7), + AWAIT_CUE(7), + AWAIT_CUE(7), { 0x89, 0x10, 0x0200, 0x00000006, 0x00000000, NULL }, { 0x89, 0x10, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(13), + ALERT_CUE(14), WAIT(48), CALL_SCRIPT(SMILE_START_FUNC), WAIT(20), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x89, 0x08, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHWEST), WAIT(50), - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_EAST), WAIT(70), { 0x89, 0x30, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs1_g10_s0_lives8_dlg0[] = { /* 0x8143574 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x8e, 0x01, 0x0000, 0x00000058, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), FANFARE_STOP2(465), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 11, DIRECTION_EAST), FANFARE_PLAY2(468), WAIT(48), - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_WEST), WAIT(40), - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHWEST), FANFARE_PLAY2(468), WAIT(40), - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHWEST), FANFARE_PLAY2(468), WAIT(40), FANFARE_STOP2(468), - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_WEST), WAIT(16), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), WAIT(1), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x01cc, 0x00000018, 0x00000000, NULL }, + WALK_GRID(460, 24), WAIT(1), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x01cc, 0x00000018, 0x00000000, NULL }, + ALERT_CUE(7), + WALK_GRID(460, 24), WAIT(32), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs1_g10_s0_lives9_dlg0[] = { /* 0x81437d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), { 0x8e, 0x01, 0x0000, 0x00000058, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x01cc, 0x00000019, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_GRID(460, 25), + AWAIT_CUE(3), END_DELETE, }; static const struct ScriptCommand s_gs1_g10_s0_lives10_dlg0[] = { /* 0x8143884 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), { 0x8e, 0x01, 0x0000, 0x00000058, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6b, 0x00, 0x01cc, 0x00000019, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + WALK_GRID(460, 25), + AWAIT_CUE(3), END_DELETE, }; static const struct ScriptCommand s_gs1_g10_s0_lives11_dlg0[] = { /* 0x8143934 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x8e, 0x01, 0x0000, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), { 0x93, 0x04, 0x0002, 0x00000055, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 11, DIRECTION_NORTH), + AWAIT_CUE(9), WAIT(3), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x8e, 0x01, 0x0000, 0x00000058, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x8e, 0x01, 0x0000, 0x00000004, 0x00000000, NULL }, FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), { 0x8e, 0x01, 0x0000, 0x00000058, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(10, 1, DIRECTION_EAST), + AWAIT_CUE(9), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0x62, 0x00, 0x0100, -0x00000008, -0x00000008, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs1_g10_s1_lives0_dlg0[] = { /* 0x8143b44 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000001a, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 26), + AWAIT_CUE(10), { 0x89, 0x0f, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), WAIT(30), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x7a, 0x00, 0x00f0, 0x0000001b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + WALK_DIRECT(240, 27), + AWAIT_CUE(10), FANFARE_PLAY2(466), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(10), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(10), { 0x8e, 0x10, 0x0000, 0x00000059, 0x00000000, NULL }, WAIT(16), { 0x8e, 0x10, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT(16), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0080, 0x0000001c, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), + WALK_DIRECT(128, 28), WAIT(128), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), END_DELETE, }; static const struct ScriptCommand s_gs1_g10_s1_lives1_dlg0[] = { /* 0x8143d14 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000001d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 29), + AWAIT_CUE(11), WAIT(30), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x7a, 0x00, 0x00f0, 0x0000001e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + WALK_DIRECT(240, 30), + AWAIT_CUE(11), WAIT(5), { 0x8e, 0x10, 0x0000, 0x00000058, 0x00000000, NULL }, WAIT(16), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(5), FANFARE_STOP2(469), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0088, 0x0000001f, 0x00000000, NULL }, + AWAIT_CUE(11), + WALK_DIRECT(136, 31), WAIT(136), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), END_DELETE, }; static const struct ScriptCommand s_gs1_g10_s1_lives2_dlg0[] = { /* 0x8143e74 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000020, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 32), + AWAIT_CUE(12), WAIT(30), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x7a, 0x00, 0x00f0, 0x00000021, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + WALK_DIRECT(240, 33), + AWAIT_CUE(12), { 0x8e, 0x10, 0x0000, 0x00000058, 0x00000000, NULL }, WAIT(16), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0088, 0x00000022, 0x00000000, NULL }, + AWAIT_CUE(12), + WALK_DIRECT(136, 34), WAIT(136), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), END_DELETE, }; static const struct ScriptCommand s_gs1_g10_s2_lives0_dlg0[] = { /* 0x8143f74 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(10, 10, DIRECTION_SOUTH), WAIT(10), - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(24), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(20), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(20), - { 0x7a, 0x00, 0x008c, 0x00000023, 0x00000000, NULL }, + WALK_DIRECT(140, 35), END_DELETE, }; @@ -3115,7 +3115,7 @@ static const struct ScriptRef s_gs1_g11_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g11_s0_lives0_dlg2[] = { /* 0x81440a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3124,7 +3124,7 @@ static const struct ScriptCommand s_gs1_g11_s0_lives0_dlg2[] = { /* 0x81440a0 */ static const struct ScriptCommand s_gs1_g11_s0_lives1_dlg2[] = { /* 0x8144100 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3133,7 +3133,7 @@ static const struct ScriptCommand s_gs1_g11_s0_lives1_dlg2[] = { /* 0x8144100 */ static const struct ScriptCommand s_gs1_g11_s0_lives2_dlg2[] = { /* 0x8144160 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3142,7 +3142,7 @@ static const struct ScriptCommand s_gs1_g11_s0_lives2_dlg2[] = { /* 0x8144160 */ static const struct ScriptCommand s_gs1_g11_s0_lives3_dlg2[] = { /* 0x81441c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3151,7 +3151,7 @@ static const struct ScriptCommand s_gs1_g11_s0_lives3_dlg2[] = { /* 0x81441c0 */ static const struct ScriptCommand s_gs1_g11_s0_lives4_dlg2[] = { /* 0x8144220 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3160,7 +3160,7 @@ static const struct ScriptCommand s_gs1_g11_s0_lives4_dlg2[] = { /* 0x8144220 */ static const struct ScriptCommand s_gs1_g11_s0_lives5_dlg2[] = { /* 0x8144280 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3176,7 +3176,7 @@ static const struct ScriptCommand s_gs1_g11_s0_lives6_dlg1[] = { /* 0x81442e0 */ static const struct ScriptCommand s_gs1_g11_s0_lives6_dlg2[] = { /* 0x8144320 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004d, 0x00000000, NULL }, WAIT(1), @@ -3191,14 +3191,14 @@ static const struct ScriptCommand s_gs1_g11_s0_lives6_dlg2[] = { /* 0x8144320 */ static const struct ScriptCommand s_gs1_g11_s0_lives7_dlg1[] = { /* 0x8144578 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x8b, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs1_g11_s0_lives7_dlg2[] = { /* 0x81445b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Did you know that a new\ntraining gym--I think they called it\na dojo--opened in town?")), @@ -3206,32 +3206,32 @@ static const struct ScriptCommand s_gs1_g11_s0_lives7_dlg2[] = { /* 0x81445b8 */ MSG_NPC(1, _(" There was a group of\nconcerned Pokémon...{WAIT_PRESS}\nThey wanted to support rescue teams.")), MSG_NPC(1, _(" So they got together and\nbuilt the dojo.")), MSG_NPC(1, _(" You can find the dojo easily.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" From here, it's just straight\ndown this path.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" If you have a rescue team\ntoo, I highly recommend you pay the dojo\na visit.")), JUMP_SCRIPT(END_TALK), }; static const struct ScriptCommand s_gs1_g11_s0_lives7_dlg3[] = { /* 0x8144888 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), CALL_SCRIPT(WAIT_END_TALK_FUNC), RET, }; static const struct ScriptCommand s_gs1_g11_s0_lives8_dlg2[] = { /* 0x8144938 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Alakazam's team has the\nGold Rank. Isn't that awesome?")), @@ -3255,7 +3255,7 @@ static const struct ScriptCommand s_gs1_g12_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), FANFARE_PLAY(0), { 0x27, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), FANFARE_STOP(0), { 0x28, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, RET, @@ -3265,7 +3265,7 @@ static const struct ScriptRef s_gs1_g12_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g12_s0_lives0_dlg0[] = { /* 0x8144c8c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0000, 0x00000041), @@ -3279,7 +3279,7 @@ static const struct ScriptCommand s_gs1_g12_s0_lives0_dlg0[] = { /* 0x8144c8c */ MSG_NPC(0, _(" But my friend needs a gust\nof wind! Please!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -3288,56 +3288,56 @@ static const struct ScriptCommand s_gs1_g12_s0_lives0_dlg0[] = { /* 0x8144c8c */ static const struct ScriptCommand s_gs1_g12_s0_lives1_dlg0[] = { /* 0x8144d9c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g12_s0_lives2_dlg0[] = { /* 0x8144ddc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs1_g12_s0_lives3_dlg0[] = { /* 0x8144e0c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs1_g12_s0_lives4_dlg0[] = { /* 0x8144e3c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs1_g12_s0_lives5_dlg0[] = { /* 0x8144e6c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs1_g12_s0_lives6_dlg0[] = { /* 0x8144e9c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs1_g12_s0_lives7_dlg0[] = { /* 0x8144ecc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs1_g12_s0_lives8_dlg0[] = { /* 0x8144efc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs1_g12_s0_lives9_dlg0[] = { /* 0x8144f2c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; @@ -3351,7 +3351,7 @@ static const struct ScriptRef s_gs1_g13_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g13_s0_lives0_dlg2[] = { /* 0x8144f98 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3360,7 +3360,7 @@ static const struct ScriptCommand s_gs1_g13_s0_lives0_dlg2[] = { /* 0x8144f98 */ static const struct ScriptCommand s_gs1_g13_s0_lives1_dlg2[] = { /* 0x8144ff8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3369,7 +3369,7 @@ static const struct ScriptCommand s_gs1_g13_s0_lives1_dlg2[] = { /* 0x8144ff8 */ static const struct ScriptCommand s_gs1_g13_s0_lives2_dlg2[] = { /* 0x8145058 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3378,7 +3378,7 @@ static const struct ScriptCommand s_gs1_g13_s0_lives2_dlg2[] = { /* 0x8145058 */ static const struct ScriptCommand s_gs1_g13_s0_lives3_dlg2[] = { /* 0x81450b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3387,7 +3387,7 @@ static const struct ScriptCommand s_gs1_g13_s0_lives3_dlg2[] = { /* 0x81450b8 */ static const struct ScriptCommand s_gs1_g13_s0_lives4_dlg2[] = { /* 0x8145118 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3396,7 +3396,7 @@ static const struct ScriptCommand s_gs1_g13_s0_lives4_dlg2[] = { /* 0x8145118 */ static const struct ScriptCommand s_gs1_g13_s0_lives5_dlg2[] = { /* 0x8145178 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3412,7 +3412,7 @@ static const struct ScriptCommand s_gs1_g13_s0_lives6_dlg1[] = { /* 0x81451d8 */ static const struct ScriptCommand s_gs1_g13_s0_lives6_dlg2[] = { /* 0x8145218 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" We heard.{WAIT_PRESS}\nShiftry hasn't returned?")), @@ -3429,7 +3429,7 @@ static const struct ScriptCommand s_gs1_g13_s0_lives7_dlg1[] = { /* 0x81452e0 */ static const struct ScriptCommand s_gs1_g13_s0_lives7_dlg2[] = { /* 0x8145320 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I'm afraid Shiftry's team is\nalways about the money.")), @@ -3448,7 +3448,7 @@ static const struct ScriptRef s_gs1_g14_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g14_s0_lives0_dlg2[] = { /* 0x8145494 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3457,7 +3457,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives0_dlg2[] = { /* 0x8145494 */ static const struct ScriptCommand s_gs1_g14_s0_lives1_dlg2[] = { /* 0x81454f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3466,7 +3466,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives1_dlg2[] = { /* 0x81454f4 */ static const struct ScriptCommand s_gs1_g14_s0_lives2_dlg2[] = { /* 0x8145554 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3475,7 +3475,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives2_dlg2[] = { /* 0x8145554 */ static const struct ScriptCommand s_gs1_g14_s0_lives3_dlg2[] = { /* 0x81455b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3484,7 +3484,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives3_dlg2[] = { /* 0x81455b4 */ static const struct ScriptCommand s_gs1_g14_s0_lives4_dlg2[] = { /* 0x8145614 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3493,7 +3493,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives4_dlg2[] = { /* 0x8145614 */ static const struct ScriptCommand s_gs1_g14_s0_lives5_dlg2[] = { /* 0x8145674 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3509,7 +3509,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives6_dlg1[] = { /* 0x81456d4 */ static const struct ScriptCommand s_gs1_g14_s0_lives6_dlg2[] = { /* 0x8145714 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Shiftry was abducted?\nThat's shocking news!")), @@ -3525,7 +3525,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives7_dlg1[] = { /* 0x81457a4 */ static const struct ScriptCommand s_gs1_g14_s0_lives7_dlg2[] = { /* 0x81457e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Is that right...\nShiftry was taken away to {COLOR YELLOW_D}Mt. Thunder{RESET}...")), @@ -3542,7 +3542,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives8_dlg1[] = { /* 0x8145914 */ static const struct ScriptCommand s_gs1_g14_s0_lives8_dlg2[] = { /* 0x8145944 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000050, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000004e, 0x00000000, NULL }, @@ -3568,7 +3568,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives9_dlg1[] = { /* 0x8145ae4 */ static const struct ScriptCommand s_gs1_g14_s0_lives9_dlg2[] = { /* 0x8145b14 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000050, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000004e, 0x00000000, NULL }, @@ -3594,7 +3594,7 @@ static const struct ScriptCommand s_gs1_g14_s0_lives10_dlg1[] = { /* 0x8145c24 * static const struct ScriptCommand s_gs1_g14_s0_lives10_dlg2[] = { /* 0x8145c54 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000050, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000004e, 0x00000000, NULL }, @@ -3622,7 +3622,7 @@ static const struct ScriptRef s_gs1_g15_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g15_s0_lives0_dlg2[] = { /* 0x8145da0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3631,7 +3631,7 @@ static const struct ScriptCommand s_gs1_g15_s0_lives0_dlg2[] = { /* 0x8145da0 */ static const struct ScriptCommand s_gs1_g15_s0_lives1_dlg2[] = { /* 0x8145e00 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3640,7 +3640,7 @@ static const struct ScriptCommand s_gs1_g15_s0_lives1_dlg2[] = { /* 0x8145e00 */ static const struct ScriptCommand s_gs1_g15_s0_lives2_dlg2[] = { /* 0x8145e60 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3649,7 +3649,7 @@ static const struct ScriptCommand s_gs1_g15_s0_lives2_dlg2[] = { /* 0x8145e60 */ static const struct ScriptCommand s_gs1_g15_s0_lives3_dlg2[] = { /* 0x8145ec0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3658,7 +3658,7 @@ static const struct ScriptCommand s_gs1_g15_s0_lives3_dlg2[] = { /* 0x8145ec0 */ static const struct ScriptCommand s_gs1_g15_s0_lives4_dlg2[] = { /* 0x8145f20 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3667,7 +3667,7 @@ static const struct ScriptCommand s_gs1_g15_s0_lives4_dlg2[] = { /* 0x8145f20 */ static const struct ScriptCommand s_gs1_g15_s0_lives5_dlg2[] = { /* 0x8145f80 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3683,7 +3683,7 @@ static const struct ScriptCommand s_gs1_g15_s0_lives6_dlg1[] = { /* 0x8145fe0 */ static const struct ScriptCommand s_gs1_g15_s0_lives6_dlg2[] = { /* 0x8146020 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004d, 0x00000000, NULL }, WAIT(1), @@ -3700,7 +3700,7 @@ static const struct ScriptCommand s_gs1_g15_s0_lives7_dlg1[] = { /* 0x81460d8 */ static const struct ScriptCommand s_gs1_g15_s0_lives7_dlg2[] = { /* 0x8146118 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004f, 0x00000000, NULL }, WAIT(1), @@ -3711,7 +3711,7 @@ static const struct ScriptCommand s_gs1_g15_s0_lives7_dlg2[] = { /* 0x8146118 */ static const struct ScriptCommand s_gs1_g15_s0_lives8_dlg2[] = { /* 0x8146204 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I'm glad that Shiftry is\nsafe.")), @@ -3720,7 +3720,7 @@ static const struct ScriptCommand s_gs1_g15_s0_lives8_dlg2[] = { /* 0x8146204 */ static const struct ScriptCommand s_gs1_g15_s0_lives9_dlg2[] = { /* 0x8146288 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" {NAME_0}, your team is\nfantastic!")), @@ -3738,7 +3738,7 @@ static const struct ScriptRef s_gs1_g16_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g16_s0_lives0_dlg2[] = { /* 0x814638c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3747,7 +3747,7 @@ static const struct ScriptCommand s_gs1_g16_s0_lives0_dlg2[] = { /* 0x814638c */ static const struct ScriptCommand s_gs1_g16_s0_lives1_dlg2[] = { /* 0x81463ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3756,7 +3756,7 @@ static const struct ScriptCommand s_gs1_g16_s0_lives1_dlg2[] = { /* 0x81463ec */ static const struct ScriptCommand s_gs1_g16_s0_lives2_dlg2[] = { /* 0x814644c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3765,7 +3765,7 @@ static const struct ScriptCommand s_gs1_g16_s0_lives2_dlg2[] = { /* 0x814644c */ static const struct ScriptCommand s_gs1_g16_s0_lives3_dlg2[] = { /* 0x81464ac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3774,7 +3774,7 @@ static const struct ScriptCommand s_gs1_g16_s0_lives3_dlg2[] = { /* 0x81464ac */ static const struct ScriptCommand s_gs1_g16_s0_lives4_dlg2[] = { /* 0x814650c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3783,7 +3783,7 @@ static const struct ScriptCommand s_gs1_g16_s0_lives4_dlg2[] = { /* 0x814650c */ static const struct ScriptCommand s_gs1_g16_s0_lives5_dlg2[] = { /* 0x814656c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3801,7 +3801,7 @@ static const struct ScriptRef s_gs1_g16_s0_evt0_sref = { 57, 7, NULL /* NORMAL_E static const struct ScriptCommand s_gs1_g17_s0_station_sref_script[] = { /* 0x8146608 */ DEBUGINFO, SELECT_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(18, 0), CANCEL_ENTITIES(16, 0), SCENARIO_CALC(SCENARIO_MAIN, 9, 4), @@ -3812,18 +3812,18 @@ static const struct ScriptRef s_gs1_g17_s0_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g17_s0_eff0_script[] = { /* 0x8146684 */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x9b, 0x00, 0x0180, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0005, 0x00000062, 0x00000000, NULL }, { 0x2d, 0x09, 0x0006, 0x00000063, 0x00000000, NULL }, @@ -3833,11 +3833,11 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ VARIANT(/* == */ 1, _(" Hah?{WAIT_PRESS}\nWhat are those guys talking about?")), VARIANT_DEFAULT(_(" Huh?{WAIT_PRESS}\nWhat are they chatting about?")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), + ALERT_CUE(4), + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(7), MSG_NPC(2, _(" Yeah, I'm kind of shocked.")), TEXTBOX_CLEAR, WAIT(10), @@ -3849,170 +3849,170 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ MSG_NPC(3, _(" But could it be true?{WAIT_PRESS}\nI'm having a hard time believing it...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000002d, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000002b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 45), + WALK_GRID(256, 43), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, what's up?")), VARIANT_DEFAULT(_(" Hi, what's happening?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_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), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_RELATIVE(256, 16, 0), + ROTATE(8, 1, DIRECTION_SOUTHEAST), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), MSG_NPC(1, _(" The {NAME_6} legend?{WAIT_PRESS}\nWhat's that?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(8), MSG_NPC(2, _(" What, you don't know?")), MSG_NPC(2, _(" You know, it's that old\nfairy tale.")), MSG_NPC(2, _(" How you'll get cursed if you\never grab one of Ninetales's tails.")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(4, _(" All this time, everyone\nthought it was just a legend.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_NPC(4, _(" But lately, it's been rumored\nthat maybe it really happened.")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(3, _(" Well, it is still a mere\nrumor.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_EAST), MSG_NPC(3, _(" I wouldn't put too much\nstock in that story if I were you.")), MSG_NPC(3, _(" Personally, I don't believe\nin rumors of that sort.")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(2, _(" If you want to know more\nabout the {NAME_6} legend...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHEAST), MSG_NPC(2, _(" You should go see a\nPokémon named {NAME_5}.\nHe knows the story well.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), MSG_NPC(2, _(" {NAME_5} is uh...{WAIT_PRESS}\nYou know, in his pond.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_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 }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + AWAIT_CUE(5), + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs1_g17_s0_lives1_dlg0[] = { /* 0x8147160 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(464), CALL_SCRIPT(NOTICE_FUNC), { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000002c, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 44), + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_RELATIVE(256, 16, 0), + ROTATE(8, 2, DIRECTION_NORTHEAST), WAIT(20), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHEAST), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs1_g17_s0_lives2_dlg0[] = { /* 0x8147330 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(30), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs1_g17_s0_lives3_dlg0[] = { /* 0x81474c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x8b, 0x01, 0x0007, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), HALT, }; static const struct ScriptCommand s_gs1_g17_s0_lives4_dlg0[] = { /* 0x8147590 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(NOTICE_FUNC), - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTHWEST), HALT, }; @@ -4026,7 +4026,7 @@ static const struct ScriptRef s_gs1_g18_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g18_s0_lives0_dlg2[] = { /* 0x814765c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -4035,7 +4035,7 @@ static const struct ScriptCommand s_gs1_g18_s0_lives0_dlg2[] = { /* 0x814765c */ static const struct ScriptCommand s_gs1_g18_s0_lives1_dlg2[] = { /* 0x81476bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -4044,7 +4044,7 @@ static const struct ScriptCommand s_gs1_g18_s0_lives1_dlg2[] = { /* 0x81476bc */ static const struct ScriptCommand s_gs1_g18_s0_lives2_dlg2[] = { /* 0x814771c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -4053,7 +4053,7 @@ static const struct ScriptCommand s_gs1_g18_s0_lives2_dlg2[] = { /* 0x814771c */ static const struct ScriptCommand s_gs1_g18_s0_lives3_dlg2[] = { /* 0x814777c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -4062,7 +4062,7 @@ static const struct ScriptCommand s_gs1_g18_s0_lives3_dlg2[] = { /* 0x814777c */ static const struct ScriptCommand s_gs1_g18_s0_lives4_dlg2[] = { /* 0x81477dc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -4071,7 +4071,7 @@ static const struct ScriptCommand s_gs1_g18_s0_lives4_dlg2[] = { /* 0x81477dc */ static const struct ScriptCommand s_gs1_g18_s0_lives5_dlg2[] = { /* 0x814783c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -4080,7 +4080,7 @@ static const struct ScriptCommand s_gs1_g18_s0_lives5_dlg2[] = { /* 0x814783c */ static const struct ScriptCommand s_gs1_g18_s0_lives6_dlg2[] = { /* 0x814789c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Whiscash is in the pond just\nnorth of here.")), @@ -4090,7 +4090,7 @@ static const struct ScriptCommand s_gs1_g18_s0_lives6_dlg2[] = { /* 0x814789c */ static const struct ScriptCommand s_gs1_g18_s0_lives7_dlg2[] = { /* 0x8147968 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Well, it is still a mere\nrumor.")), @@ -4100,7 +4100,7 @@ static const struct ScriptCommand s_gs1_g18_s0_lives7_dlg2[] = { /* 0x8147968 */ static const struct ScriptCommand s_gs1_g18_s0_lives8_dlg2[] = { /* 0x8147a08 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I always thought it was\nonly a legend.")), @@ -4110,7 +4110,7 @@ static const struct ScriptCommand s_gs1_g18_s0_lives8_dlg2[] = { /* 0x8147a08 */ static const struct ScriptCommand s_gs1_g19_s0_station_sref_script[] = { /* 0x8147a68 */ DEBUGINFO, SELECT_ENTITIES(-1, -1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(45), { 0x23, 0x01, 0x002d, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -4122,9 +4122,9 @@ static const struct ScriptRef s_gs1_g19_s0_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g19_s0_lives0_dlg0[] = { /* 0x8147af4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(1), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), @@ -4132,7 +4132,7 @@ static const struct ScriptCommand s_gs1_g19_s0_lives0_dlg0[] = { /* 0x8147af4 */ VARIANT(/* == */ 1, _(" ...Listen, {NAME_0}.")), VARIANT_DEFAULT(_(" ...Say, {NAME_0}.")), TEXTBOX_CLEAR, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), WAIT(10), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -4140,16 +4140,16 @@ static const struct ScriptCommand s_gs1_g19_s0_lives0_dlg0[] = { /* 0x8147af4 */ VARIANT_DEFAULT(_(" Want to call it a day now?\nI can't seem to get motivated today...")), TEXTBOX_CLEAR, WAIT(45), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs1_g19_s0_lives1_dlg0[] = { /* 0x8147cf0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; @@ -4158,21 +4158,21 @@ static const struct ScriptCommand s_gs1_g20_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(1), SELECT_ENTITIES(-1, 0), BGM_STOP, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), { 0x22, 0x00, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(120), { 0x23, 0x00, 0x001e, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x22, 0x00, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(120), { 0x23, 0x00, 0x001e, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x22, 0x00, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + ALERT_CUE(6), + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -4181,80 +4181,80 @@ static const struct ScriptRef s_gs1_g20_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g20_s0_eff0_script[] = { /* 0x8147eac */ DEBUGINFO, - { 0x5b, 0x00, 0x0000, 0x0000002e, 0x00000000, NULL }, + WARP_WAYPOINT(0, 46), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x00b4, 0x0000002f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_DIRECT(180, 47), + AWAIT_CUE(4), { 0xe5, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000030, 0x00000000, NULL }, + WARP_WAYPOINT(0, 48), { 0x6c, 0xb4, 0x0100, 0x00000031, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0xe5, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000032, 0x00000000, NULL }, + WARP_WAYPOINT(0, 50), { 0x62, 0x00, 0x0100, -0x00000050, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g20_s0_lives0_dlg0[] = { /* 0x8147f8c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, 0x00000050, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + WALK_RELATIVE(128, 80, 0), + ALERT_CUE(6), FANFARE_PLAY2(469), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), MSG_NPC(1, _(" Huh?")), TEXTBOX_CLEAR, - { 0x91, 0x05, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_NORTHWEST), + ALERT_CUE(6), WAIT(20), - { 0x91, 0x0a, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 1, DIRECTION_EAST), + AWAIT_CUE(5), MSG_NPC(1, _(" The town's atmosphere\nfeels different somehow...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_NPC(1, _(" Maybe something's happened.")), MSG_NPC(1, _(" {NAME_0}, let's check\nit out!")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000078, 0x00000000, NULL }, + ALERT_CUE(3), + ALERT_CUE(6), + WALK_RELATIVE(256, 120, 0), HALT, }; static const struct ScriptCommand s_gs1_g20_s0_lives1_dlg0[] = { /* 0x81481f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, 0x00000050, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(128, 80, 0), + AWAIT_CUE(6), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000048, 0x00000000, NULL }, - { 0x91, 0x05, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_RELATIVE(256, 72, 0), + ROTATE(5, 10, DIRECTION_NORTH), WAIT(15), - { 0x91, 0x05, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(5, 1, DIRECTION_SOUTH), WAIT(15), - { 0x91, 0x05, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_EAST), WAIT(15), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000078, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_RELATIVE(256, 120, 0), + AWAIT_CUE(6), HALT, }; @@ -4264,7 +4264,7 @@ static const struct ScriptCommand s_gs1_g21_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_STOP, { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -4274,44 +4274,44 @@ static const struct ScriptRef s_gs1_g21_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g21_s0_eff0_script[] = { /* 0x8148404 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_RELATIVE(256, 34, 0), + AWAIT_CUE(4), WAIT(30), - { 0x6b, 0x00, 0x0200, 0x00000033, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0005, 0x0000003a, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + WALK_GRID(512, 51), + ALERT_CUE(5), + AWAIT_CUE(4), + WALK_DIRECT(5, 58), + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0007, 0x00000061, 0x00000000, NULL }, { 0x2d, 0x09, 0x0008, 0x00000052, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000046, 0x00000000, NULL }, + WALK_RELATIVE(256, 70, 0), WAIT(30), FANFARE_PLAY2(464), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Look!\nWhy's everyone gathered over there?")), VARIANT_DEFAULT(_(" Look!\nWhy is everyone gathered together?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(4), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, what's up?")), VARIANT_DEFAULT(_(" Hi, what's going on?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000001), MSG_NPC(5, _(" Let me tell you, I was\namazed!{WAIT_PRESS}\nIt really was true!")), TEXTBOX_CLEAR, @@ -4325,23 +4325,23 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ MSG_NPC(5, _(" The Ninetales legend!")), MSG_NPC(5, _(" I never believed the\nrumors, so you can bet I was shocked\nto learn the truth!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" {NAME_0}, {NAME_1}.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + ALERT_CUE(6), FANFARE_PLAY2(463), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x05, 0x000a, 0x00000036, 0x00000000, NULL }, MSG_NPC(1, _(" Oh, hi, {NAME_3}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(10), { 0x93, 0x0a, 0x000a, 0x00000036, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), @@ -4351,13 +4351,13 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" Yes.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0006, 0x00000000), MSG_NPC(6, _(" Ssh!{WAIT_PRESS} Quiet.")), MSG_NPC(6, _(" That guy there's telling us.\nKeep it down.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), WAIT(30), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -4367,34 +4367,34 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ WAIT(10), MSG_NPC(3, _(" I-it's...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(10), + ALERT_CUE(11), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(11), WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(10), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0096, 0x00000037, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_DIRECT(150, 55), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Ge-{NAME_2}?!")), TEXTBOX_CLEAR, WAIT(10), BGM_SWITCH(9), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 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!")), @@ -4410,11 +4410,11 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ PORTRAIT_REP(0x0002, 0x00000006), MSG_NPC(2, _(" But get this!{WAIT_PRESS}\nIt was originally a human!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(6), CALL_LABEL(15), FANFARE_PLAY2(464), CALL_SCRIPT(NOTICE_FUNC), @@ -4436,11 +4436,11 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ MSG_NPC(4, _(" Wait a second...{WAIT_PRESS}\nThat's exactly like the Ninetales legend!")), TEXTBOX_CLEAR, WAIT(4), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Kekeh!\nDon't be too shocked yet.\nThere's more.")), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(7), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 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.")), @@ -4448,12 +4448,12 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ PORTRAIT_REP(0x0002, 0x00000006), MSG_NPC(2, _(" The unthinkable will happen\nto the world! That's what Xatu said!\nKekeh!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(6), CALL_LABEL(15), FANFARE_PLAY2(473), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, @@ -4478,8 +4478,8 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ MSG_NPC(2, _(" Why, I think there's a way\nwe can do something about this.\nKekeh!")), TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(16), + ALERT_CUE(17), FANFARE_PLAY2(465), WAIT(60), MSG_NPC(6, _(" Wh-what can we do?")), @@ -4490,49 +4490,49 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ PORTRAIT_REP(0x0002, 0x00000001), MSG_NPC(2, _(" Then, if that human is\ngone, then everything should return\nto normal, correct?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(6), WAIT(15), { 0xe5, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(4, _(" Th-that's true!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_LEFT, 0x0006, 0x00000000), MSG_NPC(6, _(" When you put it that way...\nmaybe you're right.")), TEXTBOX_CLEAR, WAIT(10), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Kekeh!\nAnd that human is the rotten coward\nthat abandoned {NAME_8}, correct?")), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(11), PORTRAIT_REP(0x0002, 0x00000004), MSG_NPC(2, _(" I don't think the human can\ncomplain about anything if we get\nrid of it.")), TEXTBOX_CLEAR, BGM_STOP, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Isn't that right,\n{NAME_0}?")), TEXTBOX_CLEAR, WAIT(4), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(6), CALL_LABEL(15), FANFARE_PLAY2(473), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), CLEAR_ARRAY(EVENT_LOCAL), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" Wha...{WAIT_PRESS} What?!{WAIT_PRESS}\nIt... It can't be!")), TEXTBOX_CLEAR, @@ -4545,19 +4545,19 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ TEXTBOX_CLEAR, BGM_SWITCH(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" W-w-whoa...{WAIT_PRESS}\nThis is, like...\nWe can explain...")), VARIANT_DEFAULT(_(" W-w-wait...{WAIT_PRESS}\nThis is, like...\nThere's a good explanation for...")), TEXTBOX_CLEAR, WAIT(4), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + ALERT_CUE(6), MSG_NPC(6, _(" We're not asking you.\nWe're asking {NAME_0}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), MSG_NPC(6, _(" Hey! {NAME_0}!\nSo what is it?!")), { 0x2e, 0x15, 0x0006, -0x00000002, 0x00000000, NULL }, ASK3(FALSE, /*default*/ -1, /* speaker */ 6, _(" Are you really the human\nthat was in the legend?")), @@ -4568,7 +4568,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ LABEL(35), /* = 0x23 */ TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000005), MSG_NPC(1, _(" {NAME_0}...")), TEXTBOX_CLEAR, @@ -4577,41 +4577,41 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ MSG_NPC(3, _(" {NAME_0}...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000001), MSG_NPC(2, _(" Kekekekekekeh!\nLooks like you have nothing to say\nin your defense, {NAME_0}!")), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(15), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" That's how it is, fellow\nPokémon.")), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(6), CALL_LABEL(15), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000001), MSG_NPC(2, _(" Let's get rid of\n{NAME_0} and regain peace.\nKekekekekeh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), CALL_LABEL(15), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), CALL_LABEL(15), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...Wh-what?")), @@ -4619,66 +4619,66 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ VARIANT_DEFAULT(_(" ...Wh-what?")), VARIANT_DEFAULT(_(" E-everyone, what's gotten\ninto you?{WAIT_PRESS}\nWhat are you going to do?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x05, 0x0002, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(5, 2, DIRECTION_NORTH), WAIT(15), - { 0x91, 0x05, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(5, 1, DIRECTION_SOUTH), WAIT(15), - { 0x91, 0x05, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(5, 2, DIRECTION_EAST), { 0x62, 0x00, 0x004c, -0x00000008, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" {NAME_0}, forgive me!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), WAIT(20), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(6), { 0x8b, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(497), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, -0x00000008, -0x00000008, NULL }, WAIT(60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Wah! What the...?!")), VARIANT_DEFAULT(_(" Wah! What are you doing?!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Waaaaah!{WAIT_PRESS}\n{NAME_0}, run!")), TEXTBOX_CLEAR, { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x93, 0x02, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(7), CALL_LABEL(15), WAIT(15), { 0xe5, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0300, -0x00000078, 0x00000000, NULL }, + WALK_RELATIVE(768, -120, 0), WAIT(30), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Serves them right!\nKekekekeh!")), TEXTBOX_CLEAR, WAIT(30), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, LABEL(15), /* = 0x0f */ - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), + ALERT_CUE(13), + ALERT_CUE(14), + ALERT_CUE(15), + ALERT_CUE(16), + ALERT_CUE(17), RET_DIRECT, HALT, }; @@ -4724,114 +4724,114 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ static const struct ScriptCommand s_gs1_g21_s0_lives1_dlg0[] = { /* 0x814a970 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000050, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 80, 0), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000018, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_RELATIVE(256, 24, 0), WAIT(15), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x05, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(5, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), { 0x93, 0x0a, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x0096, 0x00000036, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_DIRECT(150, 54), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), WAIT(15), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), LABEL(0), /* = 0x00 */ - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTHEAST), WAIT(15), - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTH), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ WAIT(15), - { 0x6a, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, + WALK_RELATIVE(256, 16, 0), { 0x93, 0x05, 0x000a, 0x00000050, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), + SELECT_ANIMATION(2), { 0x62, 0x00, 0x004c, -0x00000008, -0x00000008, NULL }, { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0x91, 0x02, 0x0002, 0x00000004, 0x00000000, NULL }, + ROTATE(2, 2, DIRECTION_NORTH), WAIT(15), { 0x62, 0x00, 0x004c, -0x00000008, 0x00000008, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x02, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), CALL_SCRIPT(SHOCK_FUNC), - { 0x6b, 0x00, 0x0200, 0x00000037, 0x00000000, NULL }, - { 0x91, 0x02, 0x000a, 0x00000002, 0x00000000, NULL }, + WALK_GRID(512, 55), + ROTATE(2, 10, DIRECTION_EAST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x02, 0x000a, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(2, 10, DIRECTION_NORTHWEST), WAIT(15), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(15), - { 0x6a, 0x00, 0x0300, -0x00000078, 0x00000000, NULL }, + WALK_RELATIVE(768, -120, 0), HALT, }; static const struct ScriptCommand s_gs1_g21_s0_lives2_dlg0[] = { /* 0x814aee0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x05, 0x000a, 0x0000004d, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(5, 10, DIRECTION_SOUTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(10, 10, DIRECTION_SOUTHWEST), + SELECT_ANIMATION(2), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), @@ -4839,55 +4839,55 @@ static const struct ScriptCommand s_gs1_g21_s0_lives2_dlg0[] = { /* 0x814aee0 */ WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x06, 0x0001, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(6, 1, DIRECTION_WEST), WAIT(15), - { 0x91, 0x06, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(6, 2, DIRECTION_EAST), WAIT(15), - { 0x91, 0x06, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(6, 10, DIRECTION_SOUTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x05, 0x000a, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(5, 10, DIRECTION_SOUTHWEST), CALL_SCRIPT(SMILE_START_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SMILE_END_FUNC), { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x004c, 0x00000000, -0x00000010, NULL }, { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x05, 0x000a, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(5, 10, DIRECTION_WEST), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs1_g21_s0_lives3_dlg0[] = { /* 0x814b1e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000003d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + WALK_GRID(256, 61), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x93, 0x0a, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x0000003e, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000035, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + WALK_GRID(128, 62), + WALK_GRID(128, 53), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), LABEL(0), /* = 0x00 */ @@ -4899,16 +4899,16 @@ static const struct ScriptCommand s_gs1_g21_s0_lives3_dlg0[] = { /* 0x814b1e0 */ COND_EQUAL(2, /* to label */ 4), COND_EQUAL(3, /* to label */ 5), LABEL(2), /* = 0x02 */ - { 0x91, 0x05, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_NORTH), JUMP_LABEL(6), LABEL(3), /* = 0x03 */ - { 0x91, 0x05, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_NORTHEAST), JUMP_LABEL(6), LABEL(4), /* = 0x04 */ - { 0x91, 0x05, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_NORTHWEST), JUMP_LABEL(6), LABEL(5), /* = 0x05 */ - { 0x91, 0x05, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_EAST), JUMP_LABEL(6), LABEL(6), /* = 0x06 */ WAIT_RANDOM(15, 90), @@ -4917,38 +4917,38 @@ static const struct ScriptCommand s_gs1_g21_s0_lives3_dlg0[] = { /* 0x814b1e0 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x05, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(8), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0x91, 0x08, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(8, 2, DIRECTION_NORTHWEST), + ROTATE(8, 1, DIRECTION_NORTHEAST), + ROTATE(8, 2, DIRECTION_NORTH), + AWAIT_CUE(8), { 0x8b, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0080, -0x00000010, 0x00000010, NULL }, WAIT(30), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(15), - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTHWEST), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g21_s0_lives4_dlg0[] = { /* 0x814b6a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), LABEL(0), /* = 0x00 */ @@ -4960,16 +4960,16 @@ static const struct ScriptCommand s_gs1_g21_s0_lives4_dlg0[] = { /* 0x814b6a0 */ COND_EQUAL(2, /* to label */ 5), COND_EQUAL(3, /* to label */ 6), LABEL(3), /* = 0x03 */ - { 0x91, 0x05, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_NORTH), JUMP_LABEL(7), LABEL(4), /* = 0x04 */ - { 0x91, 0x05, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_SOUTHWEST), JUMP_LABEL(7), LABEL(5), /* = 0x05 */ - { 0x91, 0x05, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_NORTHWEST), JUMP_LABEL(7), LABEL(6), /* = 0x06 */ - { 0x91, 0x05, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_WEST), JUMP_LABEL(7), LABEL(7), /* = 0x07 */ WAIT_RANDOM(15, 90), @@ -4978,35 +4978,35 @@ static const struct ScriptCommand s_gs1_g21_s0_lives4_dlg0[] = { /* 0x814b6a0 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x05, 0x000a, 0x00000050, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000039, 0x00000000, NULL }, + AWAIT_CUE(9), + WALK_GRID(128, 57), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x001e, 0x00000037, 0x00000000, NULL }, + AWAIT_CUE(9), + WALK_DIRECT(30, 55), { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0080, 0x00000018, 0x00000000, NULL }, { 0x57, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(9), { 0x62, 0x00, 0x004c, 0x00000008, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(15), { 0x62, 0x00, 0x0300, -0x00000030, 0x00000000, NULL }, HALT, @@ -5015,34 +5015,34 @@ static const struct ScriptCommand s_gs1_g21_s0_lives4_dlg0[] = { /* 0x814b6a0 */ static const struct ScriptCommand s_gs1_g21_s0_lives5_dlg0[] = { /* 0x814bad0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, WAIT(15), - { 0x6b, 0x00, 0x00cc, 0x0000003b, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(204, 59), + ALERT_CUE(5), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + AWAIT_CUE(10), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x0002, 0x00000036, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x04, 0x000a, 0x00000036, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x0000003c, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000038, 0x00000000, NULL }, + AWAIT_CUE(10), + WALK_GRID(128, 60), + WALK_GRID(128, 56), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), LABEL(0), /* = 0x00 */ @@ -5054,16 +5054,16 @@ static const struct ScriptCommand s_gs1_g21_s0_lives5_dlg0[] = { /* 0x814bad0 */ COND_EQUAL(2, /* to label */ 5), COND_EQUAL(3, /* to label */ 6), LABEL(3), /* = 0x03 */ - { 0x91, 0x05, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_EAST), JUMP_LABEL(7), LABEL(4), /* = 0x04 */ - { 0x91, 0x05, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_SOUTHEAST), JUMP_LABEL(7), LABEL(5), /* = 0x05 */ - { 0x91, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_SOUTH), JUMP_LABEL(7), LABEL(6), /* = 0x06 */ - { 0x91, 0x05, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_SOUTHWEST), JUMP_LABEL(7), LABEL(7), /* = 0x07 */ WAIT_RANDOM(15, 90), @@ -5072,22 +5072,22 @@ static const struct ScriptCommand s_gs1_g21_s0_lives5_dlg0[] = { /* 0x814bad0 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + AWAIT_CUE(10), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x004c, -0x00000008, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x62, 0x00, 0x004c, 0x00000000, 0x00000008, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x05, 0x0001, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(5, 1, DIRECTION_WEST), WAIT(15), { 0x62, 0x00, 0x0200, -0x00000008, 0x00000008, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -5097,22 +5097,22 @@ static const struct ScriptCommand s_gs1_g21_s0_lives5_dlg0[] = { /* 0x814bad0 */ static const struct ScriptCommand s_gs1_g21_s0_lives6_dlg0[] = { /* 0x814bfb0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x93, 0x02, 0x000a, 0x00000022, 0x00000000, NULL }, CALL_SCRIPT(ANGRY_START_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0080, 0x00000034, 0x00000000, NULL }, + AWAIT_CUE(11), + WALK_GRID(128, 52), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), LABEL(0), /* = 0x00 */ @@ -5124,16 +5124,16 @@ static const struct ScriptCommand s_gs1_g21_s0_lives6_dlg0[] = { /* 0x814bfb0 */ COND_EQUAL(2, /* to label */ 5), COND_EQUAL(3, /* to label */ 6), LABEL(3), /* = 0x03 */ - { 0x91, 0x05, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_NORTH), JUMP_LABEL(7), LABEL(4), /* = 0x04 */ - { 0x91, 0x05, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_NORTHEAST), JUMP_LABEL(7), LABEL(5), /* = 0x05 */ - { 0x91, 0x05, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_NORTHWEST), JUMP_LABEL(7), LABEL(6), /* = 0x06 */ - { 0x91, 0x05, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(5, 10, DIRECTION_WEST), JUMP_LABEL(7), LABEL(7), /* = 0x07 */ WAIT_RANDOM(15, 90), @@ -5142,37 +5142,37 @@ static const struct ScriptCommand s_gs1_g21_s0_lives6_dlg0[] = { /* 0x814bfb0 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x93, 0x05, 0x000a, 0x0000004d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), CALL_SCRIPT(ANGRY_START_FUNC), { 0x93, 0x05, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(ANGRY_END_FUNC), WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x004c, -0x00000018, 0x00000000, NULL }, + AWAIT_CUE(11), + WALK_RELATIVE(76, -24, 0), { 0x8b, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(7), + AWAIT_CUE(11), { 0x62, 0x00, 0x004c, -0x00000008, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x05, 0x0002, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(11), + ROTATE(5, 2, DIRECTION_WEST), WAIT(15), { 0x62, 0x00, 0x0200, -0x00000008, -0x00000008, NULL }, HALT, @@ -5181,45 +5181,45 @@ static const struct ScriptCommand s_gs1_g21_s0_lives6_dlg0[] = { /* 0x814bfb0 */ static const struct ScriptCommand s_gs1_g21_s0_lives7_dlg0[] = { /* 0x814c4b0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(12), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x06, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(6, 2, DIRECTION_SOUTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x06, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(6, 1, DIRECTION_WEST), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_LABEL(2), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_LABEL(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_LABEL(2), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_LABEL(2), - { 0x6a, 0x00, 0x0080, -0x00000040, -0x00000008, NULL }, + WALK_RELATIVE(128, -64, -8), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_LABEL(2), - { 0x6a, 0x00, 0x0300, -0x00000010, 0x00000008, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(768, -16, 8), + AWAIT_CUE(12), LABEL(2), /* = 0x02 */ WAIT_RANDOM(0, 30), RET_DIRECT, @@ -5228,45 +5228,45 @@ static const struct ScriptCommand s_gs1_g21_s0_lives7_dlg0[] = { /* 0x814c4b0 */ static const struct ScriptCommand s_gs1_g21_s0_lives8_dlg0[] = { /* 0x814c770 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(13), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x06, 0x0001, 0x00000003, 0x00000000, NULL }, + ROTATE(6, 1, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x06, 0x0002, 0x00000006, 0x00000000, NULL }, + ROTATE(6, 2, DIRECTION_WEST), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_LABEL(2), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_LABEL(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_LABEL(2), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_LABEL(2), - { 0x6a, 0x00, 0x0080, -0x00000018, -0x00000008, NULL }, + WALK_RELATIVE(128, -24, -8), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_LABEL(2), { 0x62, 0x00, 0x0300, -0x00000008, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), LABEL(2), /* = 0x02 */ WAIT_RANDOM(0, 30), RET_DIRECT, @@ -5275,11 +5275,11 @@ static const struct ScriptCommand s_gs1_g21_s0_lives8_dlg0[] = { /* 0x814c770 */ static const struct ScriptCommand s_gs1_g21_s0_lives9_dlg0[] = { /* 0x814ca30 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), LABEL(0), /* = 0x00 */ @@ -5298,27 +5298,27 @@ static const struct ScriptCommand s_gs1_g21_s0_lives9_dlg0[] = { /* 0x814ca30 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), CALL_LABEL(3), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), CALL_LABEL(3), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), CALL_LABEL(3), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), CALL_LABEL(3), - { 0x6a, 0x00, 0x0080, -0x00000020, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, -0x00000020, 0x00000018, NULL }, + WALK_RELATIVE(128, -32, 0), + WALK_RELATIVE(128, -32, 24), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), CALL_LABEL(3), { 0x62, 0x00, 0x0100, -0x00000020, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000e, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(14), LABEL(3), /* = 0x03 */ WAIT_RANDOM(0, 30), RET_DIRECT, @@ -5327,43 +5327,43 @@ static const struct ScriptCommand s_gs1_g21_s0_lives9_dlg0[] = { /* 0x814ca30 */ static const struct ScriptCommand s_gs1_g21_s0_lives10_dlg0[] = { /* 0x814cd40 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(15), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0x70, 0x00, 0x0200, 0x00000007, 0x00000000, NULL }, WAIT(1), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), CALL_LABEL(2), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), CALL_LABEL(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), CALL_LABEL(2), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), CALL_LABEL(2), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(15), LABEL(2), /* = 0x02 */ WAIT_RANDOM(0, 30), RET_DIRECT, @@ -5372,42 +5372,42 @@ static const struct ScriptCommand s_gs1_g21_s0_lives10_dlg0[] = { /* 0x814cd40 * static const struct ScriptCommand s_gs1_g21_s0_lives11_dlg0[] = { /* 0x814cfe0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(15), { 0x93, 0x04, 0x000a, 0x00000047, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + AWAIT_CUE(16), CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), CALL_LABEL(0), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), CALL_LABEL(0), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), CALL_LABEL(0), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), WAIT(15), - { 0x6a, 0x00, 0x004c, -0x00000018, -0x00000010, NULL }, + WALK_RELATIVE(76, -24, -16), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), CALL_LABEL(0), { 0x93, 0x04, 0x000a, 0x00000047, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), LABEL(0), /* = 0x00 */ WAIT_RANDOM(0, 30), RET_DIRECT, @@ -5416,41 +5416,41 @@ static const struct ScriptCommand s_gs1_g21_s0_lives11_dlg0[] = { /* 0x814cfe0 * static const struct ScriptCommand s_gs1_g21_s0_lives12_dlg0[] = { /* 0x814d270 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(15), { 0x93, 0x04, 0x000a, 0x00000046, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + AWAIT_CUE(17), CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), CALL_LABEL(0), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), CALL_LABEL(0), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), CALL_LABEL(0), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), WAIT(30), - { 0x6a, 0x00, 0x004c, -0x00000010, -0x00000008, NULL }, + WALK_RELATIVE(76, -16, -8), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), CALL_LABEL(0), { 0x93, 0x04, 0x000a, 0x00000046, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), LABEL(0), /* = 0x00 */ WAIT_RANDOM(0, 30), RET_DIRECT, @@ -5472,7 +5472,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives0_dlg1[] = { /* 0x814d52c */ static const struct ScriptCommand s_gs1_g22_s0_lives0_dlg2[] = { /* 0x814d54c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), @@ -5483,7 +5483,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives0_dlg2[] = { /* 0x814d54c */ static const struct ScriptCommand s_gs1_g22_s0_lives0_dlg3[] = { /* 0x814d5cc */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), JUMP_SCRIPT(LIVES_REPLY), }; @@ -5494,7 +5494,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives1_dlg1[] = { /* 0x814d5fc */ static const struct ScriptCommand s_gs1_g22_s0_lives1_dlg2[] = { /* 0x814d61c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), @@ -5505,7 +5505,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives1_dlg2[] = { /* 0x814d61c */ static const struct ScriptCommand s_gs1_g22_s0_lives1_dlg3[] = { /* 0x814d69c */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), JUMP_SCRIPT(LIVES_REPLY), }; @@ -5516,7 +5516,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives2_dlg1[] = { /* 0x814d6cc */ static const struct ScriptCommand s_gs1_g22_s0_lives2_dlg2[] = { /* 0x814d6ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), @@ -5527,7 +5527,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives2_dlg2[] = { /* 0x814d6ec */ static const struct ScriptCommand s_gs1_g22_s0_lives2_dlg3[] = { /* 0x814d76c */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), JUMP_SCRIPT(LIVES_REPLY), }; @@ -5538,7 +5538,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives3_dlg1[] = { /* 0x814d79c */ static const struct ScriptCommand s_gs1_g22_s0_lives3_dlg2[] = { /* 0x814d7bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), @@ -5549,7 +5549,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives3_dlg2[] = { /* 0x814d7bc */ static const struct ScriptCommand s_gs1_g22_s0_lives3_dlg3[] = { /* 0x814d83c */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), JUMP_SCRIPT(LIVES_REPLY), }; @@ -5560,7 +5560,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives4_dlg1[] = { /* 0x814d86c */ static const struct ScriptCommand s_gs1_g22_s0_lives4_dlg2[] = { /* 0x814d88c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), @@ -5571,7 +5571,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives4_dlg2[] = { /* 0x814d88c */ static const struct ScriptCommand s_gs1_g22_s0_lives4_dlg3[] = { /* 0x814d90c */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), JUMP_SCRIPT(LIVES_REPLY), }; @@ -5582,7 +5582,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives5_dlg1[] = { /* 0x814d93c */ static const struct ScriptCommand s_gs1_g22_s0_lives5_dlg2[] = { /* 0x814d95c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), @@ -5593,7 +5593,7 @@ static const struct ScriptCommand s_gs1_g22_s0_lives5_dlg2[] = { /* 0x814d95c */ static const struct ScriptCommand s_gs1_g22_s0_lives5_dlg3[] = { /* 0x814d9dc */ DEBUGINFO, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), JUMP_SCRIPT(LIVES_REPLY), }; @@ -5609,7 +5609,7 @@ static const struct ScriptCommand s_gs1_g23_s0_station_sref_script[] = { /* 0x81 { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -5623,40 +5623,40 @@ static const struct ScriptCommand s_gs1_g23_s0_eff0_script[] = { /* 0x814db44 */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x20, 0x0100, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x1c, 0x0100, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x89, 0x40, 0x0099, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(472), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 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, WAIT(30), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(8), WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), MSG_NPC(4, _(" That's easy for you to say...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), MSG_NPC(4, _(" It's too much for us...")), TEXTBOX_CLEAR, WAIT(4), @@ -5665,13 +5665,13 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ MSG_NPC(5, _(" If we went, the best we\ncould hope for is maybe the Lapis Cave.")), TEXTBOX_CLEAR, WAIT(4), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(7), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(13), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), PORTRAIT_POS(3, -1, 0), MSG_NPC(3, _(" I joined the chase...")), @@ -5681,24 +5681,24 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ MSG_NPC(3, _(" I don't know what became\nof {NAME_0}'s team after that.")), MSG_NPC(3, _(" ...But those fugitives...\nTo think they would risk Mt. Blaze...")), MSG_NPC(3, _(" They've grown up tough!\nI can't keep up!")), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), PORTRAIT_REP(0x0003, 0x00000042), MSG_NPC(3, _(" Hahaha!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000043), MSG_NPC(2, _(" Kekeh!\nWhat a spineless lot you are!\nTch!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT_REP(0x0004, 0x00000041), MSG_NPC(4, _(" You're so full of big talk!\nWhat about your team, Gengar?")), MSG_NPC(4, _(" You just hang around in the\nsquare and don't do a thing.")), MSG_NPC(4, _(" Walk the talk.\nYou guys go.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 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!")), @@ -5710,67 +5710,67 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ WAIT(30), MSG_NPC(-1, _(" Oh, my gosh! Oh, my goodness!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(13), WAIT(15), - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" {NAME_7}, what's\nthe word?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0007, 0x00000042), MSG_NPC(7, _(" {NAME_0}...\n{NAME_0} is...")), TEXTBOX_CLEAR, WAIT(4), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000041), MSG_NPC(2, _(" Oh! Finally!\nWe're finally rid of {NAME_0}!\nKekeh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), PORTRAIT_REP(0x0007, 0x00000045), MSG_NPC(7, _(" No!{WAIT_PRESS}\nIt's the opposite!")), MSG_NPC(7, _(" {NAME_0} is back!")), TEXTBOX_CLEAR, FANFARE_PLAY2(463), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000046), MSG_NPC(2, _(" Kekeh?!\nWhat did you say?!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(12), + AWAIT_CUE(5), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(13), + AWAIT_CUE(5), WAIT(50), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000003f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(16), + WALK_GRID(256, 63), + AWAIT_CUE(5), WAIT(30), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000042), PORTRAIT_POS(3, 0, -1), MSG_NPC(3, _(" H-hey! Over there...")), WAIT(4), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0006, 0x00000042), PORTRAIT_POS(6, -2, 0), MSG_NPC(6, _(" ...{NAME_0}!")), @@ -5780,47 +5780,47 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ PORTRAIT_POS(5, 1, 0), MSG_NPC(5, _(" Th-they're back...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000040, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + ALERT_CUE(16), + ALERT_CUE(7), + ALERT_CUE(9), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(13), + WALK_GRID(256, 64), + AWAIT_CUE(5), WAIT(30), BGM_SWITCH(7), PORTRAIT(PLACEMENT_LEFT_, 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...")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" It's good to be back in the\nsquare again, {NAME_0}.")), VARIANT_DEFAULT(_(" It feels kind of nostalgic\nto be back in the square, {NAME_0}.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Hey, {NAME_1}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000003), { 0x93, 0x01, 0x000b, 0x0000005b, 0x00000000, NULL }, MSG_NPC(1, _(" Hm! Oh, it's you,\n{NAME_2}.\nIt's been a while.")), TEXTBOX_CLEAR, PORTRAIT_REP(0x0002, 0x00000044), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" (Kekeh! What's with that\nsmug confidence?)") }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x34, 0x00, 0x0002, 0x00000000, 0x00000000, _(" (Kekeh! Maybe...)\n") }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_2}!{WAIT_PRESS}\nYou spewed all sorts of trumped up\ngarbage, didn't you?!")), VARIANT(/* == */ 1, _(" {NAME_0} had nothing to\ndo with it!")), @@ -5830,12 +5830,12 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ VARIANT_DEFAULT(_(" {NAME_0} was innocent!")), TEXTBOX_CLEAR, FANFARE_PLAY2(463), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0002, 0x00000046), MSG_NPC(2, _(" Ugege?!")), @@ -5856,20 +5856,20 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ VARIANT_DEFAULT(_(" {NAME_0} isn't the human\nfrom the legend.")), VARIANT_DEFAULT(_(" We're back because we\ndiscovered the truth.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Ugegegegegegegeh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(13), + AWAIT_CUE(5), WAIT(60), FANFARE_PLAY2(470), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Kekeh! W-wait a second!{WAIT_PRESS}\nYou can't be trusted yet.")), MSG_NPC(2, _(" If you're going to make that\nclaim, let's see some proof.")), @@ -5877,13 +5877,13 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" P-proof?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(13), + AWAIT_CUE(5), { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, WAIT(45), PORTRAIT_REP(0x0002, 0x00000041), @@ -5894,57 +5894,57 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ MSG_NPC(1, _(" Proof...{WAIT_PRESS}\nWe don't have any proof...")), TEXTBOX_CLEAR, FANFARE_PLAY2(470), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ALERT_CUE(7), + ALERT_CUE(12), + ALERT_CUE(13), + AWAIT_CUE(5), MSG_NPC(2, _(" Kekekekekekeh!{WAIT_PRESS}\nIt's too bad you don't have proof!")), MSG_NPC(2, _(" You came back for us so\nwe could get rid of you easier!\nHow conveniently foolish! Kekekeh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Now, fellow Pokémon.{WAIT_PRESS}\nHere's your chance to get rid of\n{NAME_0}! Kekekekekeh!")), TEXTBOX_CLEAR, WAIT(90), FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(12), + ALERT_CUE(13), WAIT(180), PORTRAIT_REP(0x0002, 0x00000044), MSG_NPC(2, _(" ............{WAIT_PRESS}Kekeh?!{WAIT_PRESS}\nWhat's wrong, everyone?\nDon't you want to be rid of {NAME_0}?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(11), + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 11, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_LEFT_, 0x0006, 0x00000000), MSG_NPC(6, _(" I...{WAIT_PRESS}\nI always believed in {NAME_0}!")), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), MSG_NPC(6, _(" You don't fool me!")), TEXTBOX_CLEAR, FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(12), + ALERT_CUE(13), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000046), MSG_NPC(2, _(" Ugeh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(12), + ALERT_CUE(13), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000000), MSG_NPC(3, _(" ...I...\nI'm out.")), MSG_NPC(3, _(" I was saved by\n{NAME_0}'s team before.")), @@ -5952,27 +5952,27 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ MSG_NPC(3, _(" But I simply can't think\nof {NAME_0} being bad in any way.")), TEXTBOX_CLEAR, FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(12), + ALERT_CUE(13), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0002, 0x00000046), MSG_NPC(2, _(" Ugegegeh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(12), + ALERT_CUE(13), + AWAIT_CUE(5), PORTRAIT_REP(0x0004, 0x00000041), MSG_NPC(4, _(" I've heard enough too!\nI believe {NAME_0}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000000), MSG_NPC(5, _(" Yeah, that's right!\nWho needs proof?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(12), + ALERT_CUE(13), WAIT(60), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000046), MSG_NPC(2, _(" Ugegegegegege!")), @@ -5983,32 +5983,32 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ TEXTBOX_CLEAR, WAIT(30), SELECT_ENTITIES(-1, 1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(16), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(13), + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(15), WAIT(15), TEXTBOX_AUTO_PRESS(210, 210), { 0x2e, 0x03, 0x0009, -0x00000002, 0x00000000, NULL }, MSG_NPC(9, _(" Extra! Extra!\nRead all about it!")), TEXTBOX_CLEAR2, TEXTBOX_AUTO_PRESS(-1, -1), - { 0x91, 0x0a, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(5), WAIT(20), - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_EAST), + AWAIT_CUE(5), WAIT(90), FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(13), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0008, 0x00000000), MSG_NPC(8, _(" What?\nWhat is this?")), TEXTBOX_CLEAR, @@ -6016,16 +6016,16 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ PORTRAIT(PLACEMENT_TOP_LEFT, 0x0007, 0x00000000), MSG_NPC(7, _(" ......{WAIT_PRESS}\nIt looks like a newspaper...\nDoesn't it?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" OK, I'll read it aloud.\nLet's see...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), WAIT(30), MSG_LETTER(_("{CENTER_ALIGN}\n{CENTER_ALIGN}= EXTRA =")), MSG_LETTER(_("{CENTER_ALIGN} \n{CENTER_ALIGN}{NAME_0} Innocent!")), @@ -6035,53 +6035,53 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ MSG_LETTER(_("{CENTER_ALIGN}-End-")), TEXTBOX_CLEAR, FANFARE_PLAY2(470), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(12), + ALERT_CUE(13), WAIT(30), MSG_NPC(2, _(" Ugegegegegegegegegegegeh!")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0004, 0x00000041), PORTRAIT_POS(4, 2, 0), MSG_NPC(4, _(" You rotten...")), TEXTBOX_CLEAR, FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(12), + ALERT_CUE(13), WAIT(30), MSG_NPC(2, _(" Gegegeh!\nR-run!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(12), + ALERT_CUE(13), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(16), + ROTATE(4, 11, DIRECTION_NORTH), WAIT(80), FANFARE_PLAY2(471), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" Stop, you liar!\nYou conned us!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), WAIT(180), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(11), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(16), { 0x93, 0x08, 0x000b, 0x00000036, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), @@ -6097,8 +6097,8 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ MSG_NPC(1, _(" Yup, I'm glad too.")), MSG_NPC(1, _(" We won't have to keep\nrunning from everyone anymore.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -6110,7 +6110,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ VARIANT_DEFAULT(_(" Our rescue team gets\nrevived tomorrow!{WAIT_PRESS}\nLet's try to do our best!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -6160,290 +6160,290 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ static const struct ScriptCommand s_gs1_g23_s0_lives1_dlg0[] = { /* 0x8150a08 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000041, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000042, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 65), + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_GRID(256, 66), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(5), { 0x93, 0x04, 0x000b, 0x00000036, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), WAIT(210), - { 0x91, 0x0a, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(6), + ROTATE(12, 10, DIRECTION_NORTH), WAIT(45), - { 0x91, 0x0c, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(4, 11, DIRECTION_NORTH), + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000036, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs1_g23_s0_lives2_dlg0[] = { /* 0x8150cb8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000043, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000044, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(16), + WALK_GRID(256, 67), + AWAIT_CUE(16), + WALK_GRID(256, 68), + AWAIT_CUE(16), WAIT(220), - { 0x91, 0x0c, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(16), WAIT(45), - { 0x91, 0x0c, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_EAST), + AWAIT_CUE(16), + ROTATE(8, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(16), WAIT(5), { 0x93, 0x08, 0x000a, 0x00000036, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), HALT, }; static const struct ScriptCommand s_gs1_g23_s0_lives3_dlg0[] = { /* 0x8150de8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(6), { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(ANGRY_START_FUNC), WAIT(60), CALL_SCRIPT(ANGRY_END_FUNC), FANFARE_PLAY2(472), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x08, 0x000b, 0x0000004d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x04, 0x000b, 0x0000005d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(65), - { 0x6b, 0x00, 0x0099, 0x00000048, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + WALK_GRID(153, 72), + ROTATE(4, 11, DIRECTION_SOUTHWEST), + AWAIT_CUE(7), { 0x89, 0x08, 0x0100, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(SWEAT_FUNC), { 0x7e, 0x00, 0x0100, 0x00000008, -0x00000008, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 11, DIRECTION_SOUTH), WAIT(15), - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHEAST), WAIT(30), - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(QUESTION_FUNC), WAIT(1), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x08, 0x000b, 0x0000004d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_EAST), WAIT(180), - { 0x91, 0x0c, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_NORTH), + AWAIT_CUE(7), WAIT(10), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(20), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(7), WAIT(20), { 0x62, 0x00, 0x0100, 0x00000000, -0x0000000c, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x89, 0x40, 0x0200, 0x00000004, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g23_s0_lives4_dlg0[] = { /* 0x81513c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(10), { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(5), { 0x93, 0x04, 0x000b, 0x0000005d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(5), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), WAIT(5), { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(5), { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_EAST), WAIT(140), - { 0x91, 0x0a, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(8), WAIT(15), - { 0x91, 0x0a, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_NORTH), WAIT(20), - { 0x91, 0x0a, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_WEST), WAIT(15), - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), { 0x89, 0x10, 0x0099, 0x00000000, 0x00000000, NULL }, { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(8), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x89, 0x38, 0x0200, 0x00000004, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g23_s0_lives5_dlg0[] = { /* 0x81516e8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x04, 0x000b, 0x00000050, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(ANGRY_START_FUNC), WAIT(30), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), WAIT(2), { 0x93, 0x3c, 0x000b, 0x0000005d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(2), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(62), - { 0x6b, 0x00, 0x0099, 0x00000047, 0x00000000, NULL }, + WALK_GRID(153, 71), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(2), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(5), { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(8), { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_EAST), WAIT(160), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(9), WAIT(12), - { 0x91, 0x08, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTHWEST), WAIT(15), - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTHEAST), WAIT(15), - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTH), + AWAIT_CUE(9), { 0x89, 0x30, 0x0099, 0x00000004, 0x00000000, NULL }, { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, WAIT(15), - { 0xe4, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(17), + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(9), + SELECT_ANIMATION(2), + ROTATE(4, 10, DIRECTION_NORTH), FANFARE_PLAY2(471), CALL_SCRIPT(ANGRY_START_FUNC), WAIT(45), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), WAIT(10), { 0x89, 0x38, 0x0200, 0x00000004, 0x00000000, NULL }, HALT, @@ -6451,47 +6451,47 @@ static const struct ScriptCommand s_gs1_g23_s0_lives5_dlg0[] = { /* 0x81516e8 */ static const struct ScriptCommand s_gs1_g23_s0_lives6_dlg0[] = { /* 0x8151b48 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), WAIT(5), { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), WAIT(5), { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), WAIT(2), { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), WAIT(6), - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_WEST), WAIT(60), - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(10), WAIT(8), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), WAIT(8), { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_EAST), WAIT(150), - { 0x91, 0x0c, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_NORTH), + AWAIT_CUE(10), { 0x89, 0x06, 0x0100, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), WAIT(20), { 0x89, 0x38, 0x0200, 0x00000004, 0x00000000, NULL }, HALT, @@ -6499,126 +6499,126 @@ static const struct ScriptCommand s_gs1_g23_s0_lives6_dlg0[] = { /* 0x8151b48 */ static const struct ScriptCommand s_gs1_g23_s0_lives7_dlg0[] = { /* 0x8151e18 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), WAIT(8), { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), + ROTATE(4, 11, DIRECTION_WEST), WAIT(45), - { 0x91, 0x04, 0x000b, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_NORTH), + AWAIT_CUE(11), WAIT(8), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), WAIT(60), - { 0x6b, 0x00, 0x0099, 0x00000045, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + WALK_GRID(153, 69), + ROTATE(4, 11, DIRECTION_NORTHWEST), + AWAIT_CUE(11), WAIT(5), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), WAIT(2), { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), WAIT(2), { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(11), + ROTATE(4, 10, DIRECTION_EAST), WAIT(200), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(11), WAIT(13), - { 0x91, 0x0a, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_NORTHEAST), WAIT(10), - { 0x91, 0x0a, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_NORTH), WAIT(15), - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(11), { 0x89, 0x08, 0x0080, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x89, 0x18, 0x0080, 0x00000004, 0x00000000, NULL }, { 0x89, 0x05, 0x0080, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs1_g23_s0_lives8_dlg0[] = { /* 0x81521a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000049, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), + WALK_GRID(512, 73), + ALERT_CUE(5), + AWAIT_CUE(12), { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(12), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(12), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(12), WAIT(55), - { 0x6b, 0x00, 0x0099, 0x0000004a, 0x00000000, NULL }, + WALK_GRID(153, 74), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(5), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(2), { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_SCRIPT(SMILE_START_FUNC), WAIT(20), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(4, 11, DIRECTION_EAST), WAIT(45), - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTH), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(4, 11, DIRECTION_SOUTHEAST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(30), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(4, 10, DIRECTION_EAST), WAIT(230), - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTHEAST), WAIT(120), - { 0x91, 0x0c, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(12), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), WAIT(15), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x40, 0x0200, 0x00000004, 0x00000000, NULL }, @@ -6627,63 +6627,63 @@ static const struct ScriptCommand s_gs1_g23_s0_lives8_dlg0[] = { /* 0x81521a8 */ static const struct ScriptCommand s_gs1_g23_s0_lives9_dlg0[] = { /* 0x81525b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), { 0x93, 0x04, 0x000b, 0x0000005d, 0x00000000, NULL }, WAIT(45), - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHWEST), + AWAIT_CUE(13), WAIT(5), { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), WAIT(45), - { 0x91, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTHWEST), + AWAIT_CUE(13), { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_SCRIPT(SMILE_START_FUNC), WAIT(20), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(13), + ROTATE(4, 11, DIRECTION_WEST), WAIT(45), - { 0x91, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 11, DIRECTION_SOUTH), WAIT(10), CALL_SCRIPT(QUESTION_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(13), + ROTATE(4, 11, DIRECTION_SOUTHEAST), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), WAIT(15), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(13), + ROTATE(4, 10, DIRECTION_EAST), WAIT(215), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(13), WAIT(10), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0x91, 0x0a, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000b, 0x00000001, 0x00000000, NULL }, + ROTATE(10, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(13), + ROTATE(4, 11, DIRECTION_SOUTHEAST), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(13), CALL_SCRIPT(SWEAT_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), WAIT(15), { 0x89, 0x40, 0x0200, 0x00000004, 0x00000000, NULL }, HALT, @@ -6694,13 +6694,13 @@ static const struct ScriptCommand s_gs1_g23_s1_lives0_dlg0[] = { /* 0x8152988 */ { 0x2d, 0x07, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, FANFARE_PLAY2(451), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_STOP2(451), END_DELETE, @@ -6708,34 +6708,34 @@ static const struct ScriptCommand s_gs1_g23_s1_lives0_dlg0[] = { /* 0x8152988 */ static const struct ScriptCommand s_gs1_g23_s1_eff0_script[] = { /* 0x8152a68 */ DEBUGINFO, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), WAIT(344), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(16), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(11), + ALERT_CUE(13), + ALERT_CUE(17), { 0x56, 0x00, 0x0000, 0x00000065, 0x00000000, NULL }, WAIT(288), { 0x52, 0x00, 0x0000, 0x00020000, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x56, 0x00, 0x0000, 0x00000066, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), END_DELETE, }; static const struct ScriptCommand s_gs1_g23_s1_eff1_script[] = { /* 0x8152ba8 */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00020000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), WAIT(328), { 0x56, 0x00, 0x0000, 0x000001be, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(17), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, END_DELETE, }; @@ -6751,7 +6751,7 @@ static const struct ScriptRef s_gs1_g24_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g24_s0_lives0_dlg2[] = { /* 0x8152c74 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_2N, 0, /* to label */ 0), @@ -6768,7 +6768,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives0_dlg2[] = { /* 0x8152c74 */ static const struct ScriptCommand s_gs1_g24_s0_lives1_dlg2[] = { /* 0x8152e2c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_2N, 1, /* to label */ 0), @@ -6782,7 +6782,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives1_dlg2[] = { /* 0x8152e2c */ static const struct ScriptCommand s_gs1_g24_s0_lives2_dlg2[] = { /* 0x8152edc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_2N, 2, /* to label */ 0), @@ -6797,7 +6797,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives2_dlg2[] = { /* 0x8152edc */ static const struct ScriptCommand s_gs1_g24_s0_lives3_dlg2[] = { /* 0x8153034 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_2N, 3, /* to label */ 0), @@ -6812,7 +6812,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives3_dlg2[] = { /* 0x8153034 */ static const struct ScriptCommand s_gs1_g24_s0_lives4_dlg2[] = { /* 0x8153174 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_2N, 4, /* to label */ 0), @@ -6829,7 +6829,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives4_dlg2[] = { /* 0x8153174 */ static const struct ScriptCommand s_gs1_g24_s0_lives5_dlg2[] = { /* 0x8153334 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_2N, 5, /* to label */ 0), @@ -6851,7 +6851,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives6_dlg1[] = { /* 0x8153430 */ static const struct ScriptCommand s_gs1_g24_s0_lives6_dlg2[] = { /* 0x8153470 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" We got conned by Gengar...{WAIT_PRESS}\nI'm sorry.")), @@ -6867,7 +6867,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives7_dlg1[] = { /* 0x81534fc */ static const struct ScriptCommand s_gs1_g24_s0_lives7_dlg2[] = { /* 0x815353c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I'm truly sorry for what\nhappened.{WAIT_PRESS}\nSorry for suspecting you.")), @@ -6883,7 +6883,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives8_dlg1[] = { /* 0x81535e0 */ static const struct ScriptCommand s_gs1_g24_s0_lives8_dlg2[] = { /* 0x8153620 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" ...So, what became of\nAlakazam's team?\nDid they head underground?")), @@ -6894,7 +6894,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives8_dlg2[] = { /* 0x8153620 */ static const struct ScriptCommand s_gs1_g24_s0_lives9_dlg2[] = { /* 0x8153768 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Aww. No...\nI thought you were completely guilty.")), @@ -6905,7 +6905,7 @@ static const struct ScriptCommand s_gs1_g24_s0_lives9_dlg2[] = { /* 0x8153768 */ static const struct ScriptCommand s_gs1_g24_s1_station_sref_script[] = { /* 0x8153848 */ DEBUGINFO, SELECT_LIVES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -6913,7 +6913,7 @@ static const struct ScriptRef s_gs1_g24_s1_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g24_s1_lives0_dlg0[] = { /* 0x8153894 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), @@ -6923,18 +6923,18 @@ static const struct ScriptCommand s_gs1_g24_s1_lives0_dlg0[] = { /* 0x8153894 */ MSG_NPC(3, _(" I'm very ashamed that I\ntreated a valuable customer with such\ndisdain and suspicion...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" It isn't just you, my brother.{WAIT_PRESS}\nI am guilty of the same.")), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" B-Brother...{WAIT_PRESS}\nSniffle... My brother...")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" We both promise, we will\nnot repeat the same mistake.")), MSG_NPC(3, _(" I will do my best to obtain\neven better Technical Machines and Orbs.\nI hope for your continued patronage!")), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, SELECT_LIVES(-1, 0), @@ -6943,27 +6943,27 @@ static const struct ScriptCommand s_gs1_g24_s1_lives0_dlg0[] = { /* 0x8153894 */ static const struct ScriptCommand s_gs1_g24_s1_lives1_dlg0[] = { /* 0x8153bf4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs1_g24_s1_lives2_dlg0[] = { /* 0x8153c34 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(7), RET, }; static const struct ScriptCommand s_gs1_g24_s1_lives2_dlg2[] = { /* 0x8153cd4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_2N, 0, /* to label */ 0), @@ -6980,21 +6980,21 @@ static const struct ScriptCommand s_gs1_g24_s1_lives2_dlg2[] = { /* 0x8153cd4 */ static const struct ScriptCommand s_gs1_g24_s1_lives3_dlg0[] = { /* 0x8153db4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(8), RET, }; static const struct ScriptCommand s_gs1_g24_s1_lives3_dlg2[] = { /* 0x8153e64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_2N, 1, /* to label */ 0), @@ -7017,7 +7017,7 @@ static const struct ScriptRef s_gs1_g25_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g25_s0_lives0_dlg2[] = { /* 0x8153f60 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -7026,7 +7026,7 @@ static const struct ScriptCommand s_gs1_g25_s0_lives0_dlg2[] = { /* 0x8153f60 */ static const struct ScriptCommand s_gs1_g25_s0_lives1_dlg2[] = { /* 0x8153fc0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -7035,7 +7035,7 @@ static const struct ScriptCommand s_gs1_g25_s0_lives1_dlg2[] = { /* 0x8153fc0 */ static const struct ScriptCommand s_gs1_g25_s0_lives2_dlg2[] = { /* 0x8154020 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -7044,7 +7044,7 @@ static const struct ScriptCommand s_gs1_g25_s0_lives2_dlg2[] = { /* 0x8154020 */ static const struct ScriptCommand s_gs1_g25_s0_lives3_dlg2[] = { /* 0x8154080 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -7053,7 +7053,7 @@ static const struct ScriptCommand s_gs1_g25_s0_lives3_dlg2[] = { /* 0x8154080 */ static const struct ScriptCommand s_gs1_g25_s0_lives4_dlg2[] = { /* 0x81540e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -7062,7 +7062,7 @@ static const struct ScriptCommand s_gs1_g25_s0_lives4_dlg2[] = { /* 0x81540e0 */ static const struct ScriptCommand s_gs1_g25_s0_lives5_dlg2[] = { /* 0x8154140 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -7078,7 +7078,7 @@ static const struct ScriptCommand s_gs1_g25_s0_lives6_dlg1[] = { /* 0x81541a0 */ static const struct ScriptCommand s_gs1_g25_s0_lives6_dlg2[] = { /* 0x81541e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" That quake was\nsomething else!")), @@ -7095,7 +7095,7 @@ static const struct ScriptCommand s_gs1_g25_s0_lives7_dlg1[] = { /* 0x81542ac */ static const struct ScriptCommand s_gs1_g25_s0_lives7_dlg2[] = { /* 0x81542ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Oh, wasn't it shocking?!")), @@ -7112,7 +7112,7 @@ static const struct ScriptCommand s_gs1_g25_s0_lives8_dlg1[] = { /* 0x815439c */ static const struct ScriptCommand s_gs1_g25_s0_lives8_dlg2[] = { /* 0x81543dc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" What's that?\nHas Alakazam's team returned?")), @@ -7123,7 +7123,7 @@ static const struct ScriptCommand s_gs1_g25_s0_lives8_dlg2[] = { /* 0x81543dc */ static const struct ScriptCommand s_gs1_g25_s0_lives9_dlg2[] = { /* 0x8154500 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" That earthquake here\nwas wicked...")), @@ -7137,7 +7137,7 @@ static const struct ScriptCommand s_gs1_g26_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_STOP, { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(120), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, @@ -7149,25 +7149,25 @@ static const struct ScriptCommand s_gs1_g26_s0_eff0_script[] = { /* 0x8154684 */ DEBUGINFO, { 0x59, 0x00, -0x0040, 0x00000000, 0x00000000, NULL }, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000040, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000040, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000040, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000040, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_RELATIVE(256, 64, 0), + ALERT_CUE(5), + AWAIT_CUE(4), + WALK_RELATIVE(256, -64, 0), + ALERT_CUE(5), + AWAIT_CUE(4), + WALK_RELATIVE(256, 64, 0), + ALERT_CUE(5), + AWAIT_CUE(4), + WALK_RELATIVE(256, -64, 0), + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0008, 0x00000058, 0x00000000, NULL }, @@ -7175,16 +7175,16 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000053, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + WALK_GRID(256, 83), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Wow!\nLook at all the Pokémon!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), @@ -7192,14 +7192,14 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ 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?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ROTATE(4, 10, DIRECTION_EAST), WAIT(60), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), PORTRAIT_POS(3, 0, -1), MSG_NPC(3, _(" Can I get everyone's\nattention here?")), @@ -7215,7 +7215,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ MSG_NPC(3, _(" But they haven't returned!")), TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), FANFARE_PLAY2(473), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, WAIT(90), @@ -7231,38 +7231,38 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ MSG_NPC(3, _(" And that's it.\nWe haven't heard anything from them.")), MSG_NPC(3, _(" To be honest...{WAIT_PRESS}\nWe have no idea what became of them.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), WAIT(90), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), MSG_NPC(-1, _(" No idea?{WAIT_PRESS}\nHow is that possible?!{WAIT_PRESS}\nThis is {NAME_8} you're talking about?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" But they haven't come back.\nThat's for real!")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), MSG_NPC(-1, _(" That's right...\nAnd it sounds as if {NAME_9} is out of\nour league...")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" What? It's that tough?\nThis Pokémon named {NAME_9}?")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), MSG_NPC(-1, _(" Why don't you go underground and\nsee for yourself?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" Hunh?!\nYou've gotta be kidding me!")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), MSG_NPC(-1, _(" There's magma flowing everywhere\nunderground.{WAIT_PRESS}\nI'd burn up if I went anywhere like that!")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(3, _(" Quiet, please! Be quiet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), WAIT(60), MSG_NPC(3, _(" There's no denying that\nit is dangerous underground.")), MSG_NPC(3, _(" It's not a place where just\nanyone can go.")), @@ -7271,72 +7271,72 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ TEXTBOX_CLEAR, WAIT(30), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), WAIT(60), MSG_NPC(3, _(" Who will step forward?!")), MSG_NPC(3, _(" Who among us will be the\nheroes to take on the challenges\nunderground?!")), TEXTBOX_CLEAR, BGM_FADEOUT(150), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(7), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nThis is some chance. Let's go for it.")), VARIANT_DEFAULT(_(" Say, {NAME_0}.\nThis is a great opportunity. Let's go.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), { 0x62, 0x00, 0x0100, -0x00000010, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(2, _(" Don't bother, you guys.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What's with you?\nCan you get out of the way?")), VARIANT_DEFAULT(_(" What's with you?\nCan you step aside?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" You guys have gotten a lot\ntougher, that's for sure, but...")), MSG_NPC(2, _(" There's plenty of tougher\nPokémon out there.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Will no one step forward?!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(120), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), MSG_NPC(-1, _(" I'll go.")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(60), BGM_SWITCH(7), MSG_NPC(-1, _(" Whoa!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), MSG_NPC(-1, _(" It's B-{NAME_4}!")), TEXTBOX_CLEAR, WAIT(10), @@ -7345,10 +7345,10 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ WAIT(10), MSG_NPC(-1, _(" Those waterspouts on his back can\nrocket water so fast that it punches\nthrough thick iron plates!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), PORTRAIT_POS(4, 0, 1), @@ -7360,14 +7360,14 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ MSG_NPC(-1, _(" I'll join the party too.")), TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(11), + ALERT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(60), MSG_NPC(-1, _(" Woohoo! It's {NAME_5}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), MSG_NPC(-1, _(" She's {COLOR CYAN}Team Constrictor{RESET}'s leader.")), TEXTBOX_CLEAR, WAIT(10), @@ -7376,10 +7376,10 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ WAIT(10), MSG_NPC(-1, _(" She'd be nasty to face in any battle\nof endurance.")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0005, 0x00000000), PORTRAIT_POS(5, 0, -1), @@ -7389,23 +7389,23 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ MSG_NPC(-1, _(" Say, how about not forgetting about\nme?")), TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(60), MSG_NPC(-1, _(" Wow! {NAME_6}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), MSG_NPC(-1, _(" He's the most brutal out of {COLOR CYAN}Team\nRumblerock{RESET}!")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" His body is rock hard.\nHe's supposed to be able to withstand\nhuge explosions without taking damage.")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(11), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), PORTRAIT_POS(6, 0, 1), @@ -7414,69 +7414,69 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), WAIT(30), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), + ALERT_CUE(15), WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Oh, {NAME_4}!\n{NAME_5}! And {NAME_6}!")), MSG_NPC(3, _(" No one could complain\nabout your selection.")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), WAIT(60), MSG_NPC(3, _(" We will have these three\nrescuers head underground!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), MSG_NPC(-1, _(" Yeah! Good choice!")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" You're representing us!\nMake us proud!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), MSG_NPC(4, _(" Let's go!")), TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(20), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000054, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000055, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x91, 0x1e, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + WALK_GRID(256, 84), + WALK_GRID(256, 85), + ROTATE(4, 10, DIRECTION_EAST), + ROTATE(30, 2, DIRECTION_WEST), + AWAIT_CUE(5), MSG_NPC(-1, _(" Win it for us!")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" Save {NAME_8}'s team!")), TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, MSG_NPC(2, _(" See?\nThey look pretty tough, eh?")), MSG_NPC(2, _(" Let them handle things.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -7485,7 +7485,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ TEXTBOX_CLEAR, WAIT(60), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -7516,142 +7516,142 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ static const struct ScriptCommand s_gs1_g26_s0_lives1_dlg0[] = { /* 0x8156884 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000056, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 86), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000010, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), WAIT(15), CALL_SCRIPT(JUMP_ANGRY_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(6), WAIT(30), - { 0x6b, 0x00, 0x0100, 0x00000054, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000057, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x91, 0x14, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 84), + WALK_GRID(256, 87), + ROTATE(4, 10, DIRECTION_EAST), + ROTATE(20, 2, DIRECTION_WEST), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g26_s0_lives2_dlg0[] = { /* 0x8156c44 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000058, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + WALK_GRID(256, 88), + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000008, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + WALK_RELATIVE(256, 0, 8), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000059, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(7), + WALK_GRID(256, 89), + ROTATE(4, 10, DIRECTION_EAST), WAIT(30), - { 0x91, 0x1e, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(30, 10, DIRECTION_WEST), + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, 0x00000010, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 0, 16), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g26_s0_lives3_dlg0[] = { /* 0x8156eb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(8, 10, DIRECTION_NORTHWEST), WAIT(5), - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHWEST), WAIT(5), - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(8, 10, DIRECTION_NORTHWEST), WAIT(5), - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHWEST), WAIT(5), - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(8, 10, DIRECTION_NORTHWEST), WAIT(5), - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHWEST), WAIT(5), - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(8), + AWAIT_CUE(8), HALT, }; @@ -7661,11 +7661,11 @@ static const struct ScriptCommand s_gs1_g26_s0_lives3_dlg0[] = { /* 0x8156eb4 */ static const struct ScriptCommand s_gs1_g26_s0_lives4_dlg0[] = { /* 0x81570c4 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), @@ -7674,71 +7674,71 @@ static const struct ScriptCommand s_gs1_g26_s0_lives4_dlg0[] = { /* 0x81570c4 */ COND_EQUAL(1, /* to label */ 4), COND_EQUAL(2, /* to label */ 5), LABEL(3), /* = 0x03 */ - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), JUMP_LABEL(6), LABEL(4), /* = 0x04 */ - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), JUMP_LABEL(6), LABEL(5), /* = 0x05 */ - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), JUMP_LABEL(6), LABEL(6), /* = 0x06 */ WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(7), /* = 0x07 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 8), - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 8), - { 0x91, 0x08, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTHWEST), WAIT_RANDOM(15, 90), JUMP_LABEL(7), LABEL(8), /* = 0x08 */ { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x004c, 0x00000008, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x004c, 0x0000005a, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + WALK_RELATIVE(76, 8, 0), + AWAIT_CUE(9), + WALK_GRID(76, 90), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(9), LABEL(9), /* = 0x09 */ { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 9), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), LABEL(10), /* = 0x0a */ { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 10), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(30), { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000005b, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(9), + WALK_GRID(256, 91), + ALERT_CUE(5), + AWAIT_CUE(9), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; @@ -7747,11 +7747,11 @@ static const struct ScriptCommand s_gs1_g26_s0_lives4_dlg0[] = { /* 0x81570c4 */ static const struct ScriptCommand s_gs1_g26_s0_lives5_dlg0[] = { /* 0x81575e4 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), @@ -7760,61 +7760,61 @@ static const struct ScriptCommand s_gs1_g26_s0_lives5_dlg0[] = { /* 0x81575e4 */ COND_EQUAL(1, /* to label */ 3), COND_EQUAL(2, /* to label */ 4), LABEL(2), /* = 0x02 */ - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), JUMP_LABEL(5), LABEL(3), /* = 0x03 */ - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), JUMP_LABEL(5), LABEL(4), /* = 0x04 */ - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), LABEL(5), /* = 0x05 */ WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(6), /* = 0x06 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), - { 0x91, 0x08, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_SOUTH), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), - { 0x91, 0x08, 0x0001, 0x00000005, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_NORTHWEST), WAIT_RANDOM(15, 90), JUMP_LABEL(6), LABEL(7), /* = 0x07 */ { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), LABEL(8), /* = 0x08 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 8), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x004c, 0x0000005c, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(10), + WALK_GRID(76, 92), + ROTATE(4, 10, DIRECTION_EAST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(10), LABEL(9), /* = 0x09 */ { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 9), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(10), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_WEST), WAIT(30), - { 0x6b, 0x00, 0x0100, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 91), + AWAIT_CUE(10), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; @@ -7822,11 +7822,11 @@ static const struct ScriptCommand s_gs1_g26_s0_lives5_dlg0[] = { /* 0x81575e4 */ static const struct ScriptCommand s_gs1_g26_s0_lives6_dlg0[] = { /* 0x8157a64 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), @@ -7835,77 +7835,77 @@ static const struct ScriptCommand s_gs1_g26_s0_lives6_dlg0[] = { /* 0x8157a64 */ COND_EQUAL(1, /* to label */ 3), COND_EQUAL(2, /* to label */ 4), LABEL(2), /* = 0x02 */ - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), JUMP_LABEL(5), LABEL(3), /* = 0x03 */ - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), JUMP_LABEL(5), LABEL(4), /* = 0x04 */ - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), LABEL(5), /* = 0x05 */ WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(6), /* = 0x06 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), - { 0x91, 0x08, 0x0002, 0x00000006, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_WEST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), - { 0x91, 0x08, 0x0001, 0x00000003, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), JUMP_LABEL(6), LABEL(7), /* = 0x07 */ { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), LABEL(8), /* = 0x08 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 8), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), LABEL(9), /* = 0x09 */ { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 9), - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x004c, 0x0000005d, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(11), + WALK_GRID(76, 93), + ROTATE(4, 10, DIRECTION_EAST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(11), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(11), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(11), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(11), + ROTATE(4, 10, DIRECTION_WEST), WAIT(60), - { 0x6b, 0x00, 0x0100, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 91), + AWAIT_CUE(11), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g26_s0_lives7_dlg0[] = { /* 0x8157ee4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT_RANDOM(0, 60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), @@ -7914,580 +7914,580 @@ static const struct ScriptCommand s_gs1_g26_s0_lives7_dlg0[] = { /* 0x8157ee4 */ COND_EQUAL(1, /* to label */ 3), COND_EQUAL(2, /* to label */ 4), LABEL(2), /* = 0x02 */ - { 0x91, 0x08, 0x0001, 0x00000003, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_NORTHEAST), JUMP_LABEL(5), LABEL(3), /* = 0x03 */ - { 0x91, 0x08, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTHWEST), JUMP_LABEL(5), LABEL(4), /* = 0x04 */ - { 0x91, 0x08, 0x0002, 0x00000007, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_SOUTHWEST), LABEL(5), /* = 0x05 */ WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), LABEL(6), /* = 0x06 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 6), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(7), /* = 0x07 */ { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(8), /* = 0x08 */ { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 8), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(9), /* = 0x09 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 9), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g26_s0_lives8_dlg0[] = { /* 0x8158324 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT_RANDOM(0, 60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(2), /* = 0x02 */ { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(3), /* = 0x03 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g26_s0_lives9_dlg0[] = { /* 0x8158684 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHEAST), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(2), /* = 0x02 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHEAST), WAIT_RANDOM(15, 90), JUMP_LABEL(2), LABEL(3), /* = 0x03 */ { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(4), /* = 0x04 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 4), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(5), /* = 0x05 */ { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 5), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(6), /* = 0x06 */ { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 6), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(7), /* = 0x07 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g26_s0_lives10_dlg0[] = { /* 0x8158a44 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT_RANDOM(0, 60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(2), /* = 0x02 */ { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(3), /* = 0x03 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g26_s0_lives11_dlg0[] = { /* 0x8158da4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT_RANDOM(0, 60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(2), /* = 0x02 */ { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(3), /* = 0x03 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g26_s0_lives12_dlg0[] = { /* 0x8159104 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT_RANDOM(0, 60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(2), /* = 0x02 */ { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(3), /* = 0x03 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g26_s0_lives13_dlg0[] = { /* 0x8159464 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT_RANDOM(0, 60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(2), /* = 0x02 */ { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT(15), - { 0x6b, 0x00, 0x0080, 0x0000005f, 0x00000000, NULL }, + WALK_GRID(128, 95), LABEL(3), /* = 0x03 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g26_s0_lives14_dlg0[] = { /* 0x8159804 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(2), /* = 0x02 */ { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(3), /* = 0x03 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g26_s0_lives15_dlg0[] = { /* 0x8159b04 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT_RANDOM(0, 60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), WAIT_RANDOM(0, 60), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(2), /* = 0x02 */ { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(15), { 0x86, 0x00, 0x0100, 0x0000005e, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(3), /* = 0x03 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g26_s0_lives16_dlg0[] = { /* 0x8159e94 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(2), /* = 0x02 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT_RANDOM(15, 90), JUMP_LABEL(2), LABEL(3), /* = 0x03 */ { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(4), /* = 0x04 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 4), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(5), /* = 0x05 */ { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, WAIT(60), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 5), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(6), /* = 0x06 */ { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, WAIT(60), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 6), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(7), /* = 0x07 */ { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; @@ -8502,7 +8502,7 @@ static const struct ScriptRef s_gs1_g27_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g27_s0_lives0_dlg2[] = { /* 0x815a2a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -8511,7 +8511,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives0_dlg2[] = { /* 0x815a2a0 */ static const struct ScriptCommand s_gs1_g27_s0_lives1_dlg2[] = { /* 0x815a300 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -8520,7 +8520,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives1_dlg2[] = { /* 0x815a300 */ static const struct ScriptCommand s_gs1_g27_s0_lives2_dlg2[] = { /* 0x815a360 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -8529,7 +8529,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives2_dlg2[] = { /* 0x815a360 */ static const struct ScriptCommand s_gs1_g27_s0_lives3_dlg2[] = { /* 0x815a3c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -8538,7 +8538,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives3_dlg2[] = { /* 0x815a3c0 */ static const struct ScriptCommand s_gs1_g27_s0_lives4_dlg2[] = { /* 0x815a420 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -8547,7 +8547,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives4_dlg2[] = { /* 0x815a420 */ static const struct ScriptCommand s_gs1_g27_s0_lives5_dlg2[] = { /* 0x815a480 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -8563,7 +8563,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives6_dlg1[] = { /* 0x815a4e0 */ static const struct ScriptCommand s_gs1_g27_s0_lives6_dlg2[] = { /* 0x815a520 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You bet I'm worried about\nAlakazam's team...{WAIT_PRESS}\nBut Blastoise and company are tough.")), @@ -8580,7 +8580,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives7_dlg1[] = { /* 0x815a620 */ static const struct ScriptCommand s_gs1_g27_s0_lives7_dlg2[] = { /* 0x815a660 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" There have been so many\nearthquakes...{WAIT_PRESS}\nI can't get a decent night's sleep!")), @@ -8596,7 +8596,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives8_dlg1[] = { /* 0x815a714 */ static const struct ScriptCommand s_gs1_g27_s0_lives8_dlg2[] = { /* 0x815a754 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" We agreed to let Blastoise's\ncrew handle this situation.\nLet's give them some time.")), @@ -8605,7 +8605,7 @@ static const struct ScriptCommand s_gs1_g27_s0_lives8_dlg2[] = { /* 0x815a754 */ static const struct ScriptCommand s_gs1_g27_s0_lives9_dlg2[] = { /* 0x815a810 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You know how we've had\nso many earthquakes lately?")), @@ -8619,7 +8619,7 @@ static const struct ScriptCommand s_gs1_g28_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_STOP, { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -8631,37 +8631,37 @@ static const struct ScriptRef s_gs1_g28_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g28_s0_eff0_script[] = { /* 0x815a9b0 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000070, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_GRID(256, 112), + ALERT_CUE(5), + AWAIT_CUE(4), { 0x86, 0x00, 0x0100, 0x00000071, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x86, 0x00, 0x0100, 0x00000070, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000072, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000070, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), + WALK_GRID(256, 114), + ALERT_CUE(5), + AWAIT_CUE(4), + WALK_GRID(256, 112), + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0008, 0x00000058, 0x00000000, NULL }, { 0x2d, 0x09, 0x0009, 0x00000067, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000063, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 99), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_2}!")), @@ -8669,32 +8669,32 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ VARIANT_DEFAULT(_(" Oh! {NAME_2}!")), VARIANT_DEFAULT(_(" What's going on here?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Hey, {NAME_1}.\nW-well...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ...You should just go see\nfor yourself...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000064, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), + WALK_GRID(256, 100), + ROTATE(4, 10, DIRECTION_NORTHEAST), + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), BGM_SWITCH(9), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000c), MSG_NPC(1, _(" Look!\nIt's {NAME_5}!")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_3}!{WAIT_PRESS}\nWhat's going on here?!")), VARIANT_DEFAULT(_(" {NAME_3}!{WAIT_PRESS}\nWhat happened here?!")), @@ -8704,7 +8704,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ PORTRAIT_POS(3, 0, -1), MSG_NPC(3, _(" ............{WAIT_PRESS}\nThey were wiped out...{WAIT_PRESS}\nIn the underground dungeon...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), MSG_NPC(1, _(" You're kidding!")), TEXTBOX_CLEAR, @@ -8713,28 +8713,28 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ PORTRAIT_POS(5, 0, 1), MSG_NPC(5, _(" Groan... That place...{WAIT_PRESS}\nIt's rough, seriously...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTHEAST), WAIT(10), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0006, 0x00000000), PORTRAIT_POS(6, 0, -1), MSG_NPC(6, _(" ...We couldn't get far\nenough to even see {NAME_9}...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), WAIT(10), PORTRAIT(PLACEMENT_RIGHT, 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, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHEAST), WAIT(60), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, MSG_NPC(3, _(" ...It appears the dungeon\nunderground...{WAIT_PRESS}\nis far worse than we'd imagined...")), TEXTBOX_CLEAR, @@ -8743,12 +8743,12 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ BGM_SWITCH(10), MSG_NPC(-1, _(" Kekekekekeh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(13), + ALERT_CUE(8), + ALERT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(5), CALL_SCRIPT(SHOCK_FUNC), @@ -8764,29 +8764,29 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ VARIANT_DEFAULT(_(" Ge-{NAME_4}!")), VARIANT_DEFAULT(_(" What are you saying?!{WAIT_PRESS}\nIt's only expected that we try. This is for\nsaving {NAME_8}'s team.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(13), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000000), MSG_NPC(4, _(" Kekeh!\nYou really find thinking hard, don't you?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Even they look smart\ncompared to you.")), TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ALERT_CUE(20), + ALERT_CUE(6), + ALERT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHWEST), WAIT(30), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(60), MSG_NPC(-1, _(" It's too much...\nEven {NAME_5} went down...")), MSG_NPC(-1, _(" It's gotta be awful tough.")), @@ -8796,61 +8796,61 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ MSG_NPC(-1, _(" It'd be like going and knowing full\nwell we'd get wiped...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0001, 0x00000005), MSG_NPC(1, _(" ...E-everyone...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000000), MSG_NPC(4, _(" You see?\nEven they finally seem to understand\ntheir situation. Kekeh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" I...{WAIT_PRESS}\nMy leafy fans would burn up...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(9), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, WAIT(15), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000005), PORTRAIT_POS(1, -2, 0), MSG_NPC(1, _(" E-even {NAME_3}...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT_FLIP, 0x0001, 0x00000000), MSG_NPC(4, _(" Kekeh! Get over it!\nDon't expect to be rewarded just because\nyou tried!")), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), MSG_NPC(4, _(" Sometimes, it's better to\nwise up and give up!")), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000001), MSG_NPC(4, _(" ............Huh?{WAIT_PRESS}\nDid I say something profound?\nKekekekekekekeh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0001, 0x00000005), MSG_NPC(1, _(" Urf...")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, BGM_FADEOUT(150), WAIT(30), @@ -8881,29 +8881,29 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ VARIANT_DEFAULT(_(" ...{WAIT_PRESS}Yes...{WAIT_PRESS}\nI think so too.")), VARIANT_DEFAULT(_(" OK, {NAME_0}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), BGM_SWITCH(7), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Everyone, listen!")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(15), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(60), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We're going!\nTo rescue {NAME_8}'s team!")), VARIANT(/* == */ 3, _(" We're going!\nTo rescue {NAME_8}'s team!")), VARIANT_DEFAULT(_(" We're going!\nTo rescue {NAME_8}'s team!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(20), FANFARE_PLAY2(465), WAIT(30), MSG_NPC(-1, _(" Wha-what?!")), @@ -8915,8 +8915,8 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), + AWAIT_CUE(5), MSG_NPC(-1, _(" Hey, who are they?")), MSG_NPC(-1, _(" Can't say I know them...")), MSG_NPC(-1, _(" It's {COLOR CYAN}Team {TEAM_NAME}{RESET}.{WAIT_PRESS}\nThey're well known around these parts.")), @@ -8924,15 +8924,15 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ MSG_NPC(-1, _(" I heard about that!{WAIT_PRESS}\nWeren't they living like fugitives until\nrecently?")), MSG_NPC(-1, _(" Can they handle it?{WAIT_PRESS}\nThey don't look very tough.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Sure, the rescue might be\ntoo much for us to handle.")), VARIANT(/* == */ 3, _(" Yes, the rescue might be too\nmuch of a challenge for us.")), VARIANT_DEFAULT(_(" It's true--the rescue might\nbe too much for us to handle.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(30), PORTRAIT_REP(0x0001, 0x00000005), @@ -8958,10 +8958,10 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ WAIT(60), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000003), MSG_NPC(4, _(" ............{WAIT_PRESS}Keh.{WAIT_PRESS} Kekekeh!{WAIT_PRESS}\nYou really aren't very bright, are you?")), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Why don't you do like\neveryone else and wise up?")), TEXTBOX_CLEAR, @@ -8971,25 +8971,25 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ MSG_NPC(3, _(" ...No.\n{NAME_1} is right.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(20), + ALERT_CUE(6), { 0x93, 0x04, 0x0001, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000003), MSG_NPC(4, _(" ...Ugeh?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), WAIT(60), MSG_NPC(-1, _(" ...That's right.\nI wasn't thinking straight...out of fear.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(5), + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT_FLIP, 0x0004, 0x00000006), MSG_NPC(4, _(" ...Ugegegeh?")), TEXTBOX_CLEAR, @@ -8998,18 +8998,18 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ MSG_NPC(-1, _(" ...Pride...")), MSG_NPC(-1, _(" We have it too!\nPride as rescuers!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT_REP(0x0004, 0x00000006), MSG_NPC(4, _(" Ugegegegeh!\nHave you lost your senses?!")), TEXTBOX_CLEAR, WAIT(15), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT_REP(0x0004, 0x00000003), MSG_NPC(4, _(" Why would you listen to\nthat clown and, worse, be persuaded?")), WAIT(15), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), PORTRAIT_REP(0x0004, 0x00000002), MSG_NPC(4, _(" Why go if you're facing\ncertain defeat?!")), TEXTBOX_CLEAR, @@ -9018,12 +9018,12 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ MSG_NPC(5, _(" Is that so...?")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(9), + ALERT_CUE(20), { 0x93, 0x04, 0x0001, 0x00000068, 0x00000000, NULL }, WAIT(60), MSG_NPC(5, _(" ...We've only failed once.")), @@ -9036,118 +9036,118 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ MSG_NPC(5, _(" ...This is no time to be\nlying around!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000006), MSG_NPC(4, _(" Ugegeh!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ALERT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTHEAST), MSG_NPC(6, _(" Yes, no more wallowing in\nwoe-is-me self-pity.")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ALERT_CUE(9), + ROTATE(4, 10, DIRECTION_SOUTHEAST), MSG_NPC(7, _(" If we give up, that's how\nit ends. Not for me.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ALERT_CUE(9), + ROTATE(4, 10, DIRECTION_EAST), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000b), MSG_NPC(1, _(" {NAME_6}!\nAnd {NAME_7} too!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT_REP(0x0004, 0x00000003), MSG_NPC(4, _(" Ugegegeh!\nYou lot, that wasn't the tune you\nwere whistling just a little...")), TEXTBOX_CLEAR, WAIT(30), MSG_NPC(-1, _(" Aye, that's right!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), MSG_NPC(-1, _(" There've got to be ways we can\nget through!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTH), MSG_NPC(-1, _(" If we all pull together, we'll be sure\nto find a way!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), MSG_NPC(-1, _(" We'll conquer the dungeon by\nhaving all the rescue teams cooperate!")), WAIT(30), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), MSG_NPC(-1, _(" Wrooooooooaaaar!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), MSG_NPC(4, _(" Ugegegegegegegegeh!{WAIT_PRESS}\nAre you dreaming?!")), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), + ALERT_CUE(8), + ALERT_CUE(6), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), MSG_NPC(4, _(" Don't say I didn't warn you\nwhen you get into a world of pain!\nUgegegegeh!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(16), + ALERT_CUE(9), + ALERT_CUE(6), + ROTATE(10, 10, DIRECTION_NORTH), + AWAIT_CUE(5), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(20), WAIT(60), MSG_NPC(5, _(" Thank you, {NAME_1}.")), MSG_NPC(5, _(" You stopped us from\nthrowing away the most important thing\nwe have--pride.")), MSG_NPC(5, _(" My thanks from all of us.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), WAIT(15), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), WAIT(60), MSG_NPC(5, _(" Everyone!{WAIT_PRESS}\nIt's time to get to work!")), MSG_NPC(5, _(" Let's show them what we\nrescue teams are really about!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), MSG_NPC(-1, _(" Wrooooooaaaaar!")), TEXTBOX_CLEAR, WAIT(60), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -9191,883 +9191,883 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ static const struct ScriptCommand s_gs1_g28_s0_lives1_dlg0[] = { /* 0x815dbb8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000065, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 101), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(30), - { 0x6b, 0x00, 0x0100, 0x00000066, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000067, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 102), + WALK_GRID(256, 103), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), FANFARE_PLAY2(464), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), FANFARE_PLAY2(463), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(5), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x0002, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(8, 1, DIRECTION_NORTH), WAIT(30), - { 0x91, 0x08, 0x0002, 0x00000001, 0x00000000, NULL }, + ROTATE(8, 2, DIRECTION_SOUTHEAST), WAIT(30), - { 0x91, 0x08, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(8, 1, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_NORTHWEST), WAIT(15), - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTH), WAIT(15), - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), { 0x93, 0x04, 0x0002, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x0002, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(6), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives2_dlg0[] = { /* 0x815e298 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(8), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives3_dlg0[] = { /* 0x815e488 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000068, 0x00000000, NULL }, + AWAIT_CUE(9), + WALK_GRID(256, 104), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000069, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + WALK_GRID(256, 105), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), WAIT(30), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_WEST), WAIT(15), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), WAIT(15), CALL_SCRIPT(JUMP_SURPRISE_FUNC), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 1, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(9), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0300, 0x0000006a, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + WALK_GRID(768, 106), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives4_dlg0[] = { /* 0x815eaa8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x001a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives5_dlg0[] = { /* 0x815ebb8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), + AWAIT_CUE(11), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives6_dlg0[] = { /* 0x815ec78 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), + AWAIT_CUE(12), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(12), HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives7_dlg0[] = { /* 0x815ed38 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x0001, 0x00000022, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_EAST), WAIT(60), { 0x93, 0x04, 0x0001, 0x00000022, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_EAST), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_EAST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_EAST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_EAST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives8_dlg0[] = { /* 0x815f118 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_NORTHWEST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_NORTHWEST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_NORTHWEST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives9_dlg0[] = { /* 0x815f428 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(8, 10, DIRECTION_SOUTH), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x6b, 0x00, 0x0080, 0x0000006b, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + WALK_GRID(128, 107), + ROTATE(4, 10, DIRECTION_SOUTH), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), WAIT_RANDOM(60, 120), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x6b, 0x00, 0x0080, 0x0000006c, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + WALK_GRID(128, 108), + ROTATE(4, 10, DIRECTION_SOUTH), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), WAIT_RANDOM(60, 120), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x6b, 0x00, 0x0080, 0x0000006d, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + WALK_GRID(128, 109), + ROTATE(4, 10, DIRECTION_SOUTHEAST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), WAIT(30), - { 0x6b, 0x00, 0x004c, 0x0000006e, 0x00000000, NULL }, + WALK_GRID(76, 110), { 0x93, 0x04, 0x000a, 0x0000008e, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000008e, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + AWAIT_CUE(20), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), { 0x62, 0x00, 0x0100, -0x00000010, 0x00000000, NULL }, LABEL(2), /* = 0x02 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 2), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, 0x00000010, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + WALK_RELATIVE(128, 16, 0), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives10_dlg0[] = { /* 0x815f928 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_SOUTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_SOUTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_SOUTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET, }; static const struct ScriptCommand s_gs1_g28_s0_lives11_dlg0[] = { /* 0x815fc58 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(8, 10, DIRECTION_SOUTH), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHWEST), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), WAIT_RANDOM(60, 120), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHEAST), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), WAIT_RANDOM(60, 120), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(2), /* = 0x02 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHWEST), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), WAIT_RANDOM(60, 120), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHEAST), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), WAIT_RANDOM(60, 120), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), JUMP_LABEL(2), LABEL(3), /* = 0x03 */ { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_SOUTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(4), /* = 0x04 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 4), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives12_dlg0[] = { /* 0x8160158 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(2), /* = 0x02 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT_RANDOM(15, 90), JUMP_LABEL(2), LABEL(3), /* = 0x03 */ { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_NORTH), + SELECT_ANIMATION(4), + AWAIT_CUE(20), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(4), /* = 0x04 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 4), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives13_dlg0[] = { /* 0x8160588 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_EAST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_EAST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_EAST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives14_dlg0[] = { /* 0x8160898 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(20), + SELECT_ANIMATION(2), + ROTATE(4, 10, DIRECTION_WEST), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHEAST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x08, 0x000a, 0x00000088, 0x00000000, NULL }, WAIT(30), - { 0x6b, 0x00, 0x0080, 0x0000006f, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + WALK_GRID(128, 111), + SELECT_ANIMATION(4), + ALERT_CUE(5), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000088, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + AWAIT_CUE(20), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(16), { 0x62, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g28_s0_lives15_dlg0[] = { /* 0x8160c78 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(13), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000010, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000010, 0x00000010, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000008, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + WALK_RELATIVE(256, -16, 16), + WALK_RELATIVE(256, -8, 0), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_NORTHWEST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_NORTHWEST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(4, 10, DIRECTION_NORTHWEST), + SELECT_ANIMATION(4), + AWAIT_CUE(20), WAIT(30), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), HALT, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET, }; @@ -10082,7 +10082,7 @@ static const struct ScriptRef s_gs1_g29_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g29_s0_lives0_dlg2[] = { /* 0x8161054 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -10099,7 +10099,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives0_dlg2[] = { /* 0x8161054 */ static const struct ScriptCommand s_gs1_g29_s0_lives1_dlg2[] = { /* 0x81611f0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 1, /* to label */ 0), @@ -10113,7 +10113,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives1_dlg2[] = { /* 0x81611f0 */ static const struct ScriptCommand s_gs1_g29_s0_lives2_dlg2[] = { /* 0x81612a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 2, /* to label */ 0), @@ -10127,7 +10127,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives2_dlg2[] = { /* 0x81612a0 */ static const struct ScriptCommand s_gs1_g29_s0_lives3_dlg2[] = { /* 0x81613b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -10143,7 +10143,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives3_dlg2[] = { /* 0x81613b4 */ static const struct ScriptCommand s_gs1_g29_s0_lives4_dlg2[] = { /* 0x81614e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 4, /* to label */ 0), @@ -10159,7 +10159,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives4_dlg2[] = { /* 0x81614e0 */ static const struct ScriptCommand s_gs1_g29_s0_lives5_dlg2[] = { /* 0x816167c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 5, /* to label */ 0), @@ -10180,7 +10180,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives6_dlg0[] = { /* 0x8161794 */ static const struct ScriptCommand s_gs1_g29_s0_lives6_dlg2[] = { /* 0x81617c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000004d, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000068, 0x00000000, NULL }, @@ -10203,7 +10203,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives7_dlg0[] = { /* 0x8161948 */ static const struct ScriptCommand s_gs1_g29_s0_lives7_dlg2[] = { /* 0x8161978 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000004d, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000068, 0x00000000, NULL }, @@ -10226,7 +10226,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives8_dlg0[] = { /* 0x8161a58 */ static const struct ScriptCommand s_gs1_g29_s0_lives8_dlg2[] = { /* 0x8161a88 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000004f, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000069, 0x00000000, NULL }, @@ -10250,7 +10250,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives9_dlg0[] = { /* 0x8161c7c */ static const struct ScriptCommand s_gs1_g29_s0_lives9_dlg2[] = { /* 0x8161cac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000004f, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000069, 0x00000000, NULL }, @@ -10274,7 +10274,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives10_dlg0[] = { /* 0x8161d9c * static const struct ScriptCommand s_gs1_g29_s0_lives10_dlg2[] = { /* 0x8161dcc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000055, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000006a, 0x00000000, NULL }, @@ -10297,7 +10297,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives11_dlg0[] = { /* 0x8161f5c * static const struct ScriptCommand s_gs1_g29_s0_lives11_dlg2[] = { /* 0x8161f8c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000055, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000006a, 0x00000000, NULL }, @@ -10314,7 +10314,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives11_dlg2[] = { /* 0x8161f8c * static const struct ScriptCommand s_gs1_g29_s0_lives12_dlg2[] = { /* 0x816206c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Several rescue teams have\nalready left for the {COLOR YELLOW_D}Magma Cavern{RESET}.")), @@ -10325,7 +10325,7 @@ static const struct ScriptCommand s_gs1_g29_s0_lives12_dlg2[] = { /* 0x816206c * static const struct ScriptCommand s_gs1_g29_s1_station_sref_script[] = { /* 0x8162144 */ DEBUGINFO, SELECT_LIVES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -10333,7 +10333,7 @@ static const struct ScriptRef s_gs1_g29_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g29_s1_lives0_dlg0[] = { /* 0x8162190 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -10343,20 +10343,20 @@ static const struct ScriptCommand s_gs1_g29_s1_lives0_dlg0[] = { /* 0x8162190 */ MSG_NPC(3, _(" Especially the part about\ntaking pride...{WAIT_PRESS} That made me...{WAIT_PRESS}\nIt left me choked up...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" It isn't just you, my brother.{WAIT_PRESS}\nI am likewise inspired beyond words.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" B-Brother...{WAIT_PRESS}\nSniffle... My brother...")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" I will do my best to obtain\neven better Technical Machines and Orbs.")), MSG_NPC(3, _(" All with the pride of a\nmerchant!")), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, SELECT_LIVES(-1, 0), @@ -10365,27 +10365,27 @@ static const struct ScriptCommand s_gs1_g29_s1_lives0_dlg0[] = { /* 0x8162190 */ static const struct ScriptCommand s_gs1_g29_s1_lives1_dlg0[] = { /* 0x81624a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs1_g29_s1_lives2_dlg0[] = { /* 0x81624e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(7), RET, }; static const struct ScriptCommand s_gs1_g29_s1_lives2_dlg2[] = { /* 0x8162580 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -10402,21 +10402,21 @@ static const struct ScriptCommand s_gs1_g29_s1_lives2_dlg2[] = { /* 0x8162580 */ static const struct ScriptCommand s_gs1_g29_s1_lives3_dlg0[] = { /* 0x8162660 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(8), RET, }; static const struct ScriptCommand s_gs1_g29_s1_lives3_dlg2[] = { /* 0x8162710 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 1, /* to label */ 0), @@ -10439,7 +10439,7 @@ static const struct ScriptRef s_gs1_g30_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g30_s0_lives0_dlg2[] = { /* 0x816280c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -10461,7 +10461,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives1_dlg0[] = { /* 0x81628ec */ static const struct ScriptCommand s_gs1_g30_s0_lives1_dlg2[] = { /* 0x816290c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 1, /* to label */ 0), @@ -10475,7 +10475,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives1_dlg2[] = { /* 0x816290c */ static const struct ScriptCommand s_gs1_g30_s0_lives2_dlg2[] = { /* 0x81629bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 2, /* to label */ 0), @@ -10489,7 +10489,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives2_dlg2[] = { /* 0x81629bc */ static const struct ScriptCommand s_gs1_g30_s0_lives3_dlg2[] = { /* 0x8162a6c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -10505,7 +10505,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives3_dlg2[] = { /* 0x8162a6c */ static const struct ScriptCommand s_gs1_g30_s0_lives4_dlg2[] = { /* 0x8162b3c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 4, /* to label */ 0), @@ -10521,7 +10521,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives4_dlg2[] = { /* 0x8162b3c */ static const struct ScriptCommand s_gs1_g30_s0_lives5_dlg2[] = { /* 0x8162c3c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 5, /* to label */ 0), @@ -10542,7 +10542,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives6_dlg0[] = { /* 0x8162cfc */ static const struct ScriptCommand s_gs1_g30_s0_lives6_dlg2[] = { /* 0x8162d2c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000068, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000069, 0x00000000, NULL }, @@ -10581,7 +10581,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives7_dlg0[] = { /* 0x8163090 */ static const struct ScriptCommand s_gs1_g30_s0_lives7_dlg2[] = { /* 0x81630c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000068, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000069, 0x00000000, NULL }, @@ -10620,7 +10620,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives8_dlg0[] = { /* 0x81632a0 */ static const struct ScriptCommand s_gs1_g30_s0_lives8_dlg2[] = { /* 0x81632d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000068, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000069, 0x00000000, NULL }, @@ -10654,25 +10654,25 @@ static const struct ScriptCommand s_gs1_g30_s0_lives8_dlg2[] = { /* 0x81632d0 */ static const struct ScriptCommand s_gs1_g30_s0_lives9_dlg1[] = { /* 0x81634b0 */ DEBUGINFO, LABEL(0), /* = 0x00 */ - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000010, 0x00000000, NULL }, + SELECT_ANIMATION(5), + WALK_RELATIVE(256, -16, 0), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(90), - { 0x6a, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, + WALK_RELATIVE(256, 16, 0), WAIT(90), - { 0x6a, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, + WALK_RELATIVE(256, 16, 0), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(90), - { 0x6a, 0x00, 0x0100, -0x00000010, 0x00000000, NULL }, + WALK_RELATIVE(256, -16, 0), WAIT(90), JUMP_LABEL(0), }; static const struct ScriptCommand s_gs1_g30_s0_lives9_dlg2[] = { /* 0x81635b0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I ventured into the {COLOR YELLOW_D}Magma\nCavern{RESET}, but...")), @@ -10683,7 +10683,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives9_dlg2[] = { /* 0x81635b0 */ static const struct ScriptCommand s_gs1_g30_s0_lives10_dlg2[] = { /* 0x81636d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" It's tough for us to get\nvery deep in there...")), @@ -10696,7 +10696,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives10_dlg2[] = { /* 0x81636d0 * static const struct ScriptCommand s_gs1_g30_s0_lives11_dlg2[] = { /* 0x81638c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I talked to other rescue\nteams.")), @@ -10707,7 +10707,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives11_dlg2[] = { /* 0x81638c0 * static const struct ScriptCommand s_gs1_g30_s0_lives12_dlg2[] = { /* 0x81639bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I overheard some rescue\nteam Pokémon earlier.")), @@ -10719,7 +10719,7 @@ static const struct ScriptCommand s_gs1_g30_s0_lives12_dlg2[] = { /* 0x81639bc * static const struct ScriptCommand s_gs1_g30_s1_station_sref_script[] = { /* 0x8163ad8 */ DEBUGINFO, SELECT_LIVES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -10727,7 +10727,7 @@ static const struct ScriptRef s_gs1_g30_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g30_s1_lives0_dlg0[] = { /* 0x8163b24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -10737,20 +10737,20 @@ static const struct ScriptCommand s_gs1_g30_s1_lives0_dlg0[] = { /* 0x8163b24 */ MSG_NPC(3, _(" Especially the part about\ntaking pride...{WAIT_PRESS} That made me...{WAIT_PRESS}\nIt left me choked up...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" It isn't just you, my brother.{WAIT_PRESS}\nI am likewise inspired beyond words.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" B-Brother...{WAIT_PRESS}\nSniffle... My brother...")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" I will do my best to obtain\neven better Technical Machines and Orbs.")), MSG_NPC(3, _(" All with the pride of a\nmerchant!")), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, SELECT_LIVES(-1, 0), @@ -10759,27 +10759,27 @@ static const struct ScriptCommand s_gs1_g30_s1_lives0_dlg0[] = { /* 0x8163b24 */ static const struct ScriptCommand s_gs1_g30_s1_lives1_dlg0[] = { /* 0x8163cf4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs1_g30_s1_lives2_dlg0[] = { /* 0x8163d34 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(7), RET, }; static const struct ScriptCommand s_gs1_g30_s1_lives2_dlg2[] = { /* 0x8163dd4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -10796,21 +10796,21 @@ static const struct ScriptCommand s_gs1_g30_s1_lives2_dlg2[] = { /* 0x8163dd4 */ static const struct ScriptCommand s_gs1_g30_s1_lives3_dlg0[] = { /* 0x8163eb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(8), RET, }; static const struct ScriptCommand s_gs1_g30_s1_lives3_dlg2[] = { /* 0x8163f64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E09A_8N, 1, /* to label */ 0), @@ -10835,7 +10835,7 @@ static const struct ScriptCommand s_gs1_g31_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(7), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x0005, 0x00000014, 0x00ffffff, NULL }, WAIT(20), RET, @@ -10848,16 +10848,16 @@ static const struct ScriptCommand s_gs1_g31_s0_eff0_script[] = { /* 0x8164138 */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000073, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 115), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -10865,52 +10865,52 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ MSG_NPC(2, _(" Is {NAME_0}'s team\nalmost here?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), + ALERT_CUE(7), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), PORTRAIT(PLACEMENT_TOP_FLIP, 0x0003, 0x00000000), PORTRAIT_POS(3, -1, 0), MSG_NPC(3, _(" Look!\nHere they come!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), WAIT(20), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), MSG_NPC(6, _(" It's true, darlings!")), TEXTBOX_CLEAR, PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Let's go!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), WAIT(90), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00cc, 0x00000074, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), + ALERT_CUE(6), + ALERT_CUE(13), + ALERT_CUE(15), + ALERT_CUE(16), + WALK_GRID(204, 116), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(12), WAIT(30), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0004, 0x00000042), MSG_NPC(4, _(" Great work!\nGreat work, {NAME_0}!")), TEXTBOX_CLEAR, @@ -10922,14 +10922,14 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ MSG_NPC(6, _(" Darlings, it's fantastic!{WAIT_PRESS}\nYou have won me over!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000c), MSG_NPC(1, _(" Whoa!\nW-wait a second!")), MSG_NPC(1, _(" How does everyone know\nabout what happened underground?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0003, 0x00000000), PORTRAIT_POS(3, 1, 0), MSG_NPC(3, _(" Pelipper spread the word\nwith an extra edition of the Pokémon\nNews.")), @@ -10945,15 +10945,15 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ MSG_NPC(5, _(" You lot did great!{WAIT_PRESS}\nWhy don't we team up sometime?\nGahahahaha!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), MSG_NPC(8, _(" You've earned everyone's\nrespect now.")), MSG_NPC(8, _(" Your {COLOR CYAN}Team {TEAM_NAME}{RESET}\nis a first-class rescue team.")), MSG_NPC(8, _(" Take pride in that.{WAIT_PRESS}\n{NAME_1}, {NAME_0}.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), WAIT(5), PORTRAIT_REP(0x0001, 0x00000008), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -10967,41 +10967,41 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ WAIT(10), MSG_NPC(5, _(" Would you look at that?{WAIT_PRESS}\nI didn't think someone that could take down\nGroudon'd be such a crybaby! Gahahahaha!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), + ALERT_CUE(10), + ALERT_CUE(7), WAIT(90), - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(20), + ALERT_CUE(10), + ALERT_CUE(7), BGM_FADEOUT(30), FANFARE_PLAY2(487), { 0x28, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, { 0x27, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, WAIT(60), FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(15), + ALERT_CUE(16), + ALERT_CUE(20), WAIT(60), FANFARE_PLAY2(487), { 0x28, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, { 0x27, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), MSG_NPC(3, _(" No. I heard it too.")), TEXTBOX_CLEAR, WAIT(10), @@ -11011,24 +11011,24 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ MSG_NPC(7, _(" Someone talking?{WAIT_PRESS}\n...Not sure.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(12), + ALERT_CUE(15), + ALERT_CUE(16), + ALERT_CUE(20), WAIT(60), FANFARE_PLAY2(487), { 0x28, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, { 0x27, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, WAIT(60), { 0x2d, 0x09, 0x0009, 0x00000061, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_NORTH), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Th-this voice...{WAIT_PRESS}\nI remember this voice.")), @@ -11037,8 +11037,8 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ VARIANT_DEFAULT(_(" This voice...{WAIT_PRESS} I'm sure...{WAIT_PRESS}\nThat's it! It's {NAME_9}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), MSG_NPC(8, _(" {NAME_9}?{WAIT_PRESS}\nAh, that's it! Telepathy!")), MSG_NPC(8, _(" {NAME_9} is calling out\nto us using telepathy!")), TEXTBOX_CLEAR, @@ -11053,7 +11053,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ MSG_NPC(9, _(" Terrible, it is!{WAIT_PRESS}\nFrom the sky...{WAIT_PRESS} Falls a star...")), TEXTBOX_CLEAR, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -11073,428 +11073,428 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ static const struct ScriptCommand s_gs1_g31_s0_lives1_dlg0[] = { /* 0x8165464 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00cc, 0x00000075, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(204, 117), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(3), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(6), WAIT(5), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(6), WAIT(5), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives2_dlg0[] = { /* 0x8165654 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000007b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(7), + WALK_GRID(256, 123), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives3_dlg0[] = { /* 0x8165794 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000079, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0080, -0x00000008, 0x00000008, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + WALK_GRID(256, 121), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), + WALK_RELATIVE(128, -8, 8), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(12, 10, DIRECTION_NORTHWEST), WAIT(15), - { 0x91, 0x0c, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHEAST), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), + ROTATE(12, 10, DIRECTION_NORTHWEST), WAIT(15), - { 0x91, 0x0c, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHEAST), WAIT(15), - { 0x91, 0x0c, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives4_dlg0[] = { /* 0x8165964 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000007a, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(9), + WALK_GRID(256, 122), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(9), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), WAIT(5), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(5), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives5_dlg0[] = { /* 0x8165ab4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000007c, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(10), + WALK_GRID(256, 124), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(10), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(8, 10, DIRECTION_SOUTH), WAIT(45), - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_WEST), + AWAIT_CUE(10), + ROTATE(8, 10, DIRECTION_SOUTH), WAIT(45), - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_WEST), + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives6_dlg0[] = { /* 0x8165c34 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(11), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(11), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000007d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), + WALK_GRID(256, 125), + AWAIT_CUE(11), + ROTATE(8, 10, DIRECTION_NORTH), WAIT(50), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(11), + ROTATE(8, 10, DIRECTION_NORTH), WAIT(50), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives7_dlg0[] = { /* 0x8165d94 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000007e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(12), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(12), + WALK_GRID(256, 126), + AWAIT_CUE(12), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(12), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives8_dlg0[] = { /* 0x8165ea4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0008, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00cc, 0x00000076, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000d, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(13), + WALK_GRID(204, 118), + AWAIT_CUE(13), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives9_dlg0[] = { /* 0x8165f34 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00cc, 0x00000077, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(15), + WALK_GRID(204, 119), + AWAIT_CUE(15), + ROTATE(12, 10, DIRECTION_NORTHWEST), WAIT(45), - { 0x91, 0x0c, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_EAST), + AWAIT_CUE(15), + ROTATE(12, 10, DIRECTION_NORTHWEST), WAIT(45), - { 0x91, 0x0c, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_EAST), + AWAIT_CUE(15), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives10_dlg0[] = { /* 0x8166034 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x00cc, 0x00000078, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(16), + WALK_GRID(204, 120), + AWAIT_CUE(16), + ROTATE(12, 10, DIRECTION_SOUTHWEST), WAIT(30), - { 0x91, 0x0c, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_EAST), + AWAIT_CUE(16), + ROTATE(12, 10, DIRECTION_SOUTHWEST), WAIT(30), - { 0x91, 0x0c, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0010, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_EAST), + AWAIT_CUE(16), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives11_dlg0[] = { /* 0x8166134 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000084, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + WALK_GRID(256, 132), + AWAIT_CUE(20), WAIT(5), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(10), - { 0x91, 0x0c, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHEAST), WAIT(30), - { 0x91, 0x0c, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(20), WAIT(10), - { 0x91, 0x0c, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHEAST), WAIT(30), - { 0x91, 0x0c, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_NORTH), + AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives12_dlg0[] = { /* 0x81662a4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(45), - { 0x6b, 0x00, 0x0100, 0x00000086, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 134), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(20), WAIT(3), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(5), - { 0x91, 0x0c, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHEAST), WAIT(15), - { 0x91, 0x0c, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_WEST), WAIT(15), - { 0x91, 0x0c, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_NORTH), + AWAIT_CUE(20), WAIT(5), - { 0x91, 0x0c, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHEAST), WAIT(15), - { 0x91, 0x0c, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_WEST), WAIT(15), - { 0x91, 0x0c, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives13_dlg0[] = { /* 0x8166474 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(30), - { 0x6b, 0x00, 0x0100, 0x00000085, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 133), + AWAIT_CUE(20), WAIT(6), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(20), + ROTATE(8, 10, DIRECTION_SOUTHEAST), WAIT(45), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(20), + ROTATE(8, 10, DIRECTION_SOUTHEAST), WAIT(45), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives14_dlg0[] = { /* 0x81665d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000080, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + WALK_GRID(256, 128), + AWAIT_CUE(20), + AWAIT_CUE(20), WAIT(5), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(7), - { 0x91, 0x0c, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_WEST), WAIT(30), - { 0x91, 0x0c, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(20), WAIT(7), - { 0x91, 0x0c, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_WEST), WAIT(30), - { 0x91, 0x0c, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTH), + AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives15_dlg0[] = { /* 0x8166724 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(30), - { 0x6b, 0x00, 0x0100, 0x00000081, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 129), + AWAIT_CUE(20), + AWAIT_CUE(20), + AWAIT_CUE(20), + AWAIT_CUE(20), + AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives16_dlg0[] = { /* 0x81667f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000007f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), + WALK_GRID(256, 127), + AWAIT_CUE(20), + AWAIT_CUE(20), + AWAIT_CUE(20), + AWAIT_CUE(20), + AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives17_dlg0[] = { /* 0x81668b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(45), - { 0x6b, 0x00, 0x0100, 0x00000082, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 130), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(20), WAIT(2), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(3), CALL_SCRIPT(LOOK_AROUND_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives18_dlg0[] = { /* 0x81669d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(60), - { 0x6b, 0x00, 0x0100, 0x00000083, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 131), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(20), CALL_SCRIPT(SMILE_START_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(20), WAIT(12), - { 0x91, 0x0c, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_EAST), WAIT(20), - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(20), WAIT(12), - { 0x91, 0x0c, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_EAST), WAIT(20), - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g31_s0_lives19_dlg0[] = { /* 0x8166b54 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; @@ -11505,7 +11505,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives19_dlg2[] = { /* 0x8166b84 * static const struct ScriptCommand s_gs1_g31_s0_lives20_dlg0[] = { /* 0x8166ba4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; @@ -11520,7 +11520,7 @@ static const struct ScriptCommand s_gs1_g32_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(19), { 0x27, 0x00, 0x0005, 0x00000020, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -11529,7 +11529,7 @@ static const struct ScriptRef s_gs1_g32_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -11573,8 +11573,8 @@ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ MSG_NPC(9, _(" What will become of the\nPokémon sent to the sky?{WAIT_PRESS}\nEven I can guess nothing...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_FLIP, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Then, we'll do it!{WAIT_PRESS}\nWe'll go!")), @@ -11586,8 +11586,8 @@ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ MSG_NPC(8, _(" But...{WAIT_PRESS} Are you sure?{WAIT_PRESS}\nThere's no telling what you would find\nin that world above the clouds.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We expect danger!")), VARIANT(/* == */ 1, _(" It's my wish that all\nPokémon can live in peace.")), @@ -11610,14 +11610,14 @@ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ MSG_NPC(1, _(" No problem!\nWe'll be fine!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}!\nLet's get it done!")), VARIANT_DEFAULT(_(" Right, {NAME_0}?\nLet's get it done!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -11634,30 +11634,30 @@ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ static const struct ScriptCommand s_gs1_g32_s0_lives1_dlg0[] = { /* 0x8167744 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives2_dlg0[] = { /* 0x8167814 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives3_dlg0[] = { /* 0x8167854 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x59, 0x00, -0x0008, 0x00000008, 0x00000000, NULL }, HALT, @@ -11665,106 +11665,106 @@ static const struct ScriptCommand s_gs1_g32_s0_lives3_dlg0[] = { /* 0x8167854 */ static const struct ScriptCommand s_gs1_g32_s0_lives4_dlg0[] = { /* 0x81678a4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives5_dlg0[] = { /* 0x81678e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives6_dlg0[] = { /* 0x8167924 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives7_dlg0[] = { /* 0x8167964 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives8_dlg0[] = { /* 0x81679a4 */ DEBUGINFO, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(1), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0008, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives9_dlg0[] = { /* 0x8167a04 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives10_dlg0[] = { /* 0x8167a34 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives11_dlg0[] = { /* 0x8167a64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives12_dlg0[] = { /* 0x8167aa4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives13_dlg0[] = { /* 0x8167ae4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives14_dlg0[] = { /* 0x8167b24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives15_dlg0[] = { /* 0x8167b64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives16_dlg0[] = { /* 0x8167ba4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives17_dlg0[] = { /* 0x8167be4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), HALT, }; static const struct ScriptCommand s_gs1_g32_s0_lives18_dlg0[] = { /* 0x8167c24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0014, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(20), HALT, }; @@ -11788,7 +11788,7 @@ static const struct ScriptRef s_gs1_g33_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g33_s0_lives0_dlg0[] = { /* 0x8167d40 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -11803,7 +11803,7 @@ static const struct ScriptRef s_gs1_g34_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g34_s0_lives0_dlg2[] = { /* 0x8167dbc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -11844,7 +11844,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives0_dlg2[] = { /* 0x8167dbc */ static const struct ScriptCommand s_gs1_g34_s0_lives1_dlg2[] = { /* 0x8168208 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_1N, 0, /* to label */ 0), @@ -11858,7 +11858,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives1_dlg2[] = { /* 0x8168208 */ static const struct ScriptCommand s_gs1_g34_s0_lives2_dlg2[] = { /* 0x81682ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_1N, 1, /* to label */ 0), @@ -11872,7 +11872,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives2_dlg2[] = { /* 0x81682ec */ static const struct ScriptCommand s_gs1_g34_s0_lives3_dlg2[] = { /* 0x81683c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_1N, 2, /* to label */ 0), @@ -11886,7 +11886,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives3_dlg2[] = { /* 0x81683c4 */ static const struct ScriptCommand s_gs1_g34_s0_lives4_dlg2[] = { /* 0x8168494 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_1N, 3, /* to label */ 0), @@ -11900,7 +11900,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives4_dlg2[] = { /* 0x8168494 */ static const struct ScriptCommand s_gs1_g34_s0_lives5_dlg2[] = { /* 0x816856c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_1N, 4, /* to label */ 0), @@ -11914,7 +11914,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives5_dlg2[] = { /* 0x816856c */ static const struct ScriptCommand s_gs1_g34_s0_lives6_dlg2[] = { /* 0x8168674 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_1N, 5, /* to label */ 0), @@ -11929,7 +11929,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives6_dlg2[] = { /* 0x8168674 */ static const struct ScriptCommand s_gs1_g34_s0_lives7_dlg2[] = { /* 0x8168798 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Everything depends on you!\nDon't fail!")), @@ -11938,7 +11938,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives7_dlg2[] = { /* 0x8168798 */ static const struct ScriptCommand s_gs1_g34_s0_lives8_dlg2[] = { /* 0x8168824 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Darlings, I can't begin to\nimagine a world above the clouds...{WAIT_PRESS}\nThe best of luck!")), @@ -11947,7 +11947,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives8_dlg2[] = { /* 0x8168824 */ static const struct ScriptCommand s_gs1_g34_s0_lives9_dlg2[] = { /* 0x81688dc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Rayquaza is a legendary\nPokémon, isn't that right?")), @@ -11957,7 +11957,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives9_dlg2[] = { /* 0x81688dc */ static const struct ScriptCommand s_gs1_g34_s0_lives10_dlg2[] = { /* 0x81689c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" If anyone can do it, it's you!\nKeep your faith!")), @@ -11966,7 +11966,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives10_dlg2[] = { /* 0x81689c4 * static const struct ScriptCommand s_gs1_g34_s0_lives11_dlg2[] = { /* 0x8168a5c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" This is getting heavy!")), @@ -11976,7 +11976,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives11_dlg2[] = { /* 0x8168a5c * static const struct ScriptCommand s_gs1_g34_s0_lives12_dlg2[] = { /* 0x8168b28 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I will wait for you.")), @@ -11986,7 +11986,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives12_dlg2[] = { /* 0x8168b28 * static const struct ScriptCommand s_gs1_g34_s0_lives13_dlg2[] = { /* 0x8168be8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I will set out to confer\nwith Xatu.")), @@ -11996,7 +11996,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives13_dlg2[] = { /* 0x8168be8 * static const struct ScriptCommand s_gs1_g34_s0_lives14_dlg2[] = { /* 0x8168cbc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I'm throwing in my lot with\n{COLOR CYAN}Team {TEAM_NAME}{RESET}!")), @@ -12006,7 +12006,7 @@ static const struct ScriptCommand s_gs1_g34_s0_lives14_dlg2[] = { /* 0x8168cbc * static const struct ScriptCommand s_gs1_g34_s0_lives15_dlg2[] = { /* 0x8168d80 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You can do it!{WAIT_PRESS}\nYou can stop the star from falling!")), @@ -12024,7 +12024,7 @@ static const struct ScriptRef s_gs1_g35_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g35_s0_lives0_dlg2[] = { /* 0x8168e64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_3N, 0, /* to label */ 0), @@ -12038,7 +12038,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives0_dlg2[] = { /* 0x8168e64 */ static const struct ScriptCommand s_gs1_g35_s0_lives1_dlg2[] = { /* 0x8168f48 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_3N, 1, /* to label */ 0), @@ -12052,7 +12052,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives1_dlg2[] = { /* 0x8168f48 */ static const struct ScriptCommand s_gs1_g35_s0_lives2_dlg2[] = { /* 0x816901c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_3N, 2, /* to label */ 0), @@ -12066,7 +12066,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives2_dlg2[] = { /* 0x816901c */ static const struct ScriptCommand s_gs1_g35_s0_lives3_dlg2[] = { /* 0x81690ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_3N, 3, /* to label */ 0), @@ -12080,7 +12080,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives3_dlg2[] = { /* 0x81690ec */ static const struct ScriptCommand s_gs1_g35_s0_lives4_dlg2[] = { /* 0x81691cc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_3N, 4, /* to label */ 0), @@ -12094,7 +12094,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives4_dlg2[] = { /* 0x81691cc */ static const struct ScriptCommand s_gs1_g35_s0_lives5_dlg2[] = { /* 0x81692a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_3N, 5, /* to label */ 0), @@ -12108,7 +12108,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives5_dlg2[] = { /* 0x81692a8 */ static const struct ScriptCommand s_gs1_g35_s0_lives6_dlg2[] = { /* 0x8169384 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You're going, hey?\nBuckle down and get it done!")), @@ -12117,7 +12117,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives6_dlg2[] = { /* 0x8169384 */ static const struct ScriptCommand s_gs1_g35_s0_lives7_dlg2[] = { /* 0x816941c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" {NAME_0}, take care,\ndarling.")), @@ -12126,7 +12126,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives7_dlg2[] = { /* 0x816941c */ static const struct ScriptCommand s_gs1_g35_s0_lives8_dlg2[] = { /* 0x816949c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I can't even imagine what's\nup in the sky, but be brave!")), @@ -12135,7 +12135,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives8_dlg2[] = { /* 0x816949c */ static const struct ScriptCommand s_gs1_g35_s0_lives9_dlg2[] = { /* 0x816953c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Go with care!")), @@ -12144,7 +12144,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives9_dlg2[] = { /* 0x816953c */ static const struct ScriptCommand s_gs1_g35_s0_lives10_dlg2[] = { /* 0x81695ac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Oh, yeah. Leaving soon?")), @@ -12154,7 +12154,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives10_dlg2[] = { /* 0x81695ac * static const struct ScriptCommand s_gs1_g35_s0_lives11_dlg2[] = { /* 0x8169664 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You guys can do it for sure!\nThere's nothing to worry about!")), @@ -12164,7 +12164,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives11_dlg2[] = { /* 0x8169664 * static const struct ScriptCommand s_gs1_g35_s0_lives12_dlg2[] = { /* 0x816972c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Go for it! Take care!")), @@ -12173,7 +12173,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives12_dlg2[] = { /* 0x816972c * static const struct ScriptCommand s_gs1_g35_s0_lives13_dlg2[] = { /* 0x81697a4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" WE CAME TO WISH YOU\nWELL TOO! BZBZBZZZT!")), @@ -12182,7 +12182,7 @@ static const struct ScriptCommand s_gs1_g35_s0_lives13_dlg2[] = { /* 0x81697a4 * static const struct ScriptCommand s_gs1_g35_s0_lives14_dlg2[] = { /* 0x8169830 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" SAVE THE WORLD!\nBZBZBZZ!")), @@ -12200,7 +12200,7 @@ static const struct ScriptRef s_gs1_g36_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g36_s0_lives0_dlg2[] = { /* 0x81698f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_5N, 0, /* to label */ 0), @@ -12214,7 +12214,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives0_dlg2[] = { /* 0x81698f8 */ static const struct ScriptCommand s_gs1_g36_s0_lives1_dlg2[] = { /* 0x81699e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_5N, 1, /* to label */ 0), @@ -12228,7 +12228,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives1_dlg2[] = { /* 0x81699e0 */ static const struct ScriptCommand s_gs1_g36_s0_lives2_dlg2[] = { /* 0x8169ac8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_5N, 2, /* to label */ 0), @@ -12242,7 +12242,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives2_dlg2[] = { /* 0x8169ac8 */ static const struct ScriptCommand s_gs1_g36_s0_lives3_dlg2[] = { /* 0x8169bac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_5N, 3, /* to label */ 0), @@ -12256,7 +12256,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives3_dlg2[] = { /* 0x8169bac */ static const struct ScriptCommand s_gs1_g36_s0_lives4_dlg2[] = { /* 0x8169ca0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_5N, 4, /* to label */ 0), @@ -12272,7 +12272,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives4_dlg2[] = { /* 0x8169ca0 */ static const struct ScriptCommand s_gs1_g36_s0_lives5_dlg2[] = { /* 0x8169dcc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M01E10A_5N, 5, /* to label */ 0), @@ -12286,7 +12286,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives5_dlg2[] = { /* 0x8169dcc */ static const struct ScriptCommand s_gs1_g36_s0_lives6_dlg2[] = { /* 0x8169eac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" From failure comes success.\nKeep your faith!")), @@ -12295,7 +12295,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives6_dlg2[] = { /* 0x8169eac */ static const struct ScriptCommand s_gs1_g36_s0_lives7_dlg2[] = { /* 0x8169f3c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Darling, you've only begun.{WAIT_PRESS}\n{NAME_0}, keep your chin up!")), @@ -12304,7 +12304,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives7_dlg2[] = { /* 0x8169f3c */ static const struct ScriptCommand s_gs1_g36_s0_lives8_dlg2[] = { /* 0x8169fdc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Huh? There's a tower of\nclouds in the sky?!{WAIT_PRESS}\nIt exists? Amazing!")), @@ -12313,7 +12313,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives8_dlg2[] = { /* 0x8169fdc */ static const struct ScriptCommand s_gs1_g36_s0_lives9_dlg2[] = { /* 0x816a084 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I know exactly how gutsy\nyou are.")), @@ -12323,7 +12323,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives9_dlg2[] = { /* 0x816a084 */ static const struct ScriptCommand s_gs1_g36_s0_lives10_dlg2[] = { /* 0x816a134 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Go for it!\nDon't you lose!")), @@ -12332,7 +12332,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives10_dlg2[] = { /* 0x816a134 * static const struct ScriptCommand s_gs1_g36_s0_lives11_dlg2[] = { /* 0x816a1b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You'll be fine!\nGo with confidence!")), @@ -12341,7 +12341,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives11_dlg2[] = { /* 0x816a1b4 * static const struct ScriptCommand s_gs1_g36_s0_lives12_dlg2[] = { /* 0x816a23c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Get it done the next time!\nKeep at it!")), @@ -12350,7 +12350,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives12_dlg2[] = { /* 0x816a23c * static const struct ScriptCommand s_gs1_g36_s0_lives13_dlg2[] = { /* 0x816a2c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" IT'S NOT OVER YET!\nBZBZBZZ!")), @@ -12359,7 +12359,7 @@ static const struct ScriptCommand s_gs1_g36_s0_lives13_dlg2[] = { /* 0x816a2c4 * static const struct ScriptCommand s_gs1_g36_s0_lives14_dlg2[] = { /* 0x816a344 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" THE TIME IS NOW!\nSAVE THE WORLD! BZBZBZZ!")), @@ -12381,7 +12381,7 @@ static const struct ScriptRef s_gs1_g37_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g37_s0_eff0_script[] = { /* 0x816a44c */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000087, 0x00000000, NULL }, + WALK_GRID(153, 135), HALT, }; @@ -12396,7 +12396,7 @@ static const struct ScriptRef s_gs1_g38_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs1_g38_s0_lives0_dlg2[] = { /* 0x816a4d8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 0, /* to label */ 0), @@ -12412,7 +12412,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives0_dlg2[] = { /* 0x816a4d8 */ static const struct ScriptCommand s_gs1_g38_s0_lives1_dlg2[] = { /* 0x816a628 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 1, /* to label */ 0), @@ -12426,7 +12426,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives1_dlg2[] = { /* 0x816a628 */ static const struct ScriptCommand s_gs1_g38_s0_lives2_dlg2[] = { /* 0x816a6d8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 2, /* to label */ 0), @@ -12440,7 +12440,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives2_dlg2[] = { /* 0x816a6d8 */ static const struct ScriptCommand s_gs1_g38_s0_lives3_dlg2[] = { /* 0x816a7b0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 3, /* to label */ 0), @@ -12454,7 +12454,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives3_dlg2[] = { /* 0x816a7b0 */ static const struct ScriptCommand s_gs1_g38_s0_lives4_dlg2[] = { /* 0x816a8a4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 4, /* to label */ 0), @@ -12468,7 +12468,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives4_dlg2[] = { /* 0x816a8a4 */ static const struct ScriptCommand s_gs1_g38_s0_lives5_dlg2[] = { /* 0x816a980 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 5, /* to label */ 0), @@ -12482,7 +12482,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives5_dlg2[] = { /* 0x816a980 */ static const struct ScriptCommand s_gs1_g38_s0_lives6_dlg2[] = { /* 0x816aa80 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You guys were amazing...{WAIT_PRESS}\nTruly, you've impressed me.")), @@ -12491,7 +12491,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives6_dlg2[] = { /* 0x816aa80 */ static const struct ScriptCommand s_gs1_g38_s0_lives7_dlg2[] = { /* 0x816ab1c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You've done it,\n{NAME_0}!\nYou're the greatest! Really!")), @@ -12500,7 +12500,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives7_dlg2[] = { /* 0x816ab1c */ static const struct ScriptCommand s_gs1_g38_s0_lives8_dlg2[] = { /* 0x816abb8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -12511,7 +12511,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives8_dlg2[] = { /* 0x816abb8 */ static const struct ScriptCommand s_gs1_g38_s0_lives9_dlg2[] = { /* 0x816ac98 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" We're here now because\nyou succeeded! You have my thanks!")), @@ -12521,7 +12521,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives9_dlg2[] = { /* 0x816ac98 */ static const struct ScriptCommand s_gs1_g38_s0_lives10_dlg2[] = { /* 0x816ad78 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" THANK YOU, BZBZBZZ!")), @@ -12530,7 +12530,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives10_dlg2[] = { /* 0x816ad78 * static const struct ScriptCommand s_gs1_g38_s0_lives11_dlg2[] = { /* 0x816adf0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" AWESOME! AWESOME!\nBZBZBZZZT!")), @@ -12539,7 +12539,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives11_dlg2[] = { /* 0x816adf0 * static const struct ScriptCommand s_gs1_g38_s0_lives12_dlg2[] = { /* 0x816ae70 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -12551,7 +12551,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives12_dlg2[] = { /* 0x816ae70 * static const struct ScriptCommand s_gs1_g38_s0_lives13_dlg2[] = { /* 0x816af9c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -12565,7 +12565,7 @@ static const struct ScriptCommand s_gs1_g38_s0_lives13_dlg2[] = { /* 0x816af9c * static const struct ScriptCommand s_gs1_g38_s1_station_sref_script[] = { /* 0x816b104 */ DEBUGINFO, SELECT_LIVES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -12573,7 +12573,7 @@ static const struct ScriptRef s_gs1_g38_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g38_s1_lives0_dlg0[] = { /* 0x816b150 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -12583,42 +12583,42 @@ static const struct ScriptCommand s_gs1_g38_s1_lives0_dlg0[] = { /* 0x816b150 */ MSG_NPC(3, _(" Knowing that the square will\nbe safe...{WAIT_PRESS} That made me...{WAIT_PRESS}\nIt left me choked up...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" It isn't just you, my brother.{WAIT_PRESS}\nI am likewise overcome with joy.")), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" B-Brother...{WAIT_PRESS}\nSniffle... My brother...")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" {NAME_0} and\n{NAME_1}...{WAIT_PRESS}\nWe only have gratitude for you.")), MSG_NPC(3, _(" Thank you ever so much!")), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), RET, }; static const struct ScriptCommand s_gs1_g38_s1_lives1_dlg0[] = { /* 0x816b424 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(7), + SELECT_ANIMATION(4), RET, }; static const struct ScriptCommand s_gs1_g38_s1_lives1_dlg2[] = { /* 0x816b4d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 0, /* to label */ 0), @@ -12634,23 +12634,23 @@ static const struct ScriptCommand s_gs1_g38_s1_lives1_dlg2[] = { /* 0x816b4d4 */ static const struct ScriptCommand s_gs1_g38_s1_lives2_dlg0[] = { /* 0x816b620 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(8), WAIT(30), - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), RET, }; static const struct ScriptCommand s_gs1_g38_s1_lives2_dlg2[] = { /* 0x816b6f0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_M02E01A_2N, 1, /* to label */ 0), @@ -12664,7 +12664,7 @@ static const struct ScriptCommand s_gs1_g38_s1_lives2_dlg2[] = { /* 0x816b6f0 */ static const struct ScriptCommand s_gs1_g39_s0_lives0_dlg2[] = { /* 0x816b7a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" Have you made room so\nI may join your rescue team?")), @@ -12683,7 +12683,7 @@ static const struct ScriptCommand s_gs1_g39_s0_lives0_dlg2[] = { /* 0x816b7a0 */ CHOICE(/* label */ 3, _("*Yes.")), CHOICE(/* label */ 4, _("No.")), LABEL(3), /* = 0x03 */ - { 0x3d, 0x00, 0x0000, -0x00000001, 0x00000000, NULL }, + RENAME_ALLY(-1), LABEL(4), /* = 0x04 */ { 0x3b, 0x1f, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, @@ -12715,26 +12715,26 @@ static const struct ScriptCommand s_gs1_g40_s0_lives0_dlg0[] = { /* 0x816bc04 */ static const struct ScriptCommand s_gs1_g40_s0_lives0_dlg2[] = { /* 0x816bc34 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), WAIT(1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(30), MSG_NPC(1, _(" Huh? What's that?{WAIT_PRESS}\n...Oh, you mean what happened at sea?")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000001), MSG_NPC(1, _(" I wasn't drowning!{WAIT_PRESS}\nSheesh, they're making up stories about\nme!")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(30), PORTRAIT_REP(0x0001, 0x00000000), ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Want to know what really\nhappened?")), CHOICE(/* label */ 2, _("Yes.")), CHOICE(/* label */ 3, _("No.")), LABEL(3), /* = 0x03 */ - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_NPC(1, _(" Tch! Fine, then!\nHumph!")), RESET_ARRAY(EVENT_LOCAL), JUMP_SCRIPT(END_TALK), @@ -12753,20 +12753,20 @@ static const struct ScriptCommand s_gs1_g40_s0_lives0_dlg2[] = { /* 0x816bc34 */ MSG_NPC(1, _(" But who'd've guessed it?\nA dungeon in a stormy sea!")), TEXTBOX_CLEAR, WAIT(10), - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(45), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(30), FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Huh?{WAIT_PRESS}\nYou want to know more about that\ndungeon in the sea?")), MSG_NPC(1, _(" I vamoosed it out of there,\nso I can't tell you much...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(60), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(30), MSG_NPC(1, _(" I know!{WAIT_PRESS}\nMaybe Whiscash would know something.")), MSG_NPC(1, _(" Yeah, that'd be best.\nGo talk to Whiscash.")), @@ -12782,27 +12782,27 @@ static const struct ScriptCommand s_gs1_g40_s0_lives0_dlg2[] = { /* 0x816bc34 */ static const struct ScriptCommand s_gs1_g40_s0_lives0_dlg3[] = { /* 0x816c390 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x92, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x92, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, CALL_SCRIPT(NOTICE_FUNC), LABEL(0), /* = 0x00 */ { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(2), WAIT(12), RET, }; @@ -12815,20 +12815,20 @@ static const struct ScriptCommand s_gs1_g41_s0_lives0_dlg0[] = { /* 0x816c510 */ static const struct ScriptCommand s_gs1_g41_s0_lives0_dlg2[] = { /* 0x816c540 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I have heard of a weather\nanomaly afflicting a certain sea.")), MSG_NPC(1, _(" They say a whirlpool\nstretches from sea to sky in a\ncolossal tornado.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" It is said to be near the\n{COLOR GREEN}Legendary Island{RESET} Friend Area.")), MSG_NPC(1, _(" It hasn't caused any damage\nso far as I know...{WAIT_PRESS}\nBut it does concern me.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_NPC(1, _(" The {COLOR GREEN}Legendary Island{RESET}\nbelongs to your team.")), ASK3( TRUE, /*default*/ -1, /* speaker */ 1, _(" Will you travel to the\n{COLOR GREEN}Legendary Island{RESET} and observe what is\ntaking place?")), CHOICE(/* label */ 2, _("Yes.")), @@ -12856,20 +12856,20 @@ static const struct ScriptCommand s_gs1_g41_s0_lives0_dlg3[] = { /* 0x816c958 */ { 0x52, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, { 0x8d, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(2), WAIT(12), RET, }; static const struct ScriptCommand s_gs1_g42_s0_lives0_dlg2[] = { /* 0x816ca38 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004d, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), @@ -12887,7 +12887,7 @@ static const struct ScriptCommand s_gs1_g42_s0_lives1_dlg0[] = { /* 0x816cb70 */ static const struct ScriptCommand s_gs1_g42_s0_lives1_dlg2[] = { /* 0x816cba0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x0000004f, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), @@ -12898,7 +12898,7 @@ static const struct ScriptCommand s_gs1_g42_s0_lives1_dlg2[] = { /* 0x816cba0 */ static const struct ScriptCommand s_gs1_g42_s0_lives2_dlg2[] = { /* 0x816cc54 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12907,7 +12907,7 @@ static const struct ScriptCommand s_gs1_g42_s0_lives2_dlg2[] = { /* 0x816cc54 */ static const struct ScriptCommand s_gs1_g42_s0_lives3_dlg2[] = { /* 0x816ccb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12916,7 +12916,7 @@ static const struct ScriptCommand s_gs1_g42_s0_lives3_dlg2[] = { /* 0x816ccb4 */ static const struct ScriptCommand s_gs1_g42_s0_lives4_dlg2[] = { /* 0x816cd14 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12925,7 +12925,7 @@ static const struct ScriptCommand s_gs1_g42_s0_lives4_dlg2[] = { /* 0x816cd14 */ static const struct ScriptCommand s_gs1_g42_s0_lives5_dlg2[] = { /* 0x816cd74 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x19, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12934,7 +12934,7 @@ static const struct ScriptCommand s_gs1_g42_s0_lives5_dlg2[] = { /* 0x816cd74 */ static const struct ScriptCommand s_gs1_g42_s0_lives6_dlg2[] = { /* 0x816cdd4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x13, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12952,7 +12952,7 @@ static const struct ScriptRef s_gs1_g42_s0_evt0_sref = { 57, 7, NULL /* NORMAL_E static const struct ScriptCommand s_gs1_g43_s0_station_sref_script[] = { /* 0x816ce70 */ DEBUGINFO, SELECT_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), WAIT(10), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -12965,55 +12965,55 @@ static const struct ScriptRef s_gs1_g43_s0_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g43_s0_eff0_script[] = { /* 0x816cefc */ DEBUGINFO, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, -0x00000100, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_RELATIVE(512, -256, 0), HALT, }; static const struct ScriptCommand s_gs1_g43_s0_lives0_dlg0[] = { /* 0x816cf4c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT_FLIP, 0x0003, 0x00000000), MSG_NPC(3, _(" Oh?")), MSG_NPC(3, _(" Who is that? Over there.")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Never seen it before.{WAIT_PRESS}\nIt's not from around these parts.")), TEXTBOX_CLEAR, BGM_FADEOUT(120), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), WAIT(20), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(9), + AWAIT_CUE(5), { 0x58, 0x01, 0x0000, 0x000001c0, 0x00000138, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), MSG_NPC(-1, _(" No more...{WAIT_PRESS}\nI can't walk anymore...")), MSG_NPC(-1, _(" I'm falling down...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" Goodness!{WAIT_PRESS}\nIt needs help!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x01cc, -0x000000a0, 0x00000000, NULL }, + ALERT_CUE(3), + ALERT_CUE(8), + ALERT_CUE(7), + ALERT_CUE(6), + WALK_RELATIVE(460, -160, 0), HALT, }; @@ -13023,95 +13023,95 @@ static const struct ScriptCommand s_gs1_g43_s0_lives0_dlg0[] = { /* 0x816cf4c */ static const struct ScriptCommand s_gs1_g43_s0_lives1_dlg0[] = { /* 0x816d2cc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(6), { 0x58, 0x01, 0x0000, 0x000001d0, 0x00000150, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x01cc, -0x000000c8, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_RELATIVE(460, -200, 0), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs1_g43_s0_lives2_dlg0[] = { /* 0x816d39c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_WEST), WAIT(10), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x58, 0x01, 0x0000, 0x000001f0, 0x00000138, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x01cc, -0x000000c8, 0x00000000, NULL }, + AWAIT_CUE(7), + WALK_RELATIVE(460, -200, 0), HALT, }; static const struct ScriptCommand s_gs1_g43_s0_lives3_dlg0[] = { /* 0x816d48c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x58, 0x01, 0x0000, 0x000001f0, 0x00000150, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x01cc, -0x000000c8, 0x00000000, NULL }, + AWAIT_CUE(8), + WALK_RELATIVE(460, -200, 0), HALT, }; static const struct ScriptCommand s_gs1_g43_s0_lives4_dlg0[] = { /* 0x816d56c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), WAIT(20), - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000008, -0x00000008, NULL }, + SELECT_ANIMATION(5), + WALK_RELATIVE(256, 8, -8), WAIT(60), - { 0x6a, 0x00, 0x0100, 0x00000008, 0x00000008, NULL }, + WALK_RELATIVE(256, 8, 8), WAIT(60), - { 0x6a, 0x00, 0x0100, 0x00000008, -0x00000008, NULL }, + WALK_RELATIVE(256, 8, -8), FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), WAIT(45), - { 0x6a, 0x00, 0x0100, 0x00000008, 0x00000008, NULL }, + WALK_RELATIVE(256, 8, 8), FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), WAIT(45), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), FANFARE_PLAY2(809), { 0x54, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x01, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 10, DIRECTION_SOUTH), WAIT(10), { 0xe2, 0x00, 0x0329, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(510), WAIT(60), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs1_g44_s0_lives0_dlg2[] = { /* 0x816d78c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000073, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), @@ -13130,7 +13130,7 @@ static const struct ScriptCommand s_gs1_g45_s0_lives0_dlg2[] = { /* 0x816d8b4 */ static const struct ScriptCommand s_gs1_g45_s1_station_sref_script[] = { /* 0x816d8e4 */ DEBUGINFO, SELECT_ENTITIES(-1, -1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SCENARIO_CALC(SCENARIO_SUB4, 43, 2), RET, }; @@ -13139,17 +13139,17 @@ static const struct ScriptRef s_gs1_g45_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Wh-wh-wh-what?!")), MSG_NPC(2, _(" You've seen the mirage\nPokémon?!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Wh-wh-what sort of a\nPokémon was it?!")), TEXTBOX_CLEAR, WAIT(10), @@ -13161,22 +13161,22 @@ static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ COND_EQUAL(0, /* to label */ 1), COND_EQUAL(1, /* to label */ 1), MSG_NPC(2, _(" ...Wait!{WAIT_PRESS} Huh?!{WAIT_PRESS}\nYou are!{WAIT_PRESS} You are the one-and-only Ho-Oh?!")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), LABEL(1), /* = 0x01 */ TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(7), + AWAIT_CUE(5), { 0x3b, 0x23, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(2, /* to label */ 2), MSG_NPC(2, _(" Wroooooooah!")), MSG_NPC(2, _(" I...{WAIT_PRESS} You...{WAIT_PRESS}\nYou've made me open my eyes!")), MSG_NPC(2, _(" Well, they still look googly,\nbut still...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" The lesson is: we mustn't\never give up!")), MSG_NPC(2, _(" Because if you give up,\nthat's when it ends!")), MSG_NPC(2, _(" Thank you!{WAIT_PRESS}\nYou have inspired me to resume my\ntravels!")), @@ -13184,18 +13184,18 @@ static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ TEXTBOX_CLEAR, JUMP_LABEL(3), LABEL(2), /* = 0x02 */ - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Waaaaaaaaaaaah!")), MSG_NPC(2, _(" My head...{WAIT_PRESS} Is spinning...{WAIT_PRESS}\nMy head's spinning...{WAIT_PRESS} Waaaaaah!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(30), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(90), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, MSG_NPC(2, _(" I'm so sorry I keeled over\nlike that...")), MSG_NPC(2, _(" And you even came to my\naid when I was down...{WAIT_PRESS}\nThank you...")), @@ -13209,17 +13209,17 @@ static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ MSG_NPC(2, _(" I will keep the memory...{WAIT_PRESS}\nin a special place deep in my heart!{WAIT_PRESS}\nFarewell!")), TEXTBOX_CLEAR, LABEL(3), /* = 0x03 */ - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), { 0x52, 0x00, 0x0000, 0x00000004, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000020, 0x00000000, NULL }, + WALK_RELATIVE(256, -32, 0), { 0x8e, 0x0f, 0x000a, 0x00000073, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(5), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -13227,93 +13227,93 @@ static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ static const struct ScriptCommand s_gs1_g45_s1_lives1_dlg0[] = { /* 0x816e32c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(4), WAIT(60), { 0x54, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x3b, 0x23, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), COND_EQUAL(1, /* to label */ 0), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(20), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), LABEL(0), /* = 0x00 */ - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), WAIT(60), { 0x54, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(762), - { 0x54, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(17), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe2, 0x00, 0x02fa, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(510), WAIT(60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x3b, 0x23, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(2, /* to label */ 1), - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), WAIT(80), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), JUMP_LABEL(2), LABEL(1), /* = 0x01 */ FANFARE_PLAY2(473), CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0xe2, 0x00, 0x01d9, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(4), WAIT(80), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(510), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), LABEL(2), /* = 0x02 */ - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(20), - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(30), - { 0x6a, 0x00, 0x0100, 0x00000008, 0x00000010, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 8, 16), + ALERT_CUE(5), WAIT(60), - { 0x6a, 0x00, 0x0100, -0x00000008, 0x00000010, NULL }, + WALK_RELATIVE(256, -8, 16), WAIT(60), - { 0x6a, 0x00, 0x0100, 0x00000008, 0x00000010, NULL }, + WALK_RELATIVE(256, 8, 16), WAIT(60), - { 0x6a, 0x00, 0x0100, -0x00000008, 0x00000010, NULL }, + WALK_RELATIVE(256, -8, 16), WAIT(60), - { 0x6a, 0x00, 0x0100, 0x00000008, 0x00000010, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 8, 16), + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), WAIT(30), - { 0x6a, 0x00, 0x0100, -0x00000008, 0x00000010, NULL }, + WALK_RELATIVE(256, -8, 16), WAIT(60), - { 0x6a, 0x00, 0x0100, 0x00000008, 0x00000010, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 8, 16), + ROTATE(4, 10, DIRECTION_SOUTH), WAIT(30), - { 0x6a, 0x00, 0x0100, -0x00000008, 0x00000010, NULL }, + WALK_RELATIVE(256, -8, 16), WAIT(30), - { 0x6a, 0x00, 0x0100, 0x00000008, 0x00000010, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 8, 16), + ALERT_CUE(5), END_DELETE, }; @@ -13328,7 +13328,7 @@ static const struct ScriptCommand s_gs1_g46_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(7), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -13337,16 +13337,16 @@ static const struct ScriptRef s_gs1_g46_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g46_s0_eff0_script[] = { /* 0x816e988 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000020, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), + WALK_RELATIVE(256, -32, 0), + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -13354,91 +13354,91 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0005, 0x00000001), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" ...I've always wondered...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), WAIT(15), MSG_NPC(3, _(" Who would be the most\npowerful Pokémon of all?")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" What, there's someone\nbesides Rayquaza?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(4, _(" Is that it?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(2, _(" Well, sheesh, Rayquaza\ndestroyed a star!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), MSG_NPC(5, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(10), + AWAIT_CUE(5), WAIT(10), MSG_NPC(2, _(" Who else but Rayquaza\nwould be able to do that?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), MSG_NPC(5, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(10), + AWAIT_CUE(5), WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" But there's Groudon.\nIsn't that tough?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(4, _(" Is that true?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(3, _(" Why, even Alakazam's team\ncouldn't defeat it!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), MSG_NPC(5, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(10), + AWAIT_CUE(5), WAIT(10), MSG_NPC(3, _(" Legend has it that Groudon\nshaped continents.\nIt's an incredible Pokémon!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), MSG_NPC(5, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(10), + AWAIT_CUE(5), TEXTBOX_CLEAR, WAIT(30), - { 0x6b, 0x00, 0x0100, 0x00000089, 0x00000000, NULL }, + WALK_GRID(256, 137), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(2, _(" Hey, you came along at\nthe right time.")), MSG_NPC(2, _(" We're having a little\nargument about who the most powerful\nPokémon happens to be.")), MSG_NPC(2, _(" {NAME_0}, what do you\nthink?")), @@ -13452,15 +13452,15 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(2, _(" Oh, yeah?\n{NAME_0}, you think so too?")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000002), MSG_NPC(2, _(" Yeah, you bet it is!{WAIT_PRESS}\nRayquaza is the toughest!")), TEXTBOX_CLEAR, @@ -13470,15 +13470,15 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 2), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(3, _(" Ah, yes!\n{NAME_0}! Isn't that right!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Groudon is the most\npowerful when all's said and done!")), TEXTBOX_CLEAR, JUMP_LABEL(8), @@ -13487,11 +13487,11 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 3), FANFARE_PLAY2(470), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000001), PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0004, 0x00000000), PORTRAIT(PLACEMENT_TOP_LEFT_FLIP, 0x0005, 0x00000000), @@ -13514,14 +13514,14 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0005, 0x00000001), WAIT(60), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), WAIT(30), MSG_NPC(4, _(" ...Um...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(10), { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, WAIT(60), MSG_NPC(4, _(" I heard this story...")), @@ -13536,16 +13536,16 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ MSG_NPC(4, _(" All it can think of is\ndefeating anything it meets.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), PORTRAIT_REP(0x0003, 0x00000001), MSG_NPC(3, _(" Th-that's rather a savage\nPokémon! I shudder to think...")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(3, _(" Where might such a horrid\nPokémon be now?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), MSG_NPC(4, _(" Rumors say...{WAIT_PRESS}\nit is storing its power...")), MSG_NPC(4, _(" They say it is sleeping in\na dungeon somewhere...")), TEXTBOX_CLEAR, @@ -13553,27 +13553,27 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ WAIT(30), MSG_NPC(-1, _(" That rumor...{WAIT_PRESS}\nIt's true...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), BGM_SWITCH(9), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + ALERT_CUE(12), WAIT(120), { 0x62, 0x00, 0x0080, 0x00000010, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(2, _(" {NAME_6}...{WAIT_PRESS}\nAnd {NAME_7}...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(3, _(" Oh my gosh!\nWhat happened to you?!")), TEXTBOX_CLEAR, WAIT(10), @@ -13587,10 +13587,10 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), MSG_NPC(2, _(" Wh-what did you say?!")), @@ -13601,47 +13601,47 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ MSG_NPC(6, _(" ...It really was the most\npowerful...{WAIT_PRESS}\n...Gfah!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, MSG_NPC(2, _(" Ch-{NAME_6}!\nAre you OK?!")), TEXTBOX_CLEAR, WAIT(10), WAIT(60), MSG_NPC(7, _(" There is a cave...\nfar in the west...{WAIT_PRESS}\nIt's there...")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, MSG_NPC(7, _(" I never want...{WAIT_PRESS}\nto go back again...{WAIT_PRESS} Gfwoh!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(12), + AWAIT_CUE(5), FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, MSG_NPC(3, _(" Oh, my gosh!\nBlastoise went down, too!{WAIT_PRESS}\nThey need help now!")), MSG_NPC(3, _(" I'll go get someone!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(60), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), PORTRAIT(PLACEMENT_TOP_RIGHT_FLIP, 0x0005, 0x00000000), MSG_NPC(2, _(" ...Wow, it really exists...{WAIT_PRESS}\nA Pokémon that tough...")), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, MSG_NPC(2, _(" ...But, you know?{WAIT_PRESS}\nSo we now know that Pokémon is in the\n{COLOR YELLOW_D}Western Cave{RESET}...")), MSG_NPC(2, _(" I still don't feel like going\nout there...")), @@ -13651,16 +13651,16 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ MSG_NPC(4, _(" I'm scared too...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(10), PORTRAIT_REP(0x0005, 0x00000001), MSG_NPC(5, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), + ALERT_CUE(10), + AWAIT_CUE(5), WAIT(30), MSG_INSTANT(_("{CENTER_ALIGN}The cave shunned\n{CENTER_ALIGN}by all out of fear...")), BGM_STOP, @@ -13672,8 +13672,8 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), + AWAIT_CUE(5), RET, }; @@ -13701,37 +13701,37 @@ static const struct ScriptCommand s_gs1_g46_s0_lives1_dlg0[] = { /* 0x817094c */ DEBUGINFO, END_DELETE, RET, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs1_g46_s0_lives2_dlg0[] = { /* 0x81709ac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), COND_EQUAL(2, /* to label */ 1), COND_EQUAL(3, /* to label */ 2), LABEL(0), /* = 0x00 */ CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -13743,49 +13743,49 @@ static const struct ScriptCommand s_gs1_g46_s0_lives2_dlg0[] = { /* 0x81709ac */ JUMP_LABEL(3), LABEL(2), /* = 0x02 */ CALL_SCRIPT(SWEAT_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), LABEL(3), /* = 0x03 */ - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000008a, 0x00000000, NULL }, + AWAIT_CUE(7), + WALK_GRID(256, 138), { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTHEAST), + ALERT_CUE(5), + AWAIT_CUE(7), RET, }; static const struct ScriptCommand s_gs1_g46_s0_lives3_dlg0[] = { /* 0x8170d6c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), COND_EQUAL(2, /* to label */ 1), @@ -13796,8 +13796,8 @@ static const struct ScriptCommand s_gs1_g46_s0_lives3_dlg0[] = { /* 0x8170d6c */ JUMP_LABEL(3), LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -13806,50 +13806,50 @@ static const struct ScriptCommand s_gs1_g46_s0_lives3_dlg0[] = { /* 0x8170d6c */ LABEL(2), /* = 0x02 */ CALL_SCRIPT(SWEAT_FUNC), LABEL(3), /* = 0x03 */ - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + SELECT_ANIMATION(9), WAIT(60), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000008b, 0x00000000, NULL }, + AWAIT_CUE(8), + WALK_GRID(256, 139), { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0300, 0x0000008c, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0300, 0x0000008d, 0x00000000, NULL }, + AWAIT_CUE(8), + WALK_GRID(768, 140), + WALK_GRID(768, 141), END_DELETE, }; static const struct ScriptCommand s_gs1_g46_s0_lives4_dlg0[] = { /* 0x817113c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, WAIT(30), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), COND_EQUAL(2, /* to label */ 1), @@ -13861,74 +13861,74 @@ static const struct ScriptCommand s_gs1_g46_s0_lives4_dlg0[] = { /* 0x817113c */ LABEL(2), /* = 0x02 */ CALL_SCRIPT(SWEAT_FUNC), LABEL(3), /* = 0x03 */ - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), RET, }; static const struct ScriptCommand s_gs1_g46_s0_lives5_dlg0[] = { /* 0x817145c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(10), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(10), { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(10), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(10), { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, WAIT(30), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), COND_EQUAL(2, /* to label */ 1), @@ -13940,79 +13940,79 @@ static const struct ScriptCommand s_gs1_g46_s0_lives5_dlg0[] = { /* 0x817145c */ LABEL(2), /* = 0x02 */ CALL_SCRIPT(SWEAT_FUNC), LABEL(3), /* = 0x03 */ - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(10), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(10), RET, }; static const struct ScriptCommand s_gs1_g46_s0_lives6_dlg0[] = { /* 0x817197c */ DEBUGINFO, - { 0x54, 0x00, 0x0020, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(32), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), { 0x6c, 0x78, 0x004c, 0x0000008e, 0x00000000, NULL }, WAIT_RANDOM(30, 60), { 0x6c, 0x78, 0x004c, 0x0000008e, 0x00000000, NULL }, WAIT_RANDOM(30, 60), - { 0x6b, 0x00, 0x004c, 0x0000008e, 0x00000000, NULL }, + WALK_GRID(76, 142), { 0x54, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + SELECT_ANIMATION(25), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, WAIT(25), FANFARE_PLAY2(400), { 0xe2, 0x00, 0x0190, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), HALT, }; static const struct ScriptCommand s_gs1_g46_s0_lives7_dlg0[] = { /* 0x8171aac */ DEBUGINFO, - { 0x54, 0x00, 0x0021, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(33), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x6c, 0xb4, 0x004c, 0x0000008f, 0x00000000, NULL }, WAIT_RANDOM(30, 60), { 0x6c, 0x78, 0x004c, 0x0000008f, 0x00000000, NULL }, WAIT_RANDOM(30, 60), - { 0x6b, 0x00, 0x004c, 0x0000008f, 0x00000000, NULL }, + WALK_GRID(76, 143), { 0x54, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(12), { 0x54, 0x00, 0x001a, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, WAIT(20), FANFARE_PLAY2(400), { 0xe2, 0x00, 0x0190, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(12), HALT, }; @@ -14027,7 +14027,7 @@ static const struct ScriptCommand s_gs1_g47_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(7), { 0x22, 0x00, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -14038,137 +14038,137 @@ static const struct ScriptRef s_gs1_g47_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g47_s0_eff0_script[] = { /* 0x8171ce8 */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), RET, }; static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000050, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, 80, 0), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nEveryone's gathered around.")), VARIANT_DEFAULT(_(" Look, {NAME_0}.\nEveryone's gathered around.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000001), MSG_NPC(2, _(" Aiyiyi...\nI do not deserve this! I am outraged!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000091, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + WALK_GRID(256, 145), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" What's up, folks?")), VARIANT_DEFAULT(_(" What's up, everyone?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_RIGHT, 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!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), FANFARE_PLAY2(465), { 0x56, 0x00, 0x0000, 0x00000146, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, MSG_NPC(2, _(" Many, many TMs are simply\ngone! Spirited away!\nDark clouds fill my heart!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" My bank wasn't hit, but...{WAIT_PRESS}\nThese are frightening times.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_NPC(1, _(" Is the storage OK?")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTHEAST), + ALERT_CUE(10), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0005, 0x00000000), MSG_NPC(5, _(" No problem.{WAIT_PRESS}\nNothing gets stolen from under my eye.")), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0005, 0x00000001), MSG_NPC(5, _(" This mama's not about to\nmake a stupid mistake like that! Kakakah!")), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000001), MSG_NPC(2, _(" You're insinuating...{WAIT_PRESS}\nthat we were robbed for being careless?!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + ROTATE(4, 1, DIRECTION_EAST), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0006, 0x00000000), MSG_NPC(6, _(" Now wait.")), WAIT(10), MSG_NPC(6, _(" Tell me, Kecleon.{WAIT_PRESS}\nYou saw...this thief?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 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, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), MSG_NPC(6, _(" Taken off?{WAIT_PRESS}\nYou mean it flew away?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(2, _(" Yes.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" It flew off in yonder\ndirection, yes.")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), MSG_NPC(2, _(" At tremendous speed\ntoo.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), MSG_NPC(6, _(" The yonder direction...{WAIT_PRESS}\nThat would be the Northern Range...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), MSG_NPC(6, _(" It's impossible to determine\nwhat the thief is...")), MSG_NPC(6, _(" So we'll need to investigate\nthis matter properly.")), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT(PLACEMENT_TOP_LEFT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Yes. I beg for justice.{WAIT_PRESS}\nMy business faces ruination.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTH), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}.\nWant to go check it out?")), VARIANT_DEFAULT(_(" {NAME_0}.\nWant to look into this?")), @@ -14181,7 +14181,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR YELLOW_D}Northern Range{RESET}\n{CENTER_ALIGN}is now open for investigation!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -14202,136 +14202,136 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ static const struct ScriptCommand s_gs1_g47_s0_lives1_dlg0[] = { /* 0x8172b68 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000050, 0x00000000, NULL }, + WALK_RELATIVE(256, 80, 0), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, WAIT(20), { 0x8e, 0x01, 0x0000, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000090, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_EAST), + AWAIT_CUE(6), + WALK_GRID(256, 144), FANFARE_PLAY2(468), CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x00000146, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x01, 0x000a, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(1, 10, DIRECTION_NORTH), HALT, }; static const struct ScriptCommand s_gs1_g47_s0_lives2_dlg0[] = { /* 0x8172d68 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_NORTH), HALT, }; static const struct ScriptCommand s_gs1_g47_s0_lives3_dlg0[] = { /* 0x8172de8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), + AWAIT_CUE(7), CALL_SCRIPT(ANGRY_START_FUNC), WAIT(60), - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_SOUTH), WAIT(60), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, -0x00000010, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(2), + WALK_RELATIVE(512, -16, 0), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_NORTH), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_EAST), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_NORTHWEST), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_EAST), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_WEST), HALT, }; static const struct ScriptCommand s_gs1_g47_s0_lives4_dlg0[] = { /* 0x8173008 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(4, 2, DIRECTION_NORTH), + AWAIT_CUE(9), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(9), + ROTATE(4, 1, DIRECTION_NORTH), HALT, }; static const struct ScriptCommand s_gs1_g47_s0_lives5_dlg0[] = { /* 0x81730a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x03, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(3, 1, DIRECTION_SOUTH), + AWAIT_CUE(10), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(10), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 2, DIRECTION_SOUTH), HALT, }; static const struct ScriptCommand s_gs1_g47_s0_lives6_dlg0[] = { /* 0x8173188 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, -0x00000008, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000008, 0x00000018, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + WALK_RELATIVE(256, -8, 24), + ALERT_CUE(5), + ROTATE(4, 1, DIRECTION_WEST), + AWAIT_CUE(11), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(11), + ROTATE(4, 1, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(11), + ROTATE(4, 2, DIRECTION_WEST), HALT, }; @@ -14341,7 +14341,7 @@ static const struct ScriptCommand s_gs1_g48_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), BGM_SWITCH(7), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), BGM_FADEOUT(60), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -14358,17 +14358,17 @@ static const struct ScriptCommand s_gs1_g48_s0_eff0_script[] = { /* 0x8173364 */ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(1, _(" Look! He's waking up!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0005, 0x00000000), PORTRAIT_POS(5, -1, 0), MSG_NPC(5, _(" ...Wh-where...?")), @@ -14381,90 +14381,90 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ VARIANT_DEFAULT(_(" You fainted in the {COLOR YELLOW_D}Northern\nRange{RESET}, so we brought you back here.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 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.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(5, _(" ...!{WAIT_PRESS} That's right!\nI have to get my sister...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, MSG_NPC(5, _(" Ggh! This wound!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), MSG_NPC(4, _(" You're injured.\nYou can't fly for now.")), MSG_NPC(4, _(" Tell me, how do you justify\nwhat you've done?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), BGM_SWITCH(114), WAIT(60), MSG_NPC(5, _(" I have a younger sister.\nHer name is Latias.")), MSG_NPC(5, _(" Latias...{WAIT_PRESS}\nCrashed somewhere in the {COLOR YELLOW_D}Pitfall Valley{RESET}...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT_REP(0x0004, 0x00000000), MSG_NPC(4, _(" What?!{WAIT_PRESS}\nThe {COLOR YELLOW_D}Pitfall Valley{RESET}?!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 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), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT(PLACEMENT_RIGHT, 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, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(6), MSG_NPC(5, _(" Latias and I were flying\nover the Northern Range.")), MSG_NPC(5, _(" When suddenly, what\nappeared to be a meteorite struck\nLatias on the wing...")), MSG_NPC(5, _(" Her wing shattered by the\nblow, Latias tumbled down into the\ndepths of the {COLOR YELLOW_D}Pitfall Valley{RESET}...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" A meteorite?!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHEAST), MSG_NPC(1, _(" {NAME_0}!{WAIT_PRESS}\nDo you think maybe that it's a chunk of\nthe blown-up meteor?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), MSG_NPC(5, _(" I went to the {COLOR YELLOW_D}Pitfall Valley{RESET}\nin hopes of rescuing my sister, but...")), MSG_NPC(5, _(" I made little headway...\nI wasn't up to the task...")), TEXTBOX_CLEAR, @@ -14476,33 +14476,33 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ MSG_NPC(5, _(" Yes.{WAIT_PRESS}\nI intended to make amends after I saved\nmy sister...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), MSG_NPC(5, _(" But that doesn't mean I can\nget away with thievery.{WAIT_PRESS}\nIt was wrong, and I'm sorry.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), WAIT(60), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTHEAST), + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Oh... Oh, my!{WAIT_PRESS}\nIt is not a problem! Not a problem at all!")), MSG_NPC(2, _(" For a reason so compelling,\nit can't be helped. Hahaha.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(6), + ALERT_CUE(8), + ROTATE(4, 2, DIRECTION_NORTHEAST), + AWAIT_CUE(5), MSG_NPC(4, _(" However...{WAIT_PRESS}\nEven if you were to plumb the depths of\n{COLOR YELLOW_D}Pitfall Valley{RESET}...")), MSG_NPC(4, _(" What would you do then?")), MSG_NPC(4, _(" The nether regions of the\n{COLOR YELLOW_D}Pitfall Valley{RESET} are a void...")), MSG_NPC(4, _(" You will wander forever,\nneither falling...{WAIT_PRESS}nor living...{WAIT_PRESS}\nWhat then?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), PORTRAIT_REP(0x0005, 0x00000000), MSG_NPC(5, _(" ............{WAIT_PRESS}\nSo much time has passed since my sister\ncrashed.")), MSG_NPC(5, _(" Latias hasn't been able to\nclimb out of the depths.\nShe is all alone down there.")), @@ -14524,18 +14524,18 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ MSG_NPC(4, _(" No...{WAIT_PRESS} There is...{WAIT_PRESS}\nThere is but one possible way...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + ALERT_CUE(7), + ALERT_CUE(6), + ALERT_CUE(8), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_EAST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" You can?!{WAIT_PRESS}\nHow?!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), MSG_NPC(4, _(" You already have the means\nin your possession.")), MSG_NPC(4, _(" The {COLOR GREEN_I}Teleport Gem{RESET}.{WAIT_PRESS}\nUse that.")), TEXTBOX_CLEAR, @@ -14553,8 +14553,8 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ MSG_NPC(1, _(" That's it!{WAIT_PRESS}\nIf we did that, we could escape with\nLatias!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!{WAIT_PRESS}\nThis is a rescue that only we can do!")), @@ -14570,7 +14570,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Pitfall Valley{RESET}!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -14604,143 +14604,143 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ static const struct ScriptCommand s_gs1_g48_s0_lives1_dlg0[] = { /* 0x8174e1c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHEAST), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHEAST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHEAST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), HALT, }; static const struct ScriptCommand s_gs1_g48_s0_lives2_dlg0[] = { /* 0x817500c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_NORTHWEST), + AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), HALT, }; static const struct ScriptCommand s_gs1_g48_s0_lives3_dlg0[] = { /* 0x81750cc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(ANGRY_START_FUNC), WAIT(1), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), WAIT(10), - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, + WALK_RELATIVE(256, 0, -8), CALL_SCRIPT(ANGRY_END_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(7), WAIT(30), FANFARE_PLAY2(468), - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTHWEST), WAIT(20), FANFARE_PLAY2(468), - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTHEAST), WAIT(30), - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), FANFARE_PLAY2(457), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(SHOCK_FUNC), HALT, }; static const struct ScriptCommand s_gs1_g48_s0_lives4_dlg0[] = { /* 0x817534c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x62, 0x00, 0x0500, -0x00000008, 0x00000000, NULL }, { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0200, -0x00000028, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), + WALK_RELATIVE(512, -40, 0), + ROTATE(4, 2, DIRECTION_SOUTH), + AWAIT_CUE(9), + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000018, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000018, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), + WALK_RELATIVE(256, 24, 0), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(9), + WALK_RELATIVE(256, -24, 0), + ROTATE(4, 1, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(4, 2, DIRECTION_SOUTHWEST), HALT, }; static const struct ScriptCommand s_gs1_g48_s0_lives5_dlg0[] = { /* 0x81754ac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), + AWAIT_CUE(10), + SELECT_ANIMATION(4), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), { 0x54, 0x00, 0x001b, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), BGM_STOP, FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), FANFARE_PLAY2(475), { 0x54, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe2, 0x00, 0x01db, 0x00000000, 0x00000000, NULL }, @@ -14748,20 +14748,20 @@ static const struct ScriptCommand s_gs1_g48_s0_lives5_dlg0[] = { /* 0x81754ac */ WAIT(40), FANFARE_PLAY2(682), { 0xe2, 0x00, 0x02aa, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + SELECT_ANIMATION(25), + AWAIT_CUE(10), { 0x54, 0x00, 0x001b, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x54, 0x00, 0x001d, 0x00000000, 0x00000000, NULL }, WAIT(30), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0019, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), + SELECT_ANIMATION(25), + AWAIT_CUE(10), { 0x54, 0x00, 0x001d, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), CALL_SCRIPT(SHOCK_FUNC), HALT, }; @@ -14771,7 +14771,7 @@ static const struct ScriptCommand s_gs1_g49_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(1), SELECT_ENTITIES(-1, 0), { 0x27, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(30), RET, @@ -14781,26 +14781,26 @@ static const struct ScriptRef s_gs1_g49_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(7), WAIT(30), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000000), MSG_NPC(5, _(" {NAME_6}!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0006, 0x00000000), MSG_NPC(6, _(" Latios!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000001), MSG_NPC(5, _(" You're safe!\nThis is incredible...")), TEXTBOX_CLEAR, @@ -14809,19 +14809,19 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ MSG_NPC(6, _(" I'm sorry...\nI caused you so much worry...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), MSG_NPC(2, _(" Oh, this is great...\nIt's so touching... Sniffle...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(8), + ALERT_CUE(7), + AWAIT_CUE(5), + ROTATE(4, 1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_RIGHT, 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...")), @@ -14830,7 +14830,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ MSG_NPC(5, _(" We owe you so much\ngratitude! Thank you!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(10), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -14843,28 +14843,28 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ MSG_NPC(5, _(" So, and it's the least we\ncan do...{WAIT_PRESS}\nMay we join your rescue team?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" Huh...?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_EAST), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTHEAST), + AWAIT_CUE(5), MSG_NPC(5, _(" Would that work?{WAIT_PRESS}\nWould you be willing to accept us on\nyour rescue team?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 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?")), @@ -14878,11 +14878,11 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" Huh?\nYou're really sure about that?!")), TEXTBOX_CLEAR, @@ -14897,34 +14897,34 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(455), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(60), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" It is you who decides.\nThe outcome is of no concern to me.")), MSG_NPC(4, _(" However...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ROTATE(4, 2, DIRECTION_NORTHEAST), MSG_NPC(4, _(" Latios and Latias are\nPokémon so rarely seen that they are\nconsidered mythical.")), MSG_NPC(4, _(" If you part ways with them\nnow, you may never see them again.")), MSG_NPC(4, _(" Strike that.\nYou will never again see them.")), MSG_NPC(4, _(" Even knowing that...{WAIT_PRESS}\nEven if you would never see them again,\nyou will still not accept them?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTH), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, think good\nand hard about this.")), @@ -14941,19 +14941,19 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ TEXTBOX_CLEAR, WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_EAST), + ALERT_CUE(10), + ALERT_CUE(11), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + AWAIT_CUE(5), + ALERT_CUE(10), + ALERT_CUE(11), + AWAIT_CUE(5), + ALERT_CUE(7), + ALERT_CUE(8), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Done deal!")), @@ -14962,16 +14962,16 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ VARIANT_DEFAULT(_(" You're our fellow members\nfrom now on. Great to have you!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + ALERT_CUE(10), + ALERT_CUE(11), + ROTATE(4, 1, DIRECTION_SOUTHEAST), PORTRAIT_REP(0x0005, 0x00000001), MSG_NPC(5, _(" Thanks for having us!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_EAST), + AWAIT_CUE(5), PORTRAIT_REP(0x0006, 0x00000001), MSG_NPC(6, _(" Delighted to join!")), TEXTBOX_CLEAR, @@ -14988,7 +14988,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ CHOICE(/* label */ 17, _("*Yes.")), CHOICE(/* label */ 18, _("No.")), LABEL(17), /* = 0x11 */ - { 0x3d, 0x00, 0x0000, -0x00000001, 0x00000000, NULL }, + RENAME_ALLY(-1), LABEL(18), /* = 0x12 */ { 0x3b, 0x25, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, @@ -14997,12 +14997,12 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ CHOICE(/* label */ 19, _("*Yes.")), CHOICE(/* label */ 20, _("No.")), LABEL(19), /* = 0x13 */ - { 0x3d, 0x00, 0x0000, -0x00000001, 0x00000000, NULL }, + RENAME_ALLY(-1), LABEL(20), /* = 0x14 */ { 0x3b, 0x27, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -15022,243 +15022,243 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ static const struct ScriptCommand s_gs1_g49_s0_lives1_dlg0[] = { /* 0x8176dcc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTHEAST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_EAST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHEAST), + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs1_g49_s0_lives2_dlg0[] = { /* 0x817708c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(9), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(7), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(7), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(2), + ROTATE(4, 1, DIRECTION_SOUTHWEST), HALT, }; static const struct ScriptCommand s_gs1_g49_s0_lives3_dlg0[] = { /* 0x817725c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_SOUTHEAST), + AWAIT_CUE(8), + ROTATE(4, 1, DIRECTION_SOUTHWEST), + AWAIT_CUE(8), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(8), + SELECT_ANIMATION(2), + ROTATE(4, 1, DIRECTION_SOUTHWEST), HALT, }; static const struct ScriptCommand s_gs1_g49_s0_lives4_dlg0[] = { /* 0x817742c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x62, 0x00, 0x0500, -0x00000008, 0x00000000, NULL }, { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(9), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), - { 0x6a, 0x00, 0x0100, -0x00000010, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, -16, 0), + AWAIT_CUE(9), { 0x62, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(9), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x91, 0x04, 0x0002, 0x00000007, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTHWEST), HALT, }; static const struct ScriptCommand s_gs1_g49_s0_lives5_dlg0[] = { /* 0x817755c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000010, 0x00000000, NULL }, + AWAIT_CUE(10), + SELECT_ANIMATION(22), + ALERT_CUE(5), + AWAIT_CUE(10), + WALK_RELATIVE(256, -16, 0), WAIT(30), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), WAIT(60), - { 0x6a, 0x00, 0x0100, -0x00000008, 0x00000000, NULL }, - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000008, 0x00000008, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + WALK_RELATIVE(256, -8, 0), + SELECT_ANIMATION(24), + AWAIT_CUE(10), + SELECT_ANIMATION(2), + WALK_RELATIVE(256, -8, 8), + ROTATE(4, 1, DIRECTION_WEST), + ALERT_CUE(5), + AWAIT_CUE(10), { 0x62, 0x00, 0x0200, -0x00000008, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0x54, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTH), + SELECT_ANIMATION(17), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(10), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), { 0x62, 0x00, 0x0100, -0x00000008, -0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000003, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_NORTHEAST), { 0x62, 0x00, 0x0100, -0x00000008, -0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000002, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_EAST), { 0x62, 0x00, 0x0100, 0x00000008, -0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000001, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_SOUTHEAST), { 0x62, 0x00, 0x0100, 0x00000008, -0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_SOUTH), { 0x62, 0x00, 0x0100, 0x00000008, 0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000007, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_SOUTHWEST), { 0x62, 0x00, 0x0100, 0x00000008, 0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_WEST), { 0x62, 0x00, 0x0100, -0x00000008, 0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000005, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_NORTHWEST), { 0x62, 0x00, 0x0100, -0x00000008, 0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(10), { 0x62, 0x00, 0x0200, 0x00000008, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_WEST), HALT, }; static const struct ScriptCommand s_gs1_g49_s0_lives6_dlg0[] = { /* 0x817785c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, + AWAIT_CUE(11), + SELECT_ANIMATION(22), + ALERT_CUE(5), + AWAIT_CUE(11), + WALK_RELATIVE(256, 16, 0), WAIT(30), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), WAIT(60), - { 0x54, 0x00, 0x0018, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, 0x00000000, -0x00000010, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(24), + ALERT_CUE(5), + AWAIT_CUE(11), + SELECT_ANIMATION(2), + WALK_RELATIVE(256, 0, -16), + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(11), + ROTATE(4, 2, DIRECTION_SOUTH), FANFARE_PLAY2(455), - { 0x54, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(17), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(11), { 0x62, 0x00, 0x0100, 0x00000008, 0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000007, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_SOUTHWEST), { 0x62, 0x00, 0x0100, 0x00000008, 0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_WEST), FANFARE_PLAY2(457), { 0x62, 0x00, 0x0100, -0x00000008, 0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000005, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_NORTHWEST), { 0x62, 0x00, 0x0100, -0x00000008, 0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000004, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_NORTH), { 0x62, 0x00, 0x0100, -0x00000008, -0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000003, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_NORTHEAST), { 0x62, 0x00, 0x0100, -0x00000008, -0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000002, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_EAST), FANFARE_PLAY2(457), { 0x62, 0x00, 0x0100, 0x00000008, -0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000001, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_SOUTHEAST), { 0x62, 0x00, 0x0100, 0x00000008, -0x00000008, NULL }, - { 0x91, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(1, 1, DIRECTION_SOUTH), + AWAIT_CUE(11), + ROTATE(4, 1, DIRECTION_WEST), HALT, }; static const struct ScriptCommand s_gs1_g50_s0_lives0_dlg2[] = { /* 0x8177b2c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), SET_ARRAYVAL(EVENT_S07E01, 0, 1), @@ -15274,7 +15274,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives0_dlg2[] = { /* 0x8177b2c */ static const struct ScriptCommand s_gs1_g50_s0_lives1_dlg2[] = { /* 0x8177da0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), SET_ARRAYVAL(EVENT_S07E01, 1, 1), @@ -15285,7 +15285,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives1_dlg2[] = { /* 0x8177da0 */ static const struct ScriptCommand s_gs1_g50_s0_lives2_dlg2[] = { /* 0x8177e60 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), SET_ARRAYVAL(EVENT_S07E01, 2, 1), @@ -15300,28 +15300,28 @@ static const struct ScriptCommand s_gs1_g50_s0_lives3_dlg0[] = { /* 0x8177fcc */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + SELECT_ANIMATION(1), { 0x8b, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs1_g50_s0_lives3_dlg2[] = { /* 0x817803c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), SET_ARRAYVAL(EVENT_S07E01, 4, 1), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" What's that?\nWhere is the {COLOR YELLOW_D}Buried Relic{RESET}?")), MSG_NPC(1, _(" The {COLOR YELLOW_D}Buried Relic{RESET} is deep\nin the jungle to the southeast.")), MSG_NPC(1, _(" Are you dreaming about\nthe treasures too?")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_NPC(1, _(" Kukukuh...{WAIT_PRESS} Me too!{WAIT_PRESS}\nBest of luck, compadre!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), JUMPIF_SCENE_GT(SCENARIO_SUB7, 49, 2, /* to label */ 1), WAIT(30), MSG_INSTANT(_("{CENTER_ALIGN}Leaving aside the disturbing fact that\n{CENTER_ALIGN}{NAME_1} made them compadres...")), @@ -15340,13 +15340,13 @@ static const struct ScriptCommand s_gs1_g50_s0_lives3_dlg2[] = { /* 0x817803c */ static const struct ScriptCommand s_gs1_g50_s0_lives3_dlg3[] = { /* 0x8178340 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -15356,7 +15356,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives3_dlg3[] = { /* 0x8178340 */ static const struct ScriptCommand s_gs1_g50_s0_lives4_dlg2[] = { /* 0x8178410 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_S07E01, 5, /* to label */ 0), @@ -15373,7 +15373,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives4_dlg2[] = { /* 0x8178410 */ static const struct ScriptCommand s_gs1_g50_s0_lives5_dlg2[] = { /* 0x8178564 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_S07E01, 6, /* to label */ 0), @@ -15389,7 +15389,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives5_dlg2[] = { /* 0x8178564 */ static const struct ScriptCommand s_gs1_g50_s0_lives6_dlg2[] = { /* 0x8178690 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_S07E01, 7, /* to label */ 0), @@ -15404,7 +15404,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives6_dlg2[] = { /* 0x8178690 */ static const struct ScriptCommand s_gs1_g50_s0_lives7_dlg2[] = { /* 0x8178780 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_S07E01, 8, /* to label */ 0), @@ -15419,7 +15419,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives7_dlg2[] = { /* 0x8178780 */ static const struct ScriptCommand s_gs1_g50_s0_lives8_dlg2[] = { /* 0x8178870 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_S07E01, 9, /* to label */ 0), @@ -15436,7 +15436,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives8_dlg2[] = { /* 0x8178870 */ static const struct ScriptCommand s_gs1_g50_s0_lives9_dlg2[] = { /* 0x81789bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_S07E01, 10, /* to label */ 0), @@ -15452,7 +15452,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives9_dlg2[] = { /* 0x81789bc */ static const struct ScriptCommand s_gs1_g51_s0_lives0_dlg2[] = { /* 0x8178b08 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I think Gengar headed off\nto {COLOR YELLOW_D}Mt. Freeze{RESET}.")), @@ -15465,7 +15465,7 @@ static const struct ScriptCommand s_gs1_g51_s0_lives0_dlg2[] = { /* 0x8178b08 */ static const struct ScriptCommand s_gs1_g51_s0_lives1_dlg2[] = { /* 0x8178c10 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Gengar wants to meet with\nNinetales. That's what I think.")), @@ -15477,7 +15477,7 @@ static const struct ScriptCommand s_gs1_g51_s0_lives1_dlg2[] = { /* 0x8178c10 */ static const struct ScriptCommand s_gs1_g52_s0_lives0_dlg2[] = { /* 0x8178d0c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I have done a lot of\nthinking...")), @@ -15502,7 +15502,7 @@ static const struct ScriptCommand s_gs1_g52_s0_lives0_dlg2[] = { /* 0x8178d0c */ CHOICE(/* label */ 6, _("*Yes.")), CHOICE(/* label */ 7, _("No.")), LABEL(6), /* = 0x06 */ - { 0x3d, 0x00, 0x0000, -0x00000001, 0x00000000, NULL }, + RENAME_ALLY(-1), LABEL(7), /* = 0x07 */ { 0x3b, 0x32, 0x0000, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_t01p02a_station.h b/src/data/ground/ground_data_t01p02a_station.h index e05cd51f2..31c2a40a7 100644 --- a/src/data/ground/ground_data_t01p02a_station.h +++ b/src/data/ground/ground_data_t01p02a_station.h @@ -178,14 +178,14 @@ static const struct ScriptRef s_gs2_g0_s0_evt0_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs2_g0_s1_lives0_dlg0[] = { /* 0x817deb4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs2_g0_s1_lives1_dlg0[] = { /* 0x817def4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -206,14 +206,14 @@ static const struct ScriptRef s_gs2_g0_s2_evt0_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs2_g0_s2_lives0_dlg0[] = { /* 0x817e024 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs2_g0_s2_lives1_dlg0[] = { /* 0x817e064 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -230,13 +230,13 @@ static const struct ScriptRef s_gs2_g1_s0_station_sref = { 403, 8, NULL /* STATI static const struct ScriptCommand s_gs2_g1_s0_lives0_dlg0[] = { /* 0x817e0f0 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g1_s0_lives0_dlg2[] = { /* 0x817e130 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000005e, 0x00000000, NULL }, @@ -258,13 +258,13 @@ static const struct ScriptCommand s_gs2_g1_s0_lives0_dlg2[] = { /* 0x817e130 */ static const struct ScriptCommand s_gs2_g1_s0_lives1_dlg0[] = { /* 0x817e380 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g1_s0_lives1_dlg2[] = { /* 0x817e3c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000005e, 0x00000000, NULL }, @@ -286,13 +286,13 @@ static const struct ScriptCommand s_gs2_g1_s0_lives1_dlg2[] = { /* 0x817e3c0 */ static const struct ScriptCommand s_gs2_g1_s0_lives2_dlg0[] = { /* 0x817e4e0 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g1_s0_lives2_dlg2[] = { /* 0x817e520 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" The Jumpluff appear to\nhave left on the winds.")), @@ -344,19 +344,19 @@ static const struct ScriptRef s_gs2_g2_s0_station_sref = { 403, 8, NULL /* STATI static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg0[] = { /* 0x817e7f4 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg2[] = { /* 0x817e834 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_SCENE_GT(SCENARIO_SUB2, 33, 3, /* to label */ 0), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Ah, so you wish to know\nabout the dungeon in the sea?")), MSG_NPC(1, _(" I, too, have heard of it.")), MSG_NPC(1, _(" I have heard of a place that\nis far off our coast...")), @@ -366,12 +366,12 @@ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg2[] = { /* 0x817e834 */ MSG_NPC(1, _(" The sea is infinitely dark,\nand its depth unimaginable.\nThat is what I have heard.")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_NPC(1, _(" Hohoho!{WAIT_PRESS}\nYou look eager to go.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" However...{WAIT_PRESS}\nTo go beneath the sea, a Hidden Machine\nnamed {COLOR GREEN_I}Dive{RESET} is needed.")), MSG_NPC(1, _(" Without {COLOR GREEN_I}Dive{RESET}, you cannot\ngo to the {COLOR YELLOW_D}Stormy Sea{RESET}.")), @@ -409,13 +409,13 @@ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg2[] = { /* 0x817e834 */ MSG_NPC(1, _(" All I had was the one\nI gave you...{WAIT_PRESS}\nHmm... What should one do?")), MSG_NPC(1, _(" The Hidden Machine {COLOR GREEN_I}Dive{RESET}\nwas apparently found in the {COLOR YELLOW_D}Solar Cave{RESET}.")), MSG_NPC(1, _(" I suppose it wouldn't hurt\nto search there.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_NPC(1, _(" Hohoho.{WAIT_PRESS}\nAdventures keep you young.")), MSG_NPC(1, _(" Why, if I were only a little\nyounger, I might have joined you on your\nadventures.")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), JUMP_SCRIPT(END_TALK), RET, }; @@ -426,30 +426,30 @@ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg2[] = { /* 0x817e834 */ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg3[] = { /* 0x817f2d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), JUMPIF_SCENE_GT(SCENARIO_SUB2, 33, 3, /* to label */ 0), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(2), WAIT(12), RET, LABEL(0), /* = 0x00 */ { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), RET, }; @@ -462,19 +462,19 @@ static const struct ScriptCommand s_gs2_g3_s0_obj0_dlg2[] = { /* 0x817f474 */ static const struct ScriptCommand s_gs2_g4_s0_lives0_dlg0[] = { /* 0x817f4a4 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g4_s0_lives0_dlg2[] = { /* 0x817f4e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), SET_ARRAYVAL(EVENT_S07E01, 3, 1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), MSG_NPC(1, _(" Hohoho.{WAIT_PRESS}\nThere is an old saying about the {COLOR YELLOW_D}Buried\nRelic{RESET}.")), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(1, _(" Three parts there are,\nguarded by three disciples.")), MSG_NPC(1, _(" When the three parts\nare gathered in hand...{WAIT_PRESS}\nA mirage shall appear to the bearer...")), MSG_NPC(1, _(" ...What this actually means,\nthere is no telling now. Hohoho.")), @@ -484,10 +484,10 @@ static const struct ScriptCommand s_gs2_g4_s0_lives0_dlg2[] = { /* 0x817f4e4 */ static const struct ScriptCommand s_gs2_g4_s0_lives0_dlg3[] = { /* 0x817f6b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -524,7 +524,7 @@ static const struct ScriptRef s_gs2_g5_s0_evt0_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs2_g6_s0_station_sref_script[] = { /* 0x817f824 */ DEBUGINFO, SELECT_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), JUMPIF_SCENE_GT(SCENARIO_SUB8, 51, 2, /* to label */ 0), SCENARIO_CALC(SCENARIO_SUB8, 51, 2), LABEL(0), /* = 0x00 */ @@ -535,22 +535,22 @@ static const struct ScriptRef s_gs2_g6_s0_station_sref = { 401, 7, NULL /* EVENT static const struct ScriptCommand s_gs2_g6_s0_eff0_script[] = { /* 0x817f8a0 */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), HALT, }; static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x95, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(2, _(" ........................")), @@ -567,17 +567,17 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ WAIT(10), PORTRAIT_REP(0x0002, 0x00000001), PORTRAIT_REP(0x0003, 0x00000002), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), MSG_NPC(2, _(" My wish...\nIt will finally come true!{WAIT_PRESS}\nPshehehe!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), MSG_NPC(3, _(" Hey, now, don't forget about\nmy wish!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(2, _(" Listen, {NAME_3}.{WAIT_PRESS}\nWe must keep this a secret just between\nthe two of us.")), @@ -591,9 +591,9 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ TEXTBOX_CLEAR, WAIT(30), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0002, 0x00000002), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0003, 0x00000001), @@ -604,11 +604,11 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000001), LABEL(3), /* = 0x03 */ FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), MSG_NPC(2, _(" Aiyeeeeeeeeeeeh!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(60), PORTRAIT_REP(0x0002, 0x00000000), PORTRAIT_REP(0x0003, 0x00000000), @@ -618,17 +618,17 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ MSG_NPC(3, _(" Me too!\nI don't know a thing!")), MSG_NPC(3, _(" I don't know anything about\nmaking wishes come true!{WAIT_PRESS}\nI know nothing!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), WAIT(60), { 0x93, 0x08, 0x000a, 0x0000005d, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(5), CANCEL_EVENTS(5, 0), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -637,80 +637,80 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ static const struct ScriptCommand s_gs2_g6_s0_lives1_dlg0[] = { /* 0x818009c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs2_g6_s0_lives2_dlg0[] = { /* 0x81800fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(60), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(30), CJUMP_UNK_C8(0), COND_EQUAL(2, /* to label */ 0), - { 0x6b, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, + WALK_GRID(512, 0), JUMP_LABEL(1), LABEL(0), /* = 0x00 */ - { 0x6b, 0x00, 0x0200, 0x00000001, 0x00000000, NULL }, + WALK_GRID(512, 1), LABEL(1), /* = 0x01 */ - { 0x6b, 0x00, 0x0200, 0x00000003, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000004, 0x00000000, NULL }, + WALK_GRID(512, 3), + WALK_GRID(512, 4), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, END_DELETE, }; static const struct ScriptCommand s_gs2_g6_s0_lives3_dlg0[] = { /* 0x818034c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(60), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(8), CJUMP_UNK_C8(0), COND_EQUAL(2, /* to label */ 0), - { 0x6b, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, + WALK_GRID(512, 0), JUMP_LABEL(1), LABEL(0), /* = 0x00 */ - { 0x6b, 0x00, 0x0200, 0x00000002, 0x00000000, NULL }, + WALK_GRID(512, 2), LABEL(1), /* = 0x01 */ - { 0x6b, 0x00, 0x0200, 0x00000003, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x00000004, 0x00000000, NULL }, + WALK_GRID(512, 3), + WALK_GRID(512, 4), END_DELETE, }; @@ -737,7 +737,7 @@ static const struct ScriptRef s_gs2_g7_s0_evt0_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs2_g8_s0_station_sref_script[] = { /* 0x8180598 */ DEBUGINFO, SELECT_ENTITIES(-1, 0), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), JUMPIF_SCENE_GT(SCENARIO_SUB8, 51, 3, /* to label */ 0), SCENARIO_CALC(SCENARIO_SUB8, 51, 4), LABEL(0), /* = 0x00 */ @@ -748,21 +748,21 @@ static const struct ScriptRef s_gs2_g8_s0_station_sref = { 401, 7, NULL /* EVENT static const struct ScriptCommand s_gs2_g8_s0_eff0_script[] = { /* 0x8180614 */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x95, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(2, _(" {NAME_3}, listen.{WAIT_PRESS}\nI'm thinking it is best if only we go\ninto the dungeon.")), @@ -777,15 +777,15 @@ static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ MSG_NPC(2, _(" But of course.\nI can't wait until our wishes\ncome true〜♪")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000002), MSG_NPC(3, _(" My wish is for a broader\nlower jaw.")), MSG_NPC(3, _(" I want bigger jaws so I can\nswallow bigger things whole.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000003), MSG_NPC(2, _(" My wish is for a place\nwhere I can meditate in peace〜♪")), MSG_NPC(2, _(" With no one to bother me...")), @@ -793,9 +793,9 @@ static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ TEXTBOX_CLEAR, WAIT(60), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0002, 0x00000002), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0003, 0x00000001), @@ -806,11 +806,11 @@ static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000001), LABEL(4), /* = 0x04 */ FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), MSG_NPC(2, _(" Giyaaaaaaaaaaaaaaaaah!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(60), PORTRAIT_REP(0x0002, 0x00000000), PORTRAIT_REP(0x0003, 0x00000000), @@ -820,17 +820,17 @@ static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ MSG_NPC(3, _(" Me too!\nI don't know a thing!")), MSG_NPC(3, _(" I don't know anything about\na dungeon that makes wishes come true!{WAIT_PRESS}\nI know nothing!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), WAIT(60), { 0x93, 0x08, 0x000a, 0x0000005d, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHEAST), + AWAIT_CUE(5), CANCEL_EVENTS(7, 0), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -840,80 +840,80 @@ static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ static const struct ScriptCommand s_gs2_g8_s0_lives1_dlg0[] = { /* 0x8180dc0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs2_g8_s0_lives2_dlg0[] = { /* 0x8180e20 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(60), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(30), CJUMP_UNK_C8(0), COND_EQUAL(2, /* to label */ 0), - { 0x6b, 0x00, 0x0200, 0x00000006, 0x00000000, NULL }, + WALK_GRID(512, 6), JUMP_LABEL(1), LABEL(0), /* = 0x00 */ - { 0x6b, 0x00, 0x0200, 0x00000007, 0x00000000, NULL }, + WALK_GRID(512, 7), LABEL(1), /* = 0x01 */ - { 0x6b, 0x00, 0x0200, 0x00000009, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, + WALK_GRID(512, 9), + WALK_GRID(512, 10), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, END_DELETE, }; static const struct ScriptCommand s_gs2_g8_s0_lives3_dlg0[] = { /* 0x8181010 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(60), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(8), CJUMP_UNK_C8(0), COND_EQUAL(2, /* to label */ 0), - { 0x6b, 0x00, 0x0200, 0x00000006, 0x00000000, NULL }, + WALK_GRID(512, 6), JUMP_LABEL(1), LABEL(0), /* = 0x00 */ - { 0x6b, 0x00, 0x0200, 0x00000008, 0x00000000, NULL }, + WALK_GRID(512, 8), LABEL(1), /* = 0x01 */ - { 0x6b, 0x00, 0x0200, 0x00000009, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, + WALK_GRID(512, 9), + WALK_GRID(512, 10), END_DELETE, }; static const struct ScriptCommand s_gs2_g9_s0_lives0_dlg0[] = { /* 0x81811c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, RET, }; @@ -927,7 +927,7 @@ static const struct ScriptCommand s_gs2_g9_s0_lives0_dlg2[] = { /* 0x8181200 */ static const struct ScriptCommand s_gs2_g9_s1_station_sref_script[] = { /* 0x8181230 */ DEBUGINFO, SELECT_ENTITIES(-1, -1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), JUMPIF_SCENE_GT(SCENARIO_SUB8, 51, 5, /* to label */ 0), SCENARIO_CALC(SCENARIO_SUB8, 51, 6), LABEL(0), /* = 0x00 */ @@ -939,45 +939,45 @@ static const struct ScriptRef s_gs2_g9_s1_station_sref = { 401, 7, NULL /* EVENT static const struct ScriptCommand s_gs2_g9_s1_eff0_script[] = { /* 0x81812bc */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0xa1, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs2_g9_s1_lives0_dlg0[] = { /* 0x818131c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(2, _(" ...I got KO'd in that\ndungeon, but what about Medicham?\nHope she's OK...")), MSG_NPC(2, _(" I hope she gets to the end\nand gets my wish to come true...")), TEXTBOX_CLEAR, FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), FANFARE_PLAY2(473), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT_REP(0x0002, 0x00000001), MSG_NPC(2, _(" Giyah!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(60), MSG_NPC(2, _(" Wh-what are you staring\nat, you?!")), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" I'm having a hard time\ntrying to make up my mind!{WAIT_PRESS}\nGet lost!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ...Hunh? Wait a second...\nMaybe I shouldn't be wishing for\na bigger lower jaw...?")), MSG_NPC(2, _(" I wonder if it'd be better\nif I could coil myself tighter...")), MSG_NPC(2, _(" ...Hmm...\nMutter...")), TEXTBOX_CLEAR, { 0xa1, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -986,33 +986,33 @@ static const struct ScriptCommand s_gs2_g9_s1_lives0_dlg0[] = { /* 0x818131c */ static const struct ScriptCommand s_gs2_g9_s1_lives1_dlg0[] = { /* 0x81816d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs2_g9_s1_lives2_dlg0[] = { /* 0x8181730 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(60), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x92, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), RET, }; @@ -1027,13 +1027,13 @@ static const struct ScriptRef s_gs2_g10_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g10_s0_lives0_dlg0[] = { /* 0x81818ac */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g10_s0_lives0_dlg2[] = { /* 0x81818ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0001, 0x00000000), @@ -1059,13 +1059,13 @@ static const struct ScriptRef s_gs2_g11_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g11_s0_lives0_dlg0[] = { /* 0x8181a8c */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g11_s0_lives0_dlg2[] = { /* 0x8181acc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I've lived in this pond for\nmany long years...")), @@ -1090,13 +1090,13 @@ static const struct ScriptRef s_gs2_g12_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g12_s0_lives0_dlg0[] = { /* 0x8181c18 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g12_s0_lives0_dlg2[] = { /* 0x8181c58 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Seeing the innocence of\nchildren at play is a good thing.\nHohoho.")), @@ -1112,7 +1112,7 @@ static const struct ScriptCommand s_gs2_g12_s0_obj0_dlg2[] = { /* 0x8181d3c */ static const struct ScriptCommand s_gs2_g12_s0_lives1_dlg2[] = { /* 0x8181d6c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000005e, 0x00000000, NULL }, @@ -1135,13 +1135,13 @@ static const struct ScriptRef s_gs2_g13_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g13_s0_lives0_dlg0[] = { /* 0x8181ef8 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g13_s0_lives0_dlg2[] = { /* 0x8181f38 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, WAIT(1), @@ -1167,13 +1167,13 @@ static const struct ScriptRef s_gs2_g14_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g14_s0_lives0_dlg0[] = { /* 0x81820b0 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g14_s0_lives0_dlg2[] = { /* 0x81820f0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT_REP(0x0001, 0x00000001), @@ -1199,7 +1199,7 @@ static const struct ScriptCommand s_gs2_g14_s0_obj0_dlg2[] = { /* 0x8182484 */ static const struct ScriptCommand s_gs2_g14_s0_lives1_dlg2[] = { /* 0x81824b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x0000005e, 0x00000000, NULL }, WAIT(1), @@ -1210,7 +1210,7 @@ static const struct ScriptCommand s_gs2_g14_s0_lives1_dlg2[] = { /* 0x81824b4 */ static const struct ScriptCommand s_gs2_g14_s0_lives2_dlg2[] = { /* 0x818255c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -1229,13 +1229,13 @@ static const struct ScriptRef s_gs2_g15_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g15_s0_lives0_dlg0[] = { /* 0x8182624 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g15_s0_lives0_dlg2[] = { /* 0x8182664 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0001, 0x00000001), @@ -1257,7 +1257,7 @@ static const struct ScriptCommand s_gs2_g15_s0_lives1_dlg0[] = { /* 0x8182738 */ static const struct ScriptCommand s_gs2_g15_s0_lives1_dlg2[] = { /* 0x8182768 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000005e, 0x00000000, NULL }, @@ -1281,7 +1281,7 @@ static const struct ScriptCommand s_gs2_g15_s0_lives2_dlg0[] = { /* 0x81828d4 */ static const struct ScriptCommand s_gs2_g15_s0_lives2_dlg2[] = { /* 0x8182904 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000036, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x0000005e, 0x00000000, NULL }, @@ -1308,13 +1308,13 @@ static const struct ScriptRef s_gs2_g16_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g16_s0_lives0_dlg0[] = { /* 0x8182a30 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g16_s0_lives0_dlg2[] = { /* 0x8182a70 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000063, 0x00000000, NULL }, WAIT(1), @@ -1345,7 +1345,7 @@ static const struct ScriptCommand s_gs2_g16_s0_obj0_dlg2[] = { /* 0x8182cb8 */ static const struct ScriptCommand s_gs2_g16_s0_lives1_dlg2[] = { /* 0x8182ce8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000062, 0x00000000, NULL }, WAIT(1), @@ -1356,7 +1356,7 @@ static const struct ScriptCommand s_gs2_g16_s0_lives1_dlg2[] = { /* 0x8182ce8 */ static const struct ScriptCommand s_gs2_g16_s0_lives2_dlg2[] = { /* 0x8182da0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000062, 0x00000000, NULL }, WAIT(1), @@ -1366,10 +1366,10 @@ static const struct ScriptCommand s_gs2_g16_s0_lives2_dlg2[] = { /* 0x8182da0 */ static const struct ScriptCommand s_gs2_g16_s0_eff0_script[] = { /* 0x8182e4c */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), END_DELETE, }; @@ -1386,13 +1386,13 @@ static const struct ScriptRef s_gs2_g16_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000063, 0x00000000, NULL }, { 0x2d, 0x09, 0x0004, 0x00000052, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), WAIT(1), - { 0x6b, 0x00, 0x0100, 0x0000000c, 0x00000000, NULL }, + WALK_GRID(256, 12), { 0x8b, 0x1e, 0x0004, 0x00000000, 0x00000000, NULL }, BGM_SWITCH(6), MSG_NPC(1, _(" There once lived a Pokémon\nby the name of {NAME_2}.")), @@ -1435,19 +1435,19 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ MSG_NPC(1, _(" “That human will one day\nbe reborn as a Pokémon...”")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), FANFARE_PLAY2(466), CALL_SCRIPT(SHOCK_FUNC), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x0000000c), MSG_NPC(3, _(" What?!{WAIT_PRESS}\nA human turn into a Pokémon?!")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, + ALERT_CUE(8), + ROTATE(4, 1, DIRECTION_EAST), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), WAIT(60), - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), MSG_NPC(1, _(" “And when the human \nbecomes a Pokémon...”")), MSG_NPC(1, _(" “The world's balance will\nbe upset...”")), MSG_NPC(1, _(" ...And that is how the legend\nends.")), @@ -1465,35 +1465,35 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ MSG_NPC(1, _(" But it is only ancient\nfolklore, nothing more.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), PORTRAIT(PLACEMENT_LEFT_, 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 }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), BGM_SWITCH(8), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), RET, }; static const struct ScriptCommand s_gs2_g16_s1_lives1_dlg0[] = { /* 0x8183b64 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000000d, 0x00000000, NULL }, + WALK_GRID(256, 13), { 0x8b, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), + AWAIT_CUE(8), FANFARE_PLAY2(466), CALL_SCRIPT(SHOCK_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_WEST), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), WAIT(60), - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(8), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -1501,10 +1501,10 @@ static const struct ScriptCommand s_gs2_g16_s1_lives1_dlg0[] = { /* 0x8183b64 */ static const struct ScriptCommand s_gs2_g16_s1_lives2_dlg0[] = { /* 0x8183c84 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), @@ -1513,7 +1513,7 @@ static const struct ScriptCommand s_gs2_g16_s1_lives2_dlg0[] = { /* 0x8183c84 */ static const struct ScriptCommand s_gs2_g16_s1_lives2_dlg2[] = { /* 0x8183d24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000063, 0x00000000, NULL }, WAIT(1), @@ -1539,7 +1539,7 @@ static const struct ScriptCommand s_gs2_g17_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(2), SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -1551,7 +1551,7 @@ static const struct ScriptCommand s_gs2_g18_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(2), SELECT_ENTITIES(-1, 0), { 0x27, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x28, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, RET, }; @@ -1560,7 +1560,7 @@ static const struct ScriptRef s_gs2_g18_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs2_g18_s0_lives0_dlg0[] = { /* 0x8183f98 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000052, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1580,7 +1580,7 @@ static const struct ScriptCommand s_gs2_g18_s0_lives0_dlg0[] = { /* 0x8183f98 */ MSG_NPC(2, _(" There exist strong bonds\nbetween humans and Pokémon.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -1589,7 +1589,7 @@ static const struct ScriptCommand s_gs2_g18_s0_lives0_dlg0[] = { /* 0x8183f98 */ static const struct ScriptCommand s_gs2_g18_s0_lives1_dlg0[] = { /* 0x81841f0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, HALT, }; @@ -1597,7 +1597,7 @@ static const struct ScriptCommand s_gs2_g18_s0_lives1_dlg0[] = { /* 0x81841f0 */ static const struct ScriptCommand s_gs2_g18_s0_lives2_dlg0[] = { /* 0x8184230 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, HALT, }; @@ -1613,7 +1613,7 @@ static const struct ScriptRef s_gs2_g19_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g19_s0_lives0_dlg0[] = { /* 0x81842bc */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), RET, }; @@ -1634,13 +1634,13 @@ static const struct ScriptRef s_gs2_g20_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g20_s0_lives0_dlg0[] = { /* 0x8184368 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g20_s0_lives0_dlg2[] = { /* 0x81843a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I regret this...{WAIT_PRESS}\nHow some old folklore I told...{WAIT_PRESS}\ncould cause such an uproar...")), @@ -1658,7 +1658,7 @@ static const struct ScriptCommand s_gs2_g20_s0_lives1_dlg0[] = { /* 0x81844f8 */ DEBUGINFO, JUMPIF_SCENE_EQ(SCENARIO_SUB1, 30, -1, /* to label */ 0), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, LABEL(0), /* = 0x00 */ END_DELETE, @@ -1666,7 +1666,7 @@ static const struct ScriptCommand s_gs2_g20_s0_lives1_dlg0[] = { /* 0x81844f8 */ static const struct ScriptCommand s_gs2_g20_s0_lives1_dlg2[] = { /* 0x8184568 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I'm so glad {NAME_0}\nisn't under suspicion anymore.")), @@ -1675,7 +1675,7 @@ static const struct ScriptCommand s_gs2_g20_s0_lives1_dlg2[] = { /* 0x8184568 */ static const struct ScriptCommand s_gs2_g20_s0_lives2_dlg2[] = { /* 0x81845fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I just knew {NAME_0}\ncouldn't be evil.")), @@ -1695,13 +1695,13 @@ static const struct ScriptRef s_gs2_g21_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g21_s0_lives0_dlg0[] = { /* 0x8184714 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g21_s0_lives0_dlg2[] = { /* 0x8184754 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Wroooar!\nI can't relax!")), @@ -1720,7 +1720,7 @@ static const struct ScriptCommand s_gs2_g21_s0_lives1_dlg0[] = { /* 0x818487c */ DEBUGINFO, JUMPIF_SCENE_EQ(SCENARIO_SUB1, 30, -1, /* to label */ 0), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, LABEL(0), /* = 0x00 */ END_DELETE, @@ -1728,7 +1728,7 @@ static const struct ScriptCommand s_gs2_g21_s0_lives1_dlg0[] = { /* 0x818487c */ static const struct ScriptCommand s_gs2_g21_s0_lives1_dlg2[] = { /* 0x81848ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" That earthquake really\nfrightened me...")), @@ -1738,7 +1738,7 @@ static const struct ScriptCommand s_gs2_g21_s0_lives1_dlg2[] = { /* 0x81848ec */ static const struct ScriptCommand s_gs2_g21_s0_lives2_dlg2[] = { /* 0x81849e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I hardened when the quake\nhit...")), @@ -1759,13 +1759,13 @@ static const struct ScriptRef s_gs2_g22_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g22_s0_lives0_dlg0[] = { /* 0x8184b3c */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g22_s0_lives0_dlg2[] = { /* 0x8184b7c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Wroooar!\nI can't relax!")), @@ -1784,7 +1784,7 @@ static const struct ScriptCommand s_gs2_g22_s0_lives1_dlg0[] = { /* 0x8184c2c */ DEBUGINFO, JUMPIF_SCENE_EQ(SCENARIO_SUB1, 30, -1, /* to label */ 0), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, LABEL(0), /* = 0x00 */ END_DELETE, @@ -1792,7 +1792,7 @@ static const struct ScriptCommand s_gs2_g22_s0_lives1_dlg0[] = { /* 0x8184c2c */ static const struct ScriptCommand s_gs2_g22_s0_lives1_dlg2[] = { /* 0x8184c9c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I'm terrified of all the\nearthquakes...")), @@ -1801,7 +1801,7 @@ static const struct ScriptCommand s_gs2_g22_s0_lives1_dlg2[] = { /* 0x8184c9c */ static const struct ScriptCommand s_gs2_g22_s0_lives2_dlg2[] = { /* 0x8184d28 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I haven't relaxed from\nhardening at all...")), @@ -1820,13 +1820,13 @@ static const struct ScriptRef s_gs2_g23_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g23_s0_lives0_dlg0[] = { /* 0x8184e04 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g23_s0_lives0_dlg2[] = { /* 0x8184e44 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Your words in the square\nstruck me to my heart.")), @@ -1845,7 +1845,7 @@ static const struct ScriptCommand s_gs2_g23_s0_lives1_dlg0[] = { /* 0x8184fbc */ DEBUGINFO, JUMPIF_SCENE_EQ(SCENARIO_SUB1, 30, -1, /* to label */ 0), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, LABEL(0), /* = 0x00 */ END_DELETE, @@ -1853,7 +1853,7 @@ static const struct ScriptCommand s_gs2_g23_s0_lives1_dlg0[] = { /* 0x8184fbc */ static const struct ScriptCommand s_gs2_g23_s0_lives1_dlg2[] = { /* 0x818502c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -1864,7 +1864,7 @@ static const struct ScriptCommand s_gs2_g23_s0_lives1_dlg2[] = { /* 0x818502c */ static const struct ScriptCommand s_gs2_g23_s0_lives2_dlg2[] = { /* 0x8185100 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I'll do my best to harden\nmyself!")), @@ -1883,13 +1883,13 @@ static const struct ScriptRef s_gs2_g24_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g24_s0_lives0_dlg0[] = { /* 0x81851d4 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g24_s0_lives0_dlg2[] = { /* 0x8185214 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Sniffle...\nThis is so inspiring...")), @@ -1908,7 +1908,7 @@ static const struct ScriptCommand s_gs2_g24_s0_lives1_dlg0[] = { /* 0x818537c */ DEBUGINFO, JUMPIF_SCENE_EQ(SCENARIO_SUB1, 30, -1, /* to label */ 0), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, LABEL(0), /* = 0x00 */ END_DELETE, @@ -1916,7 +1916,7 @@ static const struct ScriptCommand s_gs2_g24_s0_lives1_dlg0[] = { /* 0x818537c */ static const struct ScriptCommand s_gs2_g24_s0_lives1_dlg2[] = { /* 0x81853ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" My mom has joined other\nPokémon to fight in the {COLOR YELLOW_D}Magma Cavern{RESET}.")), @@ -1929,7 +1929,7 @@ static const struct ScriptCommand s_gs2_g24_s0_lives1_dlg2[] = { /* 0x81853ec */ static const struct ScriptCommand s_gs2_g24_s0_lives2_dlg2[] = { /* 0x81855b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I've hardened quite a lot!\nNo earthquake can touch me now!")), @@ -1947,13 +1947,13 @@ static const struct ScriptRef s_gs2_g25_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g25_s0_lives0_dlg0[] = { /* 0x8185694 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g25_s0_lives0_dlg2[] = { /* 0x81856d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" A shooting star is on\na collision course...{WAIT_PRESS}\nThis is indeed a desperate time.")), @@ -1970,7 +1970,7 @@ static const struct ScriptCommand s_gs2_g25_s0_obj0_dlg2[] = { /* 0x8185844 */ static const struct ScriptCommand s_gs2_g25_s0_lives1_dlg2[] = { /* 0x8185874 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I'll use Harden and wait for\n{NAME_0}'s team to come back!")), @@ -1989,13 +1989,13 @@ static const struct ScriptRef s_gs2_g26_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g26_s0_lives0_dlg0[] = { /* 0x818595c */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g26_s0_lives0_dlg2[] = { /* 0x818599c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I see...\nYou are finally off.")), @@ -2011,7 +2011,7 @@ static const struct ScriptCommand s_gs2_g26_s0_obj0_dlg2[] = { /* 0x8185a70 */ static const struct ScriptCommand s_gs2_g26_s0_lives1_dlg2[] = { /* 0x8185aa0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -2023,7 +2023,7 @@ static const struct ScriptCommand s_gs2_g26_s0_lives1_dlg2[] = { /* 0x8185aa0 */ static const struct ScriptCommand s_gs2_g26_s0_lives2_dlg2[] = { /* 0x8185bac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Hello, I am Caterpie's\nmother. It's been a while.")), @@ -2033,7 +2033,7 @@ static const struct ScriptCommand s_gs2_g26_s0_lives2_dlg2[] = { /* 0x8185bac */ static const struct ScriptCommand s_gs2_g26_s0_lives3_dlg2[] = { /* 0x8185ca4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I'll use Harden and wait for\n{NAME_0}'s team to come back!")), @@ -2052,13 +2052,13 @@ static const struct ScriptRef s_gs2_g27_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g27_s0_lives0_dlg0[] = { /* 0x8185d50 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g27_s0_lives0_dlg2[] = { /* 0x8185d90 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Ah...{WAIT_PRESS} The {COLOR YELLOW_D}Sky Tower{RESET},\nyou say...")), @@ -2075,7 +2075,7 @@ static const struct ScriptCommand s_gs2_g27_s0_obj0_dlg2[] = { /* 0x8185eac */ static const struct ScriptCommand s_gs2_g27_s0_lives1_dlg2[] = { /* 0x8185edc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000022, 0x00000000, NULL }, WAIT(1), @@ -2086,7 +2086,7 @@ static const struct ScriptCommand s_gs2_g27_s0_lives1_dlg2[] = { /* 0x8185edc */ static const struct ScriptCommand s_gs2_g27_s0_lives2_dlg2[] = { /* 0x8185f90 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I believe too.\n{NAME_0}, don't let us down!")), @@ -2095,7 +2095,7 @@ static const struct ScriptCommand s_gs2_g27_s0_lives2_dlg2[] = { /* 0x8185f90 */ static const struct ScriptCommand s_gs2_g27_s0_lives3_dlg2[] = { /* 0x818601c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Oh, is that right?\nYou can climb above the clouds?")), @@ -2119,14 +2119,14 @@ static const struct ScriptRef s_gs2_g28_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs2_g28_s0_eff0_script[] = { /* 0x8186180 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x0000000e, 0x00000000, NULL }, + WALK_GRID(153, 14), HALT, }; static const struct ScriptCommand s_gs2_g28_s0_lives0_dlg0[] = { /* 0x81861c0 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; @@ -2142,7 +2142,7 @@ static const struct ScriptCommand s_gs2_g29_s0_station_sref_script[] = { /* 0x81 WAIT(30), BGM_SWITCH(8), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), SELECT_EVENTS(0, 2), CALL_STATION( 30, 0), @@ -2156,49 +2156,49 @@ static const struct ScriptCommand s_gs2_g29_s0_eff0_script[] = { /* 0x818630c */ { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000017, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 23), + AWAIT_CUE(4), { 0x86, 0x00, 0x0100, 0x00000018, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x86, 0x00, 0x0200, 0x00000019, 0x00000000, NULL }, WAIT(150), { 0x86, 0x00, 0x0200, 0x00000018, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000000f, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + WALK_GRID(256, 15), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_NPC(1, _(" Hi, {NAME_4}!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(4), + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), + WALK_GRID(256, 16), + ROTATE(4, 10, DIRECTION_NORTH), WAIT(30), FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_4}?{WAIT_PRESS}\nHave you seen Snubbull around?")), VARIANT(/* == */ 1, _(" I heard something weird\nhappened to him.")), @@ -2206,16 +2206,16 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ VARIANT_DEFAULT(_(" I heard something strange\nhappened to him.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0005, 0x00000000), PORTRAIT_POS(5, 2, 3), MSG_NPC(5, _(" I'm Snubbull.")), TEXTBOX_CLEAR, FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Whaaaat?!{WAIT_PRESS}\nYou're Snubbull?")), MSG_NPC(1, _(" But you don't look anything\nlike the way you did before!")), @@ -2233,54 +2233,54 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ PORTRAIT_POS(6, 0, -1), MSG_NPC(6, _(" It appeared without me\nnoticing.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(11), + AWAIT_CUE(5), MSG_NPC(6, _(" See?\nRight there.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(10), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT(15), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" So you went in there...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(9), + ALERT_CUE(11), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), WAIT(15), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(5, _(" Yup.{WAIT_PRESS}\nAnd I came out looking like this...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000000), MSG_NPC(4, _(" Snubbull underwent\n“evolution.”{WAIT_PRESS}\nHe evolved.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(10), WAIT(5), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), WAIT(30), FANFARE_PLAY2(468), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Evolution? Evolved?{WAIT_PRESS}\nWhat's that about?")), @@ -2292,10 +2292,10 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Oh, wow!{WAIT_PRESS}\nYour own appearance...{WAIT_PRESS}\nThat can change?!")), @@ -2308,8 +2308,8 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ MSG_NPC(4, _(" And perhaps that cave\nbecame unsealed.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_LEFT, 0x0002, 0x00000000), PORTRAIT_POS(2, -2, 0), MSG_NPC(2, _(" So if I evolved, I would\nbecome like {NAME_3}?!")), @@ -2320,24 +2320,24 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ MSG_NPC(3, _(" I wish...{WAIT_PRESS}\nI want to be Butterfree quickly...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(5, _(" W-wait a second.{WAIT_PRESS}\nI don't know if I like this or not...")), MSG_NPC(5, _(" My cute little face turned\nall craggy...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + AWAIT_CUE(5), MSG_NPC(4, _(" Evolution is not a bad\nthing.")), MSG_NPC(4, _(" Appearance isn't the only\nthing that changes through evolution.")), MSG_NPC(4, _(" One's power and abilities\nmay be enhanced, for example.")), TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(7), + ALERT_CUE(8), + ALERT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), MSG_NPC(5, _(" Oh! Really?!{WAIT_PRESS}\nI...{WAIT_PRESS} I might be stronger?!")), TEXTBOX_CLEAR, @@ -2346,14 +2346,14 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ MSG_NPC(3, _(" I wish I could be Butterfree\nsoon...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000041), MSG_NPC(2, _(" M-me too!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(30), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -2362,24 +2362,24 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ VARIANT_DEFAULT(_(" Can we evolve if we go to\nthat cave?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(9), + ALERT_CUE(10), + AWAIT_CUE(5), MSG_NPC(4, _(" Yes.{WAIT_PRESS}\nBut it would depend on the conditions.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_WEST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}.{WAIT_PRESS}\nWe should go to the cave if we want to\nevolve.")), VARIANT(/* == */ 3, _(" {NAME_0}.{WAIT_PRESS}\nLet's go to the cave if we're ready to\nevolve.")), VARIANT_DEFAULT(_(" {NAME_0}.{WAIT_PRESS}\nLet's go to the cave if we're ready to\nevolve.")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -2408,193 +2408,193 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ static const struct ScriptCommand s_gs2_g29_s0_lives1_dlg0[] = { /* 0x8187888 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000011, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + WALK_GRID(256, 17), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000012, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + WALK_GRID(256, 18), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_WEST), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), WAIT(15), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_NORTHEAST), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(6), CALL_SCRIPT(QUESTION_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), WAIT(90), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs2_g29_s0_lives2_dlg0[] = { /* 0x8187b78 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000013, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 19), + AWAIT_CUE(7), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(7), WAIT(5), - { 0x6b, 0x00, 0x0100, 0x00000014, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 20), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(7), WAIT(4), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(7), WAIT(4), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(7), WAIT(3), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), HALT, }; static const struct ScriptCommand s_gs2_g29_s0_lives3_dlg0[] = { /* 0x8187d98 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000015, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 21), + ALERT_CUE(5), + AWAIT_CUE(8), WAIT(20), - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(8), WAIT(10), - { 0x6b, 0x00, 0x0100, 0x00000016, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 22), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(8), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(8), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(8), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(8), WAIT(4), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs2_g29_s0_lives4_dlg0[] = { /* 0x8187f58 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(9), + ROTATE(8, 10, DIRECTION_SOUTHWEST), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_NORTH), + AWAIT_CUE(9), + ROTATE(4, 10, DIRECTION_EAST), + AWAIT_CUE(9), + ROTATE(8, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(8, 10, DIRECTION_EAST), + ALERT_CUE(5), + AWAIT_CUE(9), + ROTATE(8, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(9), HALT, }; static const struct ScriptCommand s_gs2_g29_s0_lives5_dlg0[] = { /* 0x81880b8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), WAIT(10), - { 0x91, 0x08, 0x000a, 0x00000007, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_SOUTHWEST), WAIT(30), - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(10), + ROTATE(10, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(8, 10, DIRECTION_NORTHWEST), + AWAIT_CUE(10), + ROTATE(10, 10, DIRECTION_SOUTHWEST), + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(10, 10, DIRECTION_WEST), + AWAIT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0a, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(10, 10, DIRECTION_SOUTH), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_WEST), CALL_SCRIPT(NOTICE_FUNC), - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(10), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(10), HALT, }; static const struct ScriptCommand s_gs2_g29_s0_lives6_dlg0[] = { /* 0x81882a8 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x0c, 0x000a, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(11), + ROTATE(12, 10, DIRECTION_NORTHWEST), + ALERT_CUE(5), + AWAIT_CUE(11), WAIT(4), - { 0x91, 0x0c, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, + ROTATE(12, 10, DIRECTION_SOUTH), + AWAIT_CUE(11), HALT, }; @@ -2609,7 +2609,7 @@ static const struct ScriptRef s_gs2_g30_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs2_g30_s0_lives0_dlg2[] = { /* 0x81883b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" First I have to evolve like\nMetapod!")), @@ -2618,7 +2618,7 @@ static const struct ScriptCommand s_gs2_g30_s0_lives0_dlg2[] = { /* 0x81883b4 */ static const struct ScriptCommand s_gs2_g30_s0_lives1_dlg2[] = { /* 0x818843c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Oh, I hope I can be\nButterfree soon...")), @@ -2627,7 +2627,7 @@ static const struct ScriptCommand s_gs2_g30_s0_lives1_dlg2[] = { /* 0x818843c */ static const struct ScriptCommand s_gs2_g30_s0_lives2_dlg2[] = { /* 0x81884c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I suspect that cave is where\nevolution can take place.")), @@ -2637,7 +2637,7 @@ static const struct ScriptCommand s_gs2_g30_s0_lives2_dlg2[] = { /* 0x81884c8 */ static const struct ScriptCommand s_gs2_g30_s0_lives3_dlg2[] = { /* 0x818856c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" I might become\nstronger!{WAIT_PRESS}\nOoh, it's exciting...")), @@ -2647,13 +2647,13 @@ static const struct ScriptCommand s_gs2_g30_s0_lives3_dlg2[] = { /* 0x818856c */ static const struct ScriptCommand s_gs2_g30_s0_lives4_dlg0[] = { /* 0x8188604 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs2_g30_s0_lives4_dlg2[] = { /* 0x8188644 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" That cave's entrance\nappears rather narrow.\nOnly one may enter at a time, it seems.")), diff --git a/src/data/ground/ground_data_t01p03_station.h b/src/data/ground/ground_data_t01p03_station.h index caf51beb5..e645b0a35 100644 --- a/src/data/ground/ground_data_t01p03_station.h +++ b/src/data/ground/ground_data_t01p03_station.h @@ -176,7 +176,7 @@ static const struct ScriptRef s_gs4_g0_s0_evt1_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs4_g0_s0_obj0_dlg2[] = { /* 0x818a1f8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0xaf, 0x01, 0x000d, 0x00000000, 0x00000000, NULL }, @@ -205,17 +205,17 @@ static const struct ScriptCommand s_gs4_g0_s0_lives0_dlg0[] = { /* 0x818a358 */ { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x000001e0, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x60, 0x00, 0x0000, 0x00000018, 0x00000000, NULL }, LABEL(1), /* = 0x01 */ { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, WAIT(15), { 0x68, 0x00, 0x0100, 0x00000018, 0x00000000, NULL }, WAIT(15), - { 0x91, 0x1e, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0x7a, 0x00, 0x012c, 0x00000001, 0x00000000, NULL }, - { 0x7a, 0x00, 0x012c, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x1e, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(30, 10, DIRECTION_WEST), + WALK_DIRECT(300, 1), + WALK_DIRECT(300, 0), + ROTATE(30, 10, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, WAIT(15), @@ -234,12 +234,12 @@ static const struct ScriptCommand s_gs4_g0_s0_lives1_dlg0[] = { /* 0x818a4f8 */ { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x000001e0, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x60, 0x00, 0x0000, 0x00000018, 0x00000000, NULL }, LABEL(1), /* = 0x01 */ WAIT(90), - { 0x7a, 0x00, 0x012c, 0x00000002, 0x00000000, NULL }, - { 0x91, 0x1e, 0x000a, 0x00000000, 0x00000000, NULL }, + WALK_DIRECT(300, 2), + ROTATE(30, 10, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, WAIT(15), @@ -249,8 +249,8 @@ static const struct ScriptCommand s_gs4_g0_s0_lives1_dlg0[] = { /* 0x818a4f8 */ WAIT(15), { 0x68, 0x00, 0x0100, 0x00000018, 0x00000000, NULL }, WAIT(15), - { 0x91, 0x1e, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0x7a, 0x00, 0x012c, 0x00000003, 0x00000000, NULL }, + ROTATE(30, 10, DIRECTION_EAST), + WALK_DIRECT(300, 3), JUMP_LABEL(1), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, RET, @@ -260,56 +260,56 @@ static const struct ScriptCommand s_gs4_g0_s0_lives1_dlg0[] = { /* 0x818a4f8 */ static const struct ScriptCommand s_gs4_g0_s1_lives0_dlg0[] = { /* 0x818a6a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs4_g0_s1_lives1_dlg0[] = { /* 0x818a6e8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs4_g0_s2_lives0_dlg0[] = { /* 0x818a728 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs4_g0_s2_lives1_dlg0[] = { /* 0x818a768 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs4_g0_s3_lives0_dlg0[] = { /* 0x818a7a8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs4_g0_s3_lives1_dlg0[] = { /* 0x818a7e8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs4_g0_s4_lives0_dlg0[] = { /* 0x818a828 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs4_g0_s4_lives1_dlg0[] = { /* 0x818a868 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -336,7 +336,7 @@ static const struct ScriptCommand s_gs4_g1_s0_lives0_dlg2[] = { /* 0x818a944 */ static const struct ScriptCommand s_gs4_g1_s0_lives1_dlg2[] = { /* 0x818a974 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" My {COLOR CYAN}Team Hydro{RESET} is Bronze\nRank.")), @@ -346,7 +346,7 @@ static const struct ScriptCommand s_gs4_g1_s0_lives1_dlg2[] = { /* 0x818a974 */ static const struct ScriptCommand s_gs4_g1_s0_lives2_dlg2[] = { /* 0x818aa20 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Our {COLOR CYAN}Team Rumblerock{RESET}\nis famous for savagery...")), @@ -356,7 +356,7 @@ static const struct ScriptCommand s_gs4_g1_s0_lives2_dlg2[] = { /* 0x818aa20 */ static const struct ScriptCommand s_gs4_g1_s0_lives3_dlg2[] = { /* 0x818ab0c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_UNK_BD(118, /* to label */ 0), /* likely "is friend area unlocked" (by GroundEnter id) */ @@ -380,7 +380,7 @@ static const struct ScriptCommand s_gs4_g1_s0_lives4_dlg0[] = { /* 0x818ae1c */ JUMPIF_SUM(JUDGE_LT, EVENT_S07E01, 11, /* to label */ 1), LABEL(0), /* = 0x00 */ { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, LABEL(1), /* = 0x01 */ END_DELETE, @@ -388,7 +388,7 @@ static const struct ScriptCommand s_gs4_g1_s0_lives4_dlg0[] = { /* 0x818ae1c */ static const struct ScriptCommand s_gs4_g1_s0_lives4_dlg2[] = { /* 0x818aecc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), JUMPIF_ARRAY(EVENT_T01P03, 2, /* to label */ 0), @@ -412,8 +412,8 @@ static const struct ScriptCommand s_gs4_g1_s0_lives4_dlg2[] = { /* 0x818aecc */ MSG_NPC(1, _(" This is what they say about\nChansey.{WAIT_PRESS} If you are lucky enough to meet\none, you will be filled with happiness.")), MSG_NPC(1, _(" I wonder what sort of\na Pokémon it is.{WAIT_PRESS} Wouldn't you like to meet\none, even once?{WAIT_PRESS} Wait a second...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Waaaaaaaaaaaaaaaaaaaah!")), MSG_NPC(1, _(" You're...{WAIT_PRESS}\nMaybe...{WAIT_PRESS} Chansey?!")), MSG_NPC(1, _(" You are! You really are!{WAIT_PRESS}\nI'm so lucky!")), @@ -427,7 +427,7 @@ static const struct ScriptCommand s_gs4_g1_s0_lives4_dlg2[] = { /* 0x818aecc */ static const struct ScriptCommand s_gs4_g1_s0_lives4_dlg3[] = { /* 0x818b4d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, JUMPIF_ARRAY(EVENT_T01P03, 2, /* to label */ 1), { 0x3b, 0x35, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -435,16 +435,16 @@ static const struct ScriptCommand s_gs4_g1_s0_lives4_dlg3[] = { /* 0x818b4d4 */ COND_EQUAL(2, /* to label */ 2), LABEL(1), /* = 0x01 */ { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(2), WAIT(12), RET, LABEL(2), /* = 0x02 */ { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(2), WAIT(12), RET, }; @@ -453,7 +453,7 @@ static const struct ScriptCommand s_gs4_g1_s0_lives4_dlg3[] = { /* 0x818b4d4 */ static const struct ScriptCommand s_gs4_g1_s1_station_sref_script[] = { /* 0x818b624 */ DEBUGINFO, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(-1, 2), RET, }; @@ -462,19 +462,19 @@ static const struct ScriptRef s_gs4_g1_s1_station_sref = { 401, 7, NULL /* EVENT static const struct ScriptCommand s_gs4_g1_s1_eff0_script[] = { /* 0x818b680 */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), { 0x86, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(4), END_DELETE, }; static const struct ScriptCommand s_gs4_g1_s1_lives0_dlg0[] = { /* 0x818b710 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" (Papa still hasn't come\nhome...)") }, @@ -482,71 +482,71 @@ static const struct ScriptCommand s_gs4_g1_s1_lives0_dlg0[] = { /* 0x818b710 */ TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" ...Oh!{WAIT_PRESS}\nThat voice!")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), FANFARE_PLAY2(453), { 0x97, 0x00, 0x0002, 0x00000003, 0x00000002, NULL }, WAIT(120), FANFARE_STOP2(453), { 0x97, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), MSG_NPC(2, _(" Get set!")), TEXTBOX_CLEAR, TEXTBOX_AUTO_PRESS(0, 0), WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Ha!")), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), + AWAIT_CUE(5), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Ha!")), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ROTATE(4, 10, DIRECTION_WEST), + AWAIT_CUE(5), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Ha!")), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTH), + AWAIT_CUE(5), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Ha!")), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" Ha!")), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(7), + AWAIT_CUE(5), WAIT(30), TEXTBOX_AUTO_PRESS(-1, -1), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), MSG_NPC(3, _(" Papa!")), TEXTBOX_CLEAR, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(10), MSG_NPC(2, _(" Our son, we're sorry for\ncausing you anxiety.")), TEXTBOX_CLEAR, @@ -557,8 +557,8 @@ static const struct ScriptCommand s_gs4_g1_s1_lives0_dlg0[] = { /* 0x818b710 */ MSG_NPC(2, _(" We were traveling the\nworld.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" The world is vast.{WAIT_PRESS}\nThere are countless Pokémon around the\nworld that are unknown in these areas.")), TEXTBOX_CLEAR, WAIT(10), @@ -571,23 +571,23 @@ static const struct ScriptCommand s_gs4_g1_s1_lives0_dlg0[] = { /* 0x818b710 */ WAIT(10), MSG_NPC(3, _(" Oh! Of course!{WAIT_PRESS}\nPapa, you're so special!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, SET_ARRAYVAL(EVENT_T01P03, 1, 1), - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs4_g1_s1_lives1_dlg0[] = { /* 0x818bfec */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -598,112 +598,112 @@ static const struct ScriptCommand s_gs4_g1_s1_lives2_dlg0[] = { /* 0x818c05c */ { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000005, 0x00000000, NULL }, + AWAIT_CUE(7), + WARP_WAYPOINT(0, 5), { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, FANFARE_PLAY2(454), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000006, 0x00000000, NULL }, + WARP_WAYPOINT(0, 6), { 0x8b, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000007, 0x00000000, NULL }, + WARP_WAYPOINT(0, 7), { 0x8b, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000008, 0x00000000, NULL }, + WARP_WAYPOINT(0, 8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x5b, 0x00, 0x0000, 0x00000009, 0x00000000, NULL }, + WARP_WAYPOINT(0, 9), { 0x8b, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(8, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_EAST), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(4), { 0x57, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs4_g1_s1_lives3_dlg0[] = { /* 0x818c4dc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_WEST), WAIT(15), CALL_SCRIPT(LOOK_AROUND_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000007, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTHWEST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_WEST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_SOUTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_WEST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_EAST), { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + ALERT_CUE(5), HALT, }; @@ -760,7 +760,7 @@ static const struct ScriptCommand s_gs4_g3_s0_station_sref_script[] = { /* 0x818 SELECT_ENTITIES(-1, -1), BGM_SWITCH(7), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -771,7 +771,7 @@ static const struct ScriptCommand s_gs4_g3_s0_eff0_script[] = { /* 0x818ca10 */ DEBUGINFO, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), WAIT(30), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, END_DELETE, @@ -779,7 +779,7 @@ static const struct ScriptCommand s_gs4_g3_s0_eff0_script[] = { /* 0x818ca10 */ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -791,53 +791,53 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ MSG_NPC(1, _(" Did you two put up that job?")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTHEAST), + ALERT_CUE(7), MSG_NPC(2, _(" Yup, yup!")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(6), + ALERT_CUE(8), + AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000041), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTHEAST), + ALERT_CUE(6), MSG_NPC(2, _(" A bad Mankey gang is going\nwild in our forest.\nEveryone is upset.")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(6), + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), - { 0x91, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_NORTHEAST), + ALERT_CUE(7), MSG_NPC(2, _(" We don't know why they\nrampage around...")), MSG_NPC(2, _(" But they are always angry\nand attack anyone they see!")), TEXTBOX_CLEAR, WAIT(10), - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(6), + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(10), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmm... That is a problem.")), VARIANT_DEFAULT(_(" Oh, no... That is a problem.")), - { 0x91, 0x04, 0x0001, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_EAST), + ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, we should go.")), @@ -847,13 +847,13 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ MSG_NPC(2, _(" Thank you!\nWe're counting on you!")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), WAIT(30), MSG_INSTANT(_("{CENTER_ALIGN}The place where the Mankey gang\n{CENTER_ALIGN}is wreaking havoc on others...")), BGM_STOP, @@ -861,7 +861,7 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR YELLOW_D}Uproar Forest{RESET} is now\n{CENTER_ALIGN}open for exploration!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -873,72 +873,72 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ static const struct ScriptCommand s_gs4_g3_s0_lives1_dlg0[] = { /* 0x818d208 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000006, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6a, 0x00, 0x0100, -0x00000050, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_NORTHWEST), + AWAIT_CUE(6), + ROTATE(4, 2, DIRECTION_WEST), + AWAIT_CUE(6), + ROTATE(4, 1, DIRECTION_NORTH), + AWAIT_CUE(6), + WALK_RELATIVE(256, -80, 0), HALT, }; static const struct ScriptCommand s_gs4_g3_s0_lives2_dlg0[] = { /* 0x818d328 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + SELECT_ANIMATION(19), WAIT(15), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000007, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTHWEST), HALT, }; static const struct ScriptCommand s_gs4_g3_s0_lives3_dlg0[] = { /* 0x818d3c8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), + AWAIT_CUE(8), + SELECT_ANIMATION(19), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), + SELECT_ANIMATION(2), HALT, }; static const struct ScriptCommand s_gs4_g4_s0_lives0_dlg2[] = { /* 0x818d588 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), ASK3( TRUE, /*default*/ 0, /* speaker */ -1, _("Activate sub-scenario 1-2\n“Team Flag”?")), @@ -961,7 +961,7 @@ static const struct ScriptCommand s_gs4_g5_s0_station_sref_script[] = { /* 0x818 SELECT_ENTITIES(-1, -1), BGM_SWITCH(7), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(30), RET, @@ -971,14 +971,14 @@ static const struct ScriptRef s_gs4_g5_s0_station_sref = { 400, 7, NULL /* EVENT static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -988,9 +988,9 @@ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ VARIANT_DEFAULT(_(" What does it say?{WAIT_PRESS}\nCan you read it?")), TEXTBOX_CLEAR, WAIT(20), - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(6), + AWAIT_CUE(5), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} read the letter.")), TEXTBOX_CLEAR, WAIT(20), @@ -1002,8 +1002,8 @@ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ MSG_LETTER(_("I am lost in the {COLOR YELLOW_D}Howling Forest{RESET}!{WAIT_PRESS}\nSomebody!{WAIT_PRESS} Please save me!”")), TEXTBOX_CLEAR, WAIT(20), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" .............{WAIT_PRESS}\nIt says he ran away because he didn't want\nto be an adult...{WAIT_PRESS} What's up with that?")), @@ -1018,7 +1018,7 @@ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR YELLOW_D}Howling Forest{RESET}\n{CENTER_ALIGN}is now open for exploration!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; @@ -1028,56 +1028,56 @@ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ static const struct ScriptCommand s_gs4_g5_s0_lives1_dlg0[] = { /* 0x818def4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs4_g6_s0_lives0_dlg0[] = { /* 0x818dfd4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), LABEL(0), /* = 0x00 */ WAIT(90), - { 0x54, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(17), WAIT(1), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(17), WAIT(1), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), JUMP_LABEL(0), RET, }; static const struct ScriptCommand s_gs4_g6_s0_lives0_dlg2[] = { /* 0x818e0a4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Oh, no...\nMedicham went down...\nWhat should I do...?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" If I went, I'd only last a\nlittle while... Oh, no...")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), WAIT(1), SELECT_LIVES(6, 0), - { 0xe4, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(2), RET, }; @@ -1085,26 +1085,26 @@ static const struct ScriptCommand s_gs4_g6_s0_lives0_dlg2[] = { /* 0x818e0a4 */ static const struct ScriptCommand s_gs4_g6_s0_lives0_dlg3[] = { /* 0x818e248 */ DEBUGINFO, { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), WAIT(30), { 0x92, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, WAIT(5), { 0x92, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, WAIT(5), { 0x92, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x92, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, WAIT(5), { 0x92, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, WAIT(5), { 0x92, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), RET, }; @@ -1115,7 +1115,7 @@ static const struct ScriptCommand s_gs4_g7_s0_station_sref_script[] = { /* 0x818 SELECT_ENTITIES(-1, -1), BGM_SWITCH(7), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(30), RET, @@ -1125,7 +1125,7 @@ static const struct ScriptRef s_gs4_g7_s0_station_sref = { 400, 7, NULL /* EVENT static const struct ScriptCommand s_gs4_g7_s0_lives0_dlg0[] = { /* 0x818e464 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), @@ -1147,43 +1147,43 @@ static const struct ScriptCommand s_gs4_g7_s0_lives0_dlg0[] = { /* 0x818e464 */ MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR YELLOW_D}Wish Cave{RESET} is now\n{CENTER_ALIGN}open for exploration!")), { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs4_g7_s0_lives1_dlg0[] = { /* 0x818e800 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs4_g7_s0_lives2_dlg0[] = { /* 0x818e840 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs4_g7_s0_lives3_dlg0[] = { /* 0x818e880 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + AWAIT_CUE(6), HALT, }; static const struct ScriptCommand s_gs4_g7_s0_lives4_dlg0[] = { /* 0x818e8c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), LABEL(0), /* = 0x00 */ WAIT(90), - { 0x54, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(17), WAIT(1), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0011, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(17), WAIT(1), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), JUMP_LABEL(0), HALT, }; @@ -1192,7 +1192,7 @@ static const struct ScriptCommand s_gs4_g8_s0_lives0_dlg0[] = { /* 0x818e990 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; @@ -1206,7 +1206,7 @@ static const struct ScriptCommand s_gs4_g8_s0_lives1_dlg0[] = { /* 0x818ea10 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; @@ -1219,7 +1219,7 @@ static const struct ScriptCommand s_gs4_g8_s0_lives1_dlg2[] = { /* 0x818ea60 */ static const struct ScriptCommand s_gs4_g9_s0_station_sref_script[] = { /* 0x818ea90 */ DEBUGINFO, SELECT_ENTITIES(-1, -1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(10, 0), EXECUTE_FUNCTION(EVENT_S09E01A_L002), RET, @@ -1229,12 +1229,12 @@ static const struct ScriptRef s_gs4_g9_s0_station_sref = { 401, 7, NULL /* EVENT static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" Say, sweetie.{WAIT_PRESS}\nHave you seen Gengar around?")), @@ -1243,8 +1243,8 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ LABEL(2), /* = 0x02 */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000042), MSG_NPC(2, _(" Hunh? You did?{WAIT_PRESS}\n...Wh-where?")), TEXTBOX_CLEAR, @@ -1271,16 +1271,16 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ MSG_NPC(3, _(" Yeah... He looks like he has\na lot on his mind...")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" You think so?{WAIT_PRESS}\nHis expression...\nIt looks the same as usual, no?")), MSG_NPC(2, _(" All I have seen is him\nlaughing in his usual mean way?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x0000005c, 0x00000000, NULL }, MSG_NPC(3, _(" No, it's different.{WAIT_PRESS}\nI can tell.")), MSG_NPC(3, _(" The way he sets his mouth.\nIt's different just a little at the corners.")), @@ -1289,19 +1289,19 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ MSG_NPC(2, _(" ...Hmm...{WAIT_PRESS}\nPerhaps that is so.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, MSG_NPC(2, _(" Anyway, without Gengar\naround, {COLOR CYAN}Team Meanies{RESET} can't operate.")), MSG_NPC(2, _(" Such a vexing problem!")), TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -1316,56 +1316,56 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ static const struct ScriptCommand s_gs4_g9_s0_lives1_dlg0[] = { /* 0x818f284 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; static const struct ScriptCommand s_gs4_g9_s0_lives2_dlg0[] = { /* 0x818f2e4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 0), LABEL(0), /* = 0x00 */ { 0x93, 0x04, 0x000a, 0x0000005c, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs4_g9_s0_lives3_dlg0[] = { /* 0x818f434 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(5), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), HALT, }; static const struct ScriptCommand s_gs4_g10_s0_lives0_dlg2[] = { /* 0x818f4f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Anyway, without Gengar\naround, {COLOR CYAN}Team Meanies{RESET} can't operate.")), @@ -1375,7 +1375,7 @@ static const struct ScriptCommand s_gs4_g10_s0_lives0_dlg2[] = { /* 0x818f4f4 */ static const struct ScriptCommand s_gs4_g10_s0_lives1_dlg2[] = { /* 0x818f564 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Something seems to be\nwrong with Gengar lately.")), @@ -1419,7 +1419,7 @@ static const struct ScriptCommand s_gs4_g11_s0_station_sref_script[] = { /* 0x81 LABEL(5), /* = 0x05 */ BGM_SWITCH(7), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -1429,39 +1429,39 @@ static const struct ScriptRef s_gs4_g11_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs4_g11_s1_lives0_dlg0[] = { /* 0x818f840 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), { 0x3c, 0x23, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs4_g11_s1_lives1_dlg0[] = { /* 0x818f8e0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs4_g11_s2_lives0_dlg0[] = { /* 0x818f920 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), { 0x3c, 0x23, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), HALT, }; static const struct ScriptCommand s_gs4_g11_s3_lives0_dlg0[] = { /* 0x818f9b0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), HALT, @@ -1469,7 +1469,7 @@ static const struct ScriptCommand s_gs4_g11_s3_lives0_dlg0[] = { /* 0x818f9b0 */ static const struct ScriptCommand s_gs4_g11_s4_lives0_dlg0[] = { /* 0x818fa00 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), HALT, @@ -1477,7 +1477,7 @@ static const struct ScriptCommand s_gs4_g11_s4_lives0_dlg0[] = { /* 0x818fa00 */ static const struct ScriptCommand s_gs4_g11_s5_lives0_dlg0[] = { /* 0x818fa50 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_TOP_LEFT, 0x0002, 0x00000000), HALT, @@ -1485,7 +1485,7 @@ static const struct ScriptCommand s_gs4_g11_s5_lives0_dlg0[] = { /* 0x818fa50 */ static const struct ScriptCommand s_gs4_g11_s5_lives1_dlg0[] = { /* 0x818faa0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000000), HALT, @@ -1502,7 +1502,7 @@ static const struct ScriptCommand s_gs4_g12_s0_station_sref_script[] = { /* 0x81 CANCEL_LIVES(0, 0), BGM_SWITCH(7), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), SELECT_LIVES(0, 0), { 0xaf, 0x01, 0x000d, 0x00000000, 0x00000000, NULL }, @@ -1514,16 +1514,16 @@ static const struct ScriptRef s_gs4_g12_s0_station_sref = { 402, 7, NULL /* EVEN static const struct ScriptCommand s_gs4_g12_s0_eff0_script[] = { /* 0x818fbec */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x7a, 0x00, 0x008c, 0x0000000a, 0x00000000, NULL }, + AWAIT_CUE(4), + ALERT_CUE(7), + ALERT_CUE(8), + WALK_DIRECT(140, 10), FANFARE_PLAY2(451), WAIT(150), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), WAIT(60), FANFARE_STOP2(451), - { 0x7a, 0x00, 0x003c, 0x0000000b, 0x00000000, NULL }, + WALK_DIRECT(60, 11), { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), END_DELETE, @@ -1531,7 +1531,7 @@ static const struct ScriptCommand s_gs4_g12_s0_eff0_script[] = { /* 0x818fbec */ static const struct ScriptCommand s_gs4_g12_s0_lives0_dlg0[] = { /* 0x818fcdc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x50, 0x00cc, 0x00000002, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1540,20 +1540,20 @@ static const struct ScriptCommand s_gs4_g12_s0_lives0_dlg0[] = { /* 0x818fcdc */ VARIANT(/* == */ 1, _(" Over there... The\n{COLOR CYAN}Pelipper Post Office{RESET}.")), VARIANT_DEFAULT(_(" That building is the\n{COLOR CYAN}Pelipper Post Office{RESET}.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000000c, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), + AWAIT_CUE(5), + ALERT_CUE(6), + WALK_GRID(256, 12), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 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.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), + ROTATE(4, 10, DIRECTION_NORTH), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Take a look at this!\nSee this Bulletin Board?")), VARIANT_DEFAULT(_(" See?\nHave a look at this Bulletin Board.")), @@ -1563,9 +1563,9 @@ static const struct ScriptCommand s_gs4_g12_s0_lives0_dlg0[] = { /* 0x818fcdc */ MSG_NPC(1, _(" It lists rescue jobs.\nCheck it out?")), TEXTBOX_CLEAR, { 0x3c, 0x20, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ROTATE(4, 10, DIRECTION_NORTHEAST), + AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" See?\nThere were jobs listed, right?")), VARIANT(/* == */ 1, _(" If you want to go on a\nrescue, you first choose the job by\nselecting it with {COLOR YELLOW}Accept{RESET}...")), @@ -1598,31 +1598,31 @@ static const struct ScriptCommand s_gs4_g12_s0_lives0_dlg0[] = { /* 0x818fcdc */ VARIANT_DEFAULT(_(" Choose the job on the {COLOR CYAN}Job\nList{RESET}...{WAIT_PRESS} Then, select {COLOR YELLOW}Take Job{RESET}.{WAIT_PRESS}\nTry to always do that before you leave!")), TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs4_g12_s0_lives1_dlg0[] = { /* 0x81909bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x89, 0x50, 0x00cc, 0x00000002, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x0000000d, 0x00000000, NULL }, + AWAIT_CUE(6), + WALK_GRID(256, 13), WAIT(20), { 0x8e, 0x14, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), WAIT(20), { 0x8b, 0x14, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -1631,16 +1631,16 @@ static const struct ScriptCommand s_gs4_g12_s0_lives2_dlg0[] = { /* 0x8190aec */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x60, 0x00, 0x0000, 0x00000008, 0x00000000, NULL }, { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), WAIT(60), { 0x68, 0x00, 0x0100, 0x00000018, 0x00000000, NULL }, WAIT(15), - { 0x91, 0x1e, 0x000a, 0x00000006, 0x00000000, NULL }, + ROTATE(30, 10, DIRECTION_WEST), WAIT(15), - { 0x7a, 0x00, 0x0078, 0x0000000e, 0x00000000, NULL }, + WALK_DIRECT(120, 14), WAIT(15), END_DELETE, RET, @@ -1650,14 +1650,14 @@ static const struct ScriptCommand s_gs4_g12_s0_lives3_dlg0[] = { /* 0x8190bec */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x60, 0x00, 0x0000, 0x00000018, 0x00000000, NULL }, { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), WAIT(160), - { 0x7a, 0x00, 0x0078, 0x0000000f, 0x00000000, NULL }, + WALK_DIRECT(120, 15), WAIT(15), - { 0x91, 0x1e, 0x000a, 0x00000000, 0x00000000, NULL }, + ROTATE(30, 10, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, WAIT(15), @@ -1697,7 +1697,7 @@ static const struct ScriptRef s_gs4_g16_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs4_g16_s0_lives0_dlg2[] = { /* 0x8190dbc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Did you know that you get\na reward if you complete a rescue job?")), @@ -1707,7 +1707,7 @@ static const struct ScriptCommand s_gs4_g16_s0_lives0_dlg2[] = { /* 0x8190dbc */ static const struct ScriptCommand s_gs4_g16_s0_lives1_dlg0[] = { /* 0x8190eb0 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, RET, }; @@ -1720,7 +1720,7 @@ static const struct ScriptCommand s_gs4_g16_s0_lives1_dlg2[] = { /* 0x8190ef0 */ static const struct ScriptCommand s_gs4_g16_s0_lives2_dlg0[] = { /* 0x8190f20 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, RET, }; @@ -1741,7 +1741,7 @@ static const struct ScriptRef s_gs4_g16_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs4_g16_s1_lives0_dlg0[] = { /* 0x8190fcc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, @@ -1752,36 +1752,36 @@ static const struct ScriptCommand s_gs4_g16_s1_lives0_dlg0[] = { /* 0x8190fcc */ MSG_NPC(3, _(" Yes, Papa.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Papa?{WAIT_PRESS}\nPapa, have you ever gone out to sea?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ..................{WAIT_PRESS}\nOf course.")), MSG_NPC(2, _(" What do you take us for?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(3, _(" Oh! You have!{WAIT_PRESS}\nPapa, you're so special!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), JUMP_SCRIPT(END_TALK), }; static const struct ScriptCommand s_gs4_g16_s1_lives1_dlg0[] = { /* 0x8191244 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + ALERT_CUE(5), HALT, }; @@ -1793,14 +1793,14 @@ static const struct ScriptCommand s_gs4_g16_s1_lives1_dlg2[] = { /* 0x81912f4 */ static const struct ScriptCommand s_gs4_g16_s1_lives2_dlg0[] = { /* 0x8191324 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), HALT, }; @@ -1820,7 +1820,7 @@ static const struct ScriptRef s_gs4_g17_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs4_g17_s0_lives0_dlg0[] = { /* 0x8191430 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, RET, }; @@ -1833,7 +1833,7 @@ static const struct ScriptCommand s_gs4_g17_s0_lives0_dlg2[] = { /* 0x8191470 */ static const struct ScriptCommand s_gs4_g17_s0_lives1_dlg0[] = { /* 0x81914a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, RET, }; @@ -1854,7 +1854,7 @@ static const struct ScriptRef s_gs4_g17_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs4_g17_s1_lives0_dlg0[] = { /* 0x819154c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, @@ -1865,36 +1865,36 @@ static const struct ScriptCommand s_gs4_g17_s1_lives0_dlg0[] = { /* 0x819154c */ MSG_NPC(3, _(" Yes, Papa.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Papa?{WAIT_PRESS}\nPapa, have you ever gone out to sea?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ..................{WAIT_PRESS}\nOf course.")), MSG_NPC(2, _(" What do you take us for?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(3, _(" Oh! You have!{WAIT_PRESS}\nPapa, you're so special!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), JUMP_SCRIPT(END_TALK), }; static const struct ScriptCommand s_gs4_g17_s1_lives1_dlg0[] = { /* 0x819171c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + ALERT_CUE(5), HALT, }; @@ -1906,14 +1906,14 @@ static const struct ScriptCommand s_gs4_g17_s1_lives1_dlg2[] = { /* 0x81917cc */ static const struct ScriptCommand s_gs4_g17_s1_lives2_dlg0[] = { /* 0x81917fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), HALT, }; @@ -1939,30 +1939,30 @@ static const struct ScriptRef s_gs4_g18_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs4_g18_s0_lives0_dlg2[] = { /* 0x8191968 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, WAIT(1), MSG_NPC(3, _(" ............Papa said they've\ngone to sea before...")), { 0x34, 0x00, 0x0003, 0x00000000, 0x00000000, _(" .........(Does that mean Papa\ncan swim...?)") }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), ASK3( TRUE, /*default*/ -1, /* speaker */ 3, _(" {NAME_0}.{WAIT_PRESS}\n{NAME_0}, can you swim?")), CHOICE(/* label */ 0, _("Yes.")), CHOICE(/* label */ 1, _("No.")), LABEL(0), /* = 0x00 */ MSG_NPC(3, _(" Oh.\nSo you can swim too, {NAME_0}...")), MSG_NPC(3, _(" OK!\nI'm going to try hard to swim too!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), JUMP_SCRIPT(END_TALK), LABEL(1), /* = 0x01 */ MSG_NPC(3, _(" Oh.\nSo you can't swim either, {NAME_0}...")), MSG_NPC(3, _(" But that's natural.\nSwimming isn't very easy.")), MSG_NPC(3, _(" My papa is special!\nI'm going to try hard to swim too!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), JUMP_SCRIPT(END_TALK), }; @@ -1970,18 +1970,18 @@ static const struct ScriptCommand s_gs4_g18_s0_lives0_dlg3[] = { /* 0x8191c7c */ DEBUGINFO, { 0x2d, 0x09, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x8e, 0x0a, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(5), HALT, }; static const struct ScriptCommand s_gs4_g18_s1_lives0_dlg2[] = { /* 0x8191d1c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You know what?\nThe jobs on the Bulletin Board...")), @@ -2013,7 +2013,7 @@ static const struct ScriptRef s_gs4_g19_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs4_g19_s0_lives0_dlg0[] = { /* 0x81921dc */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, RET, }; @@ -2026,7 +2026,7 @@ static const struct ScriptCommand s_gs4_g19_s0_lives0_dlg2[] = { /* 0x819221c */ static const struct ScriptCommand s_gs4_g19_s0_lives1_dlg0[] = { /* 0x819224c */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, RET, }; @@ -2055,38 +2055,38 @@ static const struct ScriptCommand s_gs4_g19_s1_lives0_dlg0[] = { /* 0x81922f8 */ TEXTBOX_CLEAR, WAIT(10), MSG_NPC(3, _(" Yes, Papa.")), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Papa?{WAIT_PRESS}\nPapa, can you swim?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ..................{WAIT_PRESS}\nOf course.")), MSG_NPC(2, _(" What do you take us for?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(3, _(" Oh! So you can swim!{WAIT_PRESS}\nPapa, you're so special!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs4_g19_s1_lives1_dlg0[] = { /* 0x8192548 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 1, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), + ALERT_CUE(5), RET, }; @@ -2098,14 +2098,14 @@ static const struct ScriptCommand s_gs4_g19_s1_lives1_dlg2[] = { /* 0x81925f8 */ static const struct ScriptCommand s_gs4_g19_s1_lives2_dlg0[] = { /* 0x8192628 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), RET, }; @@ -2127,7 +2127,7 @@ static const struct ScriptRef s_gs4_g20_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs4_g20_s0_lives0_dlg0[] = { /* 0x8192744 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET, }; @@ -2139,14 +2139,14 @@ static const struct ScriptCommand s_gs4_g20_s0_lives0_dlg2[] = { /* 0x8192784 */ static const struct ScriptCommand s_gs4_g20_s0_lives1_dlg0[] = { /* 0x81927b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 2, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), HALT, }; @@ -2158,9 +2158,9 @@ static const struct ScriptCommand s_gs4_g20_s0_lives1_dlg2[] = { /* 0x8192854 */ static const struct ScriptCommand s_gs4_g20_s1_lives0_dlg0[] = { /* 0x8192884 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -2169,7 +2169,7 @@ static const struct ScriptCommand s_gs4_g20_s1_station_sref_script[] = { /* 0x81 DEBUGINFO, CANCEL_LIVES(-1, 0), SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -2177,16 +2177,16 @@ static const struct ScriptRef s_gs4_g20_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs4_g20_s1_eff0_script[] = { /* 0x8192940 */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, @@ -2197,53 +2197,53 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ MSG_NPC(3, _(" Yes, Papa.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Papa?{WAIT_PRESS}\nPapa, how do you swim in the sea?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ..................{WAIT_PRESS}\nWell, Son...{WAIT_PRESS}\nThe three of us cooperate, and...")), TEXTBOX_CLEAR, WAIT(10), TEXTBOX_AUTO_PRESS(0, 0), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, TEXTBOX_CLEAR, PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(30, 30), PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), TEXTBOX_AUTO_PRESS(-1, -1), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), MSG_NPC(2, _(" ...And that's sort of how\nwe swim!{WAIT_PRESS}\nGasp, gasp...")), @@ -2252,30 +2252,30 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ WAIT(10), MSG_NPC(3, _(" OK!{WAIT_PRESS}\nPapa, you're so special!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs4_g20_s1_lives2_dlg0[] = { /* 0x8192fa8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -2284,70 +2284,70 @@ static const struct ScriptCommand s_gs4_g20_s1_lives3_dlg0[] = { /* 0x8193098 */ DEBUGINFO, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, { 0x59, 0x01, -0x0050, 0x00000030, 0x00000000, NULL }, { 0x8b, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, { 0x59, 0x01, 0x0050, -0x00000030, 0x00000000, NULL }, { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, { 0x59, 0x01, -0x0030, 0x00000030, 0x00000000, NULL }, { 0x8b, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, { 0x59, 0x01, 0x0030, -0x00000030, 0x00000000, NULL }, { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + ROTATE(8, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x57, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, RET, @@ -2362,22 +2362,22 @@ static const struct ScriptCommand s_gs4_g20_s1_lives3_dlg2[] = { /* 0x81934f8 */ static const struct ScriptCommand s_gs4_g20_s1_lives4_dlg0[] = { /* 0x8193528 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), RET, HALT, }; @@ -2400,7 +2400,7 @@ static const struct ScriptRef s_gs4_g21_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs4_g21_s0_lives0_dlg0[] = { /* 0x81936e4 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET, }; @@ -2413,7 +2413,7 @@ static const struct ScriptCommand s_gs4_g21_s0_lives0_dlg2[] = { /* 0x8193724 */ static const struct ScriptCommand s_gs4_g21_s0_lives1_dlg0[] = { /* 0x8193754 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET, }; @@ -2426,7 +2426,7 @@ static const struct ScriptCommand s_gs4_g21_s0_lives1_dlg2[] = { /* 0x8193794 */ static const struct ScriptCommand s_gs4_g21_s1_station_sref_script[] = { /* 0x81937c4 */ DEBUGINFO, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -2434,16 +2434,16 @@ static const struct ScriptRef s_gs4_g21_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs4_g21_s1_eff0_script[] = { /* 0x8193810 */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, @@ -2455,54 +2455,54 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ MSG_NPC(3, _(" Especially when I'm\nburrowing. It makes me twitchy because\nI get so scared.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Papa?{WAIT_PRESS}\nPapa, aren't you afraid of earthquakes?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ........................{WAIT_PRESS}\nOf course they don't scare us.")), MSG_NPC(2, _(" What do you...{WAIT_PRESS}\nTake us for?!")), MSG_NPC(2, _(" If we were in charge...{WAIT_PRESS}\nThis is what we'd do to any earthquake!")), TEXTBOX_CLEAR, TEXTBOX_AUTO_PRESS(0, 0), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT_FLIP, 0x0002, 0x00000000), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), + ALERT_CUE(6), + ALERT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(30, 30), PORTRAIT(PLACEMENT_RIGHT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), TEXTBOX_AUTO_PRESS(-1, -1), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), MSG_NPC(2, _(" Gasp, gasp...")), @@ -2510,30 +2510,30 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ WAIT(10), MSG_NPC(3, _(" OK!{WAIT_PRESS}\nPapa, you're so special!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + ALERT_CUE(8), + AWAIT_CUE(5), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs4_g21_s1_lives1_dlg0[] = { /* 0x8193edc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -2542,70 +2542,70 @@ static const struct ScriptCommand s_gs4_g21_s1_lives2_dlg0[] = { /* 0x8193fcc */ DEBUGINFO, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, { 0x59, 0x01, -0x0050, 0x00000030, 0x00000000, NULL }, { 0x8b, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, { 0x59, 0x01, 0x0050, -0x00000030, 0x00000000, NULL }, { 0x8b, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, { 0x59, 0x01, -0x0030, 0x00000030, 0x00000000, NULL }, { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), FANFARE_PLAY2(486), - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, { 0x59, 0x01, 0x0030, -0x00000030, 0x00000000, NULL }, { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(454), { 0x53, 0x00, 0x0000, 0x00400000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0016, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(22), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(2), + ROTATE(8, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x57, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, RET, @@ -2619,23 +2619,23 @@ static const struct ScriptCommand s_gs4_g21_s1_lives2_dlg2[] = { /* 0x819442c */ static const struct ScriptCommand s_gs4_g21_s1_lives3_dlg0[] = { /* 0x819445c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000004, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), + ROTATE(4, 10, DIRECTION_NORTH), + ALERT_CUE(5), + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), RET, }; @@ -2662,7 +2662,7 @@ static const struct ScriptRef s_gs4_g22_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs4_g22_s0_lives0_dlg0[] = { /* 0x8194658 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET, }; @@ -2681,7 +2681,7 @@ static const struct ScriptCommand s_gs4_g22_s0_lives1_dlg2[] = { /* 0x81946c8 */ static const struct ScriptCommand s_gs4_g22_s1_station_sref_script[] = { /* 0x81946f8 */ DEBUGINFO, SELECT_ENTITIES(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_ENTITIES(-1, 2), RET, }; @@ -2690,16 +2690,16 @@ static const struct ScriptRef s_gs4_g22_s1_station_sref = { 401, 7, NULL /* EVEN static const struct ScriptCommand s_gs4_g22_s1_eff0_script[] = { /* 0x8194754 */ DEBUGINFO, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs4_g22_s1_lives0_dlg0[] = { /* 0x81947b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0002, 0x00000042, 0x00000000, NULL }, { 0x2d, 0x09, 0x0003, 0x00000044, 0x00000000, NULL }, @@ -2710,13 +2710,13 @@ static const struct ScriptCommand s_gs4_g22_s1_lives0_dlg0[] = { /* 0x81947b4 */ MSG_NPC(3, _(" Yes, Papa.{WAIT_PRESS}\nIt frightens me so much I don't know\nwhat to think.")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), MSG_NPC(3, _(" Papa?{WAIT_PRESS}\nAre you going to the {COLOR YELLOW_D}Magma Cavern{RESET} too,\nPapa?")), TEXTBOX_CLEAR, WAIT(10), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), MSG_NPC(2, _(" ........................{WAIT_PRESS}\nOf course.")), MSG_NPC(2, _(" What do you take us for?!")), MSG_NPC(2, _(" If we were in charge...{WAIT_PRESS}\nThis is what we'd do to the {COLOR YELLOW_D}Magma\nCavern{RESET}!{WAIT_PRESS} Hah!")), @@ -2726,30 +2726,30 @@ static const struct ScriptCommand s_gs4_g22_s1_lives0_dlg0[] = { /* 0x81947b4 */ MSG_NPC(2, _(" Hah!")), TEXTBOX_CLEAR, FANFARE_PLAY2(486), - { 0xe4, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(7), + AWAIT_CUE(5), TEXTBOX_AUTO_PRESS(-1, -1), MSG_NPC(3, _(" ............")), MSG_NPC(3, _(" ........................")), MSG_NPC(3, _(" ....................................{WAIT_PRESS}Huh?{WAIT_PRESS}\nPapa?{WAIT_PRESS} Where did you go, Papa?")), TEXTBOX_CLEAR, WAIT(30), - { 0xe4, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(8), + AWAIT_CUE(5), SET_ARRAYVAL(EVENT_T01P03, 0, 1), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs4_g22_s1_lives1_dlg0[] = { /* 0x8194c3c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -2757,35 +2757,35 @@ static const struct ScriptCommand s_gs4_g22_s1_lives1_dlg0[] = { /* 0x8194c3c */ static const struct ScriptCommand s_gs4_g22_s1_lives2_dlg0[] = { /* 0x8194cac */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0007, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0017, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(7), + ROTATE(4, 10, DIRECTION_SOUTH), + ALERT_CUE(5), + AWAIT_CUE(7), + SELECT_ANIMATION(23), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(5), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs4_g22_s1_lives3_dlg0[] = { /* 0x8194d7c */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(8), { 0x8e, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(8), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(30), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), WAIT(10), - { 0x91, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 10, DIRECTION_EAST), + ALERT_CUE(5), HALT, }; @@ -2820,19 +2820,19 @@ static const struct ScriptRef s_gs4_g23_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs4_g23_s0_lives0_dlg1[] = { /* 0x8194f6c */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), HALT, }; static const struct ScriptCommand s_gs4_g23_s0_lives0_dlg2[] = { /* 0x8194fac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Papa hasn't come back...{WAIT_PRESS}\nI wonder where they went?")), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Oh!{WAIT_PRESS} Maybe they've already\ngone to the {COLOR YELLOW_D}Magma Cavern{RESET}...")), MSG_NPC(1, _(" And maybe they're already\nfighting Groudon.")), MSG_NPC(1, _(" And, maybe, maybe...{WAIT_PRESS}\nMaybe they've already won.{WAIT_PRESS}\nMaybe they've already beaten Groudon!")), @@ -2842,12 +2842,12 @@ static const struct ScriptCommand s_gs4_g23_s0_lives0_dlg2[] = { /* 0x8194fac */ static const struct ScriptCommand s_gs4_g23_s0_lives0_dlg3[] = { /* 0x81951c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(2), RET, }; @@ -2862,19 +2862,19 @@ static const struct ScriptRef s_gs4_g24_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs4_g24_s0_lives0_dlg0[] = { /* 0x819527c */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs4_g24_s0_lives0_dlg2[] = { /* 0x81952bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Papa hasn't come back yet...\nI wonder what happened to them?")), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Oh!{WAIT_PRESS}\nMaybe they've already gone to the sky...")), MSG_NPC(1, _(" And maybe they've already\nmet Rayquaza...")), MSG_NPC(1, _(" ...That's not possible.\nEven Papa can't fly.")), @@ -2884,18 +2884,18 @@ static const struct ScriptCommand s_gs4_g24_s0_lives0_dlg2[] = { /* 0x81952bc */ static const struct ScriptCommand s_gs4_g24_s0_lives0_dlg3[] = { /* 0x8195484 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(2), RET, }; static const struct ScriptCommand s_gs4_g24_s0_lives1_dlg2[] = { /* 0x8195504 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" If that shooting star\ncrashes, it's going to be terrible!")), @@ -2905,7 +2905,7 @@ static const struct ScriptCommand s_gs4_g24_s0_lives1_dlg2[] = { /* 0x8195504 */ static const struct ScriptCommand s_gs4_g24_s0_lives2_dlg2[] = { /* 0x81955d8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Oh my, isn't this awful!")), @@ -2925,19 +2925,19 @@ static const struct ScriptRef s_gs4_g25_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs4_g25_s0_lives0_dlg0[] = { /* 0x8195710 */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs4_g25_s0_lives0_dlg2[] = { /* 0x8195750 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Papa hasn't come back yet...\nI wonder what happened to them?")), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Oh!{WAIT_PRESS}\nMaybe they've already gone to the sky...")), MSG_NPC(1, _(" And maybe they've already\nmet Rayquaza...")), MSG_NPC(1, _(" ...That's not possible.\nEven Papa can't fly.")), @@ -2947,18 +2947,18 @@ static const struct ScriptCommand s_gs4_g25_s0_lives0_dlg2[] = { /* 0x8195750 */ static const struct ScriptCommand s_gs4_g25_s0_lives0_dlg3[] = { /* 0x8195820 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(2), RET, }; static const struct ScriptCommand s_gs4_g25_s0_lives1_dlg2[] = { /* 0x81958a0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You're going, aren't you?\nGo for it!")), @@ -2967,7 +2967,7 @@ static const struct ScriptCommand s_gs4_g25_s0_lives1_dlg2[] = { /* 0x81958a0 */ static const struct ScriptCommand s_gs4_g25_s0_lives2_dlg2[] = { /* 0x819592c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Oh my, it's time to go?")), @@ -2987,19 +2987,19 @@ static const struct ScriptRef s_gs4_g26_s0_station_sref = { 403, 8, NULL /* STAT static const struct ScriptCommand s_gs4_g26_s0_lives0_dlg0[] = { /* 0x8195a1c */ DEBUGINFO, { 0x52, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs4_g26_s0_lives0_dlg2[] = { /* 0x8195a5c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Papa hasn't come back yet...\nI wonder what happened to them?")), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Oh!{WAIT_PRESS}\nMaybe they've already gone to the sky...")), MSG_NPC(1, _(" And maybe they've already\nmet Rayquaza...")), MSG_NPC(1, _(" ...That's not possible.\nEven Papa can't fly.")), @@ -3009,18 +3009,18 @@ static const struct ScriptCommand s_gs4_g26_s0_lives0_dlg2[] = { /* 0x8195a5c */ static const struct ScriptCommand s_gs4_g26_s0_lives0_dlg3[] = { /* 0x8195b2c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(2), RET, }; static const struct ScriptCommand s_gs4_g26_s0_lives1_dlg2[] = { /* 0x8195bac */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You'll get it done next time!\nGo for it!")), @@ -3029,7 +3029,7 @@ static const struct ScriptCommand s_gs4_g26_s0_lives1_dlg2[] = { /* 0x8195bac */ static const struct ScriptCommand s_gs4_g26_s0_lives2_dlg2[] = { /* 0x8195c38 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You must make another\nchallenge.")), @@ -3053,7 +3053,7 @@ static const struct ScriptRef s_gs4_g27_s0_station_sref = { 400, 7, NULL /* EVEN static const struct ScriptCommand s_gs4_g27_s0_eff0_script[] = { /* 0x8195d88 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0099, 0x00000010, 0x00000000, NULL }, + WALK_GRID(153, 16), HALT, }; @@ -3069,23 +3069,23 @@ static const struct ScriptCommand s_gs4_g28_s0_lives0_dlg1[] = { /* 0x8195e04 */ DEBUGINFO, { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET, }; static const struct ScriptCommand s_gs4_g28_s0_lives0_dlg2[] = { /* 0x8195e54 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x34, 0x00, 0x0001, 0x00000000, 0x00000000, _(" (Everything returned to\npeace...)") }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" But Papa still hasn't come\nback...")), MSG_NPC(1, _(" Everyone says they haven't\nseen them...{WAIT_PRESS}\nWhere did my papa go?")), FANFARE_PLAY2(465), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), + AWAIT_CUE(5), MSG_NPC(1, _(" Oh!{WAIT_PRESS}\nMaybe they got left behind in the sky...")), MSG_NPC(1, _(" And maybe Rayquaza is\nhaving them as a meal...")), MSG_NPC(1, _(" ......{WAIT_PRESS}That's not possible.{WAIT_PRESS}\nPapa can't fly in the first place.")), @@ -3095,21 +3095,21 @@ static const struct ScriptCommand s_gs4_g28_s0_lives0_dlg2[] = { /* 0x8195e54 */ static const struct ScriptCommand s_gs4_g28_s0_lives0_dlg3[] = { /* 0x819609c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(5), + AWAIT_CUE(2), RET, }; static const struct ScriptCommand s_gs4_g28_s0_lives1_dlg2[] = { /* 0x819614c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Oh, how marvelous,\n{NAME_0}!")), @@ -3119,7 +3119,7 @@ static const struct ScriptCommand s_gs4_g28_s0_lives1_dlg2[] = { /* 0x819614c */ static const struct ScriptCommand s_gs4_g28_s0_lives2_dlg2[] = { /* 0x8196210 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You were flat-out\nincredible!")), @@ -3129,7 +3129,7 @@ static const struct ScriptCommand s_gs4_g28_s0_lives2_dlg2[] = { /* 0x8196210 */ static const struct ScriptCommand s_gs4_g28_s0_lives3_dlg2[] = { /* 0x81962d8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" Oh, darlings, you've outdone\nyourselves, {NAME_0}!")), @@ -3138,7 +3138,7 @@ static const struct ScriptCommand s_gs4_g28_s0_lives3_dlg2[] = { /* 0x81962d8 */ static const struct ScriptCommand s_gs4_g28_s0_lives4_dlg2[] = { /* 0x8196370 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_NPC(1, _(" You fought your way up\na tower of clouds?{WAIT_PRESS} I can't even imagine\nthat. Sounds kind of wow!{WAIT_PRESS} Ayup!")), @@ -3152,7 +3152,7 @@ static const struct ScriptCommand s_gs4_g29_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), BGM_SWITCH(40), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -3163,11 +3163,11 @@ static const struct ScriptCommand s_gs4_g29_s0_lives0_dlg0[] = { /* 0x81964d4 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x80, 0x00, 0x0100, 0x00000011, 0x00000000, NULL }, { 0x80, 0x00, 0x0180, 0x00000012, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x80, 0x00, 0x0200, 0x00000013, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_t01p04_station.h b/src/data/ground/ground_data_t01p04_station.h index 9a73ea2f8..e384d2017 100644 --- a/src/data/ground/ground_data_t01p04_station.h +++ b/src/data/ground/ground_data_t01p04_station.h @@ -58,14 +58,14 @@ static const struct ScriptRef s_gs5_g0_s0_evt0_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs5_g0_s1_lives0_dlg0[] = { /* 0x8197c70 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs5_g0_s1_lives1_dlg0[] = { /* 0x8197cb0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -83,7 +83,7 @@ static const struct ScriptRef s_gs5_g1_s0_station_sref = { 403, 8, NULL /* STATI static const struct ScriptCommand s_gs5_g1_s0_lives0_dlg2[] = { /* 0x8197d5c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1c, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -100,7 +100,7 @@ static const struct ScriptCommand s_gs5_g1_s0_lives0_dlg2[] = { /* 0x8197d5c */ static const struct ScriptCommand s_gs5_g1_s0_lives1_dlg2[] = { /* 0x8197e3c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1e, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -109,7 +109,7 @@ static const struct ScriptCommand s_gs5_g1_s0_lives1_dlg2[] = { /* 0x8197e3c */ static const struct ScriptCommand s_gs5_g1_s0_lives2_dlg2[] = { /* 0x8197e9c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1f, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -130,7 +130,7 @@ static const struct ScriptCommand s_gs5_g2_s0_station_sref_script[] = { /* 0x819 SELECT_ENTITIES(-1, -1), BGM_SWITCH(7), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 1, 0), SELECT_EVENTS(0, 0), RET, @@ -141,24 +141,24 @@ static const struct ScriptRef s_gs5_g2_s0_station_sref = { 402, 7, NULL /* EVENT static const struct ScriptCommand s_gs5_g2_s0_lives0_dlg0[] = { /* 0x8197fe8 */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x1d, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs5_g2_s0_lives1_dlg0[] = { /* 0x8198098 */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAIT_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -166,9 +166,9 @@ static const struct ScriptCommand s_gs5_g2_s0_lives1_dlg0[] = { /* 0x8198098 */ static const struct ScriptCommand s_gs5_g2_s0_lives2_dlg0[] = { /* 0x8198118 */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -180,7 +180,7 @@ static const struct ScriptCommand s_gs5_g3_s0_station_sref_script[] = { /* 0x819 SELECT_ENTITIES(-1, -1), BGM_SWITCH(7), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 1, 0), SELECT_EVENTS(0, 0), RET, @@ -191,7 +191,7 @@ static const struct ScriptRef s_gs5_g3_s0_station_sref = { 402, 7, NULL /* EVENT static const struct ScriptCommand s_gs5_g3_s0_lives0_dlg0[] = { /* 0x8198234 */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), { 0x2d, 0x09, 0x0002, 0x0000002f, 0x00000000, NULL }, { 0x3b, 0x0c, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -199,28 +199,28 @@ static const struct ScriptCommand s_gs5_g3_s0_lives0_dlg0[] = { /* 0x8198234 */ MSG_NPC(2, _(" Oh! Welcome back!{WAIT_PRESS}\nThe rescue...{WAIT_PRESS}went badly, I see...")), MSG_NPC(2, _(" But that wasn't the final\nchance! Don't give up!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, LABEL(0), /* = 0x00 */ MSG_NPC(2, _(" Oh! Welcome back!{WAIT_PRESS}\nThe rescue...{WAIT_PRESS}went badly, I see...")), MSG_NPC(2, _(" I'm terribly sorry, but you\nmay not go on that rescue again...")), MSG_NPC(2, _(" Please inform your friend\nthat, regrettably, the friend rescue\nmission ended in failure.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs5_g3_s0_lives1_dlg0[] = { /* 0x81984bc */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAIT_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -233,7 +233,7 @@ static const struct ScriptCommand s_gs5_g4_s0_station_sref_script[] = { /* 0x819 SELECT_ENTITIES(-1, -1), BGM_SWITCH(7), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 1, 0), SELECT_EVENTS(0, 0), RET, @@ -244,7 +244,7 @@ static const struct ScriptRef s_gs5_g4_s0_station_sref = { 402, 7, NULL /* EVENT static const struct ScriptCommand s_gs5_g4_s0_lives0_dlg0[] = { /* 0x81985f8 */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), { 0x2d, 0x09, 0x0002, 0x0000002f, 0x00000000, NULL }, { 0x3b, 0x0c, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -252,28 +252,28 @@ static const struct ScriptCommand s_gs5_g4_s0_lives0_dlg0[] = { /* 0x81985f8 */ MSG_NPC(2, _(" Oh! Welcome back!{WAIT_PRESS}\nThe rescue...{WAIT_PRESS}went badly, I see...")), MSG_NPC(2, _(" But that wasn't the final\nchance! Don't give up!")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, LABEL(0), /* = 0x00 */ MSG_NPC(2, _(" Oh! Welcome back!{WAIT_PRESS}\nThe rescue...{WAIT_PRESS}went badly, I see...")), MSG_NPC(2, _(" I'm terribly sorry, but you\nmay not go on that rescue again...")), MSG_NPC(2, _(" Please inform your friend\nthat, regrettably, the friend rescue\nmission ended in failure.")), TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs5_g4_s0_lives1_dlg0[] = { /* 0x8198768 */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAIT_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -284,7 +284,7 @@ static const struct ScriptCommand s_gs5_g5_s0_station_sref_script[] = { /* 0x819 SELECT_ENTITIES(-1, -1), BGM_SWITCH(40), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -294,9 +294,9 @@ static const struct ScriptRef s_gs5_g5_s0_station_sref = { 400, 7, NULL /* EVENT static const struct ScriptCommand s_gs5_g5_s0_eff0_script[] = { /* 0x8198874 */ DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), WAIT(1), - { 0x6b, 0x00, 0x0080, 0x00000000, 0x00000000, NULL }, + WALK_GRID(128, 0), { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), END_DELETE, @@ -305,40 +305,40 @@ static const struct ScriptCommand s_gs5_g5_s0_eff0_script[] = { /* 0x8198874 */ static const struct ScriptCommand s_gs5_g5_s0_lives0_dlg0[] = { /* 0x81988f4 */ DEBUGINFO, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), WAIT(60), - { 0x54, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(5), WAIT(30), - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), WAIT(30), { 0x68, 0x00, 0x0080, 0x00000020, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x80, 0x00, 0x0080, 0x00000002, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000002, 0x00000000, NULL }, + ROTATE(8, 10, DIRECTION_EAST), { 0x80, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x80, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, HALT, }; static const struct ScriptCommand s_gs5_g5_s0_lives1_dlg0[] = { /* 0x8198a24 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x91, 0x08, 0x000a, 0x00000006, 0x00000000, NULL }, + AWAIT_CUE(6), + ROTATE(8, 10, DIRECTION_WEST), HALT, }; static const struct ScriptCommand s_gs5_g5_s0_lives2_dlg0[] = { /* 0x8198a84 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x6b, 0x00, 0x0100, 0x00000005, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + WALK_GRID(256, 5), + ALERT_CUE(5), HALT, }; diff --git a/src/data/ground/ground_data_t01p05_station.h b/src/data/ground/ground_data_t01p05_station.h index 67e0b2da1..77353e2fd 100644 --- a/src/data/ground/ground_data_t01p05_station.h +++ b/src/data/ground/ground_data_t01p05_station.h @@ -63,28 +63,28 @@ static const struct ScriptRef s_gs6_g0_s0_evt0_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs6_g0_s1_lives0_dlg0[] = { /* 0x8199134 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs6_g0_s1_lives1_dlg0[] = { /* 0x8199174 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs6_g0_s2_lives0_dlg0[] = { /* 0x81991b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs6_g0_s2_lives1_dlg0[] = { /* 0x81991f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -130,7 +130,7 @@ static const struct ScriptCommand s_gs6_g1_s0_lives0_dlg1[] = { /* 0x81993ac */ static const struct ScriptCommand s_gs6_g1_s0_lives0_dlg2[] = { /* 0x81993dc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x06, 0x00, 0x001e, -0x00000001, 0x00000000, NULL }, @@ -161,7 +161,7 @@ static const struct ScriptRef s_gs6_g1_s0_evt0_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs6_g1_s1_evt0_sref_script[] = { /* 0x8199528 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), MSG_INSTANT(_("{CENTER_ALIGN}There appears to be no one inside.")), @@ -179,7 +179,7 @@ static const struct ScriptCommand s_gs6_g2_s0_station_sref_script[] = { /* 0x819 SELECT_ENTITIES(-1, -1), BGM_SWITCH(7), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 1, 0), SELECT_EVENTS(0, 0), RET, @@ -190,7 +190,7 @@ static const struct ScriptRef s_gs6_g2_s0_station_sref = { 402, 7, NULL /* EVENT static const struct ScriptCommand s_gs6_g2_s0_lives0_dlg0[] = { /* 0x81996f8 */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), CALL_SCRIPT(WAIT_START_FUNC), @@ -205,9 +205,9 @@ static const struct ScriptCommand s_gs6_g2_s0_lives0_dlg0[] = { /* 0x81996f8 */ LABEL(0), /* = 0x00 */ { 0x3c, 0x2c, 0x0000, 0x00000049, 0x00000000, NULL }, LABEL(5), /* = 0x05 */ - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; @@ -218,10 +218,10 @@ static const struct ScriptCommand s_gs6_g2_s0_lives0_dlg0[] = { /* 0x81996f8 */ static const struct ScriptCommand s_gs6_g2_s0_lives1_dlg0[] = { /* 0x8199848 */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAIT_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -232,7 +232,7 @@ static const struct ScriptCommand s_gs6_g2_s0_lives2_dlg0[] = { /* 0x81998c8 */ CALL_SCRIPT(INIT_PLAZA_SLEEP_TALK_FUNC), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -243,7 +243,7 @@ static const struct ScriptCommand s_gs6_g3_s0_station_sref_script[] = { /* 0x819 SELECT_ENTITIES(-1, -1), BGM_SWITCH(7), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 1, 0), SELECT_EVENTS(0, 0), RET, @@ -254,24 +254,24 @@ static const struct ScriptRef s_gs6_g3_s0_station_sref = { 402, 7, NULL /* EVENT static const struct ScriptCommand s_gs6_g3_s0_lives0_dlg0[] = { /* 0x81999e4 */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), CALL_SCRIPT(WAIT_START_FUNC), { 0x3c, 0x26, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs6_g3_s0_lives1_dlg0[] = { /* 0x8199a94 */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAIT_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -282,7 +282,7 @@ static const struct ScriptCommand s_gs6_g3_s0_lives2_dlg0[] = { /* 0x8199b14 */ CALL_SCRIPT(INIT_PLAZA_SLEEP_TALK_FUNC), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -293,7 +293,7 @@ static const struct ScriptCommand s_gs6_g4_s0_station_sref_script[] = { /* 0x819 SELECT_ENTITIES(-1, -1), BGM_SWITCH(7), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 1, 0), SELECT_EVENTS(0, 0), RET, @@ -304,24 +304,24 @@ static const struct ScriptRef s_gs6_g4_s0_station_sref = { 402, 7, NULL /* EVENT static const struct ScriptCommand s_gs6_g4_s0_lives0_dlg0[] = { /* 0x8199c30 */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), CALL_SCRIPT(WAIT_START_FUNC), { 0x3c, 0x26, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs6_g4_s0_lives1_dlg0[] = { /* 0x8199ce0 */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAIT_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -332,7 +332,7 @@ static const struct ScriptCommand s_gs6_g4_s0_lives2_dlg0[] = { /* 0x8199d60 */ CALL_SCRIPT(INIT_PLAZA_SLEEP_TALK_FUNC), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; @@ -343,7 +343,7 @@ static const struct ScriptCommand s_gs6_g5_s0_station_sref_script[] = { /* 0x819 SELECT_ENTITIES(-1, -1), BGM_SWITCH(7), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), CALL_STATION( 1, 0), SELECT_EVENTS(0, 0), RET, @@ -354,24 +354,24 @@ static const struct ScriptRef s_gs6_g5_s0_station_sref = { 402, 7, NULL /* EVENT static const struct ScriptCommand s_gs6_g5_s0_lives0_dlg0[] = { /* 0x8199e7c */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), CALL_SCRIPT(WAIT_START_FUNC), { 0x3c, 0x27, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(6), RET, }; static const struct ScriptCommand s_gs6_g5_s0_lives1_dlg0[] = { /* 0x8199f2c */ DEBUGINFO, { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAIT_START_FUNC), - { 0xe3, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, }; @@ -382,7 +382,7 @@ static const struct ScriptCommand s_gs6_g5_s0_lives2_dlg0[] = { /* 0x8199fac */ CALL_SCRIPT(INIT_PLAZA_SLEEP_TALK_FUNC), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x8e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET, }; diff --git a/src/data/ground/ground_data_t01p06_station.h b/src/data/ground/ground_data_t01p06_station.h index e26c72c04..4b059e78e 100644 --- a/src/data/ground/ground_data_t01p06_station.h +++ b/src/data/ground/ground_data_t01p06_station.h @@ -44,14 +44,14 @@ static const struct ScriptRef s_gs7_g0_s0_evt0_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs7_g0_s1_lives0_dlg0[] = { /* 0x819a5bc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs7_g0_s1_lives1_dlg0[] = { /* 0x819a5fc */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; diff --git a/src/data/ground/ground_data_t01p07_station.h b/src/data/ground/ground_data_t01p07_station.h index c6c93f789..896046548 100644 --- a/src/data/ground/ground_data_t01p07_station.h +++ b/src/data/ground/ground_data_t01p07_station.h @@ -34,14 +34,14 @@ static const struct ScriptRef s_gs8_g0_s0_evt0_sref = { 357, 2, NULL /* GETOUT_N static const struct ScriptCommand s_gs8_g0_s1_lives0_dlg0[] = { /* 0x819a884 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; static const struct ScriptCommand s_gs8_g0_s1_lives1_dlg0[] = { /* 0x819a8c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), CALL_SCRIPT(WAIT_START_FUNC), RET, }; @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs8_g1_s0_station_sref_script[] = { /* 0x819 SELECT_ENTITIES(-1, -1), BGM_SWITCH(8), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -65,25 +65,25 @@ static const struct ScriptCommand s_gs8_g1_s0_eff0_script[] = { /* 0x819a990 */ CALL_SCRIPT(WAIT_START_FUNC), { 0x99, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3c, 0x1a, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), + ALERT_CUE(5), END_DELETE, }; static const struct ScriptCommand s_gs8_g1_s0_lives0_dlg0[] = { /* 0x819aa10 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; static const struct ScriptCommand s_gs8_g1_s1_station_sref_script[] = { /* 0x819aa80 */ DEBUGINFO, SELECT_EFFECTS(-1, 1), - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), SELECT_EVENTS(0, 0), RET, }; @@ -102,11 +102,11 @@ static const struct ScriptCommand s_gs8_g1_s1_eff0_script[] = { /* 0x819aadc */ static const struct ScriptCommand s_gs8_g1_s1_lives0_dlg0[] = { /* 0x819ab4c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(5), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(3), RET, }; diff --git a/src/data/ground/ground_event_data.h b/src/data/ground/ground_event_data.h index 61b2e221e..e3dfd5406 100644 --- a/src/data/ground/ground_event_data.h +++ b/src/data/ground/ground_event_data.h @@ -13,19 +13,19 @@ static const struct ScriptCommand s_script_END_TALK[] = { /* 0x811ee64 */ DEBUGINFO, TEXTBOX_CLEAR, - { 0xe4, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(2), RET, }; static const struct ScriptCommand s_script_WAIT_END_TALK_FUNC[] = { /* 0x811eec8 */ DEBUGINFO, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(2), RET_DIRECT, }; static const struct ScriptCommand s_script_WAIT_END_EVENT_FUNC[] = { /* 0x811eef8 */ DEBUGINFO, - { 0xe3, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(3), RET_DIRECT, }; @@ -43,16 +43,16 @@ static const struct ScriptCommand s_script_INCOMPLETE_TALK[] = { /* 0x811ef58 */ static const struct ScriptCommand s_script_NORMAL_WAIT_END_TALK[] = { /* 0x811efa8 */ DEBUGINFO, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(2), RET, }; static const struct ScriptCommand s_script_LIVES_REPLY_NORMAL[] = { /* 0x811efd8 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(2), WAIT(12), RET, }; @@ -61,14 +61,14 @@ static const struct ScriptCommand s_script_LIVES_REPLY[] = { /* 0x811f048 */ DEBUGINFO, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(2), WAIT(12), RET, }; static const struct ScriptCommand s_script_OBJECT_REPLY_NORMAL[] = { /* 0x811f0a8 */ DEBUGINFO, - { 0xe3, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(2), WAIT(20), RET, }; @@ -87,7 +87,7 @@ static const struct ScriptCommand s_script_ENTER_WAIT_FUNC[] = { /* 0x811f168 */ static const struct ScriptCommand s_script_UNIT_TALK[] = { /* 0x811f188 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), @@ -98,7 +98,7 @@ static const struct ScriptCommand s_script_UNIT_TALK[] = { /* 0x811f188 */ static const struct ScriptCommand s_script_HABITAT_TALK[] = { /* 0x811f214 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), @@ -106,7 +106,7 @@ static const struct ScriptCommand s_script_HABITAT_TALK[] = { /* 0x811f214 */ { 0x3b, 0x0a, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), COND_EQUAL(2, /* to label */ 1), - { 0xe3, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(0), TEXTBOX_CLEAR, { 0x3b, 0x10, 0x0000, 0x00000000, 0x00000000, NULL }, RET, @@ -121,7 +121,7 @@ static const struct ScriptCommand s_script_HABITAT_TALK[] = { /* 0x811f214 */ static const struct ScriptCommand s_script_HABITAT_TALK_S01E02A[] = { /* 0x811f36c */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), PORTRAIT(PLACEMENT_LEFT, 0x0000, 0x00000000), @@ -160,7 +160,7 @@ static const struct ScriptCommand s_script_HABITAT_MOVE1[] = { /* 0x811f7c0 */ COND_EQUAL(1, /* to label */ 0), JUMP_SCRIPT(HABITAT_MOVE_STAY_TURN), LABEL(0), /* = 0x00 */ - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), LABEL(1), /* = 0x01 */ { 0x8a, 0x18, 0x0100, 0x00000009, 0x00000000, NULL }, WAIT_RANDOM(24, 48), @@ -173,7 +173,7 @@ static const struct ScriptCommand s_script_HABITAT_MOVE2[] = { /* 0x811f860 */ COND_EQUAL(1, /* to label */ 0), JUMP_SCRIPT(HABITAT_MOVE_STAY_TURN), LABEL(0), /* = 0x00 */ - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x52, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, LABEL(1), /* = 0x01 */ @@ -185,7 +185,7 @@ static const struct ScriptCommand s_script_HABITAT_MOVE2[] = { /* 0x811f860 */ static const struct ScriptCommand s_script_HABITAT_MOVE_PAUSE[] = { /* 0x811f920 */ DEBUGINFO, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ WAIT(240), @@ -195,7 +195,7 @@ static const struct ScriptCommand s_script_HABITAT_MOVE_PAUSE[] = { /* 0x811f920 static const struct ScriptCommand s_script_HABITAT_MOVE_STAY_FIX[] = { /* 0x811f990 */ DEBUGINFO, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ WAIT(240), @@ -205,7 +205,7 @@ static const struct ScriptCommand s_script_HABITAT_MOVE_STAY_FIX[] = { /* 0x811f static const struct ScriptCommand s_script_HABITAT_MOVE_STAY_TURN[] = { /* 0x811fa00 */ DEBUGINFO, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), LABEL(0), /* = 0x00 */ { 0x8d, 0x01, 0x0009, 0x00000000, 0x00000000, NULL }, WAIT_RANDOM(24, 48), @@ -215,7 +215,7 @@ static const struct ScriptCommand s_script_HABITAT_MOVE_STAY_TURN[] = { /* 0x811 static const struct ScriptCommand s_script_LIVES_MOVE_NORMAL[] = { /* 0x811fa70 */ DEBUGINFO, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), LABEL(0), /* = 0x00 */ WAIT(240), JUMP_LABEL(0), @@ -232,7 +232,7 @@ static const struct ScriptCommand s_script_LIVES_MOVE_CHANGE[] = { /* 0x811fad0 static const struct ScriptCommand s_script_OBJECT_MOVE_NORMAL[] = { /* 0x811fb30 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), LABEL(0), /* = 0x00 */ WAIT(240), JUMP_LABEL(0), @@ -240,7 +240,7 @@ static const struct ScriptCommand s_script_OBJECT_MOVE_NORMAL[] = { /* 0x811fb30 static const struct ScriptCommand s_script_OBJECT_MOVE_CHANGE[] = { /* 0x811fb80 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), LABEL(0), /* = 0x00 */ WAIT(240), JUMP_LABEL(0), @@ -248,7 +248,7 @@ static const struct ScriptCommand s_script_OBJECT_MOVE_CHANGE[] = { /* 0x811fb80 static const struct ScriptCommand s_script_EFFECT_MOVE_NORMAL[] = { /* 0x811fbd0 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), LABEL(0), /* = 0x00 */ WAIT(240), JUMP_LABEL(0), @@ -256,7 +256,7 @@ static const struct ScriptCommand s_script_EFFECT_MOVE_NORMAL[] = { /* 0x811fbd0 static const struct ScriptCommand s_script_EFFECT_MOVE_CHANGE[] = { /* 0x811fc20 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), LABEL(0), /* = 0x00 */ WAIT(240), JUMP_LABEL(0), @@ -271,7 +271,7 @@ static const struct ScriptCommand s_script_MOVE_INIT[] = { /* 0x811fc70 */ static const struct ScriptCommand s_script_MOVE_PAUSE[] = { /* 0x811fca0 */ DEBUGINFO, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ WAIT(240), @@ -281,7 +281,7 @@ static const struct ScriptCommand s_script_MOVE_PAUSE[] = { /* 0x811fca0 */ static const struct ScriptCommand s_script_MOVE_STAY[] = { /* 0x811fd10 */ DEBUGINFO, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ WAIT(240), @@ -291,7 +291,7 @@ static const struct ScriptCommand s_script_MOVE_STAY[] = { /* 0x811fd10 */ static const struct ScriptCommand s_script_MOVE_SLEEP[] = { /* 0x811fd80 */ DEBUGINFO, { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), LABEL(0), /* = 0x00 */ WAIT(240), JUMP_LABEL(0), @@ -299,7 +299,7 @@ static const struct ScriptCommand s_script_MOVE_SLEEP[] = { /* 0x811fd80 */ static const struct ScriptCommand s_script_MOVE_RANDOM[] = { /* 0x811fde0 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), LABEL(0), /* = 0x00 */ { 0x8a, 0x18, 0x0100, 0x00000008, 0x00000000, NULL }, WAIT(48), @@ -308,7 +308,7 @@ static const struct ScriptCommand s_script_MOVE_RANDOM[] = { /* 0x811fde0 */ static const struct ScriptCommand s_script_MOVE_BOY[] = { /* 0x811fe40 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), LABEL(0), /* = 0x00 */ { 0x8a, 0x18, 0x0100, 0x00000008, 0x00000000, NULL }, WAIT_RANDOM(24, 48), @@ -317,7 +317,7 @@ static const struct ScriptCommand s_script_MOVE_BOY[] = { /* 0x811fe40 */ static const struct ScriptCommand s_script_MOVE_GIRL[] = { /* 0x811fea0 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), LABEL(0), /* = 0x00 */ { 0x8a, 0x10, 0x0100, 0x00000008, 0x00000000, NULL }, WAIT_RANDOM(16, 24), @@ -327,18 +327,18 @@ static const struct ScriptCommand s_script_MOVE_GIRL[] = { /* 0x811fea0 */ static const struct ScriptCommand s_script_WAKEUP_FUNC[] = { /* 0x811ff00 */ DEBUGINFO, JUMPIF_UNK_BE(/* to label */ 0), /* something sleep related?*/ - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x8b, 0x3c, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(60), RET_DIRECT, LABEL(0), /* = 0x00 */ - { 0x54, 0x00, 0x0026, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(38), { 0x8b, 0x3c, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0027, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(39), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), WAIT(40), RET_DIRECT, }; @@ -356,41 +356,41 @@ static const struct ScriptCommand s_script_LOOK_AROUND_FUNC[] = { /* 0x8120000 * static const struct ScriptCommand s_script_LOOK_AROUND_DOWN_FUNC[] = { /* 0x8120080 */ DEBUGINFO, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), WAIT(15), - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), WAIT(15), - { 0x91, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_SOUTH), RET_DIRECT, }; static const struct ScriptCommand s_script_LOOK_AROUND_RIGHT_FUNC[] = { /* 0x81200f0 */ DEBUGINFO, - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), WAIT(15), - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), WAIT(15), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), RET_DIRECT, }; static const struct ScriptCommand s_script_LOOK_AROUND_LEFT_FUNC[] = { /* 0x8120160 */ DEBUGINFO, - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), WAIT(15), - { 0x91, 0x04, 0x0002, 0x00000002, 0x00000000, NULL }, + ROTATE(4, 2, DIRECTION_EAST), WAIT(15), - { 0x91, 0x04, 0x0001, 0x00000006, 0x00000000, NULL }, + ROTATE(4, 1, DIRECTION_WEST), RET_DIRECT, }; static const struct ScriptCommand s_script_JUMP_HAPPY_FUNC[] = { /* 0x81201d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0x70, 0x00, 0x0200, 0x0000000a, 0x00000000, NULL }, WAIT(1), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET_DIRECT, }; @@ -401,13 +401,13 @@ static const struct ScriptCommand s_script_JUMP_SURPRISE_FUNC[] = { /* 0x8120240 WAIT(2), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET_DIRECT, }; static const struct ScriptCommand s_script_JUMP_ANGRY_FUNC[] = { /* 0x81202c0 */ DEBUGINFO, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0x70, 0x00, 0x0200, 0x00000006, 0x00000000, NULL }, WAIT(1), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, @@ -415,7 +415,7 @@ static const struct ScriptCommand s_script_JUMP_ANGRY_FUNC[] = { /* 0x81202c0 */ { 0x70, 0x00, 0x0200, 0x00000006, 0x00000000, NULL }, WAIT(1), { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET_DIRECT, }; @@ -496,31 +496,31 @@ static const struct ScriptCommand s_script_INIT_PLAZA_SLEEP_STAY_FUNC[] = { /* 0 DEBUGINFO, JUMPIF_SCENARIOCHECK(4, /* to label */ 0), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, - { 0x54, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(4), RET_DIRECT, LABEL(0), /* = 0x00 */ - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), RET_DIRECT, }; static const struct ScriptCommand s_script_INIT_PLAZA_SLEEP_TALK_FUNC[] = { /* 0x8120670 */ DEBUGINFO, JUMPIF_SCENARIOCHECK(4, /* to label */ 0), - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), RET_DIRECT, LABEL(0), /* = 0x00 */ - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), RET_DIRECT, }; static const struct ScriptCommand s_script_INIT_SLEEP_FUNC[] = { /* 0x81206e0 */ DEBUGINFO, JUMPIF_UNK_BE(/* to label */ 0), /* something sleep related?*/ - { 0x54, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(6), { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, RET_DIRECT, LABEL(0), /* = 0x00 */ - { 0x54, 0x00, 0x0026, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(38), { 0x8b, 0x3c, 0x0002, 0x00000000, 0x00000000, NULL }, RET_DIRECT, }; @@ -536,7 +536,7 @@ static const struct ScriptCommand s_script_INIT_BASE_FUNC[] = { /* 0x8120770 */ static const struct ScriptCommand s_script_INIT_DEBUG_HABITAT[] = { /* 0x81207d0 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x000001e0, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00000010, 0x00000000, NULL }, @@ -631,7 +631,7 @@ static const struct ScriptCommand s_script_NEXT_SAVE2_FUNC[] = { /* 0x8120cdc */ static const struct ScriptCommand s_script_SAVE_POINT[] = { /* 0x8120db0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3a, 0x00, 0x0000, 0x00000000, -0x00000001, _("Would you like to save your adventure?") }, JUMP_SCRIPT(END_TALK), @@ -645,7 +645,7 @@ static const struct ScriptCommand s_script_SAVE_POINT[] = { /* 0x8120db0 */ static const struct ScriptCommand s_script_WAREHOUSE_POINT[] = { /* 0x8120e60 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), { 0x3c, 0x11, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -654,7 +654,7 @@ static const struct ScriptCommand s_script_WAREHOUSE_POINT[] = { /* 0x8120e60 */ static const struct ScriptCommand s_script_SAVE_AND_WAREHOUSE_POINT[] = { /* 0x8120ec0 */ DEBUGINFO, - { 0x54, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, ASK1( TRUE, /*default*/ 0, /* speaker */ -1, _("What would you like to do?")), CHOICE(/* label */ 0, _("Check storage.")), @@ -740,7 +740,7 @@ static const struct ScriptCommand s_script_WARP_LIVES_ARRIVE3[] = { /* 0x8121244 static const struct ScriptCommand s_script_LIVES_WARP_START_FUNC[] = { /* 0x8121274 */ DEBUGINFO, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), WAIT(20), WAIT(6), { 0x52, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, @@ -764,9 +764,9 @@ static const struct ScriptCommand s_script_LIVES_WARP_START_FUNC[] = { /* 0x8121 static const struct ScriptCommand s_script_LIVES_WARP_START2_FUNC[] = { /* 0x81213c4 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), WAIT(20), - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), WAIT(20), WAIT(6), { 0x52, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, @@ -782,9 +782,9 @@ static const struct ScriptCommand s_script_LIVES_WARP_START2_FUNC[] = { /* 0x812 static const struct ScriptCommand s_script_LIVES_WARP_START3_FUNC[] = { /* 0x81214b4 */ DEBUGINFO, - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), WAIT(40), - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), WAIT(20), WAIT(6), { 0x52, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, @@ -801,14 +801,14 @@ static const struct ScriptCommand s_script_LIVES_WARP_START3_FUNC[] = { /* 0x812 static const struct ScriptCommand s_script_LIVES_WARP_START_SUB[] = { /* 0x81215a4 */ DEBUGINFO, { 0x60, 0x00, 0x0000, 0x00000060, 0x00000000, NULL }, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, END_DELETE, }; static const struct ScriptCommand s_script_LIVES_WARP_ARRIVE_FUNC[] = { /* 0x81215f4 */ DEBUGINFO, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0x52, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x000000c0, 0x00000000, NULL }, @@ -822,7 +822,7 @@ static const struct ScriptCommand s_script_LIVES_WARP_ARRIVE_FUNC[] = { /* 0x812 { 0x68, 0x00, 0x0200, 0x00000004, 0x00000000, NULL }, { 0x68, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, WAIT(10), - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), WAIT(10), { 0x53, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, RET_DIRECT, @@ -838,7 +838,7 @@ static const struct ScriptCommand s_script_LIVES_WARP_ARRIVE_FUNC[] = { /* 0x812 static const struct ScriptCommand s_script_LIVES_WARP_ARRIVE2_FUNC[] = { /* 0x81217a4 */ DEBUGINFO, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0x52, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x00, 0x0000, 0x000000c0, 0x00000000, NULL }, @@ -854,13 +854,13 @@ static const struct ScriptCommand s_script_LIVES_WARP_ARRIVE2_FUNC[] = { /* 0x81 { 0x68, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, WAIT(10), - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET_DIRECT, }; static const struct ScriptCommand s_script_LIVES_WARP_ARRIVE3_FUNC[] = { /* 0x81218d4 */ DEBUGINFO, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0x52, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x60, 0x28, 0x0000, 0x000000c0, 0x00000000, NULL }, @@ -876,14 +876,14 @@ static const struct ScriptCommand s_script_LIVES_WARP_ARRIVE3_FUNC[] = { /* 0x81 { 0x68, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x00080000, 0x00000000, NULL }, WAIT(10), - { 0x54, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(1), RET_DIRECT, }; static const struct ScriptCommand s_script_LIVES_WARP_ARRIVE_SUB[] = { /* 0x8121a04 */ DEBUGINFO, { 0x60, 0x00, 0x0000, 0x00000060, 0x00000000, NULL }, - { 0x54, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + SELECT_ANIMATION(3), { 0xdd, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, END_DELETE, }; @@ -5247,7 +5247,7 @@ static const struct ScriptCommand s_script_SETUP_DEBUG_CAMERA[] = { /* 0x812f138 DEBUGINFO, { 0x3b, 0x3e, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 0), - { 0xe3, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + AWAIT_CUE(4), LABEL(0), /* = 0x00 */ RET, }; @@ -5256,7 +5256,7 @@ static const struct ScriptCommand s_script_MOVE_DEBUG_CAMERA[] = { /* 0x812f198 DEBUGINFO, { 0x98, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x3f, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe4, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + ALERT_CUE(4), { 0x9a, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, END_DELETE, };