diff --git a/.gitignore b/.gitignore
index be881ecb7..ce202ae24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 Graphics/CustomBattlers/*
 Graphics/Battlers/*
 Graphics/Pokemon/FusionIcons/*
-
+Data/pokedex/*
 Data/sprites/*
 Data/VERSION
  
\ No newline at end of file
diff --git a/Data/Map051.rxdata b/Data/Map051.rxdata
index e2ff0013a..3728cf149 100644
Binary files a/Data/Map051.rxdata and b/Data/Map051.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index c30f4426d..42bc4dd0b 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb
index d89cea056..18fbe806a 100644
--- a/Data/Scripts/049_Compatibility/Constants.rb
+++ b/Data/Scripts/049_Compatibility/Constants.rb
@@ -84,6 +84,7 @@ SWITCH_PINKAN_SIDE_ROCKET=1099
 SWITCH_PINKAN_SIDE_POLICE=1100
 SWITCH_LEAVING_PINKAN_ISLAND=1113
 SWITCH_BLOCK_PINKAN_WHISTLE=1111
+SWITCH_PINKAN_FINISHED=1119
 
 VAR_ORICORIO_FLOWERS = 276
 #Randomizer Switches
diff --git a/Data/Scripts/052_AddOns/GameplayUtils.rb b/Data/Scripts/052_AddOns/GameplayUtils.rb
index 6b7c8ae2e..fe6505305 100644
--- a/Data/Scripts/052_AddOns/GameplayUtils.rb
+++ b/Data/Scripts/052_AddOns/GameplayUtils.rb
@@ -922,7 +922,7 @@ end
 def promptCaughtPokemonAction(pokemon)
   pickedOption = false
   return pbStorePokemon(pokemon) if !$Trainer.party_full?
-  return promptKeepOrRelease(pokemon) if isOnPinkanIsland()
+  return promptKeepOrRelease(pokemon) if isOnPinkanIsland() && !$game_switches[SWITCH_PINKAN_FINISHED]
   while !pickedOption
     command = pbMessage(_INTL("\\ts[]Your team is full!"),
                         [_INTL("Add to your party"), _INTL("Store to PC"),], 2)
diff --git a/Data/Scripts/052_AddOns/TRQuests.rb b/Data/Scripts/052_AddOns/TRQuests.rb
index dee289793..82259f432 100644
--- a/Data/Scripts/052_AddOns/TRQuests.rb
+++ b/Data/Scripts/052_AddOns/TRQuests.rb
@@ -349,6 +349,7 @@ def resetPinkanIsland()
   $game_switches[SWITCH_LEAVING_PINKAN_ISLAND]=false
   $game_switches[SWITCH_PINKAN_SIDE_POLICE]=false
   $game_switches[SWITCH_PINKAN_SIDE_ROCKET]=false
+  $game_switches[SWITCH_PINKAN_FINISHED]=false
 
   for map_id in Settings::PINKAN_ISLAND_MAPS
     map = $MapFactory.getMap(map_id,false)
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 9690d00d7..87a685ad5 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ