diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
| commit | c94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch) | |
| tree | b188427bb1942695f32e14ee3fe137855d638c8c /src/dodrio_berry_picking_2.c | |
| parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/dodrio_berry_picking_2.c')
| -rw-r--r-- | src/dodrio_berry_picking_2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c index 5bd531edc..ff44a70de 100644 --- a/src/dodrio_berry_picking_2.c +++ b/src/dodrio_berry_picking_2.c @@ -1567,7 +1567,7 @@ static void sub_8155EA0(void) DmaClear16(3, (void *)PLTT, PLTT_SIZE); SetGpuReg(REG_OFFSET_DISPCNT, 0); ResetBgsAndClearDma3BusyFlags(FALSE); - InitBgsFromTemplates(0, sUnknown_847565C, ARRAY_COUNT(sUnknown_847565C)); + InitBgsFromTemplates(0, sUnknown_847565C, NELEMS(sUnknown_847565C)); ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); ChangeBgX(1, 0, 0); |