From 6a44f96575629b0e41eb78df1a568dac7b09679f Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Sun, 1 Sep 2024 14:54:29 +0100
Subject: [PATCH] Add Unown ! and ?

Taken from https://github.com/pret/pokecrystal/wiki/Add-a-new-Unown-form

There's some embedded palette errors that need fixing.
---
 constants/engine_flags.asm                  |   2 +-
 constants/pokemon_constants.asm             |   2 ++
 data/pokemon/unown_pic_pointers.asm         |   4 +++
 data/pokemon/unown_words.asm                |   5 ++++
 data/wild/unlocked_unowns.asm               |   3 +++
 engine/gfx/load_pics.asm                    |  13 +++++++---
 engine/pokedex/pokedex.asm                  |  26 +++++++++++---------
 gfx/font/unown_font.png                     | Bin 294 -> 312 bytes
 gfx/pics.asm                                |   5 +++-
 gfx/pokemon/munchlax/credit.txt             |   2 ++
 gfx/pokemon/unown_anim_pointers.asm         |   2 ++
 gfx/pokemon/unown_anims.asm                 |   2 ++
 gfx/pokemon/unown_bitmask_pointers.asm      |   2 ++
 gfx/pokemon/unown_bitmasks.asm              |   2 ++
 gfx/pokemon/unown_exclamation/anim.asm      |   9 +++++++
 gfx/pokemon/unown_exclamation/anim_idle.asm |   6 +++++
 gfx/pokemon/unown_exclamation/back.png      | Bin 0 -> 419 bytes
 gfx/pokemon/unown_exclamation/credit.txt    |   1 +
 gfx/pokemon/unown_exclamation/front.png     | Bin 0 -> 1570 bytes
 gfx/pokemon/unown_frame_pointers.asm        |   2 ++
 gfx/pokemon/unown_frames.asm                |   2 ++
 gfx/pokemon/unown_idle_pointers.asm         |   2 ++
 gfx/pokemon/unown_idles.asm                 |   2 ++
 gfx/pokemon/unown_question/anim.asm         |   8 ++++++
 gfx/pokemon/unown_question/anim_idle.asm    |   6 +++++
 gfx/pokemon/unown_question/back.png         | Bin 0 -> 481 bytes
 gfx/pokemon/unown_question/credit.txt       |   1 +
 gfx/pokemon/unown_question/front.png        | Bin 0 -> 1285 bytes
 ram/wram.asm                                |   2 +-
 29 files changed, 93 insertions(+), 18 deletions(-)
 create mode 100644 gfx/pokemon/munchlax/credit.txt
 create mode 100644 gfx/pokemon/unown_exclamation/anim.asm
 create mode 100644 gfx/pokemon/unown_exclamation/anim_idle.asm
 create mode 100644 gfx/pokemon/unown_exclamation/back.png
 create mode 100644 gfx/pokemon/unown_exclamation/credit.txt
 create mode 100644 gfx/pokemon/unown_exclamation/front.png
 create mode 100644 gfx/pokemon/unown_question/anim.asm
 create mode 100644 gfx/pokemon/unown_question/anim_idle.asm
 create mode 100644 gfx/pokemon/unown_question/back.png
 create mode 100644 gfx/pokemon/unown_question/credit.txt
 create mode 100644 gfx/pokemon/unown_question/front.png

diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm
index 5cd615f..c112f73 100644
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -67,7 +67,7 @@
 	const ENGINE_UNLOCKED_UNOWNS_L_TO_R
 	const ENGINE_UNLOCKED_UNOWNS_S_TO_W
 	const ENGINE_UNLOCKED_UNOWNS_X_TO_Z
-	const ENGINE_UNLOCKED_UNOWNS_UNUSED_4
+	const ENGINE_UNLOCKED_UNOWNS_EXCLAMATION_QUESTION
 	const ENGINE_UNLOCKED_UNOWNS_UNUSED_5
 	const ENGINE_UNLOCKED_UNOWNS_UNUSED_6
 	const ENGINE_UNLOCKED_UNOWNS_UNUSED_7
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index af9d4b9..3033e0d 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -466,4 +466,6 @@ endc
 	const UNOWN_X ; 24
 	const UNOWN_Y ; 25
 	const UNOWN_Z ; 26
+	const UNOWN_EXCLAMATION ; 27
+	const UNOWN_QUESTION ; 28
 DEF NUM_UNOWN EQU const_value - 1 ; 26
diff --git a/data/pokemon/unown_pic_pointers.asm b/data/pokemon/unown_pic_pointers.asm
index 3617ddf..0bfec0b 100644
--- a/data/pokemon/unown_pic_pointers.asm
+++ b/data/pokemon/unown_pic_pointers.asm
@@ -53,4 +53,8 @@ UnownPicPointers::
 	dba UnownYBackpic
 	dba UnownZFrontpic
 	dba UnownZBackpic
+	dba UnownExclamationFrontpic
+	dba UnownExclamationBackpic
+	dba UnownQuestionFrontpic
+	dba UnownQuestionBackpic
 	assert_table_length NUM_UNOWN
diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm
index f6acb4a..d0eda5c 100644
--- a/data/pokemon/unown_words.asm
+++ b/data/pokemon/unown_words.asm
@@ -35,6 +35,8 @@ UnownWords:
 	dw UnownWordX
 	dw UnownWordY
 	dw UnownWordZ
+	dw UnownWordExclamation
+	dw UnownWordQuestion
 	assert_table_length NUM_UNOWN + 1
 
 UnownWordA: unownword "ANGRY"
@@ -63,3 +65,6 @@ UnownWordW: unownword "WANT"
 UnownWordX: unownword "XXXXX"
 UnownWordY: unownword "YIELD"
 UnownWordZ: unownword "ZOOM"
+UnownWordExclamation: unownword "(((((" ; "!!!!!" since "Z" + 1 == "("
+UnownWordQuestion: unownword ")))))" ; "?????" since "Z" + 2 == ")"
+; these use the words from the hgss unown report
diff --git a/data/wild/unlocked_unowns.asm b/data/wild/unlocked_unowns.asm
index 4c0d838..1ed2397 100644
--- a/data/wild/unlocked_unowns.asm
+++ b/data/wild/unlocked_unowns.asm
@@ -13,6 +13,7 @@ UnlockedUnownLetterSets:
 	dw .Set_L_R ; UNLOCKED_UNOWNS_L_TO_R_F
 	dw .Set_S_W ; UNLOCKED_UNOWNS_S_TO_W_F
 	dw .Set_X_Z ; UNLOCKED_UNOWNS_X_TO_Z_F
+	dw .Set_Exclamation_Question ; UNLOCKED_UNOWNS_EXCLAMATION_QUESTION
 	assert_table_length NUM_UNLOCKED_UNOWN_SETS
 
 .Set_A_K:
@@ -23,3 +24,5 @@ UnlockedUnownLetterSets:
 	unown_set S, T, U, V, W
 .Set_X_Z:
 	unown_set X, Y, Z
+.Set_Exclamation_Question ; I'm not the biggest fan of this - could easily just put them with XYZ, but it seems in HGSS it was made more awkward, so let's do it this way. Could also be used to place them somewhere else - Tanoby Ruins?
+	unown_set EXCLAMATION, QUESTION
diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm
index 9cebf5d..537d0c4 100644
--- a/engine/gfx/load_pics.asm
+++ b/engine/gfx/load_pics.asm
@@ -1,3 +1,5 @@
+; Modified to add ! and ?
+; Used https://github.com/pret/pokecrystal/wiki/Add-a-new-Unown-form
 GetUnownLetter:
 ; Return Unown letter in wUnownLetter based on DVs at hl
 
@@ -31,20 +33,25 @@ GetUnownLetter:
 	srl a
 	or b
 
-; Divide by 10 to get 0-25
+; Divide by 9 to get 0-28 - changed to add ! and ?
 	ldh [hDividend + 3], a
 	xor a
 	ldh [hDividend], a
 	ldh [hDividend + 1], a
 	ldh [hDividend + 2], a
-	ld a, $ff / NUM_UNOWN + 1
+	ld a, 9
 	ldh [hDivisor], a
 	ld b, 4
 	call Divide
 
-; Increment to get 1-26
+; Increment to get 1-29
 	ldh a, [hQuotient + 3]
 	inc a
+; The valid range is 1-28, so use UNOWN_E (5) instead of 29
+	cp NUM_UNOWN + 1
+	jr c, .valid
+	ld a, UNOWN_E
+.valid
 	ld [wUnownLetter], a
 	ret
 
diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm
index 3f7eb75..096cac2 100644
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -1005,7 +1005,7 @@ Pokedex_UnownModeEraseCursor:
 
 Pokedex_UnownModePlaceCursor:
 	ld a, [wDexCurUnownIndex]
-	ld c, FIRST_UNOWN_CHAR + NUM_UNOWN ; diamond cursor
+	ld c, $5c ; diamond cursor
 
 Pokedex_UnownModeUpdateCursorGfx:
 	ld e, a
@@ -1468,14 +1468,14 @@ Pokedex_PlaceSearchResultsTypeStrings:
 Pokedex_DrawUnownModeBG:
 	call Pokedex_FillBackgroundColor2
 	hlcoord 2, 1
-	lb bc, 10, 13
+	lb bc, 10, 14
 	call Pokedex_PlaceBorder
 	hlcoord 2, 14
-	lb bc, 1, 13
+	lb bc, 1, 14
 	call Pokedex_PlaceBorder
 	hlcoord 2, 15
 	ld [hl], $3d
-	hlcoord 16, 15
+	hlcoord 17, 15
 	ld [hl], $3e
 	hlcoord 6, 5
 	call Pokedex_PlaceFrontpicAtHL
@@ -1529,14 +1529,16 @@ UnownModeLetterAndCursorCoords:
 	dwcoord  11, 3,  11, 2 ; P
 	dwcoord  12, 3,  12, 2 ; Q
 	dwcoord  13, 3,  13, 2 ; R
-	dwcoord  14, 3,  15, 2 ; S
-	dwcoord  14, 4,  15, 4 ; T
-	dwcoord  14, 5,  15, 5 ; U
-	dwcoord  14, 6,  15, 6 ; V
-	dwcoord  14, 7,  15, 7 ; W
-	dwcoord  14, 8,  15, 8 ; X
-	dwcoord  14, 9,  15, 9 ; Y
-	dwcoord  14,10,  15,10 ; Z
+	dwcoord  14, 3,  14, 2 ; S
+	dwcoord  15, 3,  16, 2 ; T
+	dwcoord  15, 4,  16, 4 ; U
+	dwcoord  15, 5,  16, 5 ; V
+	dwcoord  15, 6,  16, 6 ; W
+	dwcoord  15, 7,  16, 7 ; X
+	dwcoord  15, 8,  16, 8 ; Y
+	dwcoord  15, 9,  16, 9 ; Z
+	dwcoord  15,10,  16,10 ; !
+	dwcoord  15,11,  16,11 ; ?
 
 Pokedex_FillBackgroundColor2:
 	hlcoord 0, 0
diff --git a/gfx/font/unown_font.png b/gfx/font/unown_font.png
index 5ac70b8079b6bc06d7aa2945d4c44ec803be33c5..b649ea094166ab302a3549ad3a71c20545c13fc6 100644
GIT binary patch
delta 298
zcmV+_0oDGd0=NQ@7k^L!00000Y^U;s00030Nkl<Zc-l=;K?=k$2o!o<@GF5_3w}M2
zYr(GwUIXrE+R_{<>dZJXrKm$IOiai`^-{`D>j<j-pzJgum&|E$As-&cF@nrZ<RI-J
zfY+}njG`)ffu3*V@8zY~0#90pm?}@rvA>DwCY8;o-r_>uynmD`!br%aB4xKj4n0X{
zE5-z2hR5QEry5cB`+4zN$NhR8gvw4ow~0c&^TwVhQoO$BRW@Y!KrfanBLwT~6FuyS
zBvt^~Bo|xzOcVXeB?p|GP6pig_*}u0249JEwSBSoRX!?`djiiNUhUIlMM3UxBf(qS
wi%ERm&rn3jQX~BZgX_|ClxAhAQN=|50UK#l?KF^QJ^%m!07*qoM6N<$f`w0t+5i9m

delta 280
zcmV+z0q6d>0;U3x7k@|s00000gCcTr0002(Nkl<Zc-l>oL8`_u2!w@h3tlDQw&2wR
z*#^8yz-_=cn%DAY(O{iVCrVL=b}U^=OU<THewyGilZ!Iblw32W!KHjTj;jYPU#b_G
z001X*DC4IYa)F#5<^6G4Y=hG#C}zgPvh6+4eQ8A_Dz~|m|9@PTDxjxinrhh<ltWI_
z*^WK{jPTg}a%K_rzT1myg7--sTopb3922Gd`t{RKwKzHbD(c$3BNy9^aRuAw6FJO@
zG<HDQGzVMrOcOG5$N?vh(}J%5_}syRI?q(Pt@E&ND?e2<=LF7QuI5?GNeOD!zRvy-
erJ%Ub9e*zSDiO44=WK!i0000<MNUMnLSTYK(t}C>

diff --git a/gfx/pics.asm b/gfx/pics.asm
index 54291e5..ab7acd2 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -711,7 +711,10 @@ UnownRBackpic:       INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
 
 SECTION "Pics 19", ROMX
 
-; Seems to be an accidental copy of the previous bank
+UnownExclamationFrontpic: INCBIN "gfx/pokemon/unown_exclamation/front.animated.2bpp.lz"
+UnownExclamationBackpic:  INCBIN "gfx/pokemon/unown_exclamation/back.2bpp.lz"
+UnownQuestionFrontpic: INCBIN "gfx/pokemon/unown_question/front.animated.2bpp.lz"
+UnownQuestionBackpic:  INCBIN "gfx/pokemon/unown_question/back.2bpp.lz"
 
 BellignanFrontpic:	 INCBIN "gfx/pokemon/bellignan/front.animated.2bpp.lz"
 BellignanBackpic:	 INCBIN "gfx/pokemon/bellignan/back.2bpp.lz"
diff --git a/gfx/pokemon/munchlax/credit.txt b/gfx/pokemon/munchlax/credit.txt
new file mode 100644
index 0000000..b34e14f
--- /dev/null
+++ b/gfx/pokemon/munchlax/credit.txt
@@ -0,0 +1,2 @@
+Taken from here: https://github.com/pret/pokecrystal/wiki/Add-a-new-Pok%C3%A9mon
+Made by SCMidna
\ No newline at end of file
diff --git a/gfx/pokemon/unown_anim_pointers.asm b/gfx/pokemon/unown_anim_pointers.asm
index 334a5f9..208cb50 100644
--- a/gfx/pokemon/unown_anim_pointers.asm
+++ b/gfx/pokemon/unown_anim_pointers.asm
@@ -26,4 +26,6 @@ UnownAnimationPointers:
 	dw UnownXAnimation
 	dw UnownYAnimation
 	dw UnownZAnimation
+	dw UnownExclamationAnimation
+	dw UnownQuestionAnimation
 	assert_table_length NUM_UNOWN
diff --git a/gfx/pokemon/unown_anims.asm b/gfx/pokemon/unown_anims.asm
index 6aa239e..ebfe93c 100644
--- a/gfx/pokemon/unown_anims.asm
+++ b/gfx/pokemon/unown_anims.asm
@@ -24,3 +24,5 @@ UnownWAnimation: INCLUDE "gfx/pokemon/unown_w/anim.asm"
 UnownXAnimation: INCLUDE "gfx/pokemon/unown_x/anim.asm"
 UnownYAnimation: INCLUDE "gfx/pokemon/unown_y/anim.asm"
 UnownZAnimation: INCLUDE "gfx/pokemon/unown_z/anim.asm"
+UnownExclamationAnimation: INCLUDE "gfx/pokemon/unown_exclamation/anim.asm"
+UnownQuestionAnimation: INCLUDE "gfx/pokemon/unown_question/anim.asm"
diff --git a/gfx/pokemon/unown_bitmask_pointers.asm b/gfx/pokemon/unown_bitmask_pointers.asm
index bfdc3ea..0946e23 100644
--- a/gfx/pokemon/unown_bitmask_pointers.asm
+++ b/gfx/pokemon/unown_bitmask_pointers.asm
@@ -26,4 +26,6 @@ UnownBitmasksPointers:
 	dw UnownXBitmasks
 	dw UnownYBitmasks
 	dw UnownZBitmasks
+	dw UnownExclamationBitmasks
+	dw UnownQuestionBitmasks
 	assert_table_length NUM_UNOWN
diff --git a/gfx/pokemon/unown_bitmasks.asm b/gfx/pokemon/unown_bitmasks.asm
index 99604c9..fae7c49 100644
--- a/gfx/pokemon/unown_bitmasks.asm
+++ b/gfx/pokemon/unown_bitmasks.asm
@@ -24,3 +24,5 @@ UnownWBitmasks: INCLUDE "gfx/pokemon/unown_w/bitmask.asm"
 UnownXBitmasks: INCLUDE "gfx/pokemon/unown_x/bitmask.asm"
 UnownYBitmasks: INCLUDE "gfx/pokemon/unown_y/bitmask.asm"
 UnownZBitmasks: INCLUDE "gfx/pokemon/unown_z/bitmask.asm"
+UnownExclamationBitmasks: INCLUDE "gfx/pokemon/unown_exclamation/bitmask.asm"
+UnownQuestionBitmasks: INCLUDE "gfx/pokemon/unown_question/bitmask.asm"
diff --git a/gfx/pokemon/unown_exclamation/anim.asm b/gfx/pokemon/unown_exclamation/anim.asm
new file mode 100644
index 0000000..fd6c3df
--- /dev/null
+++ b/gfx/pokemon/unown_exclamation/anim.asm
@@ -0,0 +1,9 @@
+	frame 0, 09
+	frame 1, 09
+	frame 2, 09
+	frame 3, 05
+	frame 2, 05
+	frame 4, 05
+	frame 1, 05
+	frame 1, 05
+	endanim
\ No newline at end of file
diff --git a/gfx/pokemon/unown_exclamation/anim_idle.asm b/gfx/pokemon/unown_exclamation/anim_idle.asm
new file mode 100644
index 0000000..adb95e8
--- /dev/null
+++ b/gfx/pokemon/unown_exclamation/anim_idle.asm
@@ -0,0 +1,6 @@
+	frame 0, 18
+	setrepeat 2
+	frame 5, 05
+	frame 0, 05
+	dorepeat 2
+	endanim
\ No newline at end of file
diff --git a/gfx/pokemon/unown_exclamation/back.png b/gfx/pokemon/unown_exclamation/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..76ce7d417e80cb1e43317a313a61d3f890dd98f3
GIT binary patch
literal 419
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DinK$vl=HlH+5gN3JyV@QVc+gX8p%?dniH}jVEzlr$uqR&+R
z?nbkECQhN{5lea__b=I4IN{6krrc+5jg$4x+>O`o=9=Kf>amz<Ng(5;6%3gn4JOMu
zGH$mUb9S*R6lAZRxomnz$7Q*N`|7LuB~46JO?q9OpYYh3@9JC%*P!Jv>%Z8Bumc;#
zOZTZ+xm@S%R?;*5(`G0mBep@bB1`7#%Z2~hFKpOzfAQz%5AK)>yjz|iGiz>C%6mqe
z+nFC;97#|R6*(|x)^DZg0~UJW7A$;8^}QwUW~Oj<gwJ<6t23ehVnt~7x({+HjEd46
zHZ1Xz77Cq^bU3iF^C915o`Pk`7Do-Xi`|sGVV${6W9IH|@ky+z+@|63G5e+{h!$Ha
zSv0Y$Fg^%(?W&HMs-f}khH~v;KIiAQa$mAVBYS=_&2dc3nD`|&6Bw`zp00i_>zopr
E0JWT-q5uE@

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/unown_exclamation/credit.txt b/gfx/pokemon/unown_exclamation/credit.txt
new file mode 100644
index 0000000..eb84c56
--- /dev/null
+++ b/gfx/pokemon/unown_exclamation/credit.txt
@@ -0,0 +1 @@
+Taken from Rangi's Tutorial: https://github.com/pret/pokecrystal/wiki/Add-a-new-Unown-form
\ No newline at end of file
diff --git a/gfx/pokemon/unown_exclamation/front.png b/gfx/pokemon/unown_exclamation/front.png
new file mode 100644
index 0000000000000000000000000000000000000000..0358dc64fda7f1a516b8467170dcc27bfdac1c81
GIT binary patch
literal 1570
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
UsdSv1fB*mh07*qoM6N<$g6SvGdjJ3c

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/unown_frame_pointers.asm b/gfx/pokemon/unown_frame_pointers.asm
index 245cff0..7934e17 100644
--- a/gfx/pokemon/unown_frame_pointers.asm
+++ b/gfx/pokemon/unown_frame_pointers.asm
@@ -26,4 +26,6 @@ UnownFramesPointers:
 	dw UnownXFrames
 	dw UnownYFrames
 	dw UnownZFrames
+	dw UnownExclamationFrames
+	dw UnownQuestionFrames
 	assert_table_length NUM_UNOWN
diff --git a/gfx/pokemon/unown_frames.asm b/gfx/pokemon/unown_frames.asm
index d5ed3d6..cac4786 100644
--- a/gfx/pokemon/unown_frames.asm
+++ b/gfx/pokemon/unown_frames.asm
@@ -26,3 +26,5 @@ UnownWFrames: INCLUDE "gfx/pokemon/unown_w/frames.asm"
 UnownXFrames: INCLUDE "gfx/pokemon/unown_x/frames.asm"
 UnownYFrames: INCLUDE "gfx/pokemon/unown_y/frames.asm"
 UnownZFrames: INCLUDE "gfx/pokemon/unown_z/frames.asm"
+UnownExclamationFrames: INCLUDE "gfx/pokemon/unown_exclamation/frames.asm"
+UnownQuestionFrames: INCLUDE "gfx/pokemon/unown_question/frames.asm"
diff --git a/gfx/pokemon/unown_idle_pointers.asm b/gfx/pokemon/unown_idle_pointers.asm
index f0af7c6..29a59a3 100644
--- a/gfx/pokemon/unown_idle_pointers.asm
+++ b/gfx/pokemon/unown_idle_pointers.asm
@@ -26,4 +26,6 @@ UnownAnimationIdlePointers:
 	dw UnownXAnimationIdle
 	dw UnownYAnimationIdle
 	dw UnownZAnimationIdle
+	dw UnownExclamationAnimationIdle
+	dw UnownQuestionAnimationIdle
 	assert_table_length NUM_UNOWN
diff --git a/gfx/pokemon/unown_idles.asm b/gfx/pokemon/unown_idles.asm
index 6964a48..e020f0c 100644
--- a/gfx/pokemon/unown_idles.asm
+++ b/gfx/pokemon/unown_idles.asm
@@ -24,3 +24,5 @@ UnownWAnimationIdle: INCLUDE "gfx/pokemon/unown_w/anim_idle.asm"
 UnownXAnimationIdle: INCLUDE "gfx/pokemon/unown_x/anim_idle.asm"
 UnownYAnimationIdle: INCLUDE "gfx/pokemon/unown_y/anim_idle.asm"
 UnownZAnimationIdle: INCLUDE "gfx/pokemon/unown_z/anim_idle.asm"
+UnownExclamationAnimationIdle: INCLUDE "gfx/pokemon/unown_exclamation/anim_idle.asm"
+UnownQuestionAnimationIdle: INCLUDE "gfx/pokemon/unown_question/anim_idle.asm"
diff --git a/gfx/pokemon/unown_question/anim.asm b/gfx/pokemon/unown_question/anim.asm
new file mode 100644
index 0000000..80d1dbe
--- /dev/null
+++ b/gfx/pokemon/unown_question/anim.asm
@@ -0,0 +1,8 @@
+	frame 0, 09
+	setrepeat 3
+	frame 1, 05
+	frame 2, 05
+	frame 1, 05
+	frame 0, 05
+	dorepeat 2
+	endanim
\ No newline at end of file
diff --git a/gfx/pokemon/unown_question/anim_idle.asm b/gfx/pokemon/unown_question/anim_idle.asm
new file mode 100644
index 0000000..0b94de1
--- /dev/null
+++ b/gfx/pokemon/unown_question/anim_idle.asm
@@ -0,0 +1,6 @@
+	frame 0, 13
+	setrepeat 2
+	frame 3, 05
+	frame 0, 05
+	dorepeat 2
+	endanim
\ No newline at end of file
diff --git a/gfx/pokemon/unown_question/back.png b/gfx/pokemon/unown_question/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..e727d2b3e49a2b902dea2b6968bf63a3fd76baa6
GIT binary patch
literal 481
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DinK$vl=HlH+5Lz$<GV@QVc+gZMShYWaHnYU}5E?Tom=lCqW
zhY>#UqWw<G0*)(|X?^kx<TjZU|0lZhaPqOYGZycEH%;xpEHtzx^GngrU754~EKkqd
zE?*xm!7<@Nscp;u=)(s8{;q4(Xz^RVdH4P6{&EM5qg2`ha{km@`uA?8mNUo0M%^u2
z4n2|0VKkNEKa#rT{dH&e+3#~x*1y_sWj7__$_#dS&BasrA6w{zhl)vdK6tXxG)_!T
z@F~MA5x;$GM?851i~VMBpVV5cW+?yISyM7($<~+y<v)D8`_&3}eCT02$z*Zt@+E<Z
zSJ)598AxxB=?s6*Ua{^;##z6lJxh)pTih5Z+|4R@Blr_*yRO2#+C!No*+#mS<{MdB
zmg_HEB7US+!6x+d$q<!>J&cD>{*d8+s_>10hi|&1w_$3-tiI!_+|}L(za0o$TIqi7
zp6?z3F(LgaHnkgm2R{1UX1Qouq1Es6a)s?z>rS2&OX%G(@oHo7{&w%@+`HUUb^)V>
N!PC{xWt~$(69AdK$*2GT

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/unown_question/credit.txt b/gfx/pokemon/unown_question/credit.txt
new file mode 100644
index 0000000..eb84c56
--- /dev/null
+++ b/gfx/pokemon/unown_question/credit.txt
@@ -0,0 +1 @@
+Taken from Rangi's Tutorial: https://github.com/pret/pokecrystal/wiki/Add-a-new-Unown-form
\ No newline at end of file
diff --git a/gfx/pokemon/unown_question/front.png b/gfx/pokemon/unown_question/front.png
new file mode 100644
index 0000000000000000000000000000000000000000..e368ab7f829fc20f2f9aaa57ade62545c9d7e92c
GIT binary patch
literal 1285
zcmeAS@N?(olHy`uVBq!ia0vp^8bG{&gAGX5$?DwzQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0XBj({-ZRBb+Kpqg2pE{-7;ac^fc=G{>caJ_ub&@!dy#I)y5
zCNmRe&*YyN`f<rb-Z#he<!7tLe!V{b(COx%vHkt2+^cdNryl3_i%h$B@7}AM;c@Zt
z{gWI57IMfO|Ngza?qdGcW1D?uKI-r9ulgo??3|EX;!Ba}!ezUb#6&ap$%r5PQq&oC
zhb?d#SCiJxnwg1NqTifqzqarPF0bP3uko0$V2{jOo?zC!Q?%IaKZ#6t$<{t+bWm;C
ziG!C|CQexytb4IqL*ti3@C4TCq<s~>Vx9#q>q5hf_TEkEerm7U<zoBWJ>TZf1({in
zJJwgMUK=-S@4gqdGljm0=jHaLCvTHg)Om4vb5T#>8_%0%Dn~V6CkR^f)pg(ZTGYk&
zSa?h3jU^WOF?*l$Svt;++W8?pYmWI6+eA^`#L0`+34MHdGsWFQ)x$|l=+)9IufM<F
zyR@tAqh`>Ti4vt|a;mx<ww;?#ooH0yP@WWNIf3<Ime+c@1%k`|Y488zP;w*Qc?B@s
zbXRO*4c)fj)D?fB|D`PQrJs(=HfiN>Y1GZp|0TLCXZwNtx4D{=K8YBwb$wv*eYfQ8
zXQof5uUN~_zKnzOYtW*8?=7d^@Gj?wTj-@1pEe_^^=Z?;eLTUFV-6|5cT~~Pceg$q
z;;6s$)WLom71fKkx;Fc4=+rD?H}&kiXX}3P_>3l<8^WKDW^eLnQZ8D%Y0~d%q5I-{
z)q|V<9a?+#W6qgv$}Oz5RbhRGeYTpn`<7Uw%IYv3znC8o?HO`0v8Kt4cecp$-qqjl
zD5_@!Ym5K$>HXZc<>{(Lia9}7LY3@nXTRZC$>Mp!$!YJDs=xpCZV$O=VCULpC$#w7
zvBgVR7pfPANm@=|NpvyNX5XX`<NNX|v&o@<^ITGY-dE9z4uB*qZ~#rK5xbo~=Z1mD
zY&MqkgWtLy9ly0m|Fp@$c{A3oc_QMdm-oMF@m=9_IdRK#elFy^wIt2Mud?g5-!6{Y
zpUrcNe~F|xs@%H2KP*qm^rY$!%|1VUA90taPeogdeMG+mt&-9Cze2m{*4{{0)v92x
zi_>?$*9pGnsQ=7+W)dVd71jGc`n~9Tir0ns9a}Bu_1-LN*|5O>{3*j@8`V>9PZU|c
zrWqJJx2pU0g$ae0NX%d0dsyvg<>Obj<tI3AT{+ciAN+XF!}-qyLQPtHyLNdUS)M*w
zR&lBVXQao9=|Su7@BcncOX}EikBja}S8i5J*`n}8<(!r>`y_=PkF=)_VlAsR_f|Ey
z-MBw_h0gs?t6_;|*_!5m^^PVHE1n*ea%8nTci{c+sI4D$f|u>sE}mmhHthq4_wpNE
z##dFJ-r_2FvV&vUbWmE!p=vfG7%=OaKb>28*u+uWJh-H)>2mOzVA)6S<ThWe&TToa
zZ~Xtc)7=-UC1HEanqiq_q3#9SjW2AU&-`V2<gV?^#8nS!;^O`>X}r{neYHQ<3RrY8
Nc)I$ztaD0e0sz{oRi^*|

literal 0
HcmV?d00001

diff --git a/ram/wram.asm b/ram/wram.asm
index 3a04ad1..3543559 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -3328,7 +3328,7 @@ wPartyMon{d:n}Nickname:: ds MON_NAME_LENGTH
 endr
 wPartyMonNicknamesEnd::
 
-	ds 22
+	ds 20 ; modified to fit the new unown
 
 wPokedexCaught:: flag_array NUM_POKEMON
 wEndPokedexCaught::