diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-24 23:19:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 23:19:48 -0400 |
| commit | 35b68c68ee565b9b232252e4f37ea082e9310560 (patch) | |
| tree | aeacb544f27db8f63b17b7e808b28f4a1e12acde /src/pokemon_summary_screen.c | |
| parent | d8b76e6fb545efd69bfb18322a67243520e4d11d (diff) | |
| parent | 7f70b570dd2e18a34a2c0ee558f404c15c77371c (diff) | |
Merge pull request #404 from PikalaxALT/misc_doc
[PARTIALLY LEAK INFORMED] Miscellaneous cleanup and documentation
Diffstat (limited to 'src/pokemon_summary_screen.c')
| -rw-r--r-- | src/pokemon_summary_screen.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index b2ff1209b..0d10e9948 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -3996,16 +3996,16 @@ static void sub_813995C(void) if (sMonSummaryScreen->savedCallback == CB2_ReturnToTradeMenuFromSummary) { if (sMonSummaryScreen->isEnemyParty == TRUE) - spriteId = CreateMonPicSprite(species, trainerId, personality, 1, 60, 65, 12, 0xffff, 1); + spriteId = CreateMonPicSprite(species, trainerId, personality, TRUE, 60, 65, 12, 0xffff, TRUE); else - spriteId = CreateMonPicSprite_HandleDeoxys(species, trainerId, personality, 1, 60, 65, 12, 0xffff); + spriteId = CreateMonPicSprite_HandleDeoxys(species, trainerId, personality, TRUE, 60, 65, 12, 0xffff); } else { - if (ShouldIgnoreDeoxysForm(3, sLastViewedMonIndex)) - spriteId = CreateMonPicSprite(species, trainerId, personality, 1, 60, 65, 12, 0xffff, 1); + if (ShouldIgnoreDeoxysForm(DEOXYS_CHECK_TRADE_MAIN, sLastViewedMonIndex)) + spriteId = CreateMonPicSprite(species, trainerId, personality, TRUE, 60, 65, 12, 0xffff, TRUE); else - spriteId = CreateMonPicSprite_HandleDeoxys(species, trainerId, personality, 1, 60, 65, 12, 0xffff); + spriteId = CreateMonPicSprite_HandleDeoxys(species, trainerId, personality, TRUE, 60, 65, 12, 0xffff); } FreeSpriteOamMatrix(&gSprites[spriteId]); @@ -4130,7 +4130,7 @@ static void sub_8139DBC(void) } else { - if (ShouldIgnoreDeoxysForm(3, sLastViewedMonIndex)) + if (ShouldIgnoreDeoxysForm(DEOXYS_CHECK_TRADE_MAIN, sLastViewedMonIndex)) sMonSummaryScreen->unk3014 = CreateMonIcon(species, SpriteCallbackDummy, 24, 32, 0, personality, 0); else sMonSummaryScreen->unk3014 = CreateMonIcon(species, SpriteCallbackDummy, 24, 32, 0, personality, 1); |