diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:34:28 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:39:00 +0800 |
commit | 89a377cdd3a24956ff549b0fa69a5a1cc26fe128 (patch) | |
tree | a5279d2d7224d04f5e39b213d4c18deda54a438e /src/intro.c | |
parent | 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 (diff) | |
parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) |
Merge branch 'master' into battle
Diffstat (limited to 'src/intro.c')
-rw-r--r-- | src/intro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intro.c b/src/intro.c index c15f40dd3..e2432b6a2 100644 --- a/src/intro.c +++ b/src/intro.c @@ -738,7 +738,7 @@ static void sub_80ECC3C(struct IntroSequenceData * this) switch (this->field_0004) { case 0: - PlaySE(BGM_FRLG_GAMEFREAK_LOGO); + PlaySE(MUS_TITLEROG); sub_80EDC40(); this->field_0012 = 0; this->field_0004++; @@ -907,7 +907,7 @@ static void sub_80ECEA4(struct IntroSequenceData * this) case 3: if (!gPaletteFade.active) { - m4aSongNumStart(BGM_FRLG_OPENING); + m4aSongNumStart(MUS_DEMO); this->field_0012 = 0; this->field_0004++; } |