WIP 5.1 stuff

This commit is contained in:
infinitefusion
2022-11-13 12:56:41 -05:00
parent 4351333703
commit 22fb1ac9a3
65 changed files with 17 additions and 107 deletions

View File

@@ -1008,7 +1008,7 @@ class PokemonPartyScreen
def pbPokemonMultipleEntryScreenEx(ruleset)
annot = []
statuses = []
ordinals = [_INTL("INELIGIBLE"), _INTL("NOT ENTERED"), _INTL("CANNOT ENTER")]
ordinals = [_INTL("INELIGIBLE"), _INTL("NOT ENTERED"), _INTL("BANNED")]
positions = [_INTL("FIRST"), _INTL("SECOND"), _INTL("THIRD"), _INTL("FOURTH"),
_INTL("FIFTH"), _INTL("SIXTH"), _INTL("SEVENTH"), _INTL("EIGHTH"),
_INTL("NINTH"), _INTL("TENTH"), _INTL("ELEVENTH"), _INTL("TWELFTH")]

View File

@@ -2156,6 +2156,7 @@ class PokemonStorageScreen
pbDisplay(_INTL("{1} is already fused!", heldpoke.name))
return
end
p selected
if(heldpoke.egg?)
pbDisplay(_INTL("It's impossible to fuse an egg!"))
return