diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 19:54:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 19:54:16 -0500 |
| commit | 7b7f4bb7d6f5d29b40e15aa4c6285c6885359e0d (patch) | |
| tree | 8da3f8fae8c1c165e3435ee079f48631479b7611 /src/trade.c | |
| parent | c6207577802db057298917089e427a6ab9e6edf9 (diff) | |
| parent | 8bf4b1a917786c683ac30278108f74d31961274d (diff) | |
Merge pull request #636 from huderlem/assets
Map organization
Diffstat (limited to 'src/trade.c')
| -rw-r--r-- | src/trade.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/trade.c b/src/trade.c index 8d7f5b1fc..50de29b7f 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1208,7 +1208,7 @@ static void sub_8047EC0(void) sub_8048C70(); gMain.state ++; nullsub_5(7, 0); - PlayBGM(BGM_P_SCHOOL); + PlayBGM(MUS_P_SCHOOL); break; case 14: sub_804ACF4(1); @@ -4812,7 +4812,7 @@ static bool8 sub_804C29C(void) gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[0]].y_offset; gUnknown_03004828->unk_00c4 ++; gUnknown_03004828->unk_0124 = GetCurrentMapMusic(); - PlayBGM(BGM_SHINKA); + PlayBGM(MUS_SHINKA); break; case 1: if (gUnknown_03004828->bg2hofs > 0) @@ -5195,7 +5195,7 @@ static bool8 sub_804C29C(void) case 68: if (++ gUnknown_03004828->unk_00c0 == 4) { - PlayFanfare(BGM_FANFA5); + PlayFanfare(MUS_FANFA5); } if (gUnknown_03004828->unk_00c0 == 0xf0) { |