From 674c0e4a522e57d165ee382b865eb42f9aaf95ab Mon Sep 17 00:00:00 2001 From: Nayru62 Date: Mon, 12 Aug 2024 20:40:19 -0400 Subject: [PATCH] ??? gfx added for EVO page --- engine/pokedex/pokedex_evolution_page.asm | 53 +++++++++++++++++++++- gfx/pokedex/types_dark.png | Bin 5351 -> 5701 bytes gfx/pokedex/types_light.png | Bin 5131 -> 5701 bytes 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/engine/pokedex/pokedex_evolution_page.asm b/engine/pokedex/pokedex_evolution_page.asm index 03e284835..50dabefce 100644 --- a/engine/pokedex/pokedex_evolution_page.asm +++ b/engine/pokedex/pokedex_evolution_page.asm @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/gfx/pokedex/types_dark.png b/gfx/pokedex/types_dark.png index 212e1c1c3f4297160f864fc57a50ef7c47d5395b..664a4b89b9f73c921d267291d862678cbac01ffe 100644 GIT binary patch delta 1415 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 P00000NkvXXu0mjfa3DOU diff --git a/gfx/pokedex/types_light.png b/gfx/pokedex/types_light.png index 28e056a1dcbc48806f87825419619e6298d77ec6..aa5ee6b2b9d949d3bca520dccc43f2ce113c4eba 100644 GIT binary patch delta 1611 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