From 6969f3d6f7d720a36c8a4ff5082de68758b7625c Mon Sep 17 00:00:00 2001
From: Ariel Antonitis <arant@mit.edu>
Date: Wed, 24 Jun 2020 00:02:21 -0400
Subject: [PATCH] Added Nidoran M & Nidoran F sprites.

---
 .../object_events/pics/pokemon/nidoran_f.png    | Bin 0 -> 444 bytes
 .../object_events/pics/pokemon/nidoran_m.png    | Bin 0 -> 464 bytes
 spritesheet_rules.mk                            |   6 ++++++
 src/data/object_events/object_event_graphics.h  |   2 ++
 .../object_events/object_event_graphics_info.h  |   2 ++
 .../object_events/object_event_pic_tables.h     |  16 ++++++++++++++++
 6 files changed, 26 insertions(+)
 create mode 100644 graphics/object_events/pics/pokemon/nidoran_f.png
 create mode 100644 graphics/object_events/pics/pokemon/nidoran_m.png

diff --git a/graphics/object_events/pics/pokemon/nidoran_f.png b/graphics/object_events/pics/pokemon/nidoran_f.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed77773cefb17310938b05fa33bb7ba45751c2ac
GIT binary patch
literal 444
zcmV;t0Ym<YP)<h;3K|Lk000e1NJLTq006)M001Ba0{{R3wzg`v0000mP)t-s-rl|5
z|Nq72?u*6EQj5JgT4L@>ImI9lN`v+gVzd}JbN>MU{{a900RR90{}2!m!YqX+0003;
zNkl<Zc%1FhyK2KQ6b9f!u)FFN%8x|HEPa4*u-k4j!h&q+8+7R_1hVy2MH+{0u0)4O
zPLGFdE&d0?r_0gBB3iO!$&w|1CUyFBw>!4@f>S$B<jw6S>f5qn>AFQ%qwge>OU@UV
znCj*@XSH?Sn|%<?@E%%pJkHLzj8m(FbH*HkXofT80;R|1xZSTwGSQdQY(8Y45MxCv
zxL7cVPFrHmPke1)#?ApRz3jN76>x85A6c_rORfQiv7O|!qdVX=%oxlNUGvkb!R6IV
z9kY7|-Urz|G^3TQs)rR^_Rl9y6Hc4TwlijJbbf`&m;N&lU#%4#C)o4b$<DZG`$l$r
zH5yI+icmNm%1;aUO~@US|AXXg{D8LTAJ`No8pkm&sH)hIZ=fli#up1#!)H-2*vI^a
me&&ey#n<CiVHL(e|0LgLim|?HtzB&Z0000<MNUMnLSTYGrPPi9

literal 0
HcmV?d00001

diff --git a/graphics/object_events/pics/pokemon/nidoran_m.png b/graphics/object_events/pics/pokemon/nidoran_m.png
new file mode 100644
index 0000000000000000000000000000000000000000..48d6c1af5f48bf16f5570842506368f87b60fec2
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq006)M001Ba0{{R3wzg`v0000mP)t-s)z!5B
z|NjsW5dUgY-a#p}7yuZ}oB*VA0AfM^0RR8h|K^<4y<)wCDTBqu#e;)`lNeWK00047
zNkl<Zc%1FiF>1pw6b4|S-FGlr3YA0elis3B1KqMDkXw{?%I2k^zr1LyBx*7hB;O=M
zr3PAA<TVhw6#Nf@Pe|{{LS}5rlqplD{8joiRG0f)hAxeMxYTD8P&3BiDEp&3%3n?Q
zf|0H^X~V83eJn^iO=+oW($%^h2D$D@BN?O_6OB}wk>;xwkc*nM>5TG<v=Gp0y&)Y7
zJ^(LygTmGV){>S$yIU+7WyY=yjJl)Uq=K6C-b1eLm!#v7w#K~Hzu5UM(DndU3)->e
zv-0y9?aC<=ddd~>)_n*^ITh4EGou}RaGj&fw`vZNy@A3pO=FbK3nXWE?wz%vE&TnT
z@u&7y;pbVFP7U<+W20$H6`W~F3n0J_h4U}q2N%Y##D(`dx3&2Oo}8^0!wKgN;;$j{
zg8UFC@&nkh(|TL1Kjc?(qendMA#uXR6ps-3iA6o)zs@IP|0jY~s^+r*0000<MNUMn
GLSTYKd)vtX

literal 0
HcmV?d00001

diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk
index 248d14cc1b..70dae1aca7 100644
--- a/spritesheet_rules.mk
+++ b/spritesheet_rules.mk
@@ -759,12 +759,18 @@ $(OBJEVENTGFXDIR)/pokemon/sandshrew.4bpp: %.4bpp: %.png
 $(OBJEVENTGFXDIR)/pokemon/sandslash.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
+$(OBJEVENTGFXDIR)/pokemon/nidoran_f.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
 $(OBJEVENTGFXDIR)/pokemon/nidorina.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
 $(OBJEVENTGFXDIR)/pokemon/nidoqueen.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
+$(OBJEVENTGFXDIR)/pokemon/nidoran_m.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
 $(OBJEVENTGFXDIR)/pokemon/nidorino.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h
index 89b334a311..b6627c8b0e 100755
--- a/src/data/object_events/object_event_graphics.h
+++ b/src/data/object_events/object_event_graphics.h
@@ -382,8 +382,10 @@ const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/object_events/pics/po
 const u32 gObjectEventPic_Raichu[] = INCBIN_U32("graphics/object_events/pics/pokemon/raichu.4bpp");
 const u32 gObjectEventPic_Sandshrew[] = INCBIN_U32("graphics/object_events/pics/pokemon/sandshrew.4bpp");
 const u32 gObjectEventPic_Sandslash[] = INCBIN_U32("graphics/object_events/pics/pokemon/sandslash.4bpp");
+const u32 gObjectEventPic_Nidoran_f[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidoran_f.4bpp");
 const u32 gObjectEventPic_Nidorina[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidorina.4bpp");
 const u32 gObjectEventPic_Nidoqueen[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidoqueen.4bpp");
+const u32 gObjectEventPic_Nidoran_m[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidoran_m.4bpp");
 const u32 gObjectEventPic_Nidorino[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidorino.4bpp");
 const u32 gObjectEventPic_Nidoking[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidoking.4bpp");
 const u32 gObjectEventPic_Clefairy[] = INCBIN_U32("graphics/object_events/pics/pokemon/clefairy.4bpp");
diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h
index 02534ca023..4789e18e34 100755
--- a/src/data/object_events/object_event_graphics_info.h
+++ b/src/data/object_events/object_event_graphics_info.h
@@ -276,8 +276,10 @@ const struct ObjectEventGraphicsInfo gPokemonObjectGraphics[] = {
   [SPECIES_RAICHU] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Raichu, gDummySpriteAffineAnimTable},
   [SPECIES_SANDSHREW] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Sandshrew, gDummySpriteAffineAnimTable},
   [SPECIES_SANDSLASH] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Sandslash, gDummySpriteAffineAnimTable},
+  [SPECIES_NIDORAN_F] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Nidoran_f, gDummySpriteAffineAnimTable},
   [SPECIES_NIDORINA] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Nidorina, gDummySpriteAffineAnimTable},
   [SPECIES_NIDOQUEEN] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Nidoqueen, gDummySpriteAffineAnimTable},
+  [SPECIES_NIDORAN_M] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Nidoran_m, gDummySpriteAffineAnimTable},
   [SPECIES_NIDORINO] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Nidorino, gDummySpriteAffineAnimTable},
   [SPECIES_NIDOKING] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Nidoking, gDummySpriteAffineAnimTable},
   [SPECIES_CLEFAIRY] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Clefairy, gDummySpriteAffineAnimTable},
diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h
index 3d3583896e..9a158bff4c 100755
--- a/src/data/object_events/object_event_pic_tables.h
+++ b/src/data/object_events/object_event_pic_tables.h
@@ -2214,6 +2214,14 @@ const struct SpriteFrameImage gObjectEventPicTable_Sandslash[] = {
     overworld_frame(gObjectEventPic_Sandslash, 4, 4, 4),
     overworld_frame(gObjectEventPic_Sandslash, 4, 4, 5),
 };
+const struct SpriteFrameImage gObjectEventPicTable_Nidoran_f[] = {
+    overworld_frame(gObjectEventPic_Nidoran_f, 4, 4, 0),
+    overworld_frame(gObjectEventPic_Nidoran_f, 4, 4, 1),
+    overworld_frame(gObjectEventPic_Nidoran_f, 4, 4, 2),
+    overworld_frame(gObjectEventPic_Nidoran_f, 4, 4, 3),
+    overworld_frame(gObjectEventPic_Nidoran_f, 4, 4, 4),
+    overworld_frame(gObjectEventPic_Nidoran_f, 4, 4, 5),
+};
 const struct SpriteFrameImage gObjectEventPicTable_Nidorina[] = {
     overworld_frame(gObjectEventPic_Nidorina, 4, 4, 0),
     overworld_frame(gObjectEventPic_Nidorina, 4, 4, 1),
@@ -2230,6 +2238,14 @@ const struct SpriteFrameImage gObjectEventPicTable_Nidoqueen[] = {
     overworld_frame(gObjectEventPic_Nidoqueen, 4, 4, 4),
     overworld_frame(gObjectEventPic_Nidoqueen, 4, 4, 5),
 };
+const struct SpriteFrameImage gObjectEventPicTable_Nidoran_m[] = {
+    overworld_frame(gObjectEventPic_Nidoran_m, 4, 4, 0),
+    overworld_frame(gObjectEventPic_Nidoran_m, 4, 4, 1),
+    overworld_frame(gObjectEventPic_Nidoran_m, 4, 4, 2),
+    overworld_frame(gObjectEventPic_Nidoran_m, 4, 4, 3),
+    overworld_frame(gObjectEventPic_Nidoran_m, 4, 4, 4),
+    overworld_frame(gObjectEventPic_Nidoran_m, 4, 4, 5),
+};
 const struct SpriteFrameImage gObjectEventPicTable_Nidorino[] = {
     overworld_frame(gObjectEventPic_Nidorino, 4, 4, 0),
     overworld_frame(gObjectEventPic_Nidorino, 4, 4, 1),