Skip to content

Commit

Permalink
??? gfx added for EVO page
Browse files Browse the repository at this point in the history
  • Loading branch information
Nayru62 authored and xaerochill committed Aug 15, 2024
1 parent d954619 commit 674c0e4
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 1 deletion.
53 changes: 52 additions & 1 deletion engine/pokedex/pokedex_evolution_page.asm
Original file line number Diff line number Diff line change
Expand Up @@ -611,15 +611,26 @@ EVO_place_Mon_Types:
ld [wCurSpecies], a
call GetBaseData

IF EVO_HIDE_UNSEEN == TRUE
call EVO_CheckSeenMon
jr nz, .seen_done_1
ld c, 18 ; index of ???
jr .skip_to_unk_1
.seen_done_1
ENDC

; set up the palette based on the current mon slot
ld a, [wBaseType1]

IF SWAP_DARK_GHOST_TYPES == TRUE
call Evo_page_Swap_Dark_Ghost
ENDC

ld c, a
predef GetMonTypeIndex

IF EVO_HIDE_UNSEEN == TRUE
.skip_to_unk_1
ENDC
ld d, c
ld a, [wBaseType2]
IF SWAP_DARK_GHOST_TYPES == TRUE
Expand All @@ -629,6 +640,21 @@ ENDC
predef GetMonTypeIndex
ld b, d

IF EVO_HIDE_UNSEEN == TRUE
push de
push bc
call EVO_CheckSeenMon
jr nz, .seen_done_2
pop bc
pop de
ld c, 18 ; index of ???
jr .skip_to_unk_2
.seen_done_2
pop bc
pop de
.skip_to_unk_2
ENDC

IF USE_GEN3_STYLE_TYPE_GFX == TRUE
call .determine_paladdr ; pal 1, 2, 3, or 4
farcall LoadDexTypePals
Expand All @@ -645,6 +671,19 @@ ENDC
ld c, a
predef GetMonTypeIndex
ld a, c

IF EVO_HIDE_UNSEEN == TRUE
push af
call EVO_CheckSeenMon
jr nz, .seen_done_3
pop af ; unload stack
ld a, 18 ; index of ???
jr .done_3
.seen_done_3
pop af
.done_3
ENDC

IF USE_GEN3_STYLE_TYPE_GFX == TRUE
ld hl, TypeLightIconGFX
ld bc, 4 * LEN_2BPP_TILE
Expand Down Expand Up @@ -695,6 +734,18 @@ ENDC
predef GetMonTypeIndex
ld a, c ; type 2

IF EVO_HIDE_UNSEEN == TRUE
push af
call EVO_CheckSeenMon
jr nz, .seen_done_4
pop af
ld a, 18 ; index of ???
jr .skip_to_unk_4
.seen_done_4
pop af
.skip_to_unk_4
ENDC

IF USE_GEN3_STYLE_TYPE_GFX == TRUE
; load type 2 tiles
ld hl, TypeDarkIconGFX ; DexTypeDarkIconGFX
Expand Down
Binary file modified gfx/pokedex/types_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/pokedex/types_light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 674c0e4

Please sign in to comment.