pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revise constants in CheckShininess

Browse Source
This commit is contained in:
Rangi 2022-10-12 21:41:08 -04:00
parent 1222ea7def
commit ce004be92c
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
engine/gfx/color.asm
View File

@ -1,9 +1,9 @@
INCLUDE "engine/gfx/sgb_layouts.asm" INCLUDE "engine/gfx/sgb_layouts.asm"
DEF SHINY_ATK_BIT EQU 5 DEF SHINY_ATK_MASK EQU %0010
DEF SHINY_DEF_VAL EQU 10 DEF SHINY_DEF_DV EQU 10
DEF SHINY_SPD_VAL EQU 10 DEF SHINY_SPD_DV EQU 10
DEF SHINY_SPC_VAL EQU 10 DEF SHINY_SPC_DV EQU 10
CheckShininess: CheckShininess:
; Check if a mon is shiny by DVs at bc. ; Check if a mon is shiny by DVs at bc.
@ -14,25 +14,25 @@ CheckShininess:
; Attack ; Attack
ld a, [hl] ld a, [hl]
and 1 << SHINY_ATK_BIT and SHINY_ATK_MASK << 4
jr z, .not_shiny jr z, .not_shiny
; Defense ; Defense
ld a, [hli] ld a, [hli]
and $f and %1111
cp SHINY_DEF_VAL cp SHINY_DEF_DV
jr nz, .not_shiny jr nz, .not_shiny
; Speed ; Speed
ld a, [hl] ld a, [hl]
and $f0 and %1111 << 4
cp SHINY_SPD_VAL << 4 cp SHINY_SPD_DV << 4
jr nz, .not_shiny jr nz, .not_shiny
; Special ; Special
ld a, [hl] ld a, [hl]
and $f and %1111
cp SHINY_SPC_VAL cp SHINY_SPC_DV
jr nz, .not_shiny jr nz, .not_shiny
; shiny ; shiny
@ -53,7 +53,7 @@ Unused_CheckShininess:
; Defense ; Defense
ld a, [hli] ld a, [hli]
and $f and %1111
cp 10 cp 10
jr c, .not_shiny jr c, .not_shiny
@ -64,7 +64,7 @@ Unused_CheckShininess:
; Special ; Special
ld a, [hl] ld a, [hl]
and $f and %1111
cp 10 cp 10
jr c, .not_shiny jr c, .not_shiny