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/pokemon_summary_screen.c | |
| parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/pokemon_summary_screen.c')
| -rw-r--r-- | src/pokemon_summary_screen.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 03b9c6744..b2ff1209b 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2339,7 +2339,7 @@ static void sub_8136BC4(void) SetGpuReg(REG_OFFSET_DISPCNT, 0); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, sUnknown_8463EFC, ARRAY_COUNT(sUnknown_8463EFC)); + InitBgsFromTemplates(0, sUnknown_8463EFC, NELEMS(sUnknown_8463EFC)); ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); @@ -3902,20 +3902,20 @@ static void sub_8139768(struct Sprite * sprite) { case 0: sprite->pos1.y += sUnknown_8463FBE[sUnknown_203B170->unk00++]; - v0 = ARRAY_COUNT(sUnknown_8463FBE); + v0 = NELEMS(sUnknown_8463FBE); break; case 1: sprite->pos1.y += sUnknown_8463FC1[sUnknown_203B170->unk00++]; - v0 = ARRAY_COUNT(sUnknown_8463FC1); + v0 = NELEMS(sUnknown_8463FC1); break; case 2: sprite->pos1.y += sUnknown_8463FC6[sUnknown_203B170->unk00++]; - v0 = ARRAY_COUNT(sUnknown_8463FC6); + v0 = NELEMS(sUnknown_8463FC6); break; case 3: default: sprite->pos1.y += sUnknown_8463FCD[sUnknown_203B170->unk00++]; - v0 = ARRAY_COUNT(sUnknown_8463FCD); + v0 = NELEMS(sUnknown_8463FCD); break; } @@ -3941,7 +3941,7 @@ static void sub_8139868(struct Sprite * sprite) if (sUnknown_203B170->unk04++ >= 120) { sprite->pos1.x += sUnknown_8463FD4[sUnknown_203B170->unk00]; - if (++sUnknown_203B170->unk00 >= ARRAY_COUNT(sUnknown_8463FD4)) + if (++sUnknown_203B170->unk00 >= NELEMS(sUnknown_8463FD4)) { sUnknown_203B170->unk00 = 0; sUnknown_203B170->unk04 = 0; @@ -3953,7 +3953,7 @@ static void sub_8139868(struct Sprite * sprite) if (sUnknown_203B170->unk04++ >= 90) { sprite->pos1.x += sUnknown_8463FDF[sUnknown_203B170->unk00]; - if (++sUnknown_203B170->unk00 >= ARRAY_COUNT(sUnknown_8463FDF)) + if (++sUnknown_203B170->unk00 >= NELEMS(sUnknown_8463FDF)) { sUnknown_203B170->unk00 = 0; sUnknown_203B170->unk04 = 0; @@ -3965,7 +3965,7 @@ static void sub_8139868(struct Sprite * sprite) if (sUnknown_203B170->unk04++ >= 60) { sprite->pos1.x += sUnknown_8463FEA[sUnknown_203B170->unk00]; - if (++sUnknown_203B170->unk00 >= ARRAY_COUNT(sUnknown_8463FEA)) + if (++sUnknown_203B170->unk00 >= NELEMS(sUnknown_8463FEA)) { sUnknown_203B170->unk00 = 0; sUnknown_203B170->unk04 = 0; @@ -4002,7 +4002,7 @@ static void sub_813995C(void) } else { - if (sub_804455C(3, sLastViewedMonIndex)) + if (ShouldIgnoreDeoxysForm(3, sLastViewedMonIndex)) spriteId = CreateMonPicSprite(species, trainerId, personality, 1, 60, 65, 12, 0xffff, 1); else spriteId = CreateMonPicSprite_HandleDeoxys(species, trainerId, personality, 1, 60, 65, 12, 0xffff); @@ -4130,7 +4130,7 @@ static void sub_8139DBC(void) } else { - if (sub_804455C(3, sLastViewedMonIndex)) + if (ShouldIgnoreDeoxysForm(3, sLastViewedMonIndex)) sMonSummaryScreen->unk3014 = CreateMonIcon(species, SpriteCallbackDummy, 24, 32, 0, personality, 0); else sMonSummaryScreen->unk3014 = CreateMonIcon(species, SpriteCallbackDummy, 24, 32, 0, personality, 1); |