Shiny Pokedex Fix + Personal Gripe (#79)

* Tossing balls lag back to Crystal levels

* reversed order of text speed options

* fixed shiny palette on pokedex new entry

* fixed shiny palette on pokedex new entry + gamecorner

* added fix to celadon too

---------

Co-authored-by: Thorn Avery <thorn@avery.garden>
This commit is contained in:
thornAvery 2025-09-04 19:48:15 +10:00 committed by GitHub
parent ebaeaa8ca7
commit b632b469c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 55 additions and 7 deletions

View file

@ -236,17 +236,26 @@ SetPlayerPalette:
ret
GameCornerPrizeMonCheckDex:
xor a
ld [wPokedexShinyToggle], a
ld [wWasMonCaught], a
ld a, [wScriptVar]
call CheckCaughtMon
ret nz
ld a, [wScriptVar]
call SetSeenAndCaughtMon
ld a, 1
ld [wWasMonCaught], a
ret
GameCornerPrizeMonShowDex:
ld a, [wWasMonCaught]
cp 0
ret z
call FadeToMenu
ld a, [wScriptVar]
ld [wNamedObjectIndex], a
farcall NewPokedexEntry
call ExitAllMenus
ret
ret
UnusedSetSeenMon:
ld a, [wScriptVar]

View file

@ -532,6 +532,15 @@ PokeBallEffect:
ld a, [wEnemyMonSpecies]
ld [wTempSpecies], a
farcall BattleCheckEnemyShininess
jp c, .shiny
xor a
jp .shinycont
.shiny
xor a
inc a
.shinycont
ld [wPokedexShinyToggle], a
predef NewPokedexEntry
.skip_pokedex

View file

@ -114,9 +114,9 @@ GetOptionPointer:
Options_TextSpeed:
call GetTextSpeed
ldh a, [hJoyPressed]
bit D_LEFT_F, a
jr nz, .LeftPressed
bit D_RIGHT_F, a
jr nz, .RightPressed
bit D_LEFT_F, a
jr z, .NonePressed
ld a, c ; right pressed
cp OPT_TEXT_SPEED_NONE
@ -128,7 +128,7 @@ Options_TextSpeed:
ld a, e
jr .Save
.LeftPressed:
.RightPressed:
ld a, c
and a
jr nz, .Decrease

View file

@ -210,8 +210,24 @@ endr
inc de
ld a, c
ld [de], a
inc de
; Set Shininess for New Dex Entry
dec de
ld b, d
ld c, e
farcall CheckShininess
jp c, .shiny
xor a
jp .shinycont
.shiny
xor a
inc a
.shinycont
ld [wPokedexShinyToggle], a
; Unclobber de
inc de
inc de
; Initialize PP.
push hl
push de