The Swines, A Dragonfly and the changed Giraffe

- Adds Mamoswine, alongside the new Hirsuswine, a slower and more tanky alternate evolution. Design by me, sprite by zuperZACH.

- Adds the framework for an alternate Yanma evolution, currently dubbed Pending03. It's designed to be based on a clubtail, albeit one that uses its tail like an actual weapon.

- Adds the framework for Emordrome, an alternate Normal/Ghost Girafarig evolution where the dark head grows and takes control. In order to not make the line any more complicated, Calflac has been removed entirely.

- Added cries for the Cubburn line.

gfx/footprints_johto.asm

@@ -64,6 +64,7 @@ INCBIN "gfx/footprints/aercrow.1bpp"
 INCBIN "gfx/footprints/foxfire.1bpp"
 INCBIN "gfx/footprints/yanma.1bpp"
 INCBIN "gfx/footprints/yanmega.1bpp"
+INCBIN "gfx/footprints/pending03.1bpp"
 INCBIN "gfx/footprints/wooper.1bpp"
 INCBIN "gfx/footprints/quagsire.1bpp"
 INCBIN "gfx/footprints/espeon.1bpp"
@@ -82,9 +83,9 @@ INCBIN "gfx/footprints/unown.1bpp"
 INCBIN "gfx/footprints/wynaut.1bpp"
 INCBIN "gfx/footprints/wobbuffet.1bpp"
 INCBIN "gfx/footprints/bipulla.1bpp"
-INCBIN "gfx/footprints/calflac.1bpp"
 INCBIN "gfx/footprints/girafarig.1bpp"
 INCBIN "gfx/footprints/farigiraf.1bpp"
+INCBIN "gfx/footprints/emordrome.1bpp"
 INCBIN "gfx/footprints/pineco.1bpp"
 INCBIN "gfx/footprints/forretress.1bpp"
 INCBIN "gfx/footprints/dunsparce.1bpp"
@@ -109,6 +110,8 @@ INCBIN "gfx/footprints/slugma.1bpp"
 INCBIN "gfx/footprints/magcargo.1bpp"
 INCBIN "gfx/footprints/swinub.1bpp"
 INCBIN "gfx/footprints/piloswine.1bpp"
+INCBIN "gfx/footprints/mamoswine.1bpp"
+INCBIN "gfx/footprints/hirsuswine.1bpp"
 INCBIN "gfx/footprints/corsola.1bpp"
 INCBIN "gfx/footprints/remoraid.1bpp"
 INCBIN "gfx/footprints/octillery.1bpp"

gfx/pics.asm

@@ -741,14 +741,18 @@ TangrowthFrontpic:   INCBIN "gfx/pokemon/tangrowth/front.animated.2bpp.lz"
 TangrowthBackpic:    INCBIN "gfx/pokemon/tangrowth/back.2bpp.lz"
 JungelaFrontpic:     INCBIN "gfx/pokemon/jungela/front.animated.2bpp.lz"
 JungelaBackpic:      INCBIN "gfx/pokemon/jungela/back.2bpp.lz"
+MamoswineFrontpic:   INCBIN "gfx/pokemon/mamoswine/front.animated.2bpp.lz"
+MamoswineBackpic:    INCBIN "gfx/pokemon/mamoswine/back.2bpp.lz"
+HirsuswineFrontpic:  INCBIN "gfx/pokemon/hirsuswine/front.animated.2bpp.lz"
+HirsuswineBackpic:   INCBIN "gfx/pokemon/hirsuswine/back.2bpp.lz"
 
 
 SECTION "Pics 20", ROMX
 
 BipullaFrontpic:     INCBIN "gfx/pokemon/bipulla/front.animated.2bpp.lz"
 BipullaBackpic:      INCBIN "gfx/pokemon/bipulla/back.2bpp.lz"
-CalflacFrontpic:     INCBIN "gfx/pokemon/calflac/front.animated.2bpp.lz"
-CalflacBackpic:      INCBIN "gfx/pokemon/calflac/back.2bpp.lz"
+EmordromeFrontpic:   INCBIN "gfx/pokemon/emordrome/front.animated.2bpp.lz"
+EmordromeBackpic:      INCBIN "gfx/pokemon/emordrome/back.2bpp.lz"
 FarigirafFrontpic:   INCBIN "gfx/pokemon/farigiraf/front.animated.2bpp.lz"
 FarigirafBackpic:    INCBIN "gfx/pokemon/farigiraf/back.2bpp.lz"
 DudunsparceFrontpic: INCBIN "gfx/pokemon/dudunsparce/front.animated.2bpp.lz"
@@ -846,6 +850,8 @@ FoxfireFrontpic:     INCBIN "gfx/pokemon/foxfire/front.animated.2bpp.lz"
 FoxfireBackpic:      INCBIN "gfx/pokemon/foxfire/back.2bpp.lz"
 YanmegaFrontpic:     INCBIN "gfx/pokemon/yanmega/front.animated.2bpp.lz"
 YanmegaBackpic:      INCBIN "gfx/pokemon/yanmega/back.2bpp.lz"
+Pending03Frontpic:   INCBIN "gfx/pokemon/pending03/front.animated.2bpp.lz"
+Pending03Backpic:    INCBIN "gfx/pokemon/pending03/back.2bpp.lz"
 KazappelinFrontpic:  INCBIN "gfx/pokemon/kazappelin/front.animated.2bpp.lz"
 KazappelinBackpic:   INCBIN "gfx/pokemon/kazappelin/back.2bpp.lz"
 QwilfatherFrontpic:  INCBIN "gfx/pokemon/qwilfather/front.animated.2bpp.lz"

gfx/pokemon/anim_pointers.asm

@@ -275,6 +275,7 @@ AnimationPointers:
 	dw FoxfireAnimation
 	dw YanmaAnimation
 	dw YanmegaAnimation
+	dw Pending03Animation
 	dw WooperAnimation
 	dw QuagsireAnimation
 	dw EspeonAnimation
@@ -293,9 +294,9 @@ AnimationPointers:
 	dw WynautAnimation
 	dw WobbuffetAnimation
 	dw BipullaAnimation
-	dw CalflacAnimation
 	dw GirafarigAnimation
 	dw FarigirafAnimation
+	dw EmordromeAnimation
 	dw PinecoAnimation
 	dw ForretressAnimation
 	dw DunsparceAnimation
@@ -320,6 +321,8 @@ AnimationPointers:
 	dw MagcargoAnimation
 	dw SwinubAnimation
 	dw PiloswineAnimation
+	dw MamoswineAnimation
+	dw HirsuswineAnimation
 	dw CorsolaAnimation
 	dw RemoraidAnimation
 	dw OctilleryAnimation

gfx/pokemon/anims.asm

@@ -273,6 +273,7 @@ AercrowAnimation:    INCLUDE "gfx/pokemon/aercrow/anim.asm"
 FoxfireAnimation:    INCLUDE "gfx/pokemon/magneton/anim.asm"
 YanmaAnimation:      INCLUDE "gfx/pokemon/yanma/anim.asm"
 YanmegaAnimation:    INCLUDE "gfx/pokemon/yanmega/anim.asm"
+Pending03Animation:  INCLUDE "gfx/pokemon/pending03/anim.asm"
 WooperAnimation:     INCLUDE "gfx/pokemon/wooper/anim.asm"
 QuagsireAnimation:   INCLUDE "gfx/pokemon/quagsire/anim.asm"
 EspeonAnimation:     INCLUDE "gfx/pokemon/espeon/anim.asm"
@@ -291,9 +292,9 @@ UnownAnimation:      INCLUDE "gfx/pokemon/unown/anim.asm"
 WynautAnimation:     INCLUDE "gfx/pokemon/wynaut/anim.asm"
 WobbuffetAnimation:  INCLUDE "gfx/pokemon/wobbuffet/anim.asm"
 BipullaAnimation:    INCLUDE "gfx/pokemon/bipulla/anim.asm"
-CalflacAnimation:    INCLUDE "gfx/pokemon/calflac/anim.asm"
 GirafarigAnimation:  INCLUDE "gfx/pokemon/girafarig/anim.asm"
 FarigirafAnimation:  INCLUDE "gfx/pokemon/farigiraf/anim.asm"
+EmordromeAnimation:  INCLUDE "gfx/pokemon/emordrome/anim.asm"
 PinecoAnimation:     INCLUDE "gfx/pokemon/pineco/anim.asm"
 ForretressAnimation: INCLUDE "gfx/pokemon/forretress/anim.asm"
 DunsparceAnimation:  INCLUDE "gfx/pokemon/dunsparce/anim.asm"
@@ -318,6 +319,8 @@ SlugmaAnimation:     INCLUDE "gfx/pokemon/slugma/anim.asm"
 MagcargoAnimation:   INCLUDE "gfx/pokemon/magcargo/anim.asm"
 SwinubAnimation:     INCLUDE "gfx/pokemon/swinub/anim.asm"
 PiloswineAnimation:  INCLUDE "gfx/pokemon/piloswine/anim.asm"
+MamoswineAnimation:  INCLUDE "gfx/pokemon/mamoswine/anim.asm"
+HirsuswineAnimation: INCLUDE "gfx/pokemon/hirsuswine/anim.asm"
 CorsolaAnimation:    INCLUDE "gfx/pokemon/corsola/anim.asm"
 RemoraidAnimation:   INCLUDE "gfx/pokemon/remoraid/anim.asm"
 OctilleryAnimation:  INCLUDE "gfx/pokemon/octillery/anim.asm"

gfx/pokemon/bitmask_pointers.asm

@@ -275,6 +275,7 @@ BitmasksPointers:
 	dw FoxfireBitmasks
 	dw YanmaBitmasks
 	dw YanmegaBitmasks
+	dw Pending03Bitmasks
 	dw WooperBitmasks
 	dw QuagsireBitmasks
 	dw EspeonBitmasks
@@ -293,9 +294,9 @@ BitmasksPointers:
 	dw WynautBitmasks
 	dw WobbuffetBitmasks
 	dw BipullaBitmasks
-	dw CalflacBitmasks
 	dw GirafarigBitmasks
 	dw FarigirafBitmasks
+	dw EmordromeBitmasks
 	dw PinecoBitmasks
 	dw ForretressBitmasks
 	dw DunsparceBitmasks
@@ -320,6 +321,8 @@ BitmasksPointers:
 	dw MagcargoBitmasks
 	dw SwinubBitmasks
 	dw PiloswineBitmasks
+	dw MamoswineBitmasks
+	dw HirsuswineBitmasks
 	dw CorsolaBitmasks
 	dw RemoraidBitmasks
 	dw OctilleryBitmasks

gfx/pokemon/bitmasks.asm

@@ -273,6 +273,7 @@ AercrowBitmasks:    INCLUDE "gfx/pokemon/aercrow/bitmask.asm"
 FoxfireBitmasks:    INCLUDE "gfx/pokemon/foxfire/bitmask.asm"
 YanmaBitmasks:      INCLUDE "gfx/pokemon/yanma/bitmask.asm"
 YanmegaBitmasks:    INCLUDE "gfx/pokemon/yanmega/bitmask.asm"
+Pending03Bitmasks:  INCLUDE "gfx/pokemon/pending03/bitmask.asm"
 WooperBitmasks:     INCLUDE "gfx/pokemon/wooper/bitmask.asm"
 QuagsireBitmasks:   INCLUDE "gfx/pokemon/quagsire/bitmask.asm"
 EspeonBitmasks:     INCLUDE "gfx/pokemon/espeon/bitmask.asm"
@@ -291,9 +292,9 @@ UnownBitmasks:      INCLUDE "gfx/pokemon/unown/bitmask.asm"
 WynautBitmasks:     INCLUDE "gfx/pokemon/wynaut/bitmask.asm"
 WobbuffetBitmasks:  INCLUDE "gfx/pokemon/wobbuffet/bitmask.asm"
 BipullaBitmasks:    INCLUDE "gfx/pokemon/bipulla/bitmask.asm"
-CalflacBitmasks:    INCLUDE "gfx/pokemon/calflac/bitmask.asm"
 GirafarigBitmasks:  INCLUDE "gfx/pokemon/girafarig/bitmask.asm"
 FarigirafBitmasks:  INCLUDE "gfx/pokemon/farigiraf/bitmask.asm"
+EmordromeBitmasks:  INCLUDE "gfx/pokemon/emordrome/bitmask.asm"
 PinecoBitmasks:     INCLUDE "gfx/pokemon/pineco/bitmask.asm"
 ForretressBitmasks: INCLUDE "gfx/pokemon/forretress/bitmask.asm"
 DunsparceBitmasks:  INCLUDE "gfx/pokemon/dunsparce/bitmask.asm"
@@ -318,6 +319,8 @@ SlugmaBitmasks:     INCLUDE "gfx/pokemon/slugma/bitmask.asm"
 MagcargoBitmasks:   INCLUDE "gfx/pokemon/magcargo/bitmask.asm"
 SwinubBitmasks:     INCLUDE "gfx/pokemon/swinub/bitmask.asm"
 PiloswineBitmasks:  INCLUDE "gfx/pokemon/piloswine/bitmask.asm"
+MamoswineBitmasks:  INCLUDE "gfx/pokemon/mamoswine/bitmask.asm"
+HirsuswineBitmasks:  INCLUDE "gfx/pokemon/hirsuswine/bitmask.asm"
 CorsolaBitmasks:    INCLUDE "gfx/pokemon/corsola/bitmask.asm"
 RemoraidBitmasks:   INCLUDE "gfx/pokemon/remoraid/bitmask.asm"
 OctilleryBitmasks:  INCLUDE "gfx/pokemon/octillery/bitmask.asm"

gfx/pokemon/frame_pointers.asm

@@ -275,6 +275,7 @@ FramesPointers:
 	dba FoxfireFrames
 	dba YanmaFrames
 	dba YanmegaFrames
+	dba Pending03Frames
 	dba WooperFrames
 	dba QuagsireFrames
 	dba EspeonFrames
@@ -293,9 +294,9 @@ FramesPointers:
 	dba WynautFrames
 	dba WobbuffetFrames
 	dba BipullaFrames
-	dba CalflacFrames
 	dba GirafarigFrames
 	dba FarigirafFrames
+	dba EmordromeFrames
 	dba PinecoFrames
 	dba ForretressFrames
 	dba DunsparceFrames
@@ -320,6 +321,8 @@ FramesPointers:
 	dba MagcargoFrames
 	dba SwinubFrames
 	dba PiloswineFrames
+	dba MamoswineFrames
+	dba HirsuswineFrames
 	dba CorsolaFrames
 	dba RemoraidFrames
 	dba OctilleryFrames

gfx/pokemon/hirsuswine/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/hirsuswine/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/hirsuswine/shiny.pal

@@ -0,0 +1,4 @@
+
+	RGB 22, 25, 10
+	RGB 10, 13, 10
+

gfx/pokemon/idle_pointers.asm

@@ -275,6 +275,7 @@ AnimationIdlePointers:
 	dw FoxfireAnimationIdle
 	dw YanmaAnimationIdle
 	dw YanmegaAnimationIdle
+	dw Pending03AnimationIdle
 	dw WooperAnimationIdle
 	dw QuagsireAnimationIdle
 	dw EspeonAnimationIdle
@@ -293,9 +294,9 @@ AnimationIdlePointers:
 	dw WynautAnimationIdle
 	dw WobbuffetAnimationIdle
 	dw BipullaAnimationIdle
-	dw CalflacAnimationIdle
 	dw GirafarigAnimationIdle
 	dw FarigirafAnimationIdle
+	dw EmordromeAnimationIdle
 	dw PinecoAnimationIdle
 	dw ForretressAnimationIdle
 	dw DunsparceAnimationIdle
@@ -320,6 +321,8 @@ AnimationIdlePointers:
 	dw MagcargoAnimationIdle
 	dw SwinubAnimationIdle
 	dw PiloswineAnimationIdle
+	dw MamoswineAnimationIdle
+	dw HirsuswineAnimationIdle
 	dw CorsolaAnimationIdle
 	dw RemoraidAnimationIdle
 	dw OctilleryAnimationIdle

gfx/pokemon/idles.asm

@@ -273,6 +273,7 @@ AercrowAnimationIdle:    INCLUDE "gfx/pokemon/aercrow/anim_idle.asm"
 FoxfireAnimationIdle:    INCLUDE "gfx/pokemon/foxfire/anim_idle.asm"
 YanmaAnimationIdle:      INCLUDE "gfx/pokemon/yanma/anim_idle.asm"
 YanmegaAnimationIdle:    INCLUDE "gfx/pokemon/yanmega/anim_idle.asm"
+Pending03AnimationIdle:  INCLUDE "gfx/pokemon/pending03/anim_idle.asm"
 WooperAnimationIdle:     INCLUDE "gfx/pokemon/wooper/anim_idle.asm"
 QuagsireAnimationIdle:   INCLUDE "gfx/pokemon/quagsire/anim_idle.asm"
 EspeonAnimationIdle:     INCLUDE "gfx/pokemon/espeon/anim_idle.asm"
@@ -291,9 +292,9 @@ UnownAnimationIdle:      INCLUDE "gfx/pokemon/unown/anim_idle.asm"
 WynautAnimationIdle:     INCLUDE "gfx/pokemon/wynaut/anim_idle.asm"
 WobbuffetAnimationIdle:  INCLUDE "gfx/pokemon/wobbuffet/anim_idle.asm"
 BipullaAnimationIdle:    INCLUDE "gfx/pokemon/bipulla/anim_idle.asm"
-CalflacAnimationIdle:    INCLUDE "gfx/pokemon/calflac/anim_idle.asm"
 GirafarigAnimationIdle:  INCLUDE "gfx/pokemon/girafarig/anim_idle.asm"
 FarigirafAnimationIdle:  INCLUDE "gfx/pokemon/farigiraf/anim_idle.asm"
+EmordromeAnimationIdle:  INCLUDE "gfx/pokemon/emordrome/anim_idle.asm"
 PinecoAnimationIdle:     INCLUDE "gfx/pokemon/pineco/anim_idle.asm"
 ForretressAnimationIdle: INCLUDE "gfx/pokemon/forretress/anim_idle.asm"
 DunsparceAnimationIdle:  INCLUDE "gfx/pokemon/dunsparce/anim_idle.asm"
@@ -318,6 +319,8 @@ SlugmaAnimationIdle:     INCLUDE "gfx/pokemon/slugma/anim_idle.asm"
 MagcargoAnimationIdle:   INCLUDE "gfx/pokemon/magcargo/anim_idle.asm"
 SwinubAnimationIdle:     INCLUDE "gfx/pokemon/swinub/anim_idle.asm"
 PiloswineAnimationIdle:  INCLUDE "gfx/pokemon/piloswine/anim_idle.asm"
+MamoswineAnimationIdle:  INCLUDE "gfx/pokemon/mamoswine/anim_idle.asm"
+HirsuswineAnimationIdle: INCLUDE "gfx/pokemon/hirsuswine/anim_idle.asm"
 CorsolaAnimationIdle:    INCLUDE "gfx/pokemon/corsola/anim_idle.asm"
 RemoraidAnimationIdle:   INCLUDE "gfx/pokemon/remoraid/anim_idle.asm"
 OctilleryAnimationIdle:  INCLUDE "gfx/pokemon/octillery/anim_idle.asm"

gfx/pokemon/johto_frames.asm

@@ -63,6 +63,7 @@ AercrowFrames:    INCLUDE "gfx/pokemon/aercrow/frames.asm"
 FoxfireFrames:    INCLUDE "gfx/pokemon/foxfire/frames.asm"
 YanmaFrames:      INCLUDE "gfx/pokemon/yanma/frames.asm"
 YanmegaFrames:    INCLUDE "gfx/pokemon/yanmega/frames.asm"
+Pending03Frames:  INCLUDE "gfx/pokemon/pending03/frames.asm"
 WooperFrames:     INCLUDE "gfx/pokemon/wooper/frames.asm"
 QuagsireFrames:   INCLUDE "gfx/pokemon/quagsire/frames.asm"
 EspeonFrames:     INCLUDE "gfx/pokemon/espeon/frames.asm"
@@ -81,9 +82,9 @@ UnownFrames:      INCLUDE "gfx/pokemon/unown/frames.asm"
 WynautFrames:     INCLUDE "gfx/pokemon/wynaut/frames.asm"
 WobbuffetFrames:  INCLUDE "gfx/pokemon/wobbuffet/frames.asm"
 BipullaFrames:    INCLUDE "gfx/pokemon/bipulla/frames.asm"
-CalflacFrames:    INCLUDE "gfx/pokemon/calflac/frames.asm"
 GirafarigFrames:  INCLUDE "gfx/pokemon/girafarig/frames.asm"
 FarigirafFrames:  INCLUDE "gfx/pokemon/farigiraf/frames.asm"
+EmordromeFrames:  INCLUDE "gfx/pokemon/emordrome/frames.asm"
 PinecoFrames:     INCLUDE "gfx/pokemon/pineco/frames.asm"
 ForretressFrames: INCLUDE "gfx/pokemon/forretress/frames.asm"
 DunsparceFrames:  INCLUDE "gfx/pokemon/dunsparce/frames.asm"
@@ -108,6 +109,8 @@ SlugmaFrames:     INCLUDE "gfx/pokemon/slugma/frames.asm"
 MagcargoFrames:   INCLUDE "gfx/pokemon/magcargo/frames.asm"
 SwinubFrames:     INCLUDE "gfx/pokemon/swinub/frames.asm"
 PiloswineFrames:  INCLUDE "gfx/pokemon/piloswine/frames.asm"
+MamoswineFrames:  INCLUDE "gfx/pokemon/mamoswine/frames.asm"
+HirsuswineFrames: INCLUDE "gfx/pokemon/hirsuswine/frames.asm"
 CorsolaFrames:    INCLUDE "gfx/pokemon/corsola/frames.asm"
 RemoraidFrames:   INCLUDE "gfx/pokemon/remoraid/frames.asm"
 OctilleryFrames:  INCLUDE "gfx/pokemon/octillery/frames.asm"

gfx/pokemon/mamoswine/anim.asm

@@ -0,0 +1,6 @@
+	frame 1, 20
+	setrepeat 4
+	frame 2, 08
+	frame 3, 08
+	dorepeat 2
+	endanim

gfx/pokemon/mamoswine/anim_idle.asm

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

gfx/pokemon/mamoswine/shiny.pal

@@ -0,0 +1,5 @@
+		
+	RGB 18, 23, 02
+	RGB 04, 13, 08
+
+

gfx/pokemon/pending03/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/pending03/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/pending03/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 22, 22, 12
+	RGB 07, 15, 25