From b90549b3acb7c07a136913ec953a96ddd323c72c Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 22 Nov 2025 11:26:06 -0500 Subject: [PATCH] Som shit --- include/constants/bg_music.h | 3 +- include/data_script.h | 3 + include/event_flag.h | 2 +- src/data/ground/ground_data_a01p01_station.h | 38 ++-- src/data/ground/ground_data_a01p02_station.h | 8 +- src/data/ground/ground_data_a02p01_station.h | 2 +- src/data/ground/ground_data_a02p02_station.h | 2 +- src/data/ground/ground_data_a02p03_station.h | 2 +- src/data/ground/ground_data_a02p04_station.h | 2 +- src/data/ground/ground_data_a03p01_station.h | 2 +- src/data/ground/ground_data_a03p02_station.h | 2 +- src/data/ground/ground_data_a04p01_station.h | 16 +- src/data/ground/ground_data_a04p02_station.h | 2 +- src/data/ground/ground_data_a04p03_station.h | 6 +- src/data/ground/ground_data_a05p01_station.h | 4 +- src/data/ground/ground_data_b01p01a_station.h | 194 +++++++++--------- src/data/ground/ground_data_b01p02a_station.h | 102 ++++----- src/data/ground/ground_data_d01p01_station.h | 14 +- src/data/ground/ground_data_d01p02_station.h | 4 +- src/data/ground/ground_data_d02p01_station.h | 6 +- src/data/ground/ground_data_d02p02_station.h | 2 +- src/data/ground/ground_data_d03p01_station.h | 4 +- src/data/ground/ground_data_d03p02_station.h | 2 +- src/data/ground/ground_data_d04p01_station.h | 4 +- src/data/ground/ground_data_d04p02_station.h | 6 +- src/data/ground/ground_data_d05p01_station.h | 2 +- src/data/ground/ground_data_d05p02_station.h | 63 +++--- src/data/ground/ground_data_d06p01_station.h | 4 +- src/data/ground/ground_data_d06p02_station.h | 4 +- src/data/ground/ground_data_d06p03_station.h | 2 +- src/data/ground/ground_data_d07p01_station.h | 4 +- src/data/ground/ground_data_d07p02_station.h | 14 +- src/data/ground/ground_data_d08p01_station.h | 12 +- src/data/ground/ground_data_d08p02_station.h | 2 +- src/data/ground/ground_data_d09p01_station.h | 10 +- src/data/ground/ground_data_d09p02_station.h | 4 +- src/data/ground/ground_data_d09p03_station.h | 2 +- src/data/ground/ground_data_d10p01_station.h | 12 +- src/data/ground/ground_data_d10p02_station.h | 6 +- src/data/ground/ground_data_d10p03_station.h | 4 +- src/data/ground/ground_data_d11p01_station.h | 12 +- src/data/ground/ground_data_d11p02_station.h | 4 +- src/data/ground/ground_data_d11p03_station.h | 10 +- src/data/ground/ground_data_d12p01_station.h | 6 +- src/data/ground/ground_data_d12p02_station.h | 4 +- src/data/ground/ground_data_d12p04_station.h | 2 +- src/data/ground/ground_data_d13p01_station.h | 6 +- src/data/ground/ground_data_d13p02_station.h | 4 +- src/data/ground/ground_data_d13p03_station.h | 6 +- src/data/ground/ground_data_d14p01_station.h | 2 +- src/data/ground/ground_data_d15p01_station.h | 6 +- src/data/ground/ground_data_d16p01_station.h | 20 +- src/data/ground/ground_data_d17p01_station.h | 24 +-- src/data/ground/ground_data_d18p01_station.h | 18 +- src/data/ground/ground_data_d19p01_station.h | 2 +- src/data/ground/ground_data_d20p01_station.h | 22 +- src/data/ground/ground_data_d21p01_station.h | 8 +- src/data/ground/ground_data_d23p01_station.h | 2 +- src/data/ground/ground_data_d24p01_station.h | 4 +- src/data/ground/ground_data_d24p02_station.h | 2 +- src/data/ground/ground_data_d25p01_station.h | 2 +- src/data/ground/ground_data_h01p01_station.h | 2 +- src/data/ground/ground_data_h01p02_station.h | 2 +- src/data/ground/ground_data_h01p03_station.h | 2 +- src/data/ground/ground_data_h02p01_station.h | 2 +- src/data/ground/ground_data_h02p02_station.h | 2 +- src/data/ground/ground_data_h02p03_station.h | 2 +- src/data/ground/ground_data_h03p01_station.h | 2 +- src/data/ground/ground_data_h04p01_station.h | 2 +- src/data/ground/ground_data_h04p02_station.h | 2 +- src/data/ground/ground_data_h05p01_station.h | 2 +- src/data/ground/ground_data_h05p02_station.h | 2 +- src/data/ground/ground_data_h06p01_station.h | 2 +- src/data/ground/ground_data_h06p02_station.h | 2 +- src/data/ground/ground_data_h06p03_station.h | 2 +- src/data/ground/ground_data_h06p04_station.h | 2 +- src/data/ground/ground_data_h06p05_station.h | 2 +- src/data/ground/ground_data_h06p06_station.h | 2 +- src/data/ground/ground_data_h07p01_station.h | 2 +- src/data/ground/ground_data_h07p02_station.h | 2 +- src/data/ground/ground_data_h07p03_station.h | 2 +- src/data/ground/ground_data_h07p04_station.h | 2 +- src/data/ground/ground_data_h07p05_station.h | 2 +- src/data/ground/ground_data_h07p06_station.h | 2 +- src/data/ground/ground_data_h07p07_station.h | 2 +- src/data/ground/ground_data_h07p08_station.h | 2 +- src/data/ground/ground_data_h08p01_station.h | 2 +- src/data/ground/ground_data_h09p01_station.h | 2 +- src/data/ground/ground_data_h09p02_station.h | 2 +- src/data/ground/ground_data_h10p01_station.h | 2 +- src/data/ground/ground_data_h10p02_station.h | 2 +- src/data/ground/ground_data_h11p01_station.h | 2 +- src/data/ground/ground_data_h12p01_station.h | 2 +- src/data/ground/ground_data_h13p01_station.h | 2 +- src/data/ground/ground_data_h13p02_station.h | 2 +- src/data/ground/ground_data_h13p03_station.h | 2 +- src/data/ground/ground_data_h13p04_station.h | 2 +- src/data/ground/ground_data_h14p01_station.h | 2 +- src/data/ground/ground_data_h15p01_station.h | 2 +- src/data/ground/ground_data_h16p01_station.h | 2 +- src/data/ground/ground_data_h17p01_station.h | 2 +- src/data/ground/ground_data_h18p01_station.h | 2 +- src/data/ground/ground_data_h19p01_station.h | 2 +- src/data/ground/ground_data_h20p01_station.h | 2 +- src/data/ground/ground_data_h21p01_station.h | 2 +- src/data/ground/ground_data_h21p02_station.h | 2 +- src/data/ground/ground_data_h22p01_station.h | 2 +- src/data/ground/ground_data_h23p01_station.h | 2 +- src/data/ground/ground_data_h24p01_station.h | 2 +- src/data/ground/ground_data_h25p01_station.h | 2 +- src/data/ground/ground_data_h26p01_station.h | 2 +- src/data/ground/ground_data_h27p01_station.h | 2 +- src/data/ground/ground_data_h28p01_station.h | 2 +- src/data/ground/ground_data_h28p02_station.h | 2 +- src/data/ground/ground_data_h29p01_station.h | 137 ++++++------- src/data/ground/ground_data_h29p02_station.h | 2 +- src/data/ground/ground_data_h29p03_station.h | 2 +- src/data/ground/ground_data_h29p04_station.h | 2 +- src/data/ground/ground_data_s01_station.h | 2 +- src/data/ground/ground_data_s02_station.h | 6 +- src/data/ground/ground_data_s03_station.h | 2 +- src/data/ground/ground_data_t00p01_station.h | 2 +- src/data/ground/ground_data_t01p01_station.h | 106 +++++----- src/data/ground/ground_data_t01p02a_station.h | 14 +- src/data/ground/ground_data_t01p03_station.h | 22 +- src/data/ground/ground_data_t01p04_station.h | 10 +- src/data/ground/ground_data_t01p05_station.h | 10 +- src/data/ground/ground_data_t01p06_station.h | 2 +- src/data/ground/ground_data_t01p07_station.h | 4 +- src/data/ground/ground_event_data.h | 14 +- src/event_flag.c | 7 +- src/ground_main.c | 1 - src/ground_script.c | 12 +- 133 files changed, 607 insertions(+), 599 deletions(-) diff --git a/include/constants/bg_music.h b/include/constants/bg_music.h index feeaa04db..53e3073ce 100644 --- a/include/constants/bg_music.h +++ b/include/constants/bg_music.h @@ -50,7 +50,8 @@ enum MusicID MUS_TIME_OF_REUNION, MUS_OPENING_TITLE, // 47 - 50 are blank/empty slots for BG Music - MUS_DUNGEON_FAIL = 51, + MUS_BLANK_50 = 50, + MUS_DUNGEON_FAIL, MUS_DUNGEON_COMPLETE, // 53 - 99 are blank/empty slots for BG Music MUS_FRIEND_AREA_UNUSED_1 = 100, diff --git a/include/data_script.h b/include/data_script.h index 5d75c7f08..845382e3f 100644 --- a/include/data_script.h +++ b/include/data_script.h @@ -1,3 +1,4 @@ +#include "constants/bg_music.h" #include "constants/cutscenes.h" #include "constants/direction.h" #include "constants/event_flag.h" @@ -169,6 +170,8 @@ #define STOP_ANIMATION_ON_CURRENT_FRAME { 0xDD, 0, 0, 0, 0, NULL } // de..e2 - various HandleAction commands // e3..e5 - locking/condvar commands +#define WAIT_FANFARE1(id) { 0xE1, 0, id, 0, 0, NULL } +#define WAIT_FANFARE2(id) { 0xE2, 0, id, 0, 0, NULL } #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 } diff --git a/include/event_flag.h b/include/event_flag.h index c1b84ee7e..404bc80d0 100644 --- a/include/event_flag.h +++ b/include/event_flag.h @@ -20,7 +20,7 @@ s32 GetScriptVarArrayValue(u8 *localVarBuf, s32 varId, s32 idx); void SetScriptVarValue(u8 *localVarBuf, s32 varId, s32 val); void SetScriptVarArrayValue(u8 *localVarBuf, s32 varId, s32 idx, s32 val); s32 GetScriptVarArraySum(u8 *localVarBuf, s16 varId); -void GetScriptVarScenario(s32 varId,u32 *outMain,u32 *outSub); +void GetScriptVarScenario(s32 varID, u32 *outMain, u32 *outSub); void ScenarioCalc(s16 varId, s32 main, s32 sub); bool8 ScriptVarScenarioBefore(s16 varId, u32 main, s32 sub); bool8 ScriptVarScenarioEqual(s16 varId, u32 main, s32 sub); diff --git a/src/data/ground/ground_data_a01p01_station.h b/src/data/ground/ground_data_a01p01_station.h index 7422f99f5..f0b9f1a26 100644 --- a/src/data/ground/ground_data_a01p01_station.h +++ b/src/data/ground/ground_data_a01p01_station.h @@ -8,7 +8,7 @@ static const struct ScriptCommand s_gs162_g0_s0_station_sref_script[] = { /* 0x820fd30 */ DEBUGINFO_O(10), - SELECT_MAP(162), + SELECT_MAP(MAP_PERSONALITY_TEST_CYAN), BGM_STOP, JUMP_SCRIPT(COMMON_ENTER), }; @@ -17,9 +17,9 @@ static const struct ScriptRef s_gs162_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs162_g1_s0_station_sref_script[] = { /* 0x820fda8 */ DEBUGINFO_O(19), - SELECT_MAP(162), + SELECT_MAP(MAP_PERSONALITY_TEST_CYAN), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(4), + BGM_SWITCH(MUS_DREAM), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -59,9 +59,9 @@ static const struct ScriptCommand s_gs162_g1_s0_lives0_dlg0[] = { /* 0x820fe54 * static const struct ScriptCommand s_gs162_g2_s0_station_sref_script[] = { /* 0x8210084 */ DEBUGINFO_O(61), - SELECT_MAP(162), + SELECT_MAP(MAP_PERSONALITY_TEST_CYAN), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(4), + BGM_SWITCH(MUS_DREAM), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), FANFARE_FADEOUT2(60, 453), @@ -119,9 +119,9 @@ static const struct ScriptCommand s_gs162_g2_s0_lives0_dlg0[] = { /* 0x8210190 * static const struct ScriptCommand s_gs162_g3_s0_station_sref_script[] = { /* 0x82104bc */ DEBUGINFO_O(121), - SELECT_MAP(162), + SELECT_MAP(MAP_PERSONALITY_TEST_CYAN), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(4), + BGM_SWITCH(MUS_DREAM), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -228,9 +228,9 @@ static const struct ScriptCommand s_gs162_g3_s1_lives0_dlg0[] = { /* 0x82107fc * static const struct ScriptCommand s_gs162_g4_s0_station_sref_script[] = { /* 0x8210bbc */ DEBUGINFO_O(230), - SELECT_MAP(162), + SELECT_MAP(MAP_PERSONALITY_TEST_CYAN), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(4), + BGM_SWITCH(MUS_DREAM), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -376,9 +376,9 @@ static const struct ScriptCommand s_gs162_g4_s1_lives0_dlg0[] = { /* 0x821124c * static const struct ScriptCommand s_gs162_g5_s0_station_sref_script[] = { /* 0x821161c */ DEBUGINFO_O(378), - SELECT_MAP(162), + SELECT_MAP(MAP_PERSONALITY_TEST_CYAN), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(5), + BGM_SWITCH(MUS_BENEVOLENT_SPIRIT), { 0x27, 0x00, 0x0005, 0x00000020, 0x00ffffff, NULL }, AWAIT_CUE(3), FANFARE_PLAY2(506), @@ -411,9 +411,9 @@ static const struct ScriptCommand s_gs162_g5_s0_lives0_dlg0[] = { /* 0x82116b8 * static const struct ScriptCommand s_gs162_g6_s0_station_sref_script[] = { /* 0x82117e4 */ DEBUGINFO_O(413), - SELECT_MAP(162), + SELECT_MAP(MAP_PERSONALITY_TEST_CYAN), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(5), + BGM_SWITCH(MUS_BENEVOLENT_SPIRIT), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -674,7 +674,7 @@ static const struct ScriptCommand s_gs162_g6_s1_lives0_dlg0[] = { /* 0x8212774 * static const struct ScriptCommand s_gs162_g7_s0_station_sref_script[] = { /* 0x8212df4 */ DEBUGINFO_O(676), - SELECT_MAP(162), + SELECT_MAP(MAP_PERSONALITY_TEST_CYAN), SELECT_ENTITIES(-1, -1), { 0x27, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, AWAIT_CUE(3), @@ -711,9 +711,9 @@ static const struct ScriptCommand s_gs162_g7_s0_lives1_dlg0[] = { /* 0x8212f40 * static const struct ScriptCommand s_gs162_g8_s0_station_sref_script[] = { /* 0x8212f90 */ DEBUGINFO_O(713), - SELECT_MAP(162), + SELECT_MAP(MAP_PERSONALITY_TEST_CYAN), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(5), + BGM_SWITCH(MUS_BENEVOLENT_SPIRIT), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -976,9 +976,9 @@ static const struct ScriptCommand s_gs162_g8_s1_lives0_dlg0[] = { /* 0x8213b50 * static const struct ScriptCommand s_gs162_g9_s0_station_sref_script[] = { /* 0x8214480 */ DEBUGINFO_O(978), - SELECT_MAP(162), + SELECT_MAP(MAP_PERSONALITY_TEST_CYAN), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(5), + BGM_SWITCH(MUS_BENEVOLENT_SPIRIT), { 0x27, 0x00, 0x0005, 0x0000003c, 0x00ffffff, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -1235,7 +1235,7 @@ static const struct ScriptCommand s_gs162_g9_s1_lives0_dlg0[] = { /* 0x82157b8 * static const struct ScriptCommand s_gs162_g10_s0_station_sref_script[] = { /* 0x8215d28 */ DEBUGINFO_O(1237), - SELECT_MAP(162), + SELECT_MAP(MAP_PERSONALITY_TEST_CYAN), SELECT_ENTITIES(-1, 0), { 0x27, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, AWAIT_CUE(3), diff --git a/src/data/ground/ground_data_a01p02_station.h b/src/data/ground/ground_data_a01p02_station.h index 353f24f66..d97acb867 100644 --- a/src/data/ground/ground_data_a01p02_station.h +++ b/src/data/ground/ground_data_a01p02_station.h @@ -8,7 +8,7 @@ static const struct ScriptCommand s_gs163_g0_s0_station_sref_script[] = { /* 0x82163d4 */ DEBUGINFO_O(10), - SELECT_MAP(163), + SELECT_MAP(MAP_PERSONALITY_TEST_PURPLE), BGM_STOP, JUMP_SCRIPT(COMMON_ENTER), }; @@ -18,7 +18,7 @@ static const struct ScriptRef s_gs163_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs163_g1_s0_station_sref_script[] = { /* 0x821644c */ DEBUGINFO_O(19), BGM_STOP, - SELECT_MAP(163), + SELECT_MAP(MAP_PERSONALITY_TEST_PURPLE), { 0x2d, 0x09, 0x0000, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000002), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("......") }, @@ -56,7 +56,7 @@ static const struct ScriptCommand s_gs163_g1_s0_lives0_dlg0[] = { /* 0x8216594 * static const struct ScriptCommand s_gs163_g2_s0_station_sref_script[] = { /* 0x82166dc */ DEBUGINFO_O(58), - SELECT_MAP(163), + SELECT_MAP(MAP_PERSONALITY_TEST_PURPLE), SELECT_ENTITIES(-1, -1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), @@ -87,7 +87,7 @@ static const struct ScriptCommand s_gs163_g2_s0_lives0_dlg0[] = { /* 0x8216758 * static const struct ScriptCommand s_gs163_g3_s0_station_sref_script[] = { /* 0x8216898 */ DEBUGINFO_O(89), - SELECT_MAP(163), + SELECT_MAP(MAP_PERSONALITY_TEST_PURPLE), SELECT_ENTITIES(-1, -1), BGM_FADEIN(60, 37), { 0x22, 0x01, 0x005a, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a02p01_station.h b/src/data/ground/ground_data_a02p01_station.h index 40956121e..0dea42463 100644 --- a/src/data/ground/ground_data_a02p01_station.h +++ b/src/data/ground/ground_data_a02p01_station.h @@ -19,7 +19,7 @@ static const struct ScriptRef s_gs164_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs164_g1_s0_station_sref_script[] = { /* 0x82181b8 */ DEBUGINFO_O(21), - BGM_SWITCH(24), + BGM_SWITCH(MUS_THE_ESCAPE), { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(164), diff --git a/src/data/ground/ground_data_a02p02_station.h b/src/data/ground/ground_data_a02p02_station.h index 14f998131..666ab9c87 100644 --- a/src/data/ground/ground_data_a02p02_station.h +++ b/src/data/ground/ground_data_a02p02_station.h @@ -19,7 +19,7 @@ static const struct ScriptRef s_gs165_g0_s0_station_sref = { 404, 1, NULL /* ENT static const struct ScriptCommand s_gs165_g1_s0_station_sref_script[] = { /* 0x8218618 */ DEBUGINFO_O(21), - BGM_SWITCH(24), + BGM_SWITCH(MUS_THE_ESCAPE), { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(165), diff --git a/src/data/ground/ground_data_a02p03_station.h b/src/data/ground/ground_data_a02p03_station.h index c93878e6b..b48659bcf 100644 --- a/src/data/ground/ground_data_a02p03_station.h +++ b/src/data/ground/ground_data_a02p03_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs166_g1_s0_lives0_dlg0[] = { /* 0x8218cb0 * PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Oh, no! Look!")), TEXTBOX_CLEAR, - BGM_SWITCH(38), + BGM_SWITCH(MUS_THE_MOUNTAIN_OF_FIRE), ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), WAIT(20), ALERT_CUE(3), diff --git a/src/data/ground/ground_data_a02p04_station.h b/src/data/ground/ground_data_a02p04_station.h index 1e163c69a..cc342c0ba 100644 --- a/src/data/ground/ground_data_a02p04_station.h +++ b/src/data/ground/ground_data_a02p04_station.h @@ -36,7 +36,7 @@ static const struct ScriptCommand s_gs167_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(36), SELECT_MAP(167), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(24), + BGM_SWITCH(MUS_THE_ESCAPE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a03p01_station.h b/src/data/ground/ground_data_a03p01_station.h index 199af8fb7..08247d954 100644 --- a/src/data/ground/ground_data_a03p01_station.h +++ b/src/data/ground/ground_data_a03p01_station.h @@ -216,7 +216,7 @@ static const struct ScriptCommand s_gs168_g2_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(168), SELECT_WEATHER(-1), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a03p02_station.h b/src/data/ground/ground_data_a03p02_station.h index dc01a4ef2..6d15ae772 100644 --- a/src/data/ground/ground_data_a03p02_station.h +++ b/src/data/ground/ground_data_a03p02_station.h @@ -19,7 +19,7 @@ static const struct ScriptCommand s_gs169_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(169), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a04p01_station.h b/src/data/ground/ground_data_a04p01_station.h index 186164382..974abbab0 100644 --- a/src/data/ground/ground_data_a04p01_station.h +++ b/src/data/ground/ground_data_a04p01_station.h @@ -30,7 +30,7 @@ static const struct ScriptCommand s_gs171_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(30), SELECT_MAP(171), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(19), + BGM_SWITCH(MUS_WORLD_CALAMITY), { 0x27, 0x00, 0x0005, 0x00000020, 0x00ffffff, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -74,7 +74,7 @@ static const struct ScriptCommand s_gs171_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(74), SELECT_MAP(171), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(19), + BGM_SWITCH(MUS_WORLD_CALAMITY), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x28, 0x01, 0x0005, 0x00000020, 0x00ffffff, NULL }, @@ -123,7 +123,7 @@ static const struct ScriptCommand s_gs171_g3_s0_station_sref_script[] = { /* 0x8 WAIT(60), SELECT_MAP(171), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(19), + BGM_SWITCH(MUS_WORLD_CALAMITY), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -205,7 +205,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * 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 }, + WAIT_FANFARE1(212), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(7), @@ -382,7 +382,7 @@ static const struct ScriptCommand s_gs171_g4_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(382), SELECT_MAP(171), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(19), + BGM_SWITCH(MUS_WORLD_CALAMITY), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -573,7 +573,7 @@ static const struct ScriptCommand s_gs171_g5_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(5, 0), BGM_STOP, AWAIT_CUE(3), - BGM_SWITCH(41), + BGM_SWITCH(MUS_AFTERMATH), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -1057,7 +1057,7 @@ static const struct ScriptCommand s_gs171_g6_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(1057), SELECT_MAP(171), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(41), + BGM_SWITCH(MUS_AFTERMATH), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -1185,7 +1185,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(............{WAIT_PRESS}\n{NAME_5}...)") }, TEXTBOX_CLEAR, WAIT(10), - BGM_SWITCH(42), + BGM_SWITCH(MUS_FAREWELL), PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000000), MSG_NPC(5, _(" We owe everything to you,\n{NAME_0}, and your friends.")), MSG_NPC(5, _(" Peace has returned to\nour world.")), diff --git a/src/data/ground/ground_data_a04p02_station.h b/src/data/ground/ground_data_a04p02_station.h index 9a3214119..47cc360fe 100644 --- a/src/data/ground/ground_data_a04p02_station.h +++ b/src/data/ground/ground_data_a04p02_station.h @@ -20,7 +20,7 @@ static const struct ScriptCommand s_gs172_g1_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(172), SELECT_ENTITIES(-1, 0), { 0x2d, 0x09, 0x0000, 0x00000022, 0x00000000, NULL }, - BGM_SWITCH(22), + BGM_SWITCH(MUS_SKY_TOWER), ALERT_CUE(4), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), diff --git a/src/data/ground/ground_data_a04p03_station.h b/src/data/ground/ground_data_a04p03_station.h index fc95b02d2..5e78037d5 100644 --- a/src/data/ground/ground_data_a04p03_station.h +++ b/src/data/ground/ground_data_a04p03_station.h @@ -22,7 +22,7 @@ static const struct ScriptCommand s_gs173_g1_s0_station_sref_script[] = { /* 0x8 SELECT_ENTITIES(-1, -1), WAIT(60), { 0x97, 0x00, 0x0002, 0x00000001, 0x00000001, NULL }, - BGM_SWITCH(19), + BGM_SWITCH(MUS_WORLD_CALAMITY), FANFARE_PLAY2(508), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(240), @@ -46,7 +46,7 @@ static const struct ScriptCommand s_gs173_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(46), SELECT_MAP(173), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(26), + BGM_SWITCH(MUS_RAYQUAZAS_DOMAIN), FANFARE_PLAY2(508), { 0x97, 0x00, 0x0002, 0x00000001, 0x00000001, NULL }, { 0x22, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, @@ -74,7 +74,7 @@ static const struct ScriptCommand s_gs173_g3_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(74), SELECT_MAP(173), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(26), + BGM_SWITCH(MUS_RAYQUAZAS_DOMAIN), { 0x97, 0x00, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x27, 0x00, 0x0005, 0x00000010, 0x00ffffff, NULL }, AWAIT_CUE(5), diff --git a/src/data/ground/ground_data_a05p01_station.h b/src/data/ground/ground_data_a05p01_station.h index 2f6747249..5043827a5 100644 --- a/src/data/ground/ground_data_a05p01_station.h +++ b/src/data/ground/ground_data_a05p01_station.h @@ -39,7 +39,7 @@ static const struct ScriptCommand s_gs175_g1_s0_eff1_script[] = { /* 0x822b0f4 * DEBUGINFO_O(39), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(40), - BGM_SWITCH(44), + BGM_SWITCH(MUS_CREDITS), WAIT(300), TEXTBOX_AUTO_PRESS(-200, 60), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(..................)") }, @@ -83,7 +83,7 @@ static const struct ScriptCommand s_gs175_g2_s0_eff1_script[] = { /* 0x822b3d0 * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(120), - BGM_SWITCH(45), + BGM_SWITCH(MUS_TIME_OF_REUNION), WAIT(60), TEXTBOX_AUTO_PRESS(190, 190), { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_b01p01a_station.h b/src/data/ground/ground_data_b01p01a_station.h index 08743aa39..4e9a760c2 100644 --- a/src/data/ground/ground_data_b01p01a_station.h +++ b/src/data/ground/ground_data_b01p01a_station.h @@ -237,7 +237,7 @@ static const struct ScriptCommand s_gs9_g0_s0_station_sref_script[] = { /* 0x819 LABEL(55), /* = 0x37 */ SELECT_ENTITIES(0, 7), LABEL(56), /* = 0x38 */ - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), JUMP_SCRIPT(COMMON_ENTER), LABEL(53), /* = 0x35 */ JUMPIF_SCENARIOCHECK(QUEST_CAN_CHANGE_LEADER, /* to label */ 57), @@ -1050,7 +1050,7 @@ static const struct ScriptCommand s_gs9_g5_s0_station_sref_script[] = { /* 0x819 LABEL(1), /* = 0x01 */ SELECT_EVENTS(0, 0), CALL_STATION( 4, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), JUMP_STATION( 8, 0), @@ -1105,7 +1105,7 @@ static const struct ScriptCommand s_gs9_g6_s0_station_sref_script[] = { /* 0x819 SELECT_ENTITIES(-1, 2), JUMP_LABEL(2), LABEL(2), /* = 0x02 */ - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -1172,7 +1172,7 @@ static const struct ScriptCommand s_gs9_g7_s0_station_sref_script[] = { /* 0x819 LABEL(1), /* = 0x01 */ SELECT_EVENTS(0, 0), CALL_STATION( 4, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), JUMP_STATION( 8, 0), @@ -1398,7 +1398,7 @@ static const struct ScriptCommand s_gs9_g17_s0_station_sref_script[] = { /* 0x81 { 0x3b, 0x39, 0x0004, 0x00000000, 0x00000000, NULL }, SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x3b, 0x39, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -1671,7 +1671,7 @@ static const struct ScriptCommand s_gs9_g17_s3_lives0_dlg0[] = { /* 0x81a21b0 - CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), WAIT(2), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), AWAIT_CUE(6), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, STOP_ANIMATION_ON_CURRENT_FRAME, @@ -1687,7 +1687,7 @@ static const struct ScriptCommand s_gs9_g18_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1722,7 +1722,7 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ TEXTBOX_CLEAR, ALERT_CUE(6), FANFARE_PLAY2(468), - { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(468), WAIT(10), FANFARE_PLAY2(468), AWAIT_CUE(5), @@ -1776,7 +1776,7 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} checked the Mailbox.")), FANFARE_PLAY(213), MSG_INSTANT(_("{CENTER_ALIGN}The Mailbox contained\n{CENTER_ALIGN}a {COLOR CYAN}Rescue Team Starter Set{RESET}!")), - { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(213), TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), @@ -1798,13 +1798,13 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} opened\n{CENTER_ALIGN}the {COLOR CYAN}Rescue Team Starter Set{RESET}.")), FANFARE_PLAY(213), MSG_INSTANT(_("{CENTER_ALIGN}There was\n{CENTER_ALIGN}a {COLOR CYAN}Rescue Team Badge{RESET} inside!")), - { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(213), FANFARE_PLAY(213), MSG_INSTANT(_("{CENTER_ALIGN}There was a {COLOR CYAN}Toolbox{RESET} inside!")), - { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(213), FANFARE_PLAY(213), MSG_INSTANT(_("{CENTER_ALIGN}There was also an issue of\n{CENTER_ALIGN}{COLOR CYAN}Pokémon News{RESET} inside!")), - { 0xe1, 0x00, 0x00d5, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(213), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(6), @@ -2186,7 +2186,7 @@ static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ SELECT_ENTITIES(-1, 1), AWAIT_CUE(5), WAIT(30), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -2270,7 +2270,7 @@ static const struct ScriptCommand s_gs9_g21_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -2445,7 +2445,7 @@ static const struct ScriptCommand s_gs9_g23_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(2586), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -2682,7 +2682,7 @@ static const struct ScriptCommand s_gs9_g26_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -2798,7 +2798,7 @@ static const struct ScriptCommand s_gs9_g27_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -2845,7 +2845,7 @@ static const struct ScriptCommand s_gs9_g28_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(2986), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(103), + BGM_SWITCH(MUS_A_SUCCESSFUL_RESCUE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(90), @@ -3514,7 +3514,7 @@ static const struct ScriptCommand s_gs9_g29_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(3655), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -3609,7 +3609,7 @@ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Huh? What was I like when I was\na human, anyway...?)") }, FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0xe2, 0x00, 0x01d6, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(470), PORTRAIT_REP(0x0000, 0x00000005), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(............{WAIT_PRESS}\nNope. I can't remember a thing...)") }, TEXTBOX_CLEAR, @@ -3704,7 +3704,7 @@ static const struct ScriptCommand s_gs9_g30_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEIN(60, 1), @@ -3751,7 +3751,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ ALERT_CUE(4), AWAIT_CUE(5), WAIT(30), - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" There's nothing here.")), TEXTBOX_CLEAR, @@ -3987,19 +3987,19 @@ static const struct ScriptCommand s_gs9_g30_s0_lives1_dlg0[] = { /* 0x81ae20c */ AWAIT_CUE(6), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe2, 0x00, 0x01c9, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(457), ALERT_CUE(5), AWAIT_CUE(6), FANFARE_PLAY2(458), CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), WAIT(10), - { 0xe2, 0x00, 0x01ca, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(458), AWAIT_CUE(6), FANFARE_PLAY2(473), CALL_SCRIPT(SHOCK_FUNC), WAIT(20), - { 0xe2, 0x00, 0x01d9, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(473), AWAIT_CUE(6), { 0x89, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), @@ -4156,7 +4156,7 @@ static const struct ScriptCommand s_gs9_g31_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -4250,7 +4250,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ ALERT_CUE(9), ALERT_CUE(10), AWAIT_CUE(5), - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), WAIT(16), ALERT_CUE(6), AWAIT_CUE(5), @@ -4409,13 +4409,13 @@ static const struct ScriptCommand s_gs9_g31_s0_lives1_dlg0[] = { /* 0x81b002c */ CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), WAIT(5), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), AWAIT_CUE(6), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), WAIT(5), - { 0xe2, 0x00, 0x01c9, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(457), AWAIT_CUE(6), CALL_SCRIPT(ANGRY_START_FUNC), AWAIT_CUE(6), @@ -4554,7 +4554,7 @@ static const struct ScriptCommand s_gs9_g33_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -4595,7 +4595,7 @@ static const struct ScriptCommand s_gs9_g34_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(4736), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(103), + BGM_SWITCH(MUS_A_SUCCESSFUL_RESCUE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(90), @@ -4913,7 +4913,7 @@ static const struct ScriptCommand s_gs9_g35_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(5054), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -5004,7 +5004,7 @@ static const struct ScriptCommand s_gs9_g36_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, -1), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), SELECT_EVENTS(0, 0), CALL_STATION( 37, 0), RET, @@ -5040,7 +5040,7 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), WAIT(30), - BGM_SWITCH(9), + BGM_SWITCH(MUS_RISING_FEAR), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Are you serious?!")), TEXTBOX_CLEAR, @@ -5197,7 +5197,7 @@ static const struct ScriptCommand s_gs9_g38_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -5237,7 +5237,7 @@ static const struct ScriptCommand s_gs9_g39_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(5378), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -5324,7 +5324,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ WAIT(64), ALERT_CUE(6), ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), PORTRAIT(PLACEMENT_TOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Zapdos...{WAIT_PRESS}\nIt's one of the legendary bird Pokémon.")), MSG_NPC(4, _(" I heard it had been\nsleeping for a long time...")), @@ -5686,7 +5686,7 @@ static const struct ScriptCommand s_gs9_g40_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -5752,7 +5752,7 @@ static const struct ScriptCommand s_gs9_g42_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -5797,7 +5797,7 @@ static const struct ScriptCommand s_gs9_g43_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -5971,7 +5971,7 @@ static const struct ScriptCommand s_gs9_g44_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -6017,7 +6017,7 @@ static const struct ScriptCommand s_gs9_g45_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -6437,7 +6437,7 @@ static const struct ScriptCommand s_gs9_g46_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(6578), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(90), @@ -6487,7 +6487,7 @@ static const struct ScriptCommand s_gs9_g46_s0_lives0_dlg0[] = { /* 0x81ba664 */ WAIT(10), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), WAIT(30), PORTRAIT_REP(0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -6555,7 +6555,7 @@ static const struct ScriptCommand s_gs9_g47_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -6788,7 +6788,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ MSG_NPC(2, _(" On what we must do to\nsave the world...")), MSG_NPC(2, _(" And we arrived at a\nconsensus.{WAIT_PRESS}\nWe must get rid of you.")), TEXTBOX_CLEAR, - BGM_SWITCH(9), + BGM_SWITCH(MUS_RISING_FEAR), WAIT(10), ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x0000000c), @@ -6940,7 +6940,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ ALERT_CUE(10), AWAIT_CUE(5), ALERT_CUE(10), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), PORTRAIT_REP(0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's right!\nThat's the spirit!\nThat's what I wanted to hear!")), @@ -7450,7 +7450,7 @@ static const struct ScriptCommand s_gs9_g51_s0_lives0_dlg0[] = { /* 0x81bf7d4 */ VARIANT_DEFAULT(_(" We have to get away at\nall cost.")), TEXTBOX_CLEAR, WAIT(30), - BGM_SWITCH(24), + BGM_SWITCH(MUS_THE_ESCAPE), PORTRAIT(PLACEMENT_RIGHT, 0x0000, 0x00000000), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(...Yes. We have to escape.)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Like {NAME_2} said that time...)") }, @@ -7474,7 +7474,7 @@ static const struct ScriptCommand s_gs9_g52_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(7615), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(24), + BGM_SWITCH(MUS_THE_ESCAPE), { 0x27, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, AWAIT_CUE(3), { 0x28, 0x01, 0x000e, 0x0000001e, 0x00000000, NULL }, @@ -7535,7 +7535,7 @@ static const struct ScriptCommand s_gs9_g53_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(7676), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(24), + BGM_SWITCH(MUS_THE_ESCAPE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -8046,7 +8046,7 @@ static const struct ScriptCommand s_gs9_g55_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x3b, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -8178,7 +8178,7 @@ static const struct ScriptCommand s_gs9_g57_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -8268,7 +8268,7 @@ static const struct ScriptCommand s_gs9_g58_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(8409), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -8412,7 +8412,7 @@ static const struct ScriptCommand s_gs9_g59_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(MAP_TEAM_BASE), CALL_STATION( 4, 0), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -8465,7 +8465,7 @@ static const struct ScriptCommand s_gs9_g60_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -8609,7 +8609,7 @@ static const struct ScriptCommand s_gs9_g62_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -8678,7 +8678,7 @@ static const struct ScriptCommand s_gs9_g62_s0_lives0_dlg0[] = { /* 0x81c5060 */ TEXTBOX_CLEAR, FANFARE_PLAY2(463), CALL_SCRIPT(NOTICE_FUNC), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x89, 0x48, 0x0100, 0x00000000, 0x00000000, NULL }, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, ALERT_CUE(3), @@ -8712,7 +8712,7 @@ static const struct ScriptCommand s_gs9_g63_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -8795,7 +8795,7 @@ static const struct ScriptCommand s_gs9_g65_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -8855,7 +8855,7 @@ static const struct ScriptCommand s_gs9_g67_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -9407,7 +9407,7 @@ static const struct ScriptCommand s_gs9_g69_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(9548), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), RET, @@ -9617,7 +9617,7 @@ static const struct ScriptCommand s_gs9_g72_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(MAP_TEAM_BASE), CALL_STATION( 4, 0), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -9937,7 +9937,7 @@ static const struct ScriptCommand s_gs9_g74_s0_lives1_dlg0[] = { /* 0x81cb178 */ FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), ALERT_CUE(5), - { 0xe2, 0x00, 0x01d6, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(470), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -10013,7 +10013,7 @@ static const struct ScriptCommand s_gs9_g75_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(10154), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -10078,7 +10078,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ 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 }, + WAIT_FANFARE1(203), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(7), @@ -10120,7 +10120,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ TEXTBOX_CLEAR, FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0xe2, 0x00, 0x01d6, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(470), WAIT(30), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(30), @@ -10133,7 +10133,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ CALL_SCRIPT(NOTICE_FUNC), WAIT(1), ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), ALERT_CUE(4), BGM_FADEOUT(90), AWAIT_CUE(5), @@ -10154,7 +10154,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ VARIANT_DEFAULT(_(" That {NAME_4} gang...")), VARIANT_DEFAULT(_(" Did they chase us here to\nget us back?")), TEXTBOX_CLEAR, - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), ALERT_CUE(4), ALERT_CUE(9), ALERT_CUE(10), @@ -10329,7 +10329,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x8b, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -10605,7 +10605,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives1_dlg0[] = { /* 0x81ce8cc */ SELECT_ANIMATION(2), FANFARE_PLAY2(468), CALL_SCRIPT(QUESTION_FUNC), - { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(468), AWAIT_CUE(6), ROTATE_TO(2, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(6), @@ -11251,7 +11251,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives1_dlg0[] = { /* 0x81d11b8 */ FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), ALERT_CUE(5), AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, @@ -11695,7 +11695,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives0_dlg0[] = { /* 0x81d23bc */ CAMERA_INIT_PAN, SELECT_ENTITIES(-1, 0), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -11904,7 +11904,7 @@ static const struct ScriptCommand s_gs9_g78_s0_eff0_script[] = { /* 0x81d3b84 */ BGM_STOP, WAIT(20), FANFARE_PLAY(201), - { 0xe1, 0x00, 0x00c9, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(201), WAIT(30), BGM_FADEIN(120, 1), WALK_GRID(256, 118), @@ -12072,7 +12072,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), MSG_NPC(1, _(" Wh-what?!")), TEXTBOX_CLEAR, - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), { 0xe5, 0x00, 0x0009, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, @@ -12228,7 +12228,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives4_dlg0[] = { /* 0x81d52f4 */ AWAIT_CUE(9), FANFARE_PLAY2(472), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe2, 0x00, 0x01d8, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(472), ALERT_CUE(5), AWAIT_CUE(9), SELECT_ANIMATION(2), @@ -12244,7 +12244,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives4_dlg0[] = { /* 0x81d52f4 */ SELECT_ANIMATION(2), WAIT(24), FANFARE_PLAY2(610), - { 0xe2, 0x00, 0x0262, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(610), ALERT_CUE(5), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), @@ -12255,7 +12255,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives4_dlg0[] = { /* 0x81d52f4 */ SELECT_ANIMATION(2), WAIT(24), FANFARE_PLAY2(610), - { 0xe2, 0x00, 0x0262, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(610), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ FANFARE_FADEOUT2(100, 702), @@ -12368,7 +12368,7 @@ static const struct ScriptCommand s_gs9_g79_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(12509), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -12623,7 +12623,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ COND_EQUAL(1, /* to label */ 16), FANFARE_PLAY(204), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_2} joined the rescue team!")), - { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(204), TEXTBOX_CLEAR, WAIT(10), { 0x3b, 0x1e, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -12692,7 +12692,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives1_dlg0[] = { /* 0x81d764c */ ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(469), ALERT_CUE(5), AWAIT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), @@ -12733,7 +12733,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives2_dlg0[] = { /* 0x81d797c */ ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), AWAIT_CUE(7), WALK_RELATIVE(512, -16, 0), FANFARE_PLAY2(457), @@ -12761,7 +12761,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives2_dlg0[] = { /* 0x81d797c */ WAIT(30), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), ALERT_CUE(5), AWAIT_CUE(7), WALK_RELATIVE(512, 0, 32), @@ -12786,7 +12786,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives2_dlg0[] = { /* 0x81d797c */ ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), ALERT_CUE(5), AWAIT_CUE(7), WALK_GRID(512, 129), @@ -12948,7 +12948,7 @@ static const struct ScriptCommand s_gs9_g81_s0_station_sref_script[] = { /* 0x81 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -13136,7 +13136,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ 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 }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(3), @@ -13384,7 +13384,7 @@ static const struct ScriptCommand s_gs9_g84_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(13525), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -13560,7 +13560,7 @@ static const struct ScriptCommand s_gs9_g85_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(13701), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -13584,7 +13584,7 @@ static const struct ScriptCommand s_gs9_g85_s0_lives0_dlg0[] = { /* 0x81db740 */ MSG_INSTANT(_("{CENTER_ALIGN}The latest recruit to\n{CENTER_ALIGN}Team {COLOR CYAN}{TEAM_NAME}{RESET}!")), FANFARE_PLAY(204), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_2} joined\n{CENTER_ALIGN}the rescue team!")), - { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(204), TEXTBOX_CLEAR, { 0x3b, 0x2a, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 2), @@ -13593,7 +13593,7 @@ static const struct ScriptCommand s_gs9_g85_s0_lives0_dlg0[] = { /* 0x81db740 */ MSG_INSTANT(_("{CENTER_ALIGN}And more!")), MSG_INSTANT(_("{CENTER_ALIGN}The Friend Area\n{CENTER_ALIGN}{COLOR GREEN_H}{FRIEND_AREA}{RESET} was obtained!")), FANFARE_PLAY(212), - { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(212), TEXTBOX_CLEAR2, LABEL(2), /* = 0x02 */ { 0x3b, 0x2b, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -13636,7 +13636,7 @@ static const struct ScriptCommand s_gs9_g86_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), SELECT_ENTITIES(-1, 1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_ENTITIES(87, 0), @@ -13695,9 +13695,9 @@ static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ BGM_STOP, FANFARE_PLAY(204), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_2} can now tag\n{CENTER_ALIGN}along with the rescue team!")), - { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(204), TEXTBOX_CLEAR, - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), WAIT(30), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" The only place I want to go\nis {COLOR YELLOW_D}Mt. Freeze{RESET}.")), @@ -13762,7 +13762,7 @@ static const struct ScriptCommand s_gs9_g88_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(13903), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -13819,7 +13819,7 @@ static const struct ScriptCommand s_gs9_g89_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_ENTITIES(90, 0), @@ -13878,9 +13878,9 @@ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ BGM_STOP, FANFARE_PLAY(204), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_2} can now tag\n{CENTER_ALIGN}along with the rescue team!")), - { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(204), TEXTBOX_CLEAR, - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), WAIT(30), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" The only place I want to go\nis the {COLOR YELLOW_D}Murky Cave{RESET}.")), @@ -13950,7 +13950,7 @@ static const struct ScriptCommand s_gs9_g91_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(14091), SELECT_MAP(MAP_TEAM_BASE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(5), + BGM_SWITCH(MUS_BENEVOLENT_SPIRIT), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), diff --git a/src/data/ground/ground_data_b01p02a_station.h b/src/data/ground/ground_data_b01p02a_station.h index 67558850b..914f52393 100644 --- a/src/data/ground/ground_data_b01p02a_station.h +++ b/src/data/ground/ground_data_b01p02a_station.h @@ -75,7 +75,7 @@ static const struct ScriptCommand s_gs12_g0_s0_station_sref_script[] = { /* 0x81 SELECT_LIVES(0, 1), JUMP_LABEL(12), LABEL(12), /* = 0x0c */ - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), JUMP_SCRIPT(COMMON_ENTER), }; @@ -260,7 +260,7 @@ static const struct ScriptCommand s_gs12_g3_s0_station_sref_script[] = { /* 0x81 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -289,7 +289,7 @@ static const struct ScriptCommand s_gs12_g4_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -316,7 +316,7 @@ static const struct ScriptCommand s_gs12_g5_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(0, 2), SELECT_EVENTS(0, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -339,7 +339,7 @@ static const struct ScriptCommand s_gs12_g6_s0_station_sref_script[] = { /* 0x81 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -367,7 +367,7 @@ static const struct ScriptCommand s_gs12_g7_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -396,7 +396,7 @@ static const struct ScriptCommand s_gs12_g8_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -427,7 +427,7 @@ static const struct ScriptCommand s_gs12_g9_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -437,7 +437,7 @@ static const struct ScriptCommand s_gs12_g9_s0_station_sref_script[] = { /* 0x81 SELECT_LIVES(9, 1), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), RET, }; @@ -558,7 +558,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ BGM_STOP, FANFARE_PLAY(212), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} received something\n{CENTER_ALIGN}from {NAME_2}.")), - { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(212), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(7), @@ -680,7 +680,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives1_dlg0[] = { /* 0x81e4480 */ AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(469), AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(6), @@ -690,7 +690,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives1_dlg0[] = { /* 0x81e4480 */ AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(469), AWAIT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), @@ -728,7 +728,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives2_dlg0[] = { /* 0x81e4720 */ AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), ALERT_CUE(5), AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, @@ -781,27 +781,27 @@ static const struct ScriptCommand s_gs12_g9_s0_lives2_dlg0[] = { /* 0x81e4720 */ WALK_RELATIVE(256, 0, 32), ALERT_CUE(5), FANFARE_PLAY2(468), - { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(468), FANFARE_PLAY2(468), WAIT(30), WALK_RELATIVE(256, -32, 16), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), FANFARE_PLAY2(468), - { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(468), FANFARE_PLAY2(468), ALERT_CUE(5), WAIT(30), WALK_RELATIVE(256, 64, 16), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), FANFARE_PLAY2(468), - { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(468), FANFARE_PLAY2(468), ALERT_CUE(5), WAIT(30), WALK_RELATIVE(256, -32, 24), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), FANFARE_PLAY2(468), - { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(468), FANFARE_PLAY2(468), WAIT(30), ALERT_CUE(5), @@ -811,12 +811,12 @@ static const struct ScriptCommand s_gs12_g9_s0_lives2_dlg0[] = { /* 0x81e4720 */ AWAIT_CUE(7), WALK_RELATIVE(256, 16, 16), FANFARE_PLAY2(468), - { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(468), FANFARE_PLAY2(468), WAIT(60), WALK_RELATIVE(256, -16, 16), FANFARE_PLAY2(468), - { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(468), FANFARE_PLAY2(468), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(30), @@ -928,7 +928,7 @@ static const struct ScriptCommand s_gs12_g11_s0_station_sref_script[] = { /* 0x8 VARIANT_DEFAULT(_(" {NAME_0}, wake up!\nCome on, wake up!")), TEXTBOX_CLEAR, SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(120), @@ -981,7 +981,7 @@ static const struct ScriptCommand s_gs12_g12_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -1125,7 +1125,7 @@ static const struct ScriptCommand s_gs12_g13_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -1182,7 +1182,7 @@ static const struct ScriptCommand s_gs12_g13_s0_lives0_dlg0[] = { /* 0x81e6580 * WAIT(15), MSG_INSTANT(_("{CENTER_ALIGN}Team {COLOR CYAN}{TEAM_NAME}{RESET}'s\n{CENTER_ALIGN}rescue rank went up!")), FANFARE_PLAY(201), - { 0xe1, 0x00, 0x00c9, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(201), TEXTBOX_CLEAR2, { 0x3b, 0x2e, 0x0000, 0x00000000, 0x00000000, NULL }, COND_EQUAL(0, /* to label */ 2), @@ -1225,7 +1225,7 @@ static const struct ScriptCommand s_gs12_g14_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -1302,7 +1302,7 @@ static const struct ScriptCommand s_gs12_g15_s0_station_sref_script[] = { /* 0x8 MSG_ON_BG_AUTO(30, _("{CENTER_ALIGN}The next morning...")), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 16, 0), @@ -1388,7 +1388,7 @@ static const struct ScriptCommand s_gs12_g16_s1_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_ENTITIES(-1, 0), @@ -1417,7 +1417,7 @@ static const struct ScriptCommand s_gs12_g17_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1462,7 +1462,7 @@ static const struct ScriptCommand s_gs12_g18_s0_station_sref_script[] = { /* 0x8 MSG_ON_BG_AUTO(30, _("{CENTER_ALIGN}The next morning...")), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1491,7 +1491,7 @@ static const struct ScriptCommand s_gs12_g19_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1663,7 +1663,7 @@ static const struct ScriptCommand s_gs12_g21_s0_station_sref_script[] = { /* 0x8 MSG_ON_BG_AUTO(30, _("{CENTER_ALIGN}The next morning...")), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1700,7 +1700,7 @@ static const struct ScriptCommand s_gs12_g22_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1736,7 +1736,7 @@ static const struct ScriptCommand s_gs12_g23_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1772,7 +1772,7 @@ static const struct ScriptCommand s_gs12_g24_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1800,7 +1800,7 @@ static const struct ScriptCommand s_gs12_g25_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1836,7 +1836,7 @@ static const struct ScriptCommand s_gs12_g26_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1864,7 +1864,7 @@ static const struct ScriptCommand s_gs12_g27_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1900,7 +1900,7 @@ static const struct ScriptCommand s_gs12_g28_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1928,7 +1928,7 @@ static const struct ScriptCommand s_gs12_g29_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1964,7 +1964,7 @@ static const struct ScriptCommand s_gs12_g30_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -1992,7 +1992,7 @@ static const struct ScriptCommand s_gs12_g31_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -2028,7 +2028,7 @@ static const struct ScriptCommand s_gs12_g32_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -2106,7 +2106,7 @@ static const struct ScriptCommand s_gs12_g34_s0_station_sref_script[] = { /* 0x8 { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), RET, }; @@ -2150,7 +2150,7 @@ static const struct ScriptCommand s_gs12_g35_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -2225,7 +2225,7 @@ static const struct ScriptCommand s_gs12_g37_s0_station_sref_script[] = { /* 0x8 { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), RET, }; @@ -2297,7 +2297,7 @@ static const struct ScriptCommand s_gs12_g38_s0_lives0_dlg0[] = { /* 0x81eaddc * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}\nI guess it settled down...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _(".......There've been a lot of earthquakes\nlately...") }, TEXTBOX_CLEAR, - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, ALERT_CUE(3), RET, @@ -2398,7 +2398,7 @@ static const struct ScriptCommand s_gs12_g40_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -2433,7 +2433,7 @@ static const struct ScriptCommand s_gs12_g41_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -2559,7 +2559,7 @@ static const struct ScriptCommand s_gs12_g43_s0_station_sref_script[] = { /* 0x8 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -2587,7 +2587,7 @@ static const struct ScriptCommand s_gs12_g44_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -2635,7 +2635,7 @@ static const struct ScriptCommand s_gs12_g45_s0_station_sref_script[] = { /* 0x8 { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x39, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), @@ -2727,7 +2727,7 @@ static const struct ScriptCommand s_gs12_g46_s1_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_TEAM_BASE_INSIDE), SELECT_ENTITIES(0, 2), - BGM_SWITCH(1), + BGM_SWITCH(MUS_RESCUE_TEAM_BASE), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), RET, diff --git a/src/data/ground/ground_data_d01p01_station.h b/src/data/ground/ground_data_d01p01_station.h index dc20358e9..741008606 100644 --- a/src/data/ground/ground_data_d01p01_station.h +++ b/src/data/ground/ground_data_d01p01_station.h @@ -141,7 +141,7 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - WAIT(40), FANFARE_PLAY2(482), CALL_SCRIPT(SHOCK_FUNC), - { 0xe2, 0x00, 0x01e2, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(482), PORTRAIT_REP(0x0000, 0x0000000c), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(It... It's true...)") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(I have turned into\na {POKEMON_0}!)") }, @@ -214,7 +214,7 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - VARIANT_DEFAULT(_(" What's wrong?")), TEXTBOX_CLEAR, WAIT(20), - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), ALERT_CUE(7), AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000000), @@ -291,7 +291,7 @@ static const struct ScriptCommand s_gs178_g1_s0_lives1_dlg0[] = { /* 0x822d950 - AWAIT_CUE(6), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0xe2, 0x00, 0x01d6, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(470), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), @@ -305,14 +305,14 @@ static const struct ScriptCommand s_gs178_g1_s0_lives1_dlg0[] = { /* 0x822d950 - FANFARE_PLAY2(466), CALL_SCRIPT(NOTICE_FUNC), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), - { 0xe2, 0x00, 0x01d2, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(466), WAIT(30), AWAIT_CUE(6), ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), FANFARE_PLAY2(463), CALL_SCRIPT(SHOCK_FUNC), - { 0xe2, 0x00, 0x01cf, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(463), ALERT_CUE(5), AWAIT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), @@ -481,7 +481,7 @@ static const struct ScriptCommand s_gs178_g2_s0_lives1_dlg0[] = { /* 0x822e5fc - CALL_SCRIPT(QUESTION_FUNC), ALERT_CUE(5), WAIT(5), - { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(469), AWAIT_CUE(6), ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT(20), @@ -519,7 +519,7 @@ static const struct ScriptCommand s_gs178_g3_s0_station_sref_script[] = { /* 0x8 { 0x3b, 0x39, 0x0004, 0x00000000, 0x00000000, NULL }, SELECT_MAP(MAP_TINY_WOODS_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(103), + BGM_SWITCH(MUS_A_SUCCESSFUL_RESCUE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(30), diff --git a/src/data/ground/ground_data_d01p02_station.h b/src/data/ground/ground_data_d01p02_station.h index d86f4159c..297d6702c 100644 --- a/src/data/ground/ground_data_d01p02_station.h +++ b/src/data/ground/ground_data_d01p02_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs179_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(21), SELECT_MAP(179), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -93,7 +93,7 @@ static const struct ScriptCommand s_gs179_g1_s0_lives2_dlg0[] = { /* 0x8230108 - { 0x56, 0x00, 0x0000, 0x0000003e, 0x00000000, NULL }, FANFARE_PLAY2(457), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe2, 0x00, 0x01c9, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(457), ALERT_CUE(5), AWAIT_CUE(7), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), diff --git a/src/data/ground/ground_data_d02p01_station.h b/src/data/ground/ground_data_d02p01_station.h index b5e95cc13..8ad8b6a41 100644 --- a/src/data/ground/ground_data_d02p01_station.h +++ b/src/data/ground/ground_data_d02p01_station.h @@ -23,7 +23,7 @@ static const struct ScriptCommand s_gs180_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(23), SELECT_MAP(MAP_THUNDERWAVE_CAVE_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(14), + BGM_SWITCH(MUS_THUNDERWAVE_CAVE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), NEXT_DUNGEON(0, SCRIPT_DUNGEON_THUNDERWAVE_CAVE), @@ -137,7 +137,7 @@ static const struct ScriptCommand s_gs180_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(137), SELECT_MAP(MAP_THUNDERWAVE_CAVE_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(14), + BGM_SWITCH(MUS_THUNDERWAVE_CAVE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), NEXT_DUNGEON(0, SCRIPT_DUNGEON_THUNDERWAVE_CAVE), @@ -239,7 +239,7 @@ static const struct ScriptCommand s_gs180_g3_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(239), SELECT_MAP(MAP_THUNDERWAVE_CAVE_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(103), + BGM_SWITCH(MUS_A_SUCCESSFUL_RESCUE), WAIT(30), { 0x27, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, AWAIT_CUE(3), diff --git a/src/data/ground/ground_data_d02p02_station.h b/src/data/ground/ground_data_d02p02_station.h index 583d3ad90..64127e699 100644 --- a/src/data/ground/ground_data_d02p02_station.h +++ b/src/data/ground/ground_data_d02p02_station.h @@ -23,7 +23,7 @@ static const struct ScriptCommand s_gs181_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(23), SELECT_MAP(181), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(120), diff --git a/src/data/ground/ground_data_d03p01_station.h b/src/data/ground/ground_data_d03p01_station.h index caa3ac871..e48aebb71 100644 --- a/src/data/ground/ground_data_d03p01_station.h +++ b/src/data/ground/ground_data_d03p01_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs182_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(21), SELECT_MAP(182), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(120), + BGM_SWITCH(MUS_MT_STEEL), AWAIT_CUE(3), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), @@ -138,7 +138,7 @@ static const struct ScriptCommand s_gs182_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(138), SELECT_MAP(182), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(120), + BGM_SWITCH(MUS_MT_STEEL), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), RET, diff --git a/src/data/ground/ground_data_d03p02_station.h b/src/data/ground/ground_data_d03p02_station.h index 17aa96986..2f734695d 100644 --- a/src/data/ground/ground_data_d03p02_station.h +++ b/src/data/ground/ground_data_d03p02_station.h @@ -24,7 +24,7 @@ static const struct ScriptCommand s_gs183_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(24), SELECT_MAP(183), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), WAIT(30), diff --git a/src/data/ground/ground_data_d04p01_station.h b/src/data/ground/ground_data_d04p01_station.h index 4540232d9..15a705b23 100644 --- a/src/data/ground/ground_data_d04p01_station.h +++ b/src/data/ground/ground_data_d04p01_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs184_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(21), SELECT_MAP(MAP_SINISTER_WOODS_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(15), + BGM_SWITCH(MUS_SINISTER_WOODS), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_SINISTER_WOODS), @@ -78,7 +78,7 @@ static const struct ScriptCommand s_gs184_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(78), SELECT_MAP(MAP_SINISTER_WOODS_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(15), + BGM_SWITCH(MUS_SINISTER_WOODS), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_SINISTER_WOODS), diff --git a/src/data/ground/ground_data_d04p02_station.h b/src/data/ground/ground_data_d04p02_station.h index 876adba9d..ccc76f9bd 100644 --- a/src/data/ground/ground_data_d04p02_station.h +++ b/src/data/ground/ground_data_d04p02_station.h @@ -23,7 +23,7 @@ static const struct ScriptCommand s_gs185_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(23), SELECT_MAP(185), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -73,7 +73,7 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), CMD_UNK_93(4, DIR_TRANS_SPINLEFT1, 94), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_LEFT, 0x0002, 0x00000000), PORTRAIT_POS(2, 0, -3), @@ -149,7 +149,7 @@ static const struct ScriptCommand s_gs185_g1_s0_lives3_dlg0[] = { /* 0x823550c * { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, FANFARE_PLAY2(457), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe2, 0x00, 0x01c9, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(457), ALERT_CUE(5), AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d05p01_station.h b/src/data/ground/ground_data_d05p01_station.h index e41885a74..64e9fbe67 100644 --- a/src/data/ground/ground_data_d05p01_station.h +++ b/src/data/ground/ground_data_d05p01_station.h @@ -22,7 +22,7 @@ static const struct ScriptCommand s_gs186_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(22), SELECT_MAP(MAP_SILENT_CHASM_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(113), + BGM_SWITCH(MUS_SILENT_CHASM), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d05p02_station.h b/src/data/ground/ground_data_d05p02_station.h index 6edc24419..3b3caf304 100644 --- a/src/data/ground/ground_data_d05p02_station.h +++ b/src/data/ground/ground_data_d05p02_station.h @@ -1,7 +1,8 @@ - - - +#define NPC_PARTNER 1 +#define NPC_JUMPLUFF 2 +#define NPC_SHIFTRY 3 +#define NPC_ZAPDOS 6 @@ -19,7 +20,7 @@ static const struct ScriptCommand s_gs187_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(187), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -49,7 +50,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * ALERT_CUE(12), { 0x89, 0x50, 0x0100, 0x00000004, 0x00000000, NULL }, WAIT(32), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), + PORTRAIT(PLACEMENT_RIGHT, NPC_PARTNER, 0), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_2}'s friend is\nsupposed to be around here, right?")), VARIANT_DEFAULT(_(" Isn't this the place?\nWhere {NAME_2}'s friend is supposed\nto be?")), @@ -58,30 +59,30 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * WAIT(60), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT_REP(0x0001, 0x0000000c), - MSG_NPC(1, _(" Oh, hey!")), + PORTRAIT_REP(NPC_PARTNER, 12), + MSG_NPC(NPC_PARTNER, _(" Oh, hey!")), TEXTBOX_CLEAR, ALERT_CUE(6), ALERT_CUE(12), { 0x89, 0x20, 0x0100, 0x00000004, 0x00000000, NULL }, ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), - PORTRAIT_REP(0x0001, 0x00000000), - MSG_NPC(1, _(" We came for you!\nAre you all right?")), + PORTRAIT_REP(NPC_PARTNER, 0), + MSG_NPC(NPC_PARTNER, _(" We came for you!\nAre you all right?")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0002, 0x00000041), - MSG_NPC(2, _(" Yes...\nI'm fine, but...")), + PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, NPC_JUMPLUFF, 65), + MSG_NPC(NPC_JUMPLUFF, _(" Yes...\nI'm fine, but...")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT_REP(0x0001, 0x00000001), - MSG_NPC(1, _(" Great!\nYour friend is waiting for you.")), + PORTRAIT_REP(NPC_PARTNER, 1), + MSG_NPC(NPC_PARTNER, _(" Great!\nYour friend is waiting for you.")), TEXTBOX_CLEAR, WAIT(10), - MSG_NPC(2, _(" {NAME_3} is in the\nback...")), + MSG_NPC(NPC_JUMPLUFF, _(" {NAME_3} is in the\nback...")), TEXTBOX_CLEAR, WAIT(10), - PORTRAIT_REP(0x0001, 0x00000000), - MSG_NPC(1, _(" Huh? {NAME_3}?")), + PORTRAIT_REP(NPC_PARTNER, 0), + MSG_NPC(NPC_PARTNER, _(" Huh? {NAME_3}?")), TEXTBOX_CLEAR, ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), WAIT(5), @@ -91,8 +92,8 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * ROTATE_TO(2, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), ALERT_CUE(6), AWAIT_CUE(5), - PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), - MSG_NPC(1, _(" Let's go!")), + PORTRAIT(PLACEMENT_RIGHT, NPC_PARTNER, 0), + MSG_NPC(NPC_PARTNER, _(" Let's go!")), TEXTBOX_CLEAR, ALERT_CUE(6), ALERT_CUE(7), @@ -101,18 +102,18 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * { 0x89, 0x3c, 0x01cc, 0x00000004, 0x00000000, NULL }, ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT(30), - PORTRAIT_REP(0x0001, 0x0000000c), + PORTRAIT_REP(NPC_PARTNER, 12), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey! Are you all right?\nGet it together!")), VARIANT_DEFAULT(_(" Listen! Are you OK?\nSnap out of it!")), TEXTBOX_CLEAR, WAIT(30), - PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000041), - MSG_NPC(3, _(" ...Urrrgh.\nForget about me...")), - MSG_NPC(3, _(" Get away from here!")), + PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, NPC_SHIFTRY, 65), + MSG_NPC(NPC_SHIFTRY, _(" ...Urrrgh.\nForget about me...")), + MSG_NPC(NPC_SHIFTRY, _(" Get away from here!")), TEXTBOX_CLEAR, WAIT(10), - MSG_NPC(1, _(" Get...{WAIT_PRESS}\nGet away?!")), + MSG_NPC(NPC_PARTNER, _(" Get...{WAIT_PRESS}\nGet away?!")), TEXTBOX_CLEAR, BGM_STOP, FANFARE_PLAY2(502), @@ -131,7 +132,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * WAIT(90), TEXTBOX_CLEAR, WAIT(10), - MSG_NPC(3, _(" It's coming!")), + MSG_NPC(NPC_SHIFTRY, _(" It's coming!")), TEXTBOX_CLEAR, FANFARE_PLAY2(502), { 0x27, 0x01, 0x0005, 0x00000002, 0x00000000, NULL }, @@ -166,23 +167,23 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * WAIT(8), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(30), - MSG_NPC(1, _(" Shi-{NAME_3}'s gone!")), + MSG_NPC(NPC_PARTNER, _(" Shi-{NAME_3}'s gone!")), TEXTBOX_CLEAR, ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(6), ALERT_CUE(12), WAIT(15), - BGM_SWITCH(9), + BGM_SWITCH(MUS_RISING_FEAR), 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}!")), + PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, NPC_ZAPDOS, 0), + MSG_NPC(NPC_ZAPDOS, _(" If you wish to save\n{NAME_3}, then scale {COLOR YELLOW_D}Mt. Thunder{RESET}!")), TEXTBOX_CLEAR, ALERT_CUE(11), AWAIT_CUE(5), WAIT(30), - PORTRAIT_REP(0x0001, 0x0000000c), - MSG_NPC(1, _(" {NAME_6}...")), - MSG_NPC(1, _(" So that's the legendary\nmonster...")), + PORTRAIT_REP(NPC_PARTNER, 12), + MSG_NPC(NPC_PARTNER, _(" {NAME_6}...")), + MSG_NPC(NPC_PARTNER, _(" So that's the legendary\nmonster...")), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(3), diff --git a/src/data/ground/ground_data_d06p01_station.h b/src/data/ground/ground_data_d06p01_station.h index 6193fb1e5..8b6ce1464 100644 --- a/src/data/ground/ground_data_d06p01_station.h +++ b/src/data/ground/ground_data_d06p01_station.h @@ -22,7 +22,7 @@ static const struct ScriptCommand s_gs188_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(22), SELECT_MAP(MAP_MT_THUNDER_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(111), + BGM_SWITCH(MUS_MT_THUNDER), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -116,7 +116,7 @@ static const struct ScriptCommand s_gs188_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(116), SELECT_MAP(MAP_MT_THUNDER_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(111), + BGM_SWITCH(MUS_MT_THUNDER), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d06p02_station.h b/src/data/ground/ground_data_d06p02_station.h index 2e34c5005..c26fee151 100644 --- a/src/data/ground/ground_data_d06p02_station.h +++ b/src/data/ground/ground_data_d06p02_station.h @@ -36,7 +36,7 @@ static const struct ScriptCommand s_gs189_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(6), LABEL(6), /* = 0x06 */ - BGM_SWITCH(111), + BGM_SWITCH(MUS_MT_THUNDER), JUMP_SCRIPT(COMMON_ENTER), }; @@ -132,7 +132,7 @@ static const struct ScriptCommand s_gs189_g1_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_MT_THUNDER_MID), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(111), + BGM_SWITCH(MUS_MT_THUNDER), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), diff --git a/src/data/ground/ground_data_d06p03_station.h b/src/data/ground/ground_data_d06p03_station.h index 9016e9794..7350c06de 100644 --- a/src/data/ground/ground_data_d06p03_station.h +++ b/src/data/ground/ground_data_d06p03_station.h @@ -26,7 +26,7 @@ static const struct ScriptCommand s_gs190_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(26), SELECT_MAP(190), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d07p01_station.h b/src/data/ground/ground_data_d07p01_station.h index 55bf8c760..2e3a20be5 100644 --- a/src/data/ground/ground_data_d07p01_station.h +++ b/src/data/ground/ground_data_d07p01_station.h @@ -24,7 +24,7 @@ static const struct ScriptCommand s_gs191_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(24), SELECT_MAP(MAP_GREAT_CANYON_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(20), + BGM_SWITCH(MUS_GREAT_CANYON), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), NEXT_DUNGEON(0, SCRIPT_DUNGEON_GREAT_CANYON), @@ -91,7 +91,7 @@ static const struct ScriptCommand s_gs191_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(91), SELECT_MAP(MAP_GREAT_CANYON_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(20), + BGM_SWITCH(MUS_GREAT_CANYON), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), NEXT_DUNGEON(0, SCRIPT_DUNGEON_GREAT_CANYON), diff --git a/src/data/ground/ground_data_d07p02_station.h b/src/data/ground/ground_data_d07p02_station.h index 7a2cf2325..579773e41 100644 --- a/src/data/ground/ground_data_d07p02_station.h +++ b/src/data/ground/ground_data_d07p02_station.h @@ -33,7 +33,7 @@ static const struct ScriptCommand s_gs192_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(33), SELECT_MAP(192), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -87,7 +87,7 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * WAIT(10), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - { 0xe2, 0x00, 0x01d6, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(470), ALERT_CUE(7), AWAIT_CUE(5), FANFARE_PLAY2(465), @@ -119,7 +119,7 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * BGM_STOP, FANFARE_PLAY(205), MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Fiery Field{RESET}!")), - { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(3), @@ -136,7 +136,7 @@ static const struct ScriptCommand s_gs192_g1_s0_lives1_dlg0[] = { /* 0x823ec7c * AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), ALERT_CUE(5), AWAIT_CUE(7), FANFARE_PLAY2(474), @@ -158,7 +158,7 @@ static const struct ScriptCommand s_gs192_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(158), SELECT_MAP(192), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, @@ -755,12 +755,12 @@ static const struct ScriptCommand s_gs192_g2_s0_lives1_dlg0[] = { /* 0x8241890 * AWAIT_CUE(6), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), - { 0xe2, 0x00, 0x01c9, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(457), ALERT_CUE(5), AWAIT_CUE(6), FANFARE_PLAY2(473), CALL_SCRIPT(SHOCK_FUNC), - { 0xe2, 0x00, 0x01d9, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(473), ALERT_CUE(5), HALT, }; diff --git a/src/data/ground/ground_data_d08p01_station.h b/src/data/ground/ground_data_d08p01_station.h index f7e540b8f..9d876704d 100644 --- a/src/data/ground/ground_data_d08p01_station.h +++ b/src/data/ground/ground_data_d08p01_station.h @@ -37,7 +37,7 @@ static const struct ScriptCommand s_gs193_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 2), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(102), + BGM_SWITCH(MUS_LAPIS_CAVE), JUMP_SCRIPT(COMMON_ENTER), }; @@ -116,7 +116,7 @@ static const struct ScriptCommand s_gs193_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(126), SELECT_MAP(MAP_LAPIS_CAVE_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(24), + BGM_SWITCH(MUS_THE_ESCAPE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -138,7 +138,7 @@ static const struct ScriptCommand s_gs193_g1_s0_lives0_dlg0[] = { /* 0x824313c * 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), + BGM_SWITCH(MUS_LAPIS_CAVE), ALERT_CUE(6), AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), @@ -225,7 +225,7 @@ static const struct ScriptCommand s_gs193_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(235), SELECT_MAP(MAP_LAPIS_CAVE_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(102), + BGM_SWITCH(MUS_LAPIS_CAVE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -426,7 +426,7 @@ static const struct ScriptCommand s_gs193_g4_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(436), SELECT_MAP(MAP_LAPIS_CAVE_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(102), + BGM_SWITCH(MUS_LAPIS_CAVE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -493,7 +493,7 @@ static const struct ScriptCommand s_gs193_g5_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(503), SELECT_MAP(MAP_LAPIS_CAVE_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(102), + BGM_SWITCH(MUS_LAPIS_CAVE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), diff --git a/src/data/ground/ground_data_d08p02_station.h b/src/data/ground/ground_data_d08p02_station.h index bb89d51de..13c84408a 100644 --- a/src/data/ground/ground_data_d08p02_station.h +++ b/src/data/ground/ground_data_d08p02_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs194_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(21), SELECT_MAP(194), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d09p01_station.h b/src/data/ground/ground_data_d09p01_station.h index aac7180b9..8eb6e79bd 100644 --- a/src/data/ground/ground_data_d09p01_station.h +++ b/src/data/ground/ground_data_d09p01_station.h @@ -39,7 +39,7 @@ static const struct ScriptCommand s_gs195_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 2), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(25), + BGM_SWITCH(MUS_MT_BLAZE), JUMP_SCRIPT(COMMON_ENTER), }; @@ -143,7 +143,7 @@ static const struct ScriptCommand s_gs195_g1_s0_station_sref_script[] = { /* 0x8 MSG_NPC(1, _(" ........................")), MSG_NPC(1, _(" ...I think...{WAIT_PRESS}\nThey're gone.")), TEXTBOX_CLEAR, - BGM_SWITCH(25), + BGM_SWITCH(MUS_MT_BLAZE), { 0x3b, 0x3a, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), @@ -387,7 +387,7 @@ static const struct ScriptCommand s_gs195_g3_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(195), SELECT_WEATHER(13), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(25), + BGM_SWITCH(MUS_MT_BLAZE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 2, 0), @@ -502,7 +502,7 @@ static const struct ScriptCommand s_gs195_g4_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(195), SELECT_WEATHER(13), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(25), + BGM_SWITCH(MUS_MT_BLAZE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 2, 0), @@ -567,7 +567,7 @@ static const struct ScriptCommand s_gs195_g5_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(195), SELECT_WEATHER(13), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(25), + BGM_SWITCH(MUS_MT_BLAZE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 2, 0), diff --git a/src/data/ground/ground_data_d09p02_station.h b/src/data/ground/ground_data_d09p02_station.h index 17781570d..c35aba034 100644 --- a/src/data/ground/ground_data_d09p02_station.h +++ b/src/data/ground/ground_data_d09p02_station.h @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs196_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(7), LABEL(7), /* = 0x07 */ - BGM_SWITCH(25), + BGM_SWITCH(MUS_MT_BLAZE), JUMP_SCRIPT(COMMON_ENTER), }; @@ -148,7 +148,7 @@ static const struct ScriptCommand s_gs196_g1_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_MT_BLAZE_MID), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(25), + BGM_SWITCH(MUS_MT_BLAZE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), diff --git a/src/data/ground/ground_data_d09p03_station.h b/src/data/ground/ground_data_d09p03_station.h index 7475ae6f0..8100eddbf 100644 --- a/src/data/ground/ground_data_d09p03_station.h +++ b/src/data/ground/ground_data_d09p03_station.h @@ -20,7 +20,7 @@ static const struct ScriptCommand s_gs197_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(20), SELECT_MAP(MAP_MT_BLAZE_END), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d10p01_station.h b/src/data/ground/ground_data_d10p01_station.h index 6f0306561..a7ee7f06d 100644 --- a/src/data/ground/ground_data_d10p01_station.h +++ b/src/data/ground/ground_data_d10p01_station.h @@ -39,7 +39,7 @@ static const struct ScriptCommand s_gs198_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 2), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), JUMP_SCRIPT(COMMON_ENTER), }; @@ -126,7 +126,7 @@ static const struct ScriptCommand s_gs198_g1_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_FROSTY_FOREST_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 2, 0), @@ -335,7 +335,7 @@ static const struct ScriptCommand s_gs198_g3_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_FROSTY_FOREST_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 2, 0), @@ -397,7 +397,7 @@ static const struct ScriptCommand s_gs198_g4_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_FROSTY_FOREST_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 2, 0), @@ -455,7 +455,7 @@ static const struct ScriptCommand s_gs198_g5_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_FROSTY_FOREST_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 2, 0), @@ -524,7 +524,7 @@ static const struct ScriptCommand s_gs198_g6_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_FROSTY_FOREST_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 2, 0), diff --git a/src/data/ground/ground_data_d10p02_station.h b/src/data/ground/ground_data_d10p02_station.h index c3b514966..faa317cda 100644 --- a/src/data/ground/ground_data_d10p02_station.h +++ b/src/data/ground/ground_data_d10p02_station.h @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs199_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(7), LABEL(7), /* = 0x07 */ - BGM_SWITCH(104), + BGM_SWITCH(MUS_FROSTY_FOREST), JUMP_SCRIPT(COMMON_ENTER), }; @@ -148,7 +148,7 @@ static const struct ScriptCommand s_gs199_g1_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_FROSTY_FOREST_MID), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(104), + BGM_SWITCH(MUS_FROSTY_FOREST), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -216,7 +216,7 @@ static const struct ScriptCommand s_gs199_g2_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_FROSTY_FOREST_MID), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(104), + BGM_SWITCH(MUS_FROSTY_FOREST), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), diff --git a/src/data/ground/ground_data_d10p03_station.h b/src/data/ground/ground_data_d10p03_station.h index e8f1c2360..413a6c979 100644 --- a/src/data/ground/ground_data_d10p03_station.h +++ b/src/data/ground/ground_data_d10p03_station.h @@ -19,7 +19,7 @@ static const struct ScriptCommand s_gs200_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(MAP_FROSTY_FOREST_END), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x3b, 0x39, 0x0001, 0x00000000, 0x00000000, NULL }, @@ -284,7 +284,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * BGM_STOP, FANFARE_PLAY(204), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_3} joined the team!")), - { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(204), TEXTBOX_CLEAR, { 0x3b, 0x1a, 0x0000, 0x00000000, 0x00000000, NULL }, ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to {NAME_3}?")), diff --git a/src/data/ground/ground_data_d11p01_station.h b/src/data/ground/ground_data_d11p01_station.h index 83a558943..0583f785e 100644 --- a/src/data/ground/ground_data_d11p01_station.h +++ b/src/data/ground/ground_data_d11p01_station.h @@ -40,7 +40,7 @@ static const struct ScriptCommand s_gs201_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 2), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), JUMP_SCRIPT(COMMON_ENTER), }; @@ -125,7 +125,7 @@ static const struct ScriptCommand s_gs201_g1_s0_station_sref_script[] = { /* 0x8 { 0x3b, 0x1c, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(MAP_MT_FREEZE_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 2, 0), @@ -433,7 +433,7 @@ static const struct ScriptCommand s_gs201_g3_s0_station_sref_script[] = { /* 0x8 { 0x3b, 0x1c, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(MAP_MT_FREEZE_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 2, 0), @@ -496,7 +496,7 @@ static const struct ScriptCommand s_gs201_g4_s0_station_sref_script[] = { /* 0x8 { 0x3b, 0x1c, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(MAP_MT_FREEZE_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 2, 0), @@ -566,7 +566,7 @@ static const struct ScriptCommand s_gs201_g5_s0_station_sref_script[] = { /* 0x8 { 0x3b, 0x1c, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_MAP(MAP_MT_FREEZE_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(36), + BGM_SWITCH(MUS_ESCAPE_THROUGH_THE_SNOW), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 2, 0), @@ -622,7 +622,7 @@ static const struct ScriptCommand s_gs201_g6_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(631), SELECT_MAP(MAP_MT_FREEZE_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(115), + BGM_SWITCH(MUS_MT_FREEZE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), RET, diff --git a/src/data/ground/ground_data_d11p02_station.h b/src/data/ground/ground_data_d11p02_station.h index c2b419945..1ea247dd0 100644 --- a/src/data/ground/ground_data_d11p02_station.h +++ b/src/data/ground/ground_data_d11p02_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs202_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(7), LABEL(7), /* = 0x07 */ - BGM_SWITCH(115), + BGM_SWITCH(MUS_MT_FREEZE), JUMP_SCRIPT(COMMON_ENTER), }; @@ -161,7 +161,7 @@ static const struct ScriptCommand s_gs202_g1_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(MAP_MT_FREEZE_MID), CALL_STATION( 2, 0), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(115), + BGM_SWITCH(MUS_MT_FREEZE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), diff --git a/src/data/ground/ground_data_d11p03_station.h b/src/data/ground/ground_data_d11p03_station.h index 0aeb016d5..72417c6cc 100644 --- a/src/data/ground/ground_data_d11p03_station.h +++ b/src/data/ground/ground_data_d11p03_station.h @@ -82,7 +82,7 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * WAIT(30), SELECT_LIVES(-1, 1), { 0x27, 0x01, 0x0005, 0x0000003c, 0x00ffffff, NULL }, - BGM_SWITCH(6), + BGM_SWITCH(MUS_LEGEND_OF_NINETALES), WAIT(30), ALERT_CUE(7), AWAIT_CUE(5), @@ -175,7 +175,7 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * 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 }, + WAIT_FANFARE1(212), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(8), @@ -357,7 +357,7 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(5), - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" A-{NAME_2}!")), TEXTBOX_CLEAR, @@ -717,7 +717,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0005, 0x00000000), PORTRAIT_POS(5, 1, -1), - BGM_SWITCH(6), + BGM_SWITCH(MUS_LEGEND_OF_NINETALES), MSG_NPC(5, _(" Cease fighting at once,\n{NAME_2}.")), TEXTBOX_CLEAR, ALERT_CUE(10), @@ -758,7 +758,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * MSG_NPC(5, _(" {NAME_0}...")), MSG_NPC(5, _(" You may relax.\nIt is not you.")), TEXTBOX_CLEAR, - BGM_SWITCH(24), + BGM_SWITCH(MUS_THE_ESCAPE), FANFARE_PLAY2(465), ALERT_CUE(6), AWAIT_CUE(5), diff --git a/src/data/ground/ground_data_d12p01_station.h b/src/data/ground/ground_data_d12p01_station.h index d7ce91846..4687dbfd4 100644 --- a/src/data/ground/ground_data_d12p01_station.h +++ b/src/data/ground/ground_data_d12p01_station.h @@ -38,7 +38,7 @@ static const struct ScriptCommand s_gs204_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(6), LABEL(6), /* = 0x06 */ - BGM_SWITCH(108), + BGM_SWITCH(MUS_MAGMA_CAVERN), JUMP_SCRIPT(COMMON_ENTER), }; @@ -88,7 +88,7 @@ static const struct ScriptCommand s_gs204_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(88), SELECT_MAP(MAP_MAGMA_CAVERN_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(108), + BGM_SWITCH(MUS_MAGMA_CAVERN), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_MAGMA_CAVERN), @@ -156,7 +156,7 @@ static const struct ScriptCommand s_gs204_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(156), SELECT_MAP(MAP_MAGMA_CAVERN_ENTRY), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(108), + BGM_SWITCH(MUS_MAGMA_CAVERN), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_MAGMA_CAVERN), diff --git a/src/data/ground/ground_data_d12p02_station.h b/src/data/ground/ground_data_d12p02_station.h index e3c4feed8..a8e7099d5 100644 --- a/src/data/ground/ground_data_d12p02_station.h +++ b/src/data/ground/ground_data_d12p02_station.h @@ -36,7 +36,7 @@ static const struct ScriptCommand s_gs205_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(6), LABEL(6), /* = 0x06 */ - BGM_SWITCH(108), + BGM_SWITCH(MUS_MAGMA_CAVERN), JUMP_SCRIPT(COMMON_ENTER), }; @@ -132,7 +132,7 @@ static const struct ScriptCommand s_gs205_g1_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_MAGMA_CAVERN_MID), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(108), + BGM_SWITCH(MUS_MAGMA_CAVERN), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), diff --git a/src/data/ground/ground_data_d12p04_station.h b/src/data/ground/ground_data_d12p04_station.h index 57150e146..ebf38b820 100644 --- a/src/data/ground/ground_data_d12p04_station.h +++ b/src/data/ground/ground_data_d12p04_station.h @@ -19,7 +19,7 @@ static const struct ScriptCommand s_gs206_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(206), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), FANFARE_FADEOUT2(60, 453), diff --git a/src/data/ground/ground_data_d13p01_station.h b/src/data/ground/ground_data_d13p01_station.h index 2a911ef68..00ab33021 100644 --- a/src/data/ground/ground_data_d13p01_station.h +++ b/src/data/ground/ground_data_d13p01_station.h @@ -22,7 +22,7 @@ static const struct ScriptCommand s_gs207_g1_s0_station_sref_script[] = { /* 0x8 WAIT(60), SELECT_MAP(MAP_SKY_TOWER_ENTRY), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(22), + BGM_SWITCH(MUS_SKY_TOWER), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -166,7 +166,7 @@ static const struct ScriptCommand s_gs207_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(166), SELECT_MAP(MAP_SKY_TOWER_ENTRY), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(22), + BGM_SWITCH(MUS_SKY_TOWER), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_SKY_TOWER), @@ -232,7 +232,7 @@ static const struct ScriptCommand s_gs207_g3_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(232), SELECT_MAP(MAP_SKY_TOWER_ENTRY), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(22), + BGM_SWITCH(MUS_SKY_TOWER), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), NEXT_DUNGEON(30, SCRIPT_DUNGEON_SKY_TOWER), diff --git a/src/data/ground/ground_data_d13p02_station.h b/src/data/ground/ground_data_d13p02_station.h index 25b320dd4..4debb7a85 100644 --- a/src/data/ground/ground_data_d13p02_station.h +++ b/src/data/ground/ground_data_d13p02_station.h @@ -36,7 +36,7 @@ static const struct ScriptCommand s_gs208_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(6), LABEL(6), /* = 0x06 */ - BGM_SWITCH(22), + BGM_SWITCH(MUS_SKY_TOWER), JUMP_SCRIPT(COMMON_ENTER), }; @@ -132,7 +132,7 @@ static const struct ScriptCommand s_gs208_g1_s0_station_sref_script[] = { /* 0x8 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(MAP_SKY_TOWER_MID), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(22), + BGM_SWITCH(MUS_SKY_TOWER), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), diff --git a/src/data/ground/ground_data_d13p03_station.h b/src/data/ground/ground_data_d13p03_station.h index 90a173db4..56c670457 100644 --- a/src/data/ground/ground_data_d13p03_station.h +++ b/src/data/ground/ground_data_d13p03_station.h @@ -19,7 +19,7 @@ static const struct ScriptCommand s_gs209_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(209), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(26), + BGM_SWITCH(MUS_RAYQUAZAS_DOMAIN), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, @@ -229,7 +229,7 @@ static const struct ScriptCommand s_gs209_g2_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(229), SELECT_MAP(209), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(26), + BGM_SWITCH(MUS_RAYQUAZAS_DOMAIN), { 0x97, 0x00, 0x0002, 0x00000001, 0x00000001, NULL }, WAIT(15), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -396,7 +396,7 @@ static const struct ScriptCommand s_gs209_g3_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(396), SELECT_MAP(209), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(26), + BGM_SWITCH(MUS_RAYQUAZAS_DOMAIN), { 0x97, 0x00, 0x0002, 0x00000005, 0x00000002, NULL }, WAIT(15), { 0x27, 0x00, 0x0005, 0x00000010, 0x00ffffff, NULL }, diff --git a/src/data/ground/ground_data_d14p01_station.h b/src/data/ground/ground_data_d14p01_station.h index 181dfc976..93ac17f7e 100644 --- a/src/data/ground/ground_data_d14p01_station.h +++ b/src/data/ground/ground_data_d14p01_station.h @@ -19,7 +19,7 @@ static const struct ScriptCommand s_gs210_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(210), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d15p01_station.h b/src/data/ground/ground_data_d15p01_station.h index 430c7851b..f328c33dc 100644 --- a/src/data/ground/ground_data_d15p01_station.h +++ b/src/data/ground/ground_data_d15p01_station.h @@ -19,7 +19,7 @@ static const struct ScriptCommand s_gs211_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(211), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -54,11 +54,11 @@ static const struct ScriptCommand s_gs211_g1_s0_lives0_dlg0[] = { /* 0x826425c * TEXTBOX_CLEAR, FANFARE_PLAY(212), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Sunset Wing{RESET}.")), - { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(212), MSG_INSTANT(_("{CENTER_ALIGN}And...")), FANFARE_PLAY(205), MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Northwind Field{RESET}!")), - { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, ALERT_CUE(3), HALT, diff --git a/src/data/ground/ground_data_d16p01_station.h b/src/data/ground/ground_data_d16p01_station.h index 6e51ba7d3..23bc8c9c2 100644 --- a/src/data/ground/ground_data_d16p01_station.h +++ b/src/data/ground/ground_data_d16p01_station.h @@ -19,7 +19,7 @@ static const struct ScriptCommand s_gs212_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(212), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -53,13 +53,13 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * ALERT_CUE(7), { 0x28, 0x01, 0x0005, 0x00000005, 0x00fa7d7d, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00fa7d7d, NULL }, - { 0xe2, 0x00, 0x01f1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(497), WAIT(20), FANFARE_PLAY2(497), ALERT_CUE(7), { 0x28, 0x01, 0x0005, 0x00000005, 0x00550000, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00550000, NULL }, - { 0xe2, 0x00, 0x01f1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(497), WAIT(20), ALERT_CUE(7), AWAIT_CUE(5), @@ -107,8 +107,8 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * CANCEL_OBJECTS(1, 1), SELECT_EFFECTS(1, 1), { 0x27, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, - { 0xe2, 0x00, 0x01fb, 0x00000000, 0x00000000, NULL }, - BGM_SWITCH(114), + WAIT_FANFARE2(507), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), WAIT(60), MSG_NPC(2, _(" Take this and go west!")), MSG_NPC(2, _(" There, you will find\nthe {COLOR YELLOW_D}Lightning Field{RESET}.")), @@ -122,13 +122,13 @@ static const struct ScriptCommand s_gs212_g1_s0_lives0_dlg0[] = { /* 0x82649c8 * BGM_STOP, FANFARE_PLAY(212), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Red Wing{RESET}.")), - { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(212), TEXTBOX_CLEAR, WAIT(20), MSG_INSTANT(_("{CENTER_ALIGN}And...")), FANFARE_PLAY(205), MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Lightning Field{RESET}!")), - { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(3), @@ -160,14 +160,14 @@ static const struct ScriptCommand s_gs212_g1_s0_lives1_dlg0[] = { /* 0x826518c * AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), 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 }, + WAIT_FANFARE2(663), SELECT_ANIMATION(22), WAIT(30), FANFARE_PLAY2(653), @@ -194,7 +194,7 @@ static const struct ScriptCommand s_gs212_g1_s1_obj0_dlg0[] = { /* 0x82653cc */ FANFARE_PLAY2(739), { 0x56, 0x00, 0x0000, 0x0000013d, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe2, 0x00, 0x02e3, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(739), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ FANFARE_STOP2(739), diff --git a/src/data/ground/ground_data_d17p01_station.h b/src/data/ground/ground_data_d17p01_station.h index 5335f7d48..7c7ca5697 100644 --- a/src/data/ground/ground_data_d17p01_station.h +++ b/src/data/ground/ground_data_d17p01_station.h @@ -19,7 +19,7 @@ static const struct ScriptCommand s_gs213_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(213), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -53,13 +53,13 @@ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 * ALERT_CUE(7), { 0x28, 0x01, 0x0005, 0x00000005, 0x00707000, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00707000, NULL }, - { 0xe2, 0x00, 0x01f1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(497), WAIT(20), FANFARE_PLAY2(497), ALERT_CUE(7), { 0x28, 0x01, 0x0005, 0x00000005, 0x00505000, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00505000, NULL }, - { 0xe2, 0x00, 0x01f1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(497), WAIT(20), ALERT_CUE(7), AWAIT_CUE(5), @@ -105,8 +105,8 @@ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 * CANCEL_OBJECTS(1, 1), SELECT_EFFECTS(1, 1), { 0x27, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, - { 0xe2, 0x00, 0x01fb, 0x00000000, 0x00000000, NULL }, - BGM_SWITCH(114), + WAIT_FANFARE2(507), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), WAIT(60), MSG_INSTANT(_("{CENTER_ALIGN}Its subtle gradation of yellow\n{CENTER_ALIGN}to red is a truly beauteous sight!")), TEXTBOX_CLEAR, @@ -124,13 +124,13 @@ static const struct ScriptCommand s_gs213_g1_s0_lives0_dlg0[] = { /* 0x82657d4 * BGM_STOP, FANFARE_PLAY(212), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Sunset Wing{RESET}.")), - { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(212), TEXTBOX_CLEAR, WAIT(20), MSG_INSTANT(_("{CENTER_ALIGN}And...")), FANFARE_PLAY(205), MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Northwind Field{RESET}!")), - { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(3), @@ -162,18 +162,18 @@ static const struct ScriptCommand s_gs213_g1_s0_lives1_dlg0[] = { /* 0x826604c * AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), 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 }, + WAIT_FANFARE2(708), SELECT_ANIMATION(22), WAIT(15), FANFARE_PLAY2(479), - { 0xe2, 0x00, 0x01df, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(479), ALERT_CUE(5), SELECT_ANIMATION(2), HALT, @@ -196,10 +196,10 @@ static const struct ScriptCommand s_gs213_g1_s1_obj0_dlg0[] = { /* 0x826629c */ LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), FANFARE_PLAY2(726), - { 0xe2, 0x00, 0x02d6, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(726), FANFARE_PLAY2(726), WAIT(45), - { 0xe2, 0x00, 0x02d6, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(726), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ HALT, diff --git a/src/data/ground/ground_data_d18p01_station.h b/src/data/ground/ground_data_d18p01_station.h index 3a6971f3a..c9144923c 100644 --- a/src/data/ground/ground_data_d18p01_station.h +++ b/src/data/ground/ground_data_d18p01_station.h @@ -19,7 +19,7 @@ static const struct ScriptCommand s_gs214_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(214), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -53,13 +53,13 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * ALERT_CUE(7), { 0x28, 0x01, 0x0005, 0x00000005, 0x00005077, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00005077, NULL }, - { 0xe2, 0x00, 0x01f1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(497), WAIT(20), FANFARE_PLAY2(497), ALERT_CUE(7), { 0x28, 0x01, 0x0005, 0x00000005, 0x00005077, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00005077, NULL }, - { 0xe2, 0x00, 0x01f1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(497), WAIT(20), ALERT_CUE(7), AWAIT_CUE(5), @@ -107,8 +107,8 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * CANCEL_OBJECTS(1, 1), SELECT_EFFECTS(1, 1), { 0x27, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, - { 0xe2, 0x00, 0x01fb, 0x00000000, 0x00000000, NULL }, - BGM_SWITCH(114), + WAIT_FANFARE2(507), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), WAIT(60), MSG_INSTANT(_("{CENTER_ALIGN}Glittering in the seven colors\n{CENTER_ALIGN}of the rainbow, this wing is\n{CENTER_ALIGN}beautiful beyond description!")), TEXTBOX_CLEAR, @@ -127,13 +127,13 @@ static const struct ScriptCommand s_gs214_g1_s0_lives0_dlg0[] = { /* 0x8266664 * BGM_STOP, FANFARE_PLAY(212), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} received\n{CENTER_ALIGN}the {COLOR GREEN_I}Rainbow Wing{RESET}.")), - { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(212), TEXTBOX_CLEAR, WAIT(20), MSG_INSTANT(_("{CENTER_ALIGN}And...")), FANFARE_PLAY(205), MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}{COLOR YELLOW_D}Mt. Faraway{RESET}!")), - { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(3), @@ -165,7 +165,7 @@ static const struct ScriptCommand s_gs214_g1_s0_lives1_dlg0[] = { /* 0x8266f30 * AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), AWAIT_CUE(7), SELECT_ANIMATION(9), ALERT_CUE(5), @@ -173,7 +173,7 @@ static const struct ScriptCommand s_gs214_g1_s0_lives1_dlg0[] = { /* 0x8266f30 * FANFARE_PLAY2(664), { 0x56, 0x00, 0x0000, 0x00000053, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xe2, 0x00, 0x0298, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(664), SELECT_ANIMATION(22), WAIT(10), STOP_ANIMATION_ON_CURRENT_FRAME, diff --git a/src/data/ground/ground_data_d19p01_station.h b/src/data/ground/ground_data_d19p01_station.h index 5b28f1999..e4e7f88d0 100644 --- a/src/data/ground/ground_data_d19p01_station.h +++ b/src/data/ground/ground_data_d19p01_station.h @@ -19,7 +19,7 @@ static const struct ScriptCommand s_gs215_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(215), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d20p01_station.h b/src/data/ground/ground_data_d20p01_station.h index 64985d734..d465552fc 100644 --- a/src/data/ground/ground_data_d20p01_station.h +++ b/src/data/ground/ground_data_d20p01_station.h @@ -11,7 +11,7 @@ static const struct ScriptCommand s_gs216_g0_s0_station_sref_script[] = { /* 0x8267ac8 */ DEBUGINFO_O(13), - SELECT_MAP(216), + SELECT_MAP(MAP_D20), BGM_STOP, JUMP_SCRIPT(COMMON_ENTER), }; @@ -23,14 +23,14 @@ static const struct ScriptCommand s_gs216_g1_s0_station_sref_script[] = { /* 0x8 BGM_STOP, { 0x23, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x26, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, - SELECT_MAP(216), + SELECT_MAP(MAP_D20), MSG_ON_BG_AUTO(30, _("{CENTER_ALIGN}One day...")), MSG_ON_BG_AUTO(30, _("{CENTER_ALIGN}In a small cave\n{CENTER_ALIGN}in the distant west...")), TEXTBOX_CLEAR, WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x28, 0x01, 0x0002, 0x0000003c, 0x00ffffff, NULL }, @@ -139,7 +139,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * MSG_NPC(0, _(" ...No?{WAIT_PRESS}\nI don't hear anything.")), TEXTBOX_CLEAR, WAIT(10), - BGM_SWITCH(35), + BGM_SWITCH(MUS_FRIEND_AREA_CRYPTIC_CAVE), TEXTBOX_AUTO_PRESS(60, 60), MSG_NPC(-1, _(" ............{WAIT_PRESS}Is it{WAIT_PRESS} \nyou...?")), MSG_NPC(-1, _(" ......Who...disturbs...my sleep...{WAIT_PRESS}\nIs it{WAIT_PRESS} you?!\n")), @@ -185,7 +185,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * FANFARE_PLAY2(877), { 0x28, 0x01, 0x0001, 0x00000005, 0x00ffffff, NULL }, WAIT(10), - BGM_SWITCH(11), + BGM_SWITCH(MUS_BOSS_BATTLE), { 0x27, 0x01, 0x0001, 0x00000005, 0x00ffffff, NULL }, { 0x23, 0x01, 0x000a, 0x00000000, 0x00000000, NULL }, TEXTBOX_AUTO_PRESS(120, 120), @@ -302,18 +302,18 @@ static const struct ScriptCommand s_gs216_g1_s0_lives1_dlg0[] = { /* 0x8268c90 * CMD_UNK_92(4, 1, DIR_TRANS_SPINRIGHT2), AWAIT_CUE(6), FANFARE_PLAY2(786), - { 0xe2, 0x00, 0x0312, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(786), FANFARE_PLAY2(831), - { 0xe2, 0x00, 0x033f, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(831), FANFARE_PLAY2(787), - { 0xe2, 0x00, 0x0313, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(787), FANFARE_PLAY2(831), - { 0xe2, 0x00, 0x033f, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(831), WAIT(15), FANFARE_PLAY2(786), - { 0xe2, 0x00, 0x0312, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(786), FANFARE_PLAY2(831), - { 0xe2, 0x00, 0x033f, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(831), HALT, }; diff --git a/src/data/ground/ground_data_d21p01_station.h b/src/data/ground/ground_data_d21p01_station.h index 8ecc5ed62..3225f45ed 100644 --- a/src/data/ground/ground_data_d21p01_station.h +++ b/src/data/ground/ground_data_d21p01_station.h @@ -19,7 +19,7 @@ static const struct ScriptCommand s_gs217_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(217), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs217_g1_s0_lives0_dlg0[] = { /* 0x8269878 * WAIT(10), { 0x28, 0x01, 0x0005, 0x00000005, 0x00ffffff, NULL }, { 0x27, 0x01, 0x0005, 0x00000005, 0x00ffffff, NULL }, - { 0xe2, 0x00, 0x01db, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(475), AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Urghgh...")), @@ -82,14 +82,14 @@ static const struct ScriptCommand s_gs217_g1_s0_lives1_dlg0[] = { /* 0x8269b04 * WAIT(30), FANFARE_PLAY2(475), SELECT_ANIMATION(9), - { 0xe2, 0x00, 0x01db, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(475), FANFARE_PLAY2(779), { 0x54, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, WAIT(50), { 0x54, 0x00, 0x001a, 0x00000000, 0x00000000, NULL }, WAIT(40), FANFARE_PLAY2(682), - { 0xe2, 0x00, 0x02aa, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(682), ALERT_CUE(5), HALT, }; diff --git a/src/data/ground/ground_data_d23p01_station.h b/src/data/ground/ground_data_d23p01_station.h index dcb144a71..e57473091 100644 --- a/src/data/ground/ground_data_d23p01_station.h +++ b/src/data/ground/ground_data_d23p01_station.h @@ -23,7 +23,7 @@ static const struct ScriptCommand s_gs219_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(23), SELECT_MAP(219), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(120), diff --git a/src/data/ground/ground_data_d24p01_station.h b/src/data/ground/ground_data_d24p01_station.h index 60fdbc406..82886977a 100644 --- a/src/data/ground/ground_data_d24p01_station.h +++ b/src/data/ground/ground_data_d24p01_station.h @@ -22,7 +22,7 @@ static const struct ScriptCommand s_gs220_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(22), SELECT_MAP(220), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(90), @@ -152,7 +152,7 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * MSG_NPC(2, _(" Who are you?")), TEXTBOX_CLEAR, WAIT(10), - BGM_SWITCH(6), + BGM_SWITCH(MUS_LEGEND_OF_NINETALES), { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}I am the\n{CENTER_ALIGN}judge of darkness.") }, { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}You have nothing to fear from me.\n{CENTER_ALIGN}I mean you no harm.") }, { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}Just now, a key was\n{CENTER_ALIGN}inserted to break a curse.") }, diff --git a/src/data/ground/ground_data_d24p02_station.h b/src/data/ground/ground_data_d24p02_station.h index ac3278e9b..8fae0235f 100644 --- a/src/data/ground/ground_data_d24p02_station.h +++ b/src/data/ground/ground_data_d24p02_station.h @@ -19,7 +19,7 @@ static const struct ScriptCommand s_gs221_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(19), SELECT_MAP(221), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(21), + BGM_SWITCH(MUS_STORMY_SEA), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), RET, diff --git a/src/data/ground/ground_data_d25p01_station.h b/src/data/ground/ground_data_d25p01_station.h index a53daf126..2372d0569 100644 --- a/src/data/ground/ground_data_d25p01_station.h +++ b/src/data/ground/ground_data_d25p01_station.h @@ -23,7 +23,7 @@ static const struct ScriptCommand s_gs222_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(23), SELECT_MAP(222), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(120), diff --git a/src/data/ground/ground_data_h01p01_station.h b/src/data/ground/ground_data_h01p01_station.h index 78fb60085..b5f2263a8 100644 --- a/src/data/ground/ground_data_h01p01_station.h +++ b/src/data/ground/ground_data_h01p01_station.h @@ -40,7 +40,7 @@ static const struct ScriptCommand s_gs105_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(6), LABEL(6), /* = 0x06 */ - BGM_SWITCH(106), + BGM_SWITCH(MUS_FRIEND_AREA_OCEANIC), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h01p02_station.h b/src/data/ground/ground_data_h01p02_station.h index 73cef5a49..cb929922d 100644 --- a/src/data/ground/ground_data_h01p02_station.h +++ b/src/data/ground/ground_data_h01p02_station.h @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs106_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(106), + BGM_SWITCH(MUS_FRIEND_AREA_OCEANIC), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h01p03_station.h b/src/data/ground/ground_data_h01p03_station.h index d89199c82..15aec7d95 100644 --- a/src/data/ground/ground_data_h01p03_station.h +++ b/src/data/ground/ground_data_h01p03_station.h @@ -46,7 +46,7 @@ static const struct ScriptCommand s_gs107_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(106), + BGM_SWITCH(MUS_FRIEND_AREA_OCEANIC), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h02p01_station.h b/src/data/ground/ground_data_h02p01_station.h index 6c719e929..699ffa32c 100644 --- a/src/data/ground/ground_data_h02p01_station.h +++ b/src/data/ground/ground_data_h02p01_station.h @@ -54,7 +54,7 @@ static const struct ScriptCommand s_gs108_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(106), + BGM_SWITCH(MUS_FRIEND_AREA_OCEANIC), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h02p02_station.h b/src/data/ground/ground_data_h02p02_station.h index 181b89c62..715015e19 100644 --- a/src/data/ground/ground_data_h02p02_station.h +++ b/src/data/ground/ground_data_h02p02_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs109_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(30), + BGM_SWITCH(MUS_FRIEND_AREA_DEEPSEA_CURRENT), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h02p03_station.h b/src/data/ground/ground_data_h02p03_station.h index f4f9608e0..ed72f43cd 100644 --- a/src/data/ground/ground_data_h02p03_station.h +++ b/src/data/ground/ground_data_h02p03_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs110_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(31), + BGM_SWITCH(MUS_FRIEND_AREA_SEAFLOOR_CAVE), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h03p01_station.h b/src/data/ground/ground_data_h03p01_station.h index 8991e3359..30b151c59 100644 --- a/src/data/ground/ground_data_h03p01_station.h +++ b/src/data/ground/ground_data_h03p01_station.h @@ -48,7 +48,7 @@ static const struct ScriptCommand s_gs111_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(16), + BGM_SWITCH(MUS_FRIEND_AREA_POND), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h04p01_station.h b/src/data/ground/ground_data_h04p01_station.h index 10268f647..8fd8bb949 100644 --- a/src/data/ground/ground_data_h04p01_station.h +++ b/src/data/ground/ground_data_h04p01_station.h @@ -54,7 +54,7 @@ static const struct ScriptCommand s_gs112_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(105), + BGM_SWITCH(MUS_FRIEND_AREA_STEPPE), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h04p02_station.h b/src/data/ground/ground_data_h04p02_station.h index 551f77813..a492549ee 100644 --- a/src/data/ground/ground_data_h04p02_station.h +++ b/src/data/ground/ground_data_h04p02_station.h @@ -51,7 +51,7 @@ static const struct ScriptCommand s_gs113_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(107), + BGM_SWITCH(MUS_FRIEND_AREA_FIELD), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h05p01_station.h b/src/data/ground/ground_data_h05p01_station.h index 8159128a8..412ea1869 100644 --- a/src/data/ground/ground_data_h05p01_station.h +++ b/src/data/ground/ground_data_h05p01_station.h @@ -48,7 +48,7 @@ static const struct ScriptCommand s_gs114_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(121), + BGM_SWITCH(MUS_FRIEND_AREA_FOREST), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h05p02_station.h b/src/data/ground/ground_data_h05p02_station.h index 33d0b919b..3a7a116ea 100644 --- a/src/data/ground/ground_data_h05p02_station.h +++ b/src/data/ground/ground_data_h05p02_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs115_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(28), + BGM_SWITCH(MUS_FRIEND_AREA_RAINBOW_PEAK), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h06p01_station.h b/src/data/ground/ground_data_h06p01_station.h index 524569d8b..51307cf23 100644 --- a/src/data/ground/ground_data_h06p01_station.h +++ b/src/data/ground/ground_data_h06p01_station.h @@ -55,7 +55,7 @@ static const struct ScriptCommand s_gs116_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(107), + BGM_SWITCH(MUS_FRIEND_AREA_FIELD), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h06p02_station.h b/src/data/ground/ground_data_h06p02_station.h index e821d17c0..f79fe01c8 100644 --- a/src/data/ground/ground_data_h06p02_station.h +++ b/src/data/ground/ground_data_h06p02_station.h @@ -54,7 +54,7 @@ static const struct ScriptCommand s_gs117_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(107), + BGM_SWITCH(MUS_FRIEND_AREA_FIELD), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h06p03_station.h b/src/data/ground/ground_data_h06p03_station.h index 1453a6daf..459af692b 100644 --- a/src/data/ground/ground_data_h06p03_station.h +++ b/src/data/ground/ground_data_h06p03_station.h @@ -55,7 +55,7 @@ static const struct ScriptCommand s_gs118_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(105), + BGM_SWITCH(MUS_FRIEND_AREA_STEPPE), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h06p04_station.h b/src/data/ground/ground_data_h06p04_station.h index b88821362..1d9ce82ae 100644 --- a/src/data/ground/ground_data_h06p04_station.h +++ b/src/data/ground/ground_data_h06p04_station.h @@ -57,7 +57,7 @@ static const struct ScriptCommand s_gs119_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(105), + BGM_SWITCH(MUS_FRIEND_AREA_STEPPE), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h06p05_station.h b/src/data/ground/ground_data_h06p05_station.h index 6321e8acd..ceac842b8 100644 --- a/src/data/ground/ground_data_h06p05_station.h +++ b/src/data/ground/ground_data_h06p05_station.h @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs120_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(107), + BGM_SWITCH(MUS_FRIEND_AREA_FIELD), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h06p06_station.h b/src/data/ground/ground_data_h06p06_station.h index bfea15eb1..42d334f61 100644 --- a/src/data/ground/ground_data_h06p06_station.h +++ b/src/data/ground/ground_data_h06p06_station.h @@ -45,7 +45,7 @@ static const struct ScriptCommand s_gs121_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(107), + BGM_SWITCH(MUS_FRIEND_AREA_FIELD), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h07p01_station.h b/src/data/ground/ground_data_h07p01_station.h index 63de72e35..53f0c8cc6 100644 --- a/src/data/ground/ground_data_h07p01_station.h +++ b/src/data/ground/ground_data_h07p01_station.h @@ -56,7 +56,7 @@ static const struct ScriptCommand s_gs122_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(121), + BGM_SWITCH(MUS_FRIEND_AREA_FOREST), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h07p02_station.h b/src/data/ground/ground_data_h07p02_station.h index 7103293a9..02053a963 100644 --- a/src/data/ground/ground_data_h07p02_station.h +++ b/src/data/ground/ground_data_h07p02_station.h @@ -54,7 +54,7 @@ static const struct ScriptCommand s_gs123_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(121), + BGM_SWITCH(MUS_FRIEND_AREA_FOREST), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h07p03_station.h b/src/data/ground/ground_data_h07p03_station.h index 8fee19ca0..686f28b60 100644 --- a/src/data/ground/ground_data_h07p03_station.h +++ b/src/data/ground/ground_data_h07p03_station.h @@ -51,7 +51,7 @@ static const struct ScriptCommand s_gs124_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(121), + BGM_SWITCH(MUS_FRIEND_AREA_FOREST), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h07p04_station.h b/src/data/ground/ground_data_h07p04_station.h index 050669806..0b883fc43 100644 --- a/src/data/ground/ground_data_h07p04_station.h +++ b/src/data/ground/ground_data_h07p04_station.h @@ -58,7 +58,7 @@ static const struct ScriptCommand s_gs125_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(121), + BGM_SWITCH(MUS_FRIEND_AREA_FOREST), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h07p05_station.h b/src/data/ground/ground_data_h07p05_station.h index f51f2fe56..64c8430f1 100644 --- a/src/data/ground/ground_data_h07p05_station.h +++ b/src/data/ground/ground_data_h07p05_station.h @@ -46,7 +46,7 @@ static const struct ScriptCommand s_gs126_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(121), + BGM_SWITCH(MUS_FRIEND_AREA_FOREST), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h07p06_station.h b/src/data/ground/ground_data_h07p06_station.h index 77b237d4d..a20117ff4 100644 --- a/src/data/ground/ground_data_h07p06_station.h +++ b/src/data/ground/ground_data_h07p06_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs127_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(127), + BGM_SWITCH(MUS_FRIEND_AREA_HEALING_FOREST), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h07p07_station.h b/src/data/ground/ground_data_h07p07_station.h index b6927e439..1f7469a66 100644 --- a/src/data/ground/ground_data_h07p07_station.h +++ b/src/data/ground/ground_data_h07p07_station.h @@ -48,7 +48,7 @@ static const struct ScriptCommand s_gs128_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(121), + BGM_SWITCH(MUS_FRIEND_AREA_FOREST), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h07p08_station.h b/src/data/ground/ground_data_h07p08_station.h index b7e835f03..254726956 100644 --- a/src/data/ground/ground_data_h07p08_station.h +++ b/src/data/ground/ground_data_h07p08_station.h @@ -51,7 +51,7 @@ static const struct ScriptCommand s_gs129_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(121), + BGM_SWITCH(MUS_FRIEND_AREA_FOREST), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h08p01_station.h b/src/data/ground/ground_data_h08p01_station.h index 1f599c9d8..9ed9dc26c 100644 --- a/src/data/ground/ground_data_h08p01_station.h +++ b/src/data/ground/ground_data_h08p01_station.h @@ -49,7 +49,7 @@ static const struct ScriptCommand s_gs130_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(16), + BGM_SWITCH(MUS_FRIEND_AREA_POND), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h09p01_station.h b/src/data/ground/ground_data_h09p01_station.h index 6224647ec..675b3a9f1 100644 --- a/src/data/ground/ground_data_h09p01_station.h +++ b/src/data/ground/ground_data_h09p01_station.h @@ -51,7 +51,7 @@ static const struct ScriptCommand s_gs131_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(16), + BGM_SWITCH(MUS_FRIEND_AREA_POND), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h09p02_station.h b/src/data/ground/ground_data_h09p02_station.h index d4a15df2b..97894c083 100644 --- a/src/data/ground/ground_data_h09p02_station.h +++ b/src/data/ground/ground_data_h09p02_station.h @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs132_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(16), + BGM_SWITCH(MUS_FRIEND_AREA_POND), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h10p01_station.h b/src/data/ground/ground_data_h10p01_station.h index 1928d49d5..e61a17a00 100644 --- a/src/data/ground/ground_data_h10p01_station.h +++ b/src/data/ground/ground_data_h10p01_station.h @@ -46,7 +46,7 @@ static const struct ScriptCommand s_gs133_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(106), + BGM_SWITCH(MUS_FRIEND_AREA_OCEANIC), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h10p02_station.h b/src/data/ground/ground_data_h10p02_station.h index d4a9d8d8c..87c712eb9 100644 --- a/src/data/ground/ground_data_h10p02_station.h +++ b/src/data/ground/ground_data_h10p02_station.h @@ -46,7 +46,7 @@ static const struct ScriptCommand s_gs134_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(16), + BGM_SWITCH(MUS_FRIEND_AREA_POND), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h11p01_station.h b/src/data/ground/ground_data_h11p01_station.h index 9bf830ed0..ffc4f9719 100644 --- a/src/data/ground/ground_data_h11p01_station.h +++ b/src/data/ground/ground_data_h11p01_station.h @@ -49,7 +49,7 @@ static const struct ScriptCommand s_gs135_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(2), + BGM_SWITCH(MUS_FRIEND_AREA_SWAMP), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h12p01_station.h b/src/data/ground/ground_data_h12p01_station.h index 947b116ad..78f6a54e4 100644 --- a/src/data/ground/ground_data_h12p01_station.h +++ b/src/data/ground/ground_data_h12p01_station.h @@ -48,7 +48,7 @@ static const struct ScriptCommand s_gs136_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(2), + BGM_SWITCH(MUS_FRIEND_AREA_SWAMP), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h13p01_station.h b/src/data/ground/ground_data_h13p01_station.h index 99b3b03e8..10be63840 100644 --- a/src/data/ground/ground_data_h13p01_station.h +++ b/src/data/ground/ground_data_h13p01_station.h @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs137_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(3), + BGM_SWITCH(MUS_FRIEND_AREA_CAVES), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h13p02_station.h b/src/data/ground/ground_data_h13p02_station.h index 668fcabec..8137d810b 100644 --- a/src/data/ground/ground_data_h13p02_station.h +++ b/src/data/ground/ground_data_h13p02_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs138_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(35), + BGM_SWITCH(MUS_FRIEND_AREA_CRYPTIC_CAVE), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h13p03_station.h b/src/data/ground/ground_data_h13p03_station.h index 2049b2d96..1e578ff77 100644 --- a/src/data/ground/ground_data_h13p03_station.h +++ b/src/data/ground/ground_data_h13p03_station.h @@ -46,7 +46,7 @@ static const struct ScriptCommand s_gs139_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(3), + BGM_SWITCH(MUS_FRIEND_AREA_CAVES), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h13p04_station.h b/src/data/ground/ground_data_h13p04_station.h index 3bc7d811b..088f2a979 100644 --- a/src/data/ground/ground_data_h13p04_station.h +++ b/src/data/ground/ground_data_h13p04_station.h @@ -46,7 +46,7 @@ static const struct ScriptCommand s_gs140_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(3), + BGM_SWITCH(MUS_FRIEND_AREA_CAVES), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h14p01_station.h b/src/data/ground/ground_data_h14p01_station.h index abf3bbbfa..352d4a0dd 100644 --- a/src/data/ground/ground_data_h14p01_station.h +++ b/src/data/ground/ground_data_h14p01_station.h @@ -55,7 +55,7 @@ static const struct ScriptCommand s_gs141_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(116), + BGM_SWITCH(MUS_FRIEND_AREA_WILDS), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h15p01_station.h b/src/data/ground/ground_data_h15p01_station.h index 75d76c7b3..8a6fcba3f 100644 --- a/src/data/ground/ground_data_h15p01_station.h +++ b/src/data/ground/ground_data_h15p01_station.h @@ -49,7 +49,7 @@ static const struct ScriptCommand s_gs142_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(112), + BGM_SWITCH(MUS_FRIEND_AREA_LAB), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h16p01_station.h b/src/data/ground/ground_data_h16p01_station.h index 505730f6d..00b036efd 100644 --- a/src/data/ground/ground_data_h16p01_station.h +++ b/src/data/ground/ground_data_h16p01_station.h @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs143_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(116), + BGM_SWITCH(MUS_FRIEND_AREA_WILDS), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h17p01_station.h b/src/data/ground/ground_data_h17p01_station.h index 22ac10135..6d24b9d34 100644 --- a/src/data/ground/ground_data_h17p01_station.h +++ b/src/data/ground/ground_data_h17p01_station.h @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs144_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(116), + BGM_SWITCH(MUS_FRIEND_AREA_WILDS), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h18p01_station.h b/src/data/ground/ground_data_h18p01_station.h index 4bf1dc679..fdeeda35d 100644 --- a/src/data/ground/ground_data_h18p01_station.h +++ b/src/data/ground/ground_data_h18p01_station.h @@ -49,7 +49,7 @@ static const struct ScriptCommand s_gs145_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(112), + BGM_SWITCH(MUS_FRIEND_AREA_LAB), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h19p01_station.h b/src/data/ground/ground_data_h19p01_station.h index b927988a3..44e709302 100644 --- a/src/data/ground/ground_data_h19p01_station.h +++ b/src/data/ground/ground_data_h19p01_station.h @@ -49,7 +49,7 @@ static const struct ScriptCommand s_gs146_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(3), + BGM_SWITCH(MUS_FRIEND_AREA_CAVES), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h20p01_station.h b/src/data/ground/ground_data_h20p01_station.h index f8aa685e3..c21a44b5a 100644 --- a/src/data/ground/ground_data_h20p01_station.h +++ b/src/data/ground/ground_data_h20p01_station.h @@ -49,7 +49,7 @@ static const struct ScriptCommand s_gs147_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(116), + BGM_SWITCH(MUS_FRIEND_AREA_WILDS), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h21p01_station.h b/src/data/ground/ground_data_h21p01_station.h index 774d81194..7717cf343 100644 --- a/src/data/ground/ground_data_h21p01_station.h +++ b/src/data/ground/ground_data_h21p01_station.h @@ -56,7 +56,7 @@ static const struct ScriptCommand s_gs148_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(3), + BGM_SWITCH(MUS_FRIEND_AREA_CAVES), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h21p02_station.h b/src/data/ground/ground_data_h21p02_station.h index 76a377d68..cffcdd826 100644 --- a/src/data/ground/ground_data_h21p02_station.h +++ b/src/data/ground/ground_data_h21p02_station.h @@ -56,7 +56,7 @@ static const struct ScriptCommand s_gs149_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(3), + BGM_SWITCH(MUS_FRIEND_AREA_CAVES), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h22p01_station.h b/src/data/ground/ground_data_h22p01_station.h index 50ee1f0da..982268387 100644 --- a/src/data/ground/ground_data_h22p01_station.h +++ b/src/data/ground/ground_data_h22p01_station.h @@ -48,7 +48,7 @@ static const struct ScriptCommand s_gs150_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(3), + BGM_SWITCH(MUS_FRIEND_AREA_CAVES), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h23p01_station.h b/src/data/ground/ground_data_h23p01_station.h index 53a1cd948..5c1523cf1 100644 --- a/src/data/ground/ground_data_h23p01_station.h +++ b/src/data/ground/ground_data_h23p01_station.h @@ -55,7 +55,7 @@ static const struct ScriptCommand s_gs151_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(2), + BGM_SWITCH(MUS_FRIEND_AREA_SWAMP), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h24p01_station.h b/src/data/ground/ground_data_h24p01_station.h index e142825ff..c998e756b 100644 --- a/src/data/ground/ground_data_h24p01_station.h +++ b/src/data/ground/ground_data_h24p01_station.h @@ -49,7 +49,7 @@ static const struct ScriptCommand s_gs152_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(106), + BGM_SWITCH(MUS_FRIEND_AREA_OCEANIC), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h25p01_station.h b/src/data/ground/ground_data_h25p01_station.h index 214a8214c..27583fb87 100644 --- a/src/data/ground/ground_data_h25p01_station.h +++ b/src/data/ground/ground_data_h25p01_station.h @@ -48,7 +48,7 @@ static const struct ScriptCommand s_gs153_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(106), + BGM_SWITCH(MUS_FRIEND_AREA_OCEANIC), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h26p01_station.h b/src/data/ground/ground_data_h26p01_station.h index b2f9af001..4d076f52a 100644 --- a/src/data/ground/ground_data_h26p01_station.h +++ b/src/data/ground/ground_data_h26p01_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs154_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(34), + BGM_SWITCH(MUS_FRIEND_AREA_VOLCANIC_PIT), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h27p01_station.h b/src/data/ground/ground_data_h27p01_station.h index 9c86fc528..e585947a0 100644 --- a/src/data/ground/ground_data_h27p01_station.h +++ b/src/data/ground/ground_data_h27p01_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs155_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(27), + BGM_SWITCH(MUS_FRIEND_AREA_STRATOS_LOOKOUT), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h28p01_station.h b/src/data/ground/ground_data_h28p01_station.h index 70f8c4179..a7d65cb3a 100644 --- a/src/data/ground/ground_data_h28p01_station.h +++ b/src/data/ground/ground_data_h28p01_station.h @@ -48,7 +48,7 @@ static const struct ScriptCommand s_gs156_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(116), + BGM_SWITCH(MUS_FRIEND_AREA_WILDS), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h28p02_station.h b/src/data/ground/ground_data_h28p02_station.h index a96b2d307..a8901fb98 100644 --- a/src/data/ground/ground_data_h28p02_station.h +++ b/src/data/ground/ground_data_h28p02_station.h @@ -46,7 +46,7 @@ static const struct ScriptCommand s_gs157_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(116), + BGM_SWITCH(MUS_FRIEND_AREA_WILDS), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h29p01_station.h b/src/data/ground/ground_data_h29p01_station.h index a53bcc8db..0b2a75417 100644 --- a/src/data/ground/ground_data_h29p01_station.h +++ b/src/data/ground/ground_data_h29p01_station.h @@ -1,27 +1,11 @@ - - - - - - - - - - - - - - - - - - - +#define NPC_ARTICUNO 1 +#define NPC_ZAPDOS 2 +#define NPC_MOLTRES 3 static const struct ScriptCommand s_gs158_g0_s0_station_sref_script[] = { /* 0x820c898 */ DEBUGINFO_O(23), - SELECT_MAP(158), + SELECT_MAP(MAP_FRIEND_AREA_LEGENDARY_ISLAND), JUMPIF_SCENE_EQ(SCENARIO_SUB2, 34, 2, /* to label */ 0), CJUMP_SCENARIO_0(SCENARIO_MAIN), COND(JUDGE_EQ, 3, /* to label */ 1), @@ -61,7 +45,7 @@ static const struct ScriptCommand s_gs158_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(9), LABEL(9), /* = 0x09 */ - BGM_SWITCH(117), + BGM_SWITCH(MUS_FRIEND_AREA_LEGENDARY_ISLAND), JUMP_SCRIPT(COMMON_ENTER), }; @@ -187,9 +171,9 @@ static const struct ScriptCommand s_gs158_g1_s0_lives2_dlg2[] = { /* 0x820d080 * static const struct ScriptCommand s_gs158_g2_s0_station_sref_script[] = { /* 0x820d0a0 */ DEBUGINFO_O(189), - SELECT_MAP(158), + SELECT_MAP(MAP_FRIEND_AREA_LEGENDARY_ISLAND), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(117), + BGM_SWITCH(MUS_FRIEND_AREA_LEGENDARY_ISLAND), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), WAIT(60), @@ -224,6 +208,7 @@ static const struct ScriptCommand s_gs158_g2_s0_lives0_dlg0[] = { /* 0x820d22c * { 0x52, 0x00, 0x0000, 0x00040000, 0x00000000, NULL }, { 0x89, 0x30, 0x0100, 0x00000004, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + // Our character looks around WAIT(30), ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), WAIT(30), @@ -231,84 +216,96 @@ static const struct ScriptCommand s_gs158_g2_s0_lives0_dlg0[] = { /* 0x820d22c * WAIT(30), ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), WAIT(60), - { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0x8b, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, + // TODO: Find out how: + // Fade to black + // Fade in, camera shows Moltres (west), moltres floats up, fade to black + // Fade in, camera shows Zapdos (east), zapdos floats up, fade to black + // Fade in, camera shows Articuno (north), moltres and zapdos glide down + // Shadows appear, moltres faces east and zapdos faces west + // Moltres anim speeds up, attacks east, red flash + // Zapdos anim speeds up, attacks west, yellow flash + // Articuno anim speeds up, attacks south, white flash + // Fade in (slow), vortex stone appears with flashing white circle + // Our character walks north + { 0x23, 0x01, 30, 0x00000000, 0x00000000, NULL }, // Fade out black? + { 0x8b, 0x00, DIRECTION_NORTHWEST, 0x00000000, 0x00000000, NULL }, ALERT_CUE(4), AWAIT_CUE(5), - { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - ALERT_CUE(8), + { 0x22, 0x01, 30, 0x00000000, 0x00000000, NULL }, // Fade in black? + ALERT_CUE(8), // Moltres float AWAIT_CUE(5), - { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0x8b, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, + { 0x23, 0x01, 30, 0x00000000, 0x00000000, NULL }, // Fade out black? + { 0x8b, 0x00, DIRECTION_NORTHEAST, 0x00000000, 0x00000000, NULL }, ALERT_CUE(4), AWAIT_CUE(5), - { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - ALERT_CUE(7), + { 0x22, 0x01, 30, 0x00000000, 0x00000000, NULL }, // Fade in black? + ALERT_CUE(7), // Zapdos float AWAIT_CUE(5), - { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - { 0x8b, 0x00, 0x0004, 0x00000000, 0x00000000, NULL }, + { 0x23, 0x01, 30, 0x00000000, 0x00000000, NULL }, // Fade out black? + { 0x8b, 0x00, DIRECTION_NORTH, 0x00000000, 0x00000000, NULL }, ALERT_CUE(4), AWAIT_CUE(5), - { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, - ALERT_CUE(8), - ALERT_CUE(7), + { 0x22, 0x01, 30, 0x00000000, 0x00000000, NULL }, // Fade in black? + ALERT_CUE(8), // Moltres glide + ALERT_CUE(7), // Zapdos glide AWAIT_CUE(5), WAIT(60), - ALERT_CUE(8), + ALERT_CUE(8), // Moltres attack AWAIT_CUE(5), - { 0x28, 0x01, 0x0001, 0x00000005, 0x00ff1010, NULL }, + { 0x28, 0x01, 0x0001, 0x00000005, 0x00ff1010, NULL }, // Flash to red? FANFARE_PLAY2(502), - { 0x27, 0x01, 0x0001, 0x00000005, 0x00ff1010, NULL }, - ALERT_CUE(7), + { 0x27, 0x01, 0x0001, 0x00000005, 0x00ff1010, NULL }, // Flash from red? + ALERT_CUE(7), // Zapdos attack AWAIT_CUE(5), - { 0x28, 0x01, 0x0001, 0x00000005, 0x00ffff10, NULL }, + { 0x28, 0x01, 0x0001, 0x00000005, 0x00ffff10, NULL }, // Flash to yellow? FANFARE_PLAY2(502), - { 0x27, 0x01, 0x0001, 0x00000005, 0x00ffff10, NULL }, - ALERT_CUE(6), + { 0x27, 0x01, 0x0001, 0x00000005, 0x00ffff10, NULL }, // Flash from yellow? + ALERT_CUE(6), // Articuno attack AWAIT_CUE(5), FANFARE_PLAY2(506), - { 0x28, 0x01, 0x0001, 0x00000005, 0x00ffffff, NULL }, - ALERT_CUE(6), - ALERT_CUE(7), - ALERT_CUE(8), - ALERT_CUE(10), + { 0x28, 0x01, 0x0001, 0x00000005, 0x00ffffff, NULL }, // Flash to white? + ALERT_CUE(6), // Articuno something? + ALERT_CUE(7), // Zapdos something? + ALERT_CUE(8), // Moltres something? + ALERT_CUE(10), // Vortex stone or circle? WAIT(60), - { 0x27, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, - ALERT_CUE(10), + { 0x27, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, // Flash from white? + ALERT_CUE(10), // Vortex stone or circle? AWAIT_CUE(5), WAIT(60), - WALK_GRID(256, 6), - ALERT_CUE(7), - ALERT_CUE(8), + WALK_GRID(256, 6), // Our character walks up? + ALERT_CUE(7), // Zapdos faces SouthWest + ALERT_CUE(8), // Moltres faces SouthEast WAIT(60), - PORTRAIT(PLACEMENT_TOP, 0x0001, 0x00000000), - PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), - PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), - MSG_NPC(3, _(" Fire, ice, and electricity...")), + PORTRAIT(PLACEMENT_TOP, NPC_ARTICUNO, 0), + PORTRAIT(PLACEMENT_RIGHT, NPC_ZAPDOS, 0), + PORTRAIT(PLACEMENT_LEFT_, NPC_MOLTRES, 0), + // Moltres speaks first. + MSG_NPC(NPC_MOLTRES, _(" Fire, ice, and electricity...")), TEXTBOX_CLEAR, WAIT(10), - MSG_NPC(1, _(" When the three powers\nmerge as one...")), + MSG_NPC(NPC_ARTICUNO, _(" When the three powers\nmerge as one...")), TEXTBOX_CLEAR, WAIT(10), - MSG_NPC(2, _(" The guardian of the sea is\nsaid to arise.")), + MSG_NPC(NPC_ZAPDOS, _(" The guardian of the sea is\nsaid to arise.")), TEXTBOX_CLEAR, WAIT(10), - MSG_NPC(3, _(" Our arrival at the\n{COLOR GREEN_H}Legendary Island{RESET}...")), + MSG_NPC(NPC_MOLTRES, _(" Our arrival at the\n{COLOR GREEN_H}Legendary Island{RESET}...")), TEXTBOX_CLEAR, WAIT(10), - MSG_NPC(2, _(" The three of us caused\nthe sea guardian to awaken.")), - MSG_NPC(2, _(" It is what caused whirlpools\nto grow into tornadoes.")), + MSG_NPC(NPC_ZAPDOS, _(" The three of us caused\nthe sea guardian to awaken.")), + MSG_NPC(NPC_ZAPDOS, _(" It is what caused whirlpools\nto grow into tornadoes.")), TEXTBOX_CLEAR, WAIT(10), - MSG_NPC(1, _(" I have here the\n{COLOR GREEN}Vortex Stone{RESET}.")), - MSG_NPC(1, _(" Bearing it, you will gain\npassage through the sea's tornadoes...")), - MSG_NPC(1, _(" It will lead you to a place\ncalled the {COLOR YELLOW_D}Silver Trench{RESET}.")), + MSG_NPC(NPC_ARTICUNO, _(" I have here the\n{COLOR GREEN}Vortex Stone{RESET}.")), + MSG_NPC(NPC_ARTICUNO, _(" Bearing it, you will gain\npassage through the sea's tornadoes...")), + MSG_NPC(NPC_ARTICUNO, _(" It will lead you to a place\ncalled the {COLOR YELLOW_D}Silver Trench{RESET}.")), TEXTBOX_CLEAR, WAIT(10), - MSG_NPC(2, _(" There, you will find the\nguardian of the sea.")), + MSG_NPC(NPC_ZAPDOS, _(" There, you will find the\nguardian of the sea.")), TEXTBOX_CLEAR, WAIT(10), - MSG_NPC(3, _(" Now go.\nThe guardian of the sea awaits you.")), + MSG_NPC(NPC_MOLTRES, _(" Now go.\nThe guardian of the sea awaits you.")), TEXTBOX_CLEAR, WAIT(30), WALK_RELATIVE(128, 0, -16), @@ -317,12 +314,14 @@ static const struct ScriptCommand s_gs158_g2_s0_lives0_dlg0[] = { /* 0x820d22c * BGM_STOP, FANFARE_PLAY(212), MSG_INSTANT(_("{CENTER_ALIGN}Obtained the {COLOR GREEN}Vortex Stone{RESET}.")), - { 0xe1, 0x00, 0x00d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(212), MSG_INSTANT(_("{CENTER_ALIGN}And...")), FANFARE_PLAY(205), MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Silver Trench{RESET}!")), - { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, + // TODO: Find out how: + // Fades to black, then you wake up in your bed... ALERT_CUE(3), HALT, }; diff --git a/src/data/ground/ground_data_h29p02_station.h b/src/data/ground/ground_data_h29p02_station.h index 22c5e36e7..3db82a53d 100644 --- a/src/data/ground/ground_data_h29p02_station.h +++ b/src/data/ground/ground_data_h29p02_station.h @@ -44,7 +44,7 @@ static const struct ScriptCommand s_gs159_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(118), + BGM_SWITCH(MUS_FRIEND_AREA_SOUTHERN_ISLAND), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h29p03_station.h b/src/data/ground/ground_data_h29p03_station.h index ee07e72c3..93ce3ac32 100644 --- a/src/data/ground/ground_data_h29p03_station.h +++ b/src/data/ground/ground_data_h29p03_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs160_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(119), + BGM_SWITCH(MUS_FRIEND_AREA_ENCLOSED_ISLAND), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_h29p04_station.h b/src/data/ground/ground_data_h29p04_station.h index 8d9951a22..e8329a541 100644 --- a/src/data/ground/ground_data_h29p04_station.h +++ b/src/data/ground/ground_data_h29p04_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs161_g0_s0_station_sref_script[] = { /* 0x8 SELECT_LIVES(0, 1), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ - BGM_SWITCH(122), + BGM_SWITCH(MUS_FRIEND_AREA_FINAL_ISLAND), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_s01_station.h b/src/data/ground/ground_data_s01_station.h index 16cb28fa5..4d72fcb36 100644 --- a/src/data/ground/ground_data_s01_station.h +++ b/src/data/ground/ground_data_s01_station.h @@ -27,7 +27,7 @@ static const struct ScriptCommand s_gs223_g1_s0_station_sref_script[] = { /* 0x8 MSG_ON_BG(_("{CENTER_ALIGN}OK...{WAIT_PRESS}\n{CENTER_ALIGN}Let the interview begin!")), TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 0), - BGM_SWITCH(12), + BGM_SWITCH(MUS_WELCOME_TO_THE_WORLD_OF_POKEMON), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, SPECIAL_TEXT(SPECIAL_TEXT_PERSONALITY_QUIZ, 0, 0), BGM_FADEOUT(30), diff --git a/src/data/ground/ground_data_s02_station.h b/src/data/ground/ground_data_s02_station.h index 8ab862a34..65dbae67c 100644 --- a/src/data/ground/ground_data_s02_station.h +++ b/src/data/ground/ground_data_s02_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs224_g2_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(224), SELECT_ENTITIES(1, 0), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(46), + BGM_SWITCH(MUS_OPENING_TITLE), WAIT(60), { 0x22, 0x01, 0x003c, 0x00000000, 0x00000000, NULL }, WAIT(480), @@ -59,7 +59,7 @@ static const struct ScriptCommand s_gs224_g3_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(224), SELECT_ENTITIES(1, 0), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(43), + BGM_SWITCH(MUS_TITLE_SCREEN), { 0x27, 0x01, 0x0001, 0x0000003c, 0x00ffffff, NULL }, SELECT_ENTITIES(-1, 1), SELECT_ENTITIES(-1, 2), @@ -145,7 +145,7 @@ static const struct ScriptCommand s_gs224_g4_s0_station_sref_script[] = { /* 0x8 SELECT_MAP(224), SELECT_ENTITIES(1, 0), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(43), + BGM_SWITCH(MUS_TITLE_SCREEN), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(120), ALERT_CUE(4), diff --git a/src/data/ground/ground_data_s03_station.h b/src/data/ground/ground_data_s03_station.h index 9e5decbe9..c06cdce5e 100644 --- a/src/data/ground/ground_data_s03_station.h +++ b/src/data/ground/ground_data_s03_station.h @@ -31,7 +31,7 @@ static const struct ScriptCommand s_gs225_g1_s0_station_sref_script[] = { /* 0x8 DEBUGINFO_O(31), SELECT_MAP(225), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(40), + BGM_SWITCH(MUS_INTRO), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, WAIT(4), ALERT_CUE(5), diff --git a/src/data/ground/ground_data_t00p01_station.h b/src/data/ground/ground_data_t00p01_station.h index ce1b802f3..8e31df0bf 100644 --- a/src/data/ground/ground_data_t00p01_station.h +++ b/src/data/ground/ground_data_t00p01_station.h @@ -36,7 +36,7 @@ static const struct ScriptCommand s_gs0_g0_s0_station_sref_script[] = { /* 0x813 SELECT_LIVES(0, 3), JUMP_LABEL(7), LABEL(7), /* = 0x07 */ - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_t01p01_station.h b/src/data/ground/ground_data_t01p01_station.h index 7f3889371..cfac6566b 100644 --- a/src/data/ground/ground_data_t01p01_station.h +++ b/src/data/ground/ground_data_t01p01_station.h @@ -329,7 +329,7 @@ static const struct ScriptCommand s_gs1_g0_s0_station_sref_script[] = { /* 0x813 SELECT_LIVES(0, 4), JUMP_LABEL(41), LABEL(41), /* = 0x29 */ - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), JUMP_SCRIPT(COMMON_ENTER), }; @@ -1578,7 +1578,7 @@ static const struct ScriptCommand s_gs1_g6_s0_station_sref_script[] = { /* 0x813 SELECT_MAP(1), SELECT_ENTITIES(-1, 0), SELECT_ENTITIES(7, 0), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -2136,7 +2136,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ { 0x27, 0x01, 0x0005, 0x00000002, 0x00808010, NULL }, { 0x28, 0x01, 0x0005, 0x00000002, 0x00808010, NULL }, { 0x27, 0x01, 0x0005, 0x00000002, 0x00808010, NULL }, - { 0xe2, 0x00, 0x025b, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(603), FANFARE_PLAY(206), { 0x3b, 0x17, 0x0000, 0x00000000, 0x00000000, NULL }, MSG_NPC(2, _(" Congratulations!{WAIT_PRESS}\nYou can go to the {COLOR GREEN_H}Wild Plains{RESET} now.")), @@ -2173,7 +2173,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ { 0x27, 0x01, 0x0005, 0x00000002, 0x00808010, NULL }, { 0x28, 0x01, 0x0005, 0x00000002, 0x00808010, NULL }, { 0x27, 0x01, 0x0005, 0x00000002, 0x00808010, NULL }, - { 0xe2, 0x00, 0x025b, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(603), FANFARE_PLAY(206), MSG_NPC(2, _(" Congratulations!{WAIT_PRESS}\nYou can go to the {COLOR GREEN_H}Power Plant{RESET} now.")), TEXTBOX_CLEAR, @@ -2229,7 +2229,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ WAIT(30), FANFARE_PLAY(204), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_4} became a team member!")), - { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(204), TEXTBOX_CLEAR, WAIT(30), { 0x3b, 0x18, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -2393,7 +2393,7 @@ static const struct ScriptCommand s_gs1_g10_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(2393), SELECT_ENTITIES(-1, 0), CANCEL_ENTITIES(8, 0), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), AWAIT_CUE(3), SELECT_ENTITIES(-1, 1), ALERT_CUE(5), @@ -4393,7 +4393,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ MSG_NPC(1, _(" Ge-{NAME_2}?!")), TEXTBOX_CLEAR, WAIT(10), - BGM_SWITCH(9), + BGM_SWITCH(MUS_RISING_FEAR), 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}.")), @@ -4543,7 +4543,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), MSG_NPC(6, _(" Is that true?\nHey!")), TEXTBOX_CLEAR, - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000c), @@ -5791,7 +5791,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ WALK_GRID(256, 64), AWAIT_CUE(5), WAIT(30), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), MSG_NPC(1, _(" Hi, everyone!\nWe're back!")), PORTRAIT_REP(0x0001, 0x00000000), @@ -7209,7 +7209,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ TEXTBOX_CLEAR, WAIT(30), MSG_NPC(3, _(" ...Sorry.\nThis isn't the time for that!")), - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), PORTRAIT_REP(0x0003, 0x00000001), MSG_NPC(3, _(" There's big trouble!{WAIT_PRESS}\n{NAME_8}'s team went underground...")), MSG_NPC(3, _(" But they haven't returned!")), @@ -7332,7 +7332,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(20), CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(60), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), MSG_NPC(-1, _(" Whoa!")), TEXTBOX_CLEAR, WAIT(10), @@ -8687,7 +8687,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(5), - BGM_SWITCH(9), + BGM_SWITCH(MUS_RISING_FEAR), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000c), MSG_NPC(1, _(" Look!\nIt's {NAME_5}!")), TEXTBOX_CLEAR, @@ -8740,7 +8740,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ TEXTBOX_CLEAR, BGM_FADEOUT(60), WAIT(60), - BGM_SWITCH(10), + BGM_SWITCH(MUS_THERES_TROUBLE), MSG_NPC(-1, _(" Kekekekekeh!")), TEXTBOX_CLEAR, ALERT_CUE(9), @@ -8885,7 +8885,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ AWAIT_CUE(5), WAIT(15), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Everyone, listen!")), TEXTBOX_CLEAR, @@ -10833,7 +10833,7 @@ static const struct ScriptCommand s_gs1_g31_s0_station_sref_script[] = { /* 0x81 WAIT(1), { 0x25, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ENTITIES(-1, -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x28, 0x01, 0x0005, 0x00000014, 0x00ffffff, NULL }, @@ -11047,7 +11047,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ { 0x28, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, { 0x27, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, WAIT(30), - BGM_SWITCH(19), + BGM_SWITCH(MUS_WORLD_CALAMITY), { 0x2e, 0x00, 0x0009, -0x00000002, 0x00000000, NULL }, MSG_NPC(9, _(" ...To all Pokémon!\nCalling all Pokémon!")), MSG_NPC(9, _(" Terrible, it is!{WAIT_PRESS}\nFrom the sky...{WAIT_PRESS} Falls a star...")), @@ -11518,7 +11518,7 @@ static const struct ScriptCommand s_gs1_g32_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(11518), SELECT_MAP(1), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(19), + BGM_SWITCH(MUS_WORLD_CALAMITY), { 0x27, 0x00, 0x0005, 0x00000020, 0x00ffffff, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -11779,7 +11779,7 @@ static const struct ScriptCommand s_gs1_g33_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 0), SELECT_ENTITIES(0, 0), CALL_STATION( 34, 0), - BGM_SWITCH(19), + BGM_SWITCH(MUS_WORLD_CALAMITY), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, RET, }; @@ -12676,7 +12676,7 @@ static const struct ScriptCommand s_gs1_g39_s0_lives0_dlg2[] = { /* 0x816b7a0 */ MSG_NPC(1, _(" Thank you!")), FANFARE_PLAY(204), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} \n{CENTER_ALIGN}became a member!")), - { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(204), TEXTBOX_CLEAR, { 0x3b, 0x1e, 0x0000, 0x00000000, 0x00000000, NULL }, ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to {NAME_1}?")), @@ -13046,7 +13046,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives2_dlg0[] = { /* 0x816d39c */ WAIT(10), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(468), ALERT_CUE(5), AWAIT_CUE(7), { 0x58, 0x01, 0x0000, 0x000001f0, 0x00000138, NULL }, @@ -13062,7 +13062,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives3_dlg0[] = { /* 0x816d48c */ AWAIT_CUE(8), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(8), @@ -13085,12 +13085,12 @@ static const struct ScriptCommand s_gs1_g43_s0_lives4_dlg0[] = { /* 0x816d56c */ WAIT(60), WALK_RELATIVE(256, 8, -8), FANFARE_PLAY2(468), - { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(468), FANFARE_PLAY2(468), WAIT(45), WALK_RELATIVE(256, 8, 8), FANFARE_PLAY2(468), - { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(468), FANFARE_PLAY2(468), WAIT(45), ALERT_CUE(5), @@ -13099,7 +13099,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives4_dlg0[] = { /* 0x816d56c */ { 0x54, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, ROTATE_TO(1, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(10), - { 0xe2, 0x00, 0x0329, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(809), STOP_ANIMATION_ON_CURRENT_FRAME, SELECT_ANIMATION(22), STOP_ANIMATION_ON_CURRENT_FRAME, @@ -13232,7 +13232,7 @@ static const struct ScriptCommand s_gs1_g45_s1_lives1_dlg0[] = { /* 0x816e32c */ AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), ALERT_CUE(5), AWAIT_CUE(7), SELECT_ANIMATION(4), @@ -13258,7 +13258,7 @@ static const struct ScriptCommand s_gs1_g45_s1_lives1_dlg0[] = { /* 0x816e32c */ FANFARE_PLAY2(762), SELECT_ANIMATION(17), STOP_ANIMATION_ON_CURRENT_FRAME, - { 0xe2, 0x00, 0x02fa, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(762), FANFARE_PLAY2(510), WAIT(60), SELECT_ANIMATION(2), @@ -13273,7 +13273,7 @@ static const struct ScriptCommand s_gs1_g45_s1_lives1_dlg0[] = { /* 0x816e32c */ LABEL(1), /* = 0x01 */ FANFARE_PLAY2(473), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - { 0xe2, 0x00, 0x01d9, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(473), ALERT_CUE(5), AWAIT_CUE(7), SELECT_ANIMATION(4), @@ -13326,7 +13326,7 @@ static const struct ScriptCommand s_gs1_g46_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(1), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), RET, @@ -13561,7 +13561,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ WAIT(30), ALERT_CUE(4), AWAIT_CUE(5), - BGM_SWITCH(9), + BGM_SWITCH(MUS_RISING_FEAR), ALERT_CUE(11), ALERT_CUE(12), WAIT(120), @@ -13666,7 +13666,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ BGM_STOP, FANFARE_PLAY(205), MSG_INSTANT(_("{CENTER_ALIGN}The {COLOR YELLOW_D}Western Cave{RESET}\n{CENTER_ALIGN}is now open for exploration!")), - { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, WAIT(30), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -13987,7 +13987,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives6_dlg0[] = { /* 0x817197c */ { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, WAIT(25), FANFARE_PLAY2(400), - { 0xe2, 0x00, 0x0190, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(400), ALERT_CUE(5), AWAIT_CUE(11), HALT, @@ -14010,7 +14010,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives7_dlg0[] = { /* 0x8171aac */ { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, WAIT(20), FANFARE_PLAY2(400), - { 0xe2, 0x00, 0x0190, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(400), ALERT_CUE(5), AWAIT_CUE(12), HALT, @@ -14025,7 +14025,7 @@ static const struct ScriptCommand s_gs1_g47_s0_station_sref_script[] = { /* 0x81 UPDATE_VARINT(CALC_SET, PARTNER2_KIND, 0), SELECT_MAP(1), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x00, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -14179,7 +14179,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ BGM_STOP, FANFARE_PLAY(205), 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 }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, ALERT_CUE(3), HALT, @@ -14207,7 +14207,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives1_dlg0[] = { /* 0x8172b68 */ WALK_RELATIVE(256, 80, 0), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), WAIT(20), CMD_UNK_8E(1, DIR_TRANS_NONE, 1), ALERT_CUE(5), @@ -14217,7 +14217,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives1_dlg0[] = { /* 0x8172b68 */ WALK_GRID(256, 144), FANFARE_PLAY2(468), CALL_SCRIPT(QUESTION_FUNC), - { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(468), ALERT_CUE(5), AWAIT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), @@ -14270,7 +14270,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives3_dlg0[] = { /* 0x8172de8 */ ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(469), ALERT_CUE(5), AWAIT_CUE(7), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), @@ -14325,7 +14325,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives6_dlg0[] = { /* 0x8173188 */ AWAIT_CUE(11), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), ALERT_CUE(5), AWAIT_CUE(11), ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), @@ -14339,7 +14339,7 @@ static const struct ScriptCommand s_gs1_g48_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(14339), SELECT_MAP(1), SELECT_ENTITIES(-1, 0), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), BGM_FADEOUT(60), @@ -14409,7 +14409,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ ALERT_CUE(8), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), MSG_NPC(5, _(" Ggh! This wound!")), TEXTBOX_CLEAR, WAIT(10), @@ -14420,7 +14420,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ WAIT(10), ALERT_CUE(10), AWAIT_CUE(5), - BGM_SWITCH(114), + BGM_SWITCH(MUS_IN_THE_DEPTHS_OF_THE_PIT), 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}...")), @@ -14568,7 +14568,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ BGM_STOP, FANFARE_PLAY(205), 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 }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, ALERT_CUE(3), HALT, @@ -14612,14 +14612,14 @@ static const struct ScriptCommand s_gs1_g48_s0_lives1_dlg0[] = { /* 0x8174e1c */ ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), - { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(469), ALERT_CUE(5), AWAIT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), ALERT_CUE(5), AWAIT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), @@ -14671,7 +14671,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives3_dlg0[] = { /* 0x81750cc */ AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), AWAIT_CUE(7), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(7), @@ -14728,7 +14728,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives5_dlg0[] = { /* 0x81754ac */ SELECT_ANIMATION(4), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), ALERT_CUE(5), AWAIT_CUE(10), { 0x54, 0x00, 0x001b, 0x00000000, 0x00000000, NULL }, @@ -14743,11 +14743,11 @@ static const struct ScriptCommand s_gs1_g48_s0_lives5_dlg0[] = { /* 0x81754ac */ AWAIT_CUE(10), FANFARE_PLAY2(475), { 0x54, 0x00, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0xe2, 0x00, 0x01db, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(475), { 0x54, 0x00, 0x001a, 0x00000000, 0x00000000, NULL }, WAIT(40), FANFARE_PLAY2(682), - { 0xe2, 0x00, 0x02aa, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(682), ALERT_CUE(5), SELECT_ANIMATION(25), AWAIT_CUE(10), @@ -14784,7 +14784,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), WAIT(30), ALERT_CUE(10), AWAIT_CUE(5), @@ -14981,7 +14981,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ BGM_STOP, FANFARE_PLAY(204), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_5} and {NAME_6}\n{CENTER_ALIGN}became team members!")), - { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(204), TEXTBOX_CLEAR, { 0x3b, 0x24, 0x0000, 0x00000000, 0x00000000, NULL }, ASK1(FALSE, /*default*/ -1, /* speaker */ -1, _("Give a nickname to {NAME_5}?")), @@ -15031,7 +15031,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives1_dlg0[] = { /* 0x8176dcc */ AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), - { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE2(465), ALERT_CUE(5), AWAIT_CUE(6), ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), @@ -15327,7 +15327,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives3_dlg2[] = { /* 0x817803c */ MSG_INSTANT(_("{CENTER_ALIGN}Leaving aside the disturbing fact that\n{CENTER_ALIGN}{NAME_1} made them compadres...")), FANFARE_PLAY(205), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0}'s team gained\n{CENTER_ALIGN}access to the {COLOR YELLOW_D}Buried Relic{RESET}!")), - { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, JUMPIF_SCENE_GT(SCENARIO_SUB7, 49, 2, /* to label */ 1), CMD_UNK_AF(RESCUE_DUNGEON_BURIED_RELIC, TRUE), @@ -15494,7 +15494,7 @@ static const struct ScriptCommand s_gs1_g52_s0_lives0_dlg2[] = { /* 0x8178d0c */ WAIT(10), FANFARE_PLAY(204), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_1} became the\n{CENTER_ALIGN}rescue team's newest member!")), - { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(204), TEXTBOX_CLEAR, WAIT(30), { 0x3b, 0x31, 0x0000, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_t01p02a_station.h b/src/data/ground/ground_data_t01p02a_station.h index 4cdc17c10..ad4bce191 100644 --- a/src/data/ground/ground_data_t01p02a_station.h +++ b/src/data/ground/ground_data_t01p02a_station.h @@ -157,7 +157,7 @@ static const struct ScriptCommand s_gs2_g0_s0_station_sref_script[] = { /* 0x817 SELECT_LIVES(0, 2), JUMP_LABEL(30), LABEL(30), /* = 0x1e */ - BGM_SWITCH(8), + BGM_SWITCH(MUS_FILE_SELECT), JUMPIF_SCENARIOCHECK(QUEST_REACHED_POSTGAME, /* to label */ 31), JUMP_LABEL(32), LABEL(31), /* = 0x1f */ @@ -392,12 +392,12 @@ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg2[] = { /* 0x817e834 */ BGM_STOP, FANFARE_PLAY(205), MSG_INSTANT(_("{CENTER_ALIGN}Gained access to\n{CENTER_ALIGN}the {COLOR YELLOW_D}Stormy Sea{RESET}!")), - { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, WAIT(20), MSG_INSTANT(_("{CENTER_ALIGN}Beware--you must take the HM {COLOR GREEN_I}Dive{RESET},\n{CENTER_ALIGN}or a team member must learn {COLOR GREEN_I}Dive{RESET}\n{CENTER_ALIGN}as a move for the team to enter!")), TEXTBOX_CLEAR, - BGM_SWITCH(8), + BGM_SWITCH(MUS_FILE_SELECT), CMD_UNK_AF(RESCUE_DUNGEON_STORMY_SEA, TRUE), SCENARIO_CALC(SCENARIO_SUB2, 33, 4), JUMP_SCRIPT(END_TALK), @@ -1394,7 +1394,7 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ WAIT(1), WALK_GRID(256, 12), { 0x8b, 0x1e, 0x0004, 0x00000000, 0x00000000, NULL }, - BGM_SWITCH(6), + BGM_SWITCH(MUS_LEGEND_OF_NINETALES), MSG_NPC(1, _(" There once lived a Pokémon\nby the name of {NAME_2}.")), TEXTBOX_CLEAR, MSG_NPC(1, _(" Now, {NAME_2} had\nmany tails, all of them imbued with\npsychic power...")), @@ -1471,7 +1471,7 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ TEXTBOX_CLEAR, { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, ALERT_CUE(4), - BGM_SWITCH(8), + BGM_SWITCH(MUS_FILE_SELECT), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, ALERT_CUE(8), RET, @@ -2107,7 +2107,7 @@ static const struct ScriptCommand s_gs2_g28_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(2107), SELECT_MAP(2), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(41), + BGM_SWITCH(MUS_AFTERMATH), { 0x22, 0x01, 0x002d, 0x00000000, 0x00000000, NULL }, WAIT(240), { 0x23, 0x01, 0x002d, 0x00000000, 0x00000000, NULL }, @@ -2140,7 +2140,7 @@ static const struct ScriptCommand s_gs2_g29_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(3), SELECT_ENTITIES(-1, 0), WAIT(30), - BGM_SWITCH(8), + BGM_SWITCH(MUS_FILE_SELECT), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), diff --git a/src/data/ground/ground_data_t01p03_station.h b/src/data/ground/ground_data_t01p03_station.h index e62e75289..a9a91022f 100644 --- a/src/data/ground/ground_data_t01p03_station.h +++ b/src/data/ground/ground_data_t01p03_station.h @@ -151,7 +151,7 @@ static const struct ScriptCommand s_gs4_g0_s0_station_sref_script[] = { /* 0x818 SELECT_LIVES(0, 2), JUMP_LABEL(31), LABEL(31), /* = 0x1f */ - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), JUMP_SCRIPT(COMMON_ENTER), }; @@ -758,7 +758,7 @@ static const struct ScriptCommand s_gs4_g3_s0_station_sref_script[] = { /* 0x818 DEBUGINFO_O(758), SELECT_MAP(4), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -859,7 +859,7 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ BGM_STOP, FANFARE_PLAY(205), 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 }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, ALERT_CUE(3), HALT, @@ -959,7 +959,7 @@ static const struct ScriptCommand s_gs4_g5_s0_station_sref_script[] = { /* 0x818 SELECT_MAP(4), WAIT(30), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -1016,7 +1016,7 @@ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ BGM_STOP, FANFARE_PLAY(205), 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 }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, ALERT_CUE(3), HALT, @@ -1113,7 +1113,7 @@ static const struct ScriptCommand s_gs4_g7_s0_station_sref_script[] = { /* 0x818 SELECT_MAP(4), WAIT(30), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -1145,7 +1145,7 @@ static const struct ScriptCommand s_gs4_g7_s0_lives0_dlg0[] = { /* 0x818e464 */ BGM_STOP, FANFARE_PLAY(205), 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 }, + WAIT_FANFARE1(205), TEXTBOX_CLEAR, ALERT_CUE(3), HALT, @@ -1417,7 +1417,7 @@ static const struct ScriptCommand s_gs4_g11_s0_station_sref_script[] = { /* 0x81 SELECT_ENTITIES(-1, 2), JUMP_LABEL(5), LABEL(5), /* = 0x05 */ - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, @@ -1500,7 +1500,7 @@ static const struct ScriptCommand s_gs4_g12_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(4), SELECT_ENTITIES(-1, -1), CANCEL_LIVES(0, 0), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), @@ -3041,7 +3041,7 @@ static const struct ScriptCommand s_gs4_g27_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(3041), SELECT_MAP(4), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(41), + BGM_SWITCH(MUS_AFTERMATH), { 0x22, 0x01, 0x002d, 0x00000000, 0x00000000, NULL }, WAIT(240), { 0x23, 0x01, 0x002d, 0x00000000, 0x00000000, NULL }, @@ -3150,7 +3150,7 @@ static const struct ScriptCommand s_gs4_g29_s0_station_sref_script[] = { /* 0x81 SELECT_MAP(4), CANCEL_ENTITIES(0, 0), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(40), + BGM_SWITCH(MUS_INTRO), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_t01p04_station.h b/src/data/ground/ground_data_t01p04_station.h index 10bb80dda..439e17594 100644 --- a/src/data/ground/ground_data_t01p04_station.h +++ b/src/data/ground/ground_data_t01p04_station.h @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs5_g0_s0_station_sref_script[] = { /* 0x819 RET, LABEL(6), /* = 0x06 */ SET_DUNGEON_RES(/* result */ 0, /* enter */ -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), JUMP_SCRIPT(COMMON_ENTER), }; @@ -128,7 +128,7 @@ static const struct ScriptCommand s_gs5_g2_s0_station_sref_script[] = { /* 0x819 CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), CALL_STATION( 1, 0), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 1, 0), @@ -178,7 +178,7 @@ static const struct ScriptCommand s_gs5_g3_s0_station_sref_script[] = { /* 0x819 CALL_SCRIPT(DISMISSAL_SALLY_MEMBER2_FUNC), CALL_STATION( 1, 0), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 1, 0), @@ -231,7 +231,7 @@ static const struct ScriptCommand s_gs5_g4_s0_station_sref_script[] = { /* 0x819 CALL_SCRIPT(DISMISSAL_SALLY_MEMBER3_FUNC), CALL_STATION( 1, 0), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 1, 0), @@ -282,7 +282,7 @@ static const struct ScriptCommand s_gs5_g5_s0_station_sref_script[] = { /* 0x819 DEBUGINFO_O(282), SELECT_MAP(5), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(40), + BGM_SWITCH(MUS_INTRO), { 0x22, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_t01p05_station.h b/src/data/ground/ground_data_t01p05_station.h index 2f424b113..56776cb7d 100644 --- a/src/data/ground/ground_data_t01p05_station.h +++ b/src/data/ground/ground_data_t01p05_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs6_g0_s0_station_sref_script[] = { /* 0x819 RET, LABEL(7), /* = 0x07 */ SET_DUNGEON_RES(/* result */ 0, /* enter */ -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), JUMP_SCRIPT(COMMON_ENTER), }; @@ -177,7 +177,7 @@ static const struct ScriptCommand s_gs6_g2_s0_station_sref_script[] = { /* 0x819 SELECT_MAP(6), CALL_STATION( 1, 0), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 1, 0), @@ -241,7 +241,7 @@ static const struct ScriptCommand s_gs6_g3_s0_station_sref_script[] = { /* 0x819 SELECT_MAP(6), CALL_STATION( 1, 0), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 1, 0), @@ -291,7 +291,7 @@ static const struct ScriptCommand s_gs6_g4_s0_station_sref_script[] = { /* 0x819 SELECT_MAP(6), CALL_STATION( 1, 0), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 1, 0), @@ -341,7 +341,7 @@ static const struct ScriptCommand s_gs6_g5_s0_station_sref_script[] = { /* 0x819 SELECT_MAP(6), CALL_STATION( 1, 0), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(7), + BGM_SWITCH(MUS_POKEMON_SQUARE), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), CALL_STATION( 1, 0), diff --git a/src/data/ground/ground_data_t01p06_station.h b/src/data/ground/ground_data_t01p06_station.h index 6cfe52338..a716a2da0 100644 --- a/src/data/ground/ground_data_t01p06_station.h +++ b/src/data/ground/ground_data_t01p06_station.h @@ -28,7 +28,7 @@ static const struct ScriptCommand s_gs7_g0_s0_station_sref_script[] = { /* 0x819 SELECT_LIVES(0, 1), JUMP_LABEL(4), LABEL(4), /* = 0x04 */ - BGM_SWITCH(110), + BGM_SWITCH(MUS_MAKUHITA_DOJO), JUMP_SCRIPT(COMMON_ENTER), }; diff --git a/src/data/ground/ground_data_t01p07_station.h b/src/data/ground/ground_data_t01p07_station.h index 0a9d10c40..b66b4f8b6 100644 --- a/src/data/ground/ground_data_t01p07_station.h +++ b/src/data/ground/ground_data_t01p07_station.h @@ -17,7 +17,7 @@ static const struct ScriptCommand s_gs8_g0_s0_station_sref_script[] = { /* 0x819 LABEL(1), /* = 0x01 */ JUMP_STATION( 1, 0), LABEL(2), /* = 0x02 */ - BGM_SWITCH(8), + BGM_SWITCH(MUS_FILE_SELECT), JUMP_SCRIPT(COMMON_ENTER), }; @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs8_g1_s0_station_sref_script[] = { /* 0x819 DEBUGINFO_O(50), SELECT_MAP(8), SELECT_ENTITIES(-1, -1), - BGM_SWITCH(8), + BGM_SWITCH(MUS_FILE_SELECT), { 0x22, 0x01, -0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(3), SELECT_EVENTS(0, 0), diff --git a/src/data/ground/ground_event_data.h b/src/data/ground/ground_event_data.h index 2b0b5a639..629481589 100644 --- a/src/data/ground/ground_event_data.h +++ b/src/data/ground/ground_event_data.h @@ -891,7 +891,7 @@ static const struct ScriptCommand s_script_LIVES_WARP_ARRIVE_SUB[] = { /* 0x8121 static const struct ScriptCommand s_script_GET_ITEM_FUNC[] = { /* 0x8121a54 */ DEBUGINFO_O(892), FANFARE_PLAY(203), - { 0xe1, 0x00, 0x00cb, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(203), TEXTBOX_CLEAR2, RET_DIRECT, }; @@ -899,7 +899,7 @@ static const struct ScriptCommand s_script_GET_ITEM_FUNC[] = { /* 0x8121a54 */ static const struct ScriptCommand s_script_GET_ITEM_WAIT_FUNC[] = { /* 0x8121aa4 */ DEBUGINFO_O(900), FANFARE_PLAY(203), - { 0xe1, 0x00, 0x00cb, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(203), TEXTBOX_CLEAR, RET_DIRECT, }; @@ -907,7 +907,7 @@ static const struct ScriptCommand s_script_GET_ITEM_WAIT_FUNC[] = { /* 0x8121aa4 static const struct ScriptCommand s_script_GET_ITEM2_FUNC[] = { /* 0x8121af4 */ DEBUGINFO_O(908), FANFARE_PLAY(203), - { 0xe1, 0x00, 0x00cb, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(203), TEXTBOX_CLEAR2, RET_DIRECT, }; @@ -915,7 +915,7 @@ static const struct ScriptCommand s_script_GET_ITEM2_FUNC[] = { /* 0x8121af4 */ static const struct ScriptCommand s_script_GET_ITEM2_WAIT_FUNC[] = { /* 0x8121b44 */ DEBUGINFO_O(916), FANFARE_PLAY(203), - { 0xe1, 0x00, 0x00cb, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(203), TEXTBOX_CLEAR, RET_DIRECT, }; @@ -923,7 +923,7 @@ static const struct ScriptCommand s_script_GET_ITEM2_WAIT_FUNC[] = { /* 0x8121b4 static const struct ScriptCommand s_script_JOIN_FUNC[] = { /* 0x8121b94 */ DEBUGINFO_O(924), FANFARE_PLAY(204), - { 0xe1, 0x00, 0x00cc, 0x00000000, 0x00000000, NULL }, + WAIT_FANFARE1(204), TEXTBOX_CLEAR2, RET_DIRECT, }; @@ -957,7 +957,7 @@ static const struct ScriptCommand s_script_SAVE_START_FUNC[] = { /* 0x8121cb4 */ DEBUGINFO_O(957), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x43, 0x0000, 0x00000000, 0x00000000, NULL }, - BGM_SWITCH(50), + BGM_SWITCH(MUS_BLANK_50), RET_DIRECT, }; @@ -979,7 +979,7 @@ static const struct ScriptCommand s_script_SAVE_END_FUNC[] = { /* 0x8121d44 */ static const struct ScriptCommand s_script_SAVE_SOUND_FUNC[] = { /* 0x8121d94 */ DEBUGINFO_O(980), { 0x3b, 0x43, 0x0000, 0x00000000, 0x00000000, NULL }, - BGM_SWITCH(50), + BGM_SWITCH(MUS_BLANK_50), { 0xe0, 0x00, 0x0032, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x45, 0x001e, 0x00000000, 0x00000000, NULL }, RET_DIRECT, diff --git a/src/event_flag.c b/src/event_flag.c index c6ad91487..565ee742d 100644 --- a/src/event_flag.c +++ b/src/event_flag.c @@ -576,8 +576,7 @@ void sub_8001D88(void) } if (sMain_main > 0x11) { sub_80973A8(RESCUE_DUNGEON_WATERFALL_POND, TRUE); - if (((FindItemInInventory(ITEM_HM_DIVE) != -1) || (gTeamInventoryRef->teamStorage[ITEM_HM_DIVE] != 0)) || - (ScriptVarScenarioAfter(SCENARIO_SUB2,0x21,3) != 0)) { + if (FindItemInInventory(ITEM_HM_DIVE) != -1 || gTeamInventoryRef->teamStorage[ITEM_HM_DIVE] != 0 || ScriptVarScenarioAfter(SCENARIO_SUB2,0x21,3)) { sub_80973A8(RESCUE_DUNGEON_SOLAR_CAVE, TRUE); } if (GetFriendAreaStatus(FURNACE_DESERT) != 0) { @@ -611,10 +610,10 @@ void sub_8001D88(void) } } if (!ScriptVarScenarioBefore(SCENARIO_SUB6,0x30,0)) { - if ((ScriptVarScenarioEqual(SCENARIO_SUB2,0x22,0)) && HasRecruitedMon(MONSTER_ARTICUNO) && HasRecruitedMon(MONSTER_ZAPDOS) && HasRecruitedMon(MONSTER_MOLTRES)) { + if (ScriptVarScenarioEqual(SCENARIO_SUB2,0x22,0) && HasRecruitedMon(MONSTER_ARTICUNO) && HasRecruitedMon(MONSTER_ZAPDOS) && HasRecruitedMon(MONSTER_MOLTRES)) { ScenarioCalc(SCENARIO_SUB2,0x22,1); } - if (((ScriptVarScenarioEqual(SCENARIO_SUB8,0,0)) && (ScriptVarScenarioAfter(SCENARIO_SUB2,0x21,3) != 0)) && + if ((ScriptVarScenarioEqual(SCENARIO_SUB8,0,0) && (ScriptVarScenarioAfter(SCENARIO_SUB2,0x21,3))) && (GetFriendAreaStatus(SKY_BLUE_PLAINS))) { ScenarioCalc(SCENARIO_SUB8,0x33,1); } diff --git a/src/ground_main.c b/src/ground_main.c index 3e43adc8b..7976cfd4a 100644 --- a/src/ground_main.c +++ b/src/ground_main.c @@ -73,7 +73,6 @@ extern void nullsub_16(void); extern void sub_80060EC(void); extern void sub_809977C(void); extern void UpdateFadeInTile(s32); -extern void sub_8001D88(void); static s16 sub_8098FCC(u32 unused); diff --git a/src/ground_script.c b/src/ground_script.c index b72653eec..a7a284734 100644 --- a/src/ground_script.c +++ b/src/ground_script.c @@ -563,7 +563,8 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } break; } - case 0xe1: case 0xe2: { + case 0xE1: // WAIT_FANFARE1 + case 0xE2: { // WAIT_FANFARE2 cmd = *action->scriptData.curPtr; if (IsSoundPlaying(cmd.argShort)) { if (action->scriptData.unk2C++ < 3600) { @@ -2865,7 +2866,12 @@ static s32 ExecuteScriptCommand(Action *action) scriptData->unk2A = curCmd.argShort + OtherRandInt(curCmd.arg1 - curCmd.argShort); return 2; } - case 0xdd ... 0xe2: { + case 0xDD: + case 0xDE: + case 0xDF: + case 0xE0: + case 0xE1: // WAIT_FANFARE1 + case 0xE2: { // WAIT_FANFARE2 return 2; // do action } case 0xe3: { @@ -2875,7 +2881,7 @@ static s32 ExecuteScriptCommand(Action *action) } break; } - case 0xe4: { + case 0xe4: { // ALERT_CUE GroundScriptLockJumpZero(curCmd.argShort); break; }