More Unown Work

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

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm
@@ -2,6 +2,9 @@ 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
 

diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm
@@ -233,11 +233,6 @@ endr
 	and NATURE_MASK
 	ld [de], a
 	inc de
-	ld a, NUM_UNOWN
-	call RandomRange
-	inc a
-	and FORM_MASK
-	ld [de], a
 	inc de
 
 	; Initialize PP.
@@ -1342,6 +1337,13 @@ GivePoke::
 	push bc
 	push de
 	push af
+	ld a, [wCurPartyMon]
+	ld hl, wPartyMon1Form
+	ld bc, PARTYMON_STRUCT_LENGTH
+	rst AddNTimes
+	ld a, [wCurPartyForm]
+	ld [hl], a
+
 	ld a, [wCurItem]
 	and a
 	jr z, .done

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