--- nethack-3.4.3/dat/data.base	2003-12-07 16:39:14.000000000 -0700
+++ pikachu-3.4.3/dat/data.base	2009-02-25 14:02:54.776177600 -0700
@@ -3053,6 +3053,12 @@
 	But look at the goldsmith's store.
 	There, there is gold everywhere.
 		[ Divan-i Kebir Meter 2, by Mevlana Celaleddin Rumi ]
+pichu
+	It is unskilled at storing electric power. Any kind of shock
+	causes it to discharge energy spontaneously. 
+pikachu
+	When several of these Pokémon gather, their electricity
+	could build and cause lightning storms.
 *piercer
 	Ye Piercer doth look like unto a stalactyte, and hangeth
 	from the roofs of caves and caverns.  Unto the height of a
@@ -3250,6 +3256,9 @@
 	cast into the flaming pit of death.
 		[ Snow Day, directed by Chris Koch,
 		  written by Will McRobb and Chris Viscardi ]
+raichu
+	If the electric pouches in its cheeks become fully charged,
+	both ears will stand straight up.
 raijin
 raiden
 	The god of thunder.
--- nethack-3.4.3/include/monflag.h	2003-12-07 16:39:14.000000000 -0700
+++ pikachu-3.4.3/include/monflag.h	2009-02-25 13:18:01.393283200 -0700
@@ -26,28 +26,29 @@
 #define MS_MUMBLE	18	/* says something or other */
 #define MS_IMITATE	19	/* imitates others (leocrotta) */
 #define MS_ORC		MS_GRUNT	/* intelligent brutes */
-#define MS_HUMANOID	20	/* generic traveling companion */
+#define MS_PIKACHU	20	/* pikachu noises */
+#define MS_HUMANOID	21	/* generic traveling companion */
 #ifdef KOPS
-#define MS_ARREST	21	/* "Stop in the name of the law!" (Kops) */
+#define MS_ARREST	22	/* "Stop in the name of the law!" (Kops) */
 #endif
-#define MS_SOLDIER	22	/* army and watchmen expressions */
-#define MS_GUARD	23	/* "Please drop that gold and follow me." */
-#define MS_DJINNI	24	/* "Thank you for freeing me!" */
-#define MS_NURSE	25	/* "Take off your shirt, please." */
-#define MS_SEDUCE	26	/* "Hello, sailor." (Nymphs) */
-#define MS_VAMPIRE	27	/* vampiric seduction, Vlad's exclamations */
-#define MS_BRIBE	28	/* asks for money, or berates you */
-#define MS_CUSS		29	/* berates (demons) or intimidates (Wiz) */
-#define MS_RIDER	30	/* astral level special monsters */
-#define MS_LEADER	31	/* your class leader */
-#define MS_NEMESIS	32	/* your nemesis */
-#define MS_GUARDIAN	33	/* your leader's guards */
-#define MS_SELL		34	/* demand payment, complain about shoplifters */
-#define MS_ORACLE	35	/* do a consultation */
-#define MS_PRIEST	36	/* ask for contribution; do cleansing */
-#define MS_SPELL	37	/* spellcaster not matching any of the above */
-#define MS_WERE		38	/* lycanthrope in human form */
-#define MS_BOAST	39	/* giants */
+#define MS_SOLDIER	23	/* army and watchmen expressions */
+#define MS_GUARD	24	/* "Please drop that gold and follow me." */
+#define MS_DJINNI	25	/* "Thank you for freeing me!" */
+#define MS_NURSE	26	/* "Take off your shirt, please." */
+#define MS_SEDUCE	27	/* "Hello, sailor." (Nymphs) */
+#define MS_VAMPIRE	28	/* vampiric seduction, Vlad's exclamations */
+#define MS_BRIBE	29	/* asks for money, or berates you */
+#define MS_CUSS		30	/* berates (demons) or intimidates (Wiz) */
+#define MS_RIDER	31	/* astral level special monsters */
+#define MS_LEADER	32	/* your class leader */
+#define MS_NEMESIS	33	/* your nemesis */
+#define MS_GUARDIAN	34	/* your leader's guards */
+#define MS_SELL		35	/* demand payment, complain about shoplifters */
+#define MS_ORACLE	36	/* do a consultation */
+#define MS_PRIEST	37	/* ask for contribution; do cleansing */
+#define MS_SPELL	38	/* spellcaster not matching any of the above */
+#define MS_WERE		39	/* lycanthrope in human form */
+#define MS_BOAST	40	/* giants */
 
 
 #define MR_FIRE		0x01	/* resists fire */
--- nethack-3.4.3/src/mondata.c	2003-12-07 16:39:14.000000000 -0700
+++ pikachu-3.4.3/src/mondata.c	2009-02-25 14:01:39.548004800 -0700
@@ -566,6 +566,7 @@
 	{PM_ORC, PM_ORC_CAPTAIN}, {PM_HILL_ORC, PM_ORC_CAPTAIN},
 	{PM_MORDOR_ORC, PM_ORC_CAPTAIN}, {PM_URUK_HAI, PM_ORC_CAPTAIN},
 	{PM_SEWER_RAT, PM_GIANT_RAT},
+	{PM_PICHU, PM_PIKACHU, PM_RAICHU},
 	{PM_CAVE_SPIDER, PM_GIANT_SPIDER},
 	{PM_OGRE, PM_OGRE_LORD}, {PM_OGRE_LORD, PM_OGRE_KING},
 	{PM_ELF, PM_ELF_LORD}, {PM_WOODLAND_ELF, PM_ELF_LORD},
--- nethack-3.4.3/src/role.c	2003-12-07 16:39:14.000000000 -0700
+++ pikachu-3.4.3/src/role.c	2009-02-25 14:01:54.018812800 -0700
@@ -312,7 +312,7 @@
 	{"Adventurer",  0} },
 	"Blind Io", "_The Lady", "Offler", /* Discworld */
 	"Tou", "Ankh-Morpork", "the Thieves' Guild Hall",
-	PM_TOURIST, NON_PM, NON_PM,
+	PM_TOURIST, NON_PM, PM_PICHU,
 	PM_TWOFLOWER, PM_GUIDE, PM_MASTER_OF_THIEVES,
 	PM_GIANT_SPIDER, PM_FOREST_CENTAUR, S_SPIDER, S_CENTAUR,
 	ART_YENDORIAN_EXPRESS_CARD,
--- nethack-3.4.3/src/sounds.c	2003-12-07 16:39:14.000000000 -0700
+++ pikachu-3.4.3/src/sounds.c	2009-02-25 13:23:54.571128000 -0700
@@ -617,6 +617,9 @@
 	case MS_BURBLE:
 	    pline_msg = "burbles.";
 	    break;
+	case MS_PIKACHU:
+		verbl_msg = "Pika pii!";
+		break;
 	case MS_SHRIEK:
 	    pline_msg = "shrieks.";
 	    aggravate();
--- nethack-3.4.3/src/monst.c	2003-12-07 16:39:14.000000000 -0700
+++ pikachu-3.4.3/src/monst.c	2009-02-25 14:01:19.619348800 -0700
@@ -809,7 +809,24 @@
 	SIZ(30, 30, 0, MS_SQEEK, MZ_TINY), 0, 0,
 	M1_ANIMAL|M1_NOHANDS|M1_CARNIVORE, M2_HOSTILE, M3_INFRAVISIBLE,
 	CLR_BROWN),
-    MON("rabid rat", S_RODENT,
+	MON("pichu", S_RODENT,
+	LVL(1, 12, 5, 0, 0), (G_GENO|G_NOGEN)
+	A(ATTK(AT_NONE, AD_ELEC, 1,3), ATTK(AT_BITE, AD_PHYS, 1, 3), NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
+	SIZ(5, 8, 0, MS_PIKACHU, MZ_TINY, MR_ELEC, 0,
+	M1_ANIMAL|M1_NOHANDS|M1_OMNIVORE, M2_HOSTILE, 0, CLR_YELLOW),
+	MON("pikachu", S_RODENT,
+	LVL(3, 15, 4, 0, 0), (G_GENO|G_SGROUP|5),
+	A(ATTK(AT_NONE, AD_ELEC, 1, 6), ATTK(AT_BITE, AD_PHYS, 1, 4), ATTK(AT_CLAW, AD_PHYS, 1, 3),
+	NO_ATTK, NO_ATTK, NO_ATTK),
+	SIZ(10, 12, 0, MS_PIKACHU, MZ_SMALL), MR_ELEC, MR_ELEC,
+	M1_ANIMAL|M1_NOHANDS|M1_OMNIVORE, M2_HOSTILE, 0, CLR_YELLOW),
+	MON("raichu", S_RODENT,
+	LVL(5, 20, 2, 0, 0), (G_GENO|G_SGROUP|2),
+	A(ATTK(AT_NONE, AD_ELEC, 1, 8), ATTK(AT_BITE, AD_PHYS, 1, 6), ATTK(AT_CLAW, AD_PHYS, 1, 6),
+	NO_ATTK, NO_ATTK, NO_ATTK),
+	SIZ(15, 20, 0, MS_SQEEK, MZ_SMALL), MR_ELEC, MR_ELEC,
+	M1_ANIMAL|M1_NOHANDS|M1_OMNIVORE|M1_OVIPAROUS, M2_HOSTILE, 0, CLR_ORANGE),	
+	MON("rabid rat", S_RODENT,
 	LVL(2, 12, 6, 0, 0), (G_GENO|1),
 	A(ATTK(AT_BITE, AD_DRCO, 2, 4),
 	  NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),