diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-13 23:26:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-13 23:26:46 -0500 |
| commit | f42eafc85b007cd27e90bc9a1350d589e31bda43 (patch) | |
| tree | 7a09999f6ac2fc2d1b36ece5ec484ec6527a201f /src/overworld.c | |
| parent | 4c4fa1f25e55e41f469604a984a820f5a7f30e90 (diff) | |
| parent | 8d18d03c791c40bad532c62f217b0f82aadec6d2 (diff) | |
Merge branch 'master' into doc-banim
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/overworld.c b/src/overworld.c index 8b32b286c..a44d3c050 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1254,7 +1254,7 @@ static void PlayAmbientCry(void) return; pan = (Random() % 88) + 212; volume = (Random() % 30) + 50; - PlayCry2(sAmbientCrySpecies, pan, volume, 1); + PlayCry_NormalNoDucking(sAmbientCrySpecies, pan, volume, CRY_PRIORITY_AMBIENT); } void UpdateAmbientCry(s16 *state, u16 *delayCounter) @@ -2101,14 +2101,14 @@ static void InitOverworldGraphicsRegisters(void) ScheduleBgCopyTilemapToVram(1); ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(3); - ChangeBgX(0, 0, 0); - ChangeBgY(0, 0, 0); - ChangeBgX(1, 0, 0); - ChangeBgY(1, 0, 0); - ChangeBgX(2, 0, 0); - ChangeBgY(2, 0, 0); - ChangeBgX(3, 0, 0); - ChangeBgY(3, 0, 0); + ChangeBgX(0, 0, BG_COORD_SET); + ChangeBgY(0, 0, BG_COORD_SET); + ChangeBgX(1, 0, BG_COORD_SET); + ChangeBgY(1, 0, BG_COORD_SET); + ChangeBgX(2, 0, BG_COORD_SET); + ChangeBgY(2, 0, BG_COORD_SET); + ChangeBgX(3, 0, BG_COORD_SET); + ChangeBgY(3, 0, BG_COORD_SET); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_WIN1_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_HBLANK_INTERVAL); ShowBg(0); |