diff options
| -rw-r--r-- | data/predef_pointers.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/color.asm | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index 3a14a19ee..87906597a 100644 --- a/data/predef_pointers.asm +++ b/data/predef_pointers.asm @@ -58,7 +58,7 @@ PredefPointers:: ; 856b add_predef InitSGBBorder ; $30 add_predef LoadSGBLayout add_predef Pokedex_GetArea - add_predef Unused_CheckContestMon + add_predef Unused_CheckShininess add_predef DoBattleTransition add_predef DummyPredef35 add_predef DummyPredef36 diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 6d60357a5..d9b9b1dbc 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -43,37 +43,36 @@ CheckShininess: and a ret -Unused_CheckContestMon: -; Check a mon's DVs at hl in the bug catching contest. -; Return carry if its DVs are good enough to place in the contest. +Unused_CheckShininess: +; Return carry if the DVs at hl are all 10 or higher. ; Attack ld a, [hl] cp 10 << 4 - jr c, .Bad + jr c, .NotShiny ; Defense ld a, [hli] and $f cp 10 - jr c, .Bad + jr c, .NotShiny ; Speed ld a, [hl] cp 10 << 4 - jr c, .Bad + jr c, .NotShiny ; Special ld a, [hl] and $f cp 10 - jr c, .Bad + jr c, .NotShiny -.Good: +.Shiny: scf ret -.Bad: +.NotShiny: and a ret |