The Great Trainer Overhaul (Part 1)

It begins. Up to Jasmine.

gfx/footprints_johto.asm

@@ -61,7 +61,7 @@ INCBIN "gfx/footprints/sunbud.1bpp"
 INCBIN "gfx/footprints/sunflora.1bpp"
 INCBIN "gfx/footprints/hippunk.1bpp"
 INCBIN "gfx/footprints/aercrow.1bpp"
-INCBIN "gfx/footprints/foxfire.1bpp"
+INCBIN "gfx/footprints/zorriego.1bpp"
 INCBIN "gfx/footprints/yanma.1bpp"
 INCBIN "gfx/footprints/yanmega.1bpp"
 INCBIN "gfx/footprints/oniyanma.1bpp"

gfx/pics.asm

@@ -850,8 +850,8 @@ SunbudFrontpic:      INCBIN "gfx/pokemon/sunbud/front.animated.2bpp.lz"
 SunbudBackpic:       INCBIN "gfx/pokemon/sunbud/back.2bpp.lz"
 HippunkFrontpic:     INCBIN "gfx/pokemon/hippunk/front.animated.2bpp.lz"
 HippunkBackpic:      INCBIN "gfx/pokemon/hippunk/back.2bpp.lz"
-FoxfireFrontpic:     INCBIN "gfx/pokemon/foxfire/front.animated.2bpp.lz"
-FoxfireBackpic:      INCBIN "gfx/pokemon/foxfire/back.2bpp.lz"
+ZorriegoFrontpic:    INCBIN "gfx/pokemon/zorriego/front.animated.2bpp.lz"
+ZorriegoBackpic:     INCBIN "gfx/pokemon/zorriego/back.2bpp.lz"
 YanmegaFrontpic:     INCBIN "gfx/pokemon/yanmega/front.animated.2bpp.lz"
 YanmegaBackpic:      INCBIN "gfx/pokemon/yanmega/back.2bpp.lz"
 OniyanmaFrontpic:    INCBIN "gfx/pokemon/oniyanma/front.animated.2bpp.lz"

gfx/pokemon/anim_pointers.asm

@@ -272,7 +272,7 @@ AnimationPointers:
 	dw SunfloraAnimation
 	dw HippunkAnimation
 	dw AercrowAnimation
-	dw FoxfireAnimation
+	dw ZorriegoAnimation
 	dw YanmaAnimation
 	dw YanmegaAnimation
 	dw OniyanmaAnimation

gfx/pokemon/anims.asm

@@ -270,7 +270,7 @@ SunbudAnimation:     INCLUDE "gfx/pokemon/sunbud/anim.asm"
 SunfloraAnimation:   INCLUDE "gfx/pokemon/sunflora/anim.asm"
 HippunkAnimation:    INCLUDE "gfx/pokemon/hippunk/anim.asm"
 AercrowAnimation:    INCLUDE "gfx/pokemon/aercrow/anim.asm"
-FoxfireAnimation:    INCLUDE "gfx/pokemon/magneton/anim.asm"
+ZorriegoAnimation:   INCLUDE "gfx/pokemon/zorriego/anim.asm"
 YanmaAnimation:      INCLUDE "gfx/pokemon/yanma/anim.asm"
 YanmegaAnimation:    INCLUDE "gfx/pokemon/yanmega/anim.asm"
 OniyanmaAnimation:   INCLUDE "gfx/pokemon/oniyanma/anim.asm"

gfx/pokemon/bitmask_pointers.asm

@@ -272,7 +272,7 @@ BitmasksPointers:
 	dw SunfloraBitmasks
 	dw HippunkBitmasks
 	dw AercrowBitmasks
-	dw FoxfireBitmasks
+	dw ZorriegoBitmasks
 	dw YanmaBitmasks
 	dw YanmegaBitmasks
 	dw OniyanmaBitmasks

gfx/pokemon/bitmasks.asm

@@ -270,7 +270,7 @@ SunbudBitmasks:     INCLUDE "gfx/pokemon/sunbud/bitmask.asm"
 SunfloraBitmasks:   INCLUDE "gfx/pokemon/sunflora/bitmask.asm"
 HippunkBitmasks:    INCLUDE "gfx/pokemon/hippunk/bitmask.asm"
 AercrowBitmasks:    INCLUDE "gfx/pokemon/aercrow/bitmask.asm"
-FoxfireBitmasks:    INCLUDE "gfx/pokemon/foxfire/bitmask.asm"
+ZorriegoBitmasks:    INCLUDE "gfx/pokemon/zorriego/bitmask.asm"
 YanmaBitmasks:      INCLUDE "gfx/pokemon/yanma/bitmask.asm"
 YanmegaBitmasks:    INCLUDE "gfx/pokemon/yanmega/bitmask.asm"
 OniyanmaBitmasks:   INCLUDE "gfx/pokemon/oniyanma/bitmask.asm"

gfx/pokemon/frame_pointers.asm

@@ -272,7 +272,7 @@ FramesPointers:
 	dba SunfloraFrames
 	dba HippunkFrames
 	dba AercrowFrames
-	dba FoxfireFrames
+	dba ZorriegoFrames
 	dba YanmaFrames
 	dba YanmegaFrames
 	dba OniyanmaFrames

gfx/pokemon/idle_pointers.asm

@@ -272,7 +272,7 @@ AnimationIdlePointers:
 	dw SunfloraAnimationIdle
 	dw HippunkAnimationIdle
 	dw AercrowAnimationIdle
-	dw FoxfireAnimationIdle
+	dw ZorriegoAnimationIdle
 	dw YanmaAnimationIdle
 	dw YanmegaAnimationIdle
 	dw OniyanmaAnimationIdle

gfx/pokemon/idles.asm

@@ -270,7 +270,7 @@ SunbudAnimationIdle:     INCLUDE "gfx/pokemon/sunbud/anim_idle.asm"
 SunfloraAnimationIdle:   INCLUDE "gfx/pokemon/sunflora/anim_idle.asm"
 HippunkAnimationIdle:    INCLUDE "gfx/pokemon/hippunk/anim_idle.asm"
 AercrowAnimationIdle:    INCLUDE "gfx/pokemon/aercrow/anim_idle.asm"
-FoxfireAnimationIdle:    INCLUDE "gfx/pokemon/foxfire/anim_idle.asm"
+ZorriegoAnimationIdle:   INCLUDE "gfx/pokemon/zorriego/anim_idle.asm"
 YanmaAnimationIdle:      INCLUDE "gfx/pokemon/yanma/anim_idle.asm"
 YanmegaAnimationIdle:    INCLUDE "gfx/pokemon/yanmega/anim_idle.asm"
 OniyanmaAnimationIdle:   INCLUDE "gfx/pokemon/oniyanma/anim_idle.asm"

gfx/pokemon/johto_frames.asm

@@ -60,7 +60,7 @@ SunbudFrames:     INCLUDE "gfx/pokemon/sunbud/frames.asm"
 SunfloraFrames:   INCLUDE "gfx/pokemon/sunflora/frames.asm"
 HippunkFrames:    INCLUDE "gfx/pokemon/hippunk/frames.asm"
 AercrowFrames:    INCLUDE "gfx/pokemon/aercrow/frames.asm"
-FoxfireFrames:    INCLUDE "gfx/pokemon/foxfire/frames.asm"
+ZorriegoFrames:   INCLUDE "gfx/pokemon/zorriego/frames.asm"
 YanmaFrames:      INCLUDE "gfx/pokemon/yanma/frames.asm"
 YanmegaFrames:    INCLUDE "gfx/pokemon/yanmega/frames.asm"
 OniyanmaFrames:   INCLUDE "gfx/pokemon/oniyanma/frames.asm"