Nuuk sprites 2

Adds sprites for Electivire, Magmortar, Honchkrow, Porygon-Z and Wyrdeer!

Had to rearrange some things in both main.asm and layout.link but hopefully it won't break anything...

README.md

@@ -97,7 +97,7 @@ Additionally, there have been many wild encounter tweaks. View this document for
 - Zeta_Null: Topaz sprites, numerous tileset bits, Omegadge, 
 - Martha's Against Humanity: Shi-Shi, Fossil Aerodactyl, Fossil Kabutops
 - EyeDonutz: Walking Wake
-- nuuk: (WIP) Azurill, Farigiraf, Glaceon, Leafeon, Magnezone, Sylveon, Togekiss
+- nuuk: (WIP) Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer
 - SCMidna: Munchlax
 - Pokemon October et al: Bellignan, Caretorker, Inoshika, Bipulla, Sonegg, Kolta, Coinpur, Dodaerie, Bundra, Kiwooked, Koalyptus, Trebir
 - Tom Wang: Gold/Chris running sprite

gfx/pokemon/electivire/anim.asm

@@ -1 +1,11 @@
+	frame 1, 08
+	frame 2, 24
+	setrepeat 4
+	frame 3, 03
+	frame 2, 03
+	dorepeat 3
+	setrepeat 2
+	frame 3, 06
+	frame 2, 06
+	dorepeat 7
 	endanim

gfx/pokemon/electivire/anim_idle.asm

@@ -1 +1,6 @@
+	setrepeat 2
+	frame 4, 06
+	frame 0, 06
+	dorepeat 1
+	frame 5, 08
 	endanim

gfx/pokemon/electivire/shiny.pal

@@ -1,2 +1,4 @@
-	RGB 22, 22, 12
+
-	RGB 07, 15, 25
+	RGB 31, 25, 00
+	RGB 18, 20, 00
+

gfx/pokemon/honchkrow/anim.asm

@@ -1 +1,7 @@
+	frame 0, 04
+	frame 1, 52
+	setrepeat 2
+	frame 2, 08
+	frame 3, 08
+	dorepeat 3
 	endanim

gfx/pokemon/honchkrow/anim_idle.asm

@@ -1 +1,2 @@
+	frame 4, 16
 	endanim

gfx/pokemon/honchkrow/shiny.pal

@@ -1,2 +1,4 @@
-	RGB 22, 22, 12
+
-	RGB 07, 15, 25
+	RGB 29, 30, 03
+	RGB 21, 05, 19
+

gfx/pokemon/magmortar/anim.asm

@@ -1 +1,7 @@
+	frame 0, 04
+	frame 1, 08
+	setrepeat 4
+	frame 2, 06
+	frame 3, 06
+	dorepeat 3
 	endanim

gfx/pokemon/magmortar/anim_idle.asm

@@ -1 +1,6 @@
+	setrepeat 2
+	frame 4, 06
+	frame 0, 06
+	dorepeat 1
+	frame 5, 08
 	endanim

gfx/pokemon/magmortar/shiny.pal

@@ -1,2 +1,4 @@
-	RGB 22, 22, 12
+
-	RGB 07, 15, 25
+	RGB 31, 14, 30
+	RGB 24, 04, 14
+

gfx/pokemon/porygon_z/anim.asm

@@ -1 +1,12 @@
+	frame 1, 16
+	frame 2, 06
+	frame 0, 06
+	frame 2, 06
+	setrepeat 3
+	frame 3, 04
+	frame 0, 04
+	dorepeat 5
+	frame 3, 06
+	frame 0, 06
+	frame 3, 06
 	endanim

gfx/pokemon/porygon_z/anim_idle.asm

@@ -1 +1,2 @@
+	frame 3, 08
 	endanim

gfx/pokemon/porygon_z/shiny.pal

@@ -1,2 +1,5 @@
-	RGB 22, 22, 12
+
-	RGB 07, 15, 25
+	RGB 08, 11, 23
+	RGB 20, 19, 24
+
+

gfx/pokemon/wyrdeer/anim.asm

@@ -1 +1,11 @@
+	frame 0, 04
+	frame 1, 20
+	frame 2, 04
+	frame 1, 06
+	frame 2, 06
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	frame 4, 06
+	dorepeat 6
 	endanim

gfx/pokemon/wyrdeer/anim_idle.asm

@@ -1 +1,6 @@
+	frame 5, 08
+	setrepeat 2
+	frame 0, 06
+	frame 6, 06
+	dorepeat 2
 	endanim

gfx/pokemon/wyrdeer/shiny.pal

@@ -1,2 +1,5 @@
-	RGB 22, 22, 12
+		
-	RGB 07, 15, 25
+	RGB 13, 22, 07
+	RGB 12, 01, 04
+
+

layout.link

@@ -152,7 +152,6 @@ ROMX $34
 ROMX $35
 	"Pic Animations 2"
 ROMX $36
-	"Font Inversed"
 	"Pic Animations 3"
 ROMX $37
 	"Tileset Data 6"
@@ -176,6 +175,7 @@ ROMX $3e
 ROMX $3f
 	"bank3F"
 ROMX $40
+	"Font Inversed"
 	"mobile40"
 ROMX $41
 	"bank41"

main.asm

@@ -440,14 +440,14 @@ INCLUDE "gfx/pokemon/bitmasks.asm"
 INCLUDE "gfx/pokemon/unown_bitmask_pointers.asm"
 INCLUDE "gfx/pokemon/unown_bitmasks.asm"
 INCLUDE "gfx/pokemon/frame_pointers.asm"
-INCLUDE "gfx/pokemon/kanto_frames.asm"
+INCLUDE "gfx/pokemon/unown_frame_pointers.asm"
+INCLUDE "gfx/pokemon/unown_frames.asm"
 
 
 SECTION "Pic Animations 3", ROMX
 
+INCLUDE "gfx/pokemon/kanto_frames.asm"
 INCLUDE "gfx/pokemon/johto_frames.asm"
-INCLUDE "gfx/pokemon/unown_frame_pointers.asm"
-INCLUDE "gfx/pokemon/unown_frames.asm"
 
 
 SECTION "bank38", ROMX