From 136494eda3bd839ac610d640fdea7ced56c95ab2 Mon Sep 17 00:00:00 2001
From: thiago genuino <thiago@filtro.us>
Date: Wed, 24 Aug 2016 18:38:15 -0300
Subject: [PATCH 1/5] fixed favorite pokemon

---
 src/Pokemon.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Pokemon.js b/src/Pokemon.js
index 18bffb6..f3a3a66 100644
--- a/src/Pokemon.js
+++ b/src/Pokemon.js
@@ -165,12 +165,13 @@ class Pokemon {
   /**
    * [setFavorite description]
    */
-  setFavorite() {
+  setFavorite(status) {
+    status = ((status !== true) && (status !== false)) ? true : status;
     return this.parent.Call([{
       request: 'SET_FAVORITE_POKEMON',
       message: {
         pokemon_id: this.id,
-        is_favorite: true,
+        is_favorite: status,
       }
     }])
   }

From a0ff211ee01f7991fce476f7c2ad6a8c26b66296 Mon Sep 17 00:00:00 2001
From: thiago genuino <thiago@filtro.us>
Date: Wed, 24 Aug 2016 20:34:03 -0300
Subject: [PATCH 2/5] Fixed Iventory to bring Item functions

---
 src/Inventory/index.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Inventory/index.js b/src/Inventory/index.js
index bfcac91..f6b79f4 100644
--- a/src/Inventory/index.js
+++ b/src/Inventory/index.js
@@ -85,10 +85,10 @@ var usePotion = item_id => pokemon => {
 class Items {
   constructor(){
     Object.assign(this, {
-      pokeBall: new useOnEncounter(1),
-      greatBall: new useOnEncounter(2),
-      ultraBall: new useOnEncounter(3),
-      masterBall: new useOnEncounter(4),
+      pokeBall: new Item(1),
+      greatBall: new Item(2),
+      ultraBall: new Item(3),
+      masterBall: new Item(4),
       potion: usePotion(101),
       superPotion: usePotion(102),
       hyperPotion: usePotion(103),
@@ -104,11 +104,11 @@ class Items {
       // xAttack: {id: 0}
       // xDefense: {id: 0}
       // xMiracle: {id: 0}
-      razzBerry: new useOnEncounter(701),
-      blukBerry: new useOnEncounter(702),
-      nanabBerry: new useOnEncounter(703),
-      weparBerry: new useOnEncounter(704),
-      pinapBerry: new useOnEncounter(705),
+      razzBerry: new Item(701),
+      blukBerry: new Item(702),
+      nanabBerry: new Item(703),
+      weparBerry: new Item(704),
+      pinapBerry: new Item(705),
       incubatorBasicUnlimited: new Item(901),
       incubatorBasic: new Item(902)
     })

From a5fc9b5d1930891dd4c9b36899c8e79e3d01af7c Mon Sep 17 00:00:00 2001
From: thiago genuino <thiago@filtro.us>
Date: Thu, 25 Aug 2016 19:00:28 -0300
Subject: [PATCH 3/5] Fixed pokemon setFavorite to accept status

---
 src/Pokemon.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Pokemon.js b/src/Pokemon.js
index f3a3a66..4a78214 100644
--- a/src/Pokemon.js
+++ b/src/Pokemon.js
@@ -165,8 +165,7 @@ class Pokemon {
   /**
    * [setFavorite description]
    */
-  setFavorite(status) {
-    status = ((status !== true) && (status !== false)) ? true : status;
+  setFavorite(status = true) {
     return this.parent.Call([{
       request: 'SET_FAVORITE_POKEMON',
       message: {

From 52c8b7194574f327e39d436f7ae1dafa41f3c347 Mon Sep 17 00:00:00 2001
From: thiago genuino <thiago@filtro.us>
Date: Thu, 25 Aug 2016 19:03:10 -0300
Subject: [PATCH 4/5] Inventory change

---
 src/Inventory/index.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Inventory/index.js b/src/Inventory/index.js
index f6b79f4..bfcac91 100644
--- a/src/Inventory/index.js
+++ b/src/Inventory/index.js
@@ -85,10 +85,10 @@ var usePotion = item_id => pokemon => {
 class Items {
   constructor(){
     Object.assign(this, {
-      pokeBall: new Item(1),
-      greatBall: new Item(2),
-      ultraBall: new Item(3),
-      masterBall: new Item(4),
+      pokeBall: new useOnEncounter(1),
+      greatBall: new useOnEncounter(2),
+      ultraBall: new useOnEncounter(3),
+      masterBall: new useOnEncounter(4),
       potion: usePotion(101),
       superPotion: usePotion(102),
       hyperPotion: usePotion(103),
@@ -104,11 +104,11 @@ class Items {
       // xAttack: {id: 0}
       // xDefense: {id: 0}
       // xMiracle: {id: 0}
-      razzBerry: new Item(701),
-      blukBerry: new Item(702),
-      nanabBerry: new Item(703),
-      weparBerry: new Item(704),
-      pinapBerry: new Item(705),
+      razzBerry: new useOnEncounter(701),
+      blukBerry: new useOnEncounter(702),
+      nanabBerry: new useOnEncounter(703),
+      weparBerry: new useOnEncounter(704),
+      pinapBerry: new useOnEncounter(705),
       incubatorBasicUnlimited: new Item(901),
       incubatorBasic: new Item(902)
     })

From c51ab4acfcbee110dc1b8f533fe879f16500f077 Mon Sep 17 00:00:00 2001
From: thiago genuino <thiago@filtro.us>
Date: Thu, 25 Aug 2016 19:04:57 -0300
Subject: [PATCH 5/5] TODO added

---
 src/Pokemon.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Pokemon.js b/src/Pokemon.js
index 4a78214..02f0afc 100644
--- a/src/Pokemon.js
+++ b/src/Pokemon.js
@@ -166,6 +166,7 @@ class Pokemon {
    * [setFavorite description]
    */
   setFavorite(status = true) {
+    // TODO: Check if status is true/false?
     return this.parent.Call([{
       request: 'SET_FAVORITE_POKEMON',
       message: {