Temp Work for Unown

fellowship-of-the-roms · Sep 26, 2024 · 89eccde · 89eccde
1 parent 93bb36a
commit 89eccde
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm
@@ -2,9 +2,6 @@ GetUnownLetter:
 ; Return Unown letter in wUnownLetter based on Personality Form at hl
 	ld a, [hl]
 	and FORM_MASK
-	jr nz, .not_zero
-	inc a ; PLAIN_FORM will render as A
-.not_zero
 	ld [wUnownLetter], a
 	ret
 
@@ -117,6 +114,10 @@ GetPicIndirectPointer:
 
 .unown
 	ld a, [wUnownLetter]
+	and a
+	jr nz, .is_letter
+	inc a ; PLAIN_FORM will render as A
+.is_letter
 	ld c, a
 	ld b, 0
 	ld hl, UnownPicPointers - 6

diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm
@@ -269,6 +269,10 @@ PokeAnim_InitPicAttributes:
 	ld a, BANK(wUnownLetter)
 	ld hl, wUnownLetter
 	call GetFarWRAMByte
+	and a
+	jr nz, .is_letter
+	inc a ; PLAIN_FORM will render as A
+.is_letter
 	ld [wPokeAnimUnownLetter], a
 
 	call PokeAnim_GetSpeciesOrUnown
@@ -998,6 +1002,10 @@ PokeAnim_GetSpeciesOrUnown:
 	ret
 
 .unown
+	and a
+	jr nz, .is_letter
+	inc a ; PLAIN_FORM will render as A
+.is_letter
 	ld a, [wPokeAnimUnownLetter]
 	ret
 

diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm
@@ -412,6 +412,11 @@ endr
 	rst AddNTimes
 	predef GetUnownLetter
 	farcall UpdateUnownDex
+	ld a, [wFirstUnownSeen]
+	and a
+	jr nz, .done
+	ld a, [wUnownLetter]
+	ld [wFirstUnownSeen], a
 
 .done
 	scf ; When this function returns, the carry flag indicates success vs failure.

diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
@@ -162,21 +162,16 @@ if DEF(_DEBUG)
 	; givepokemove HEADBUTT,   wPartyMon3, 2
 	; givepokemove WATERFALL,  wPartyMon3, 3
 	; misc pokemon for testing
-	givepoke UNOWN, 50
+	givepoke UNOWN, UNOWN_D, 50
 	givepokemove FLY,  wPartyMon1, 0
 	givepokemove MEGA_DRAIN,  wPartyMon1, 1
 	givepokemove LEAF_BLADE,  wPartyMon1, 2
 	givepokemove LEECH_SEED,  wPartyMon1, 3
-	givepoke UNOWN, 50
-	givepoke UNOWN, 50
-	givepoke UNOWN, 50
-	givepoke UNOWN, 50
-	givepoke UNOWN, 50
-	givepoke UNOWN, 50
-	givepoke UNOWN, 50
-	givepoke UNOWN, 50
-	givepoke UNOWN, 50
-	givepoke UNOWN, 50
+	givepoke WURMPLE, 50
+	givepoke WURMPLE, 50
+	givepoke WURMPLE, 50
+	givepoke WURMPLE, 50
+	givepoke WURMPLE, 50
 	; intro events
 	addcellnum PHONE_MOM
 	setmapscene PLAYERS_HOUSE_1F, $1