Makes it not possible to put hats on triple fusions (temp fix to prevent crash)

This commit is contained in:
infinitefusion
2025-01-06 00:31:43 -05:00
parent 7a2978a329
commit fdd672c0de
9 changed files with 1623 additions and 8785 deletions

Binary file not shown.

View File

@@ -1254,7 +1254,7 @@ class PokemonPartyScreen
end
end
commands[cmdSwitch = commands.length] = _INTL("Switch") if @party.length > 1
commands[cmdHat = commands.length] = _INTL("Hat") if !pkmn.egg? && $game_switches[SWITCH_UNLOCKED_POKEMON_HATS]
commands[cmdHat = commands.length] = _INTL("Hat") if canPutHatOnPokemon(pkmn)
if !pkmn.egg?
if pkmn.mail
commands[cmdMail = commands.length] = _INTL("Mail")

View File

@@ -1282,7 +1282,7 @@ class PokemonSummary_Scene
if pbBattleChallenge.currentChallenge == -1
commands[cmdGiveItem = commands.length] = _INTL("Give item")
commands[cmdTakeItem = commands.length] = _INTL("Take item") if @pokemon.hasItem?
commands[cmdHat = commands.length] = _INTL("Hat") if !@pokemon.egg? && $game_switches[SWITCH_UNLOCKED_POKEMON_HATS]
commands[cmdHat = commands.length] = _INTL("Hat") if canPutHatOnPokemon(@pokemon)
end
commands[cmdPokedex = commands.length] = _INTL("View Pokédex") if $Trainer.has_pokedex
end

View File

@@ -314,4 +314,8 @@ def randomizePlayerOutfit()
$Trainer.skin_tone = [1,2,3,4,5,6].sample
$Trainer.hair = getFullHairId(hair_id,hair_color)
end
def canPutHatOnPokemon(pokemon)
return !pokemon.egg? && !pokemon.isTripleFusion? && $game_switches[SWITCH_UNLOCKED_POKEMON_HATS]
end

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
1736093802
1736093802
1736093807
1736093811
1736093815
1736141405
1736141411
1736141416
1736141419
1736141430

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 831 KiB

After

Width:  |  Height:  |  Size: 829 KiB