mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Fixes diancie forcing player to release their pokemon to keep it
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,7 +1,7 @@
|
|||||||
Graphics/CustomBattlers/*
|
Graphics/CustomBattlers/*
|
||||||
Graphics/Battlers/*
|
Graphics/Battlers/*
|
||||||
Graphics/Pokemon/FusionIcons/*
|
Graphics/Pokemon/FusionIcons/*
|
||||||
|
Data/pokedex/*
|
||||||
Data/sprites/*
|
Data/sprites/*
|
||||||
Data/VERSION
|
Data/VERSION
|
||||||
|
|
||||||
Binary file not shown.
Binary file not shown.
@@ -84,6 +84,7 @@ SWITCH_PINKAN_SIDE_ROCKET=1099
|
|||||||
SWITCH_PINKAN_SIDE_POLICE=1100
|
SWITCH_PINKAN_SIDE_POLICE=1100
|
||||||
SWITCH_LEAVING_PINKAN_ISLAND=1113
|
SWITCH_LEAVING_PINKAN_ISLAND=1113
|
||||||
SWITCH_BLOCK_PINKAN_WHISTLE=1111
|
SWITCH_BLOCK_PINKAN_WHISTLE=1111
|
||||||
|
SWITCH_PINKAN_FINISHED=1119
|
||||||
|
|
||||||
VAR_ORICORIO_FLOWERS = 276
|
VAR_ORICORIO_FLOWERS = 276
|
||||||
#Randomizer Switches
|
#Randomizer Switches
|
||||||
|
|||||||
@@ -922,7 +922,7 @@ end
|
|||||||
def promptCaughtPokemonAction(pokemon)
|
def promptCaughtPokemonAction(pokemon)
|
||||||
pickedOption = false
|
pickedOption = false
|
||||||
return pbStorePokemon(pokemon) if !$Trainer.party_full?
|
return pbStorePokemon(pokemon) if !$Trainer.party_full?
|
||||||
return promptKeepOrRelease(pokemon) if isOnPinkanIsland()
|
return promptKeepOrRelease(pokemon) if isOnPinkanIsland() && !$game_switches[SWITCH_PINKAN_FINISHED]
|
||||||
while !pickedOption
|
while !pickedOption
|
||||||
command = pbMessage(_INTL("\\ts[]Your team is full!"),
|
command = pbMessage(_INTL("\\ts[]Your team is full!"),
|
||||||
[_INTL("Add to your party"), _INTL("Store to PC"),], 2)
|
[_INTL("Add to your party"), _INTL("Store to PC"),], 2)
|
||||||
|
|||||||
@@ -349,6 +349,7 @@ def resetPinkanIsland()
|
|||||||
$game_switches[SWITCH_LEAVING_PINKAN_ISLAND]=false
|
$game_switches[SWITCH_LEAVING_PINKAN_ISLAND]=false
|
||||||
$game_switches[SWITCH_PINKAN_SIDE_POLICE]=false
|
$game_switches[SWITCH_PINKAN_SIDE_POLICE]=false
|
||||||
$game_switches[SWITCH_PINKAN_SIDE_ROCKET]=false
|
$game_switches[SWITCH_PINKAN_SIDE_ROCKET]=false
|
||||||
|
$game_switches[SWITCH_PINKAN_FINISHED]=false
|
||||||
|
|
||||||
for map_id in Settings::PINKAN_ISLAND_MAPS
|
for map_id in Settings::PINKAN_ISLAND_MAPS
|
||||||
map = $MapFactory.getMap(map_id,false)
|
map = $MapFactory.getMap(map_id,false)
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user