Fixed a couple of minor bugs

With giving items from a bag, and a grammatical bug.
varkor · Jan 13, 2016 · 140e444 · 140e444
1 parent 5331e66
commit 140e444
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/battle/scripts/objects/general/bag.js b/battle/scripts/objects/general/bag.js
@@ -81,7 +81,7 @@ function bag (items) {
 
 	self.give = function (index, poke) {
 		var item = self.items[index], taken = null;
-		self.items.remove(index);
+		self.remove(index);
 		if (poke.item !== null) {
 			taken = self.add(poke.item);
 			poke.item = null;

diff --git a/battle/scripts/objects/general/pokemon.js b/battle/scripts/objects/general/pokemon.js
@@ -634,7 +634,8 @@ function pokemon (data, validate) {
 	};
 
 	self.pronoun = function (capitalised) {
-		return (self.gender === "male" ? "he" : self.gender === "female" ? "she" : "it");
+		var word = (self.gender === "male" ? "he" : self.gender === "female" ? "she" : "it");
+		return (capitalised ? capitalise(word) : word);
 	};
 	self.possessivePronoun = function (capitalised) {
 		var word = (self.gender === "male" ? "his" : self.gender === "female" ? "her" : "its");