non custom finals export + random changes

This commit is contained in:
infinitefusion
2022-11-12 09:35:32 -05:00
parent be6f800a45
commit 4351333703
31 changed files with 1374 additions and 1217 deletions

View File

@@ -1008,7 +1008,7 @@ class PokemonPartyScreen
def pbPokemonMultipleEntryScreenEx(ruleset)
annot = []
statuses = []
ordinals = [_INTL("INELIGIBLE"), _INTL("NOT ENTERED"), _INTL("BANNED")]
ordinals = [_INTL("INELIGIBLE"), _INTL("NOT ENTERED"), _INTL("CANNOT ENTER")]
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,7 +2156,6 @@ 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