Fixed behavior of gift ribbons for Pokémon not in any game

2 files changed, 15 insertions, 7 deletions

@@ -186,6 +186,14 @@ module Pokeviewer
       end
     end
 
+    def gift_ribbon_description(ribbon)
+      if trainer.nil?
+        ""
+      else
+        trainer.gift_ribbon_description(ribbon)
+      end
+    end
+
     private
 
       def set_uuid
@@ -363,7 +363,7 @@ module Pokeviewer
         result << {
           filename: "marine-ribbon.png",
           name: "Marine Ribbon",
-          description: pokemon.trainer.gift_ribbon_description(:marine_ribbon)
+          description: pokemon.gift_ribbon_description(:marine_ribbon)
         }
       end
 
@@ -371,7 +371,7 @@ module Pokeviewer
         result << {
           filename: "land-ribbon.png",
           name: "Land Ribbon",
-          description: pokemon.trainer.gift_ribbon_description(:land_ribbon)
+          description: pokemon.gift_ribbon_description(:land_ribbon)
         }
       end
 
@@ -379,7 +379,7 @@ module Pokeviewer
         result << {
           filename: "sky-ribbon.png",
           name: "Sky Ribbon",
-          description: pokemon.trainer.gift_ribbon_description(:sky_ribbon)
+          description: pokemon.gift_ribbon_description(:sky_ribbon)
         }
       end
 
@@ -387,7 +387,7 @@ module Pokeviewer
         result << {
           filename: "country-ribbon.png",
           name: "Country Ribbon",
-          description: pokemon.trainer.gift_ribbon_description(:country_ribbon)
+          description: pokemon.gift_ribbon_description(:country_ribbon)
         }
       end
 
@@ -395,7 +395,7 @@ module Pokeviewer
         result << {
           filename: "national-ribbon.png",
           name: "National Ribbon",
-          description: pokemon.trainer.gift_ribbon_description(:national_ribbon)
+          description: pokemon.gift_ribbon_description(:national_ribbon)
         }
       end
 
@@ -403,7 +403,7 @@ module Pokeviewer
         result << {
           filename: "earth-ribbon.png",
           name: "Earth Ribbon",
-          description: pokemon.trainer.gift_ribbon_description(:earth_ribbon)
+          description: pokemon.gift_ribbon_description(:earth_ribbon)
         }
       end
 
@@ -411,7 +411,7 @@ module Pokeviewer
         result << {
           filename: "world-ribbon.png",
           name: "World Ribbon",
-          description: pokemon.trainer.gift_ribbon_description(:world_ribbon)
+          description: pokemon.gift_ribbon_description(:world_ribbon)
         }
       end