Adds date, game mode and difficulty to HoF screen + minor fixes

This commit is contained in:
chardub
2023-01-07 12:59:28 -05:00
parent 4ffba4437e
commit c0aeb32c45
19 changed files with 51 additions and 7 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -46,9 +46,11 @@ class PokeBattle_Scene
#hidden ability animation #hidden ability animation
if @battle.battlers[idxBattler].hasHiddenAbility? if @battle.battlers[idxBattler].hasHiddenAbility?
pbCommonAnimation("StatUp",@battle.battlers[idxBattler]) pbCommonAnimation("StatUp",@battle.battlers[idxBattler])
if @battle.is_a?(PokeBattle_Battle)
@battle.pbShowAbilitySplash(@battle.battlers[idxBattler],true) @battle.pbShowAbilitySplash(@battle.battlers[idxBattler],true)
@battle.pbHideAbilitySplash(@battle.battlers[idxBattler]) @battle.pbHideAbilitySplash(@battle.battlers[idxBattler])
end end
end
#shiny animation #shiny animation
next if !@battle.battlers[idxBattler] || !@battle.battlers[idxBattler].shiny? next if !@battle.battlers[idxBattler] || !@battle.battlers[idxBattler].shiny?

View File

@@ -46,6 +46,10 @@ class PokeBattle_FakeBattler
return $Trainer.owned?(pokemon.species) return $Trainer.owned?(pokemon.species)
end end
def hasHiddenAbility?
return @pokemon.hasHiddenAbility?
end
def pbThis(lowerCase=false) def pbThis(lowerCase=false)
return (lowerCase) ? _INTL("the wild {1}",name) : _INTL("The wild {1}",name) return (lowerCase) ? _INTL("the wild {1}",name) : _INTL("The wild {1}",name)
end end
@@ -351,6 +355,7 @@ class PokeBattle_SafariZone
return @sideSizes[index%2] return @sideSizes[index%2]
end end
#============================================================================= #=============================================================================
# Trainers and owner-related # Trainers and owner-related
#============================================================================= #=============================================================================

View File

@@ -343,6 +343,39 @@ class HallOfFame_Scene
overlay.clear overlay.clear
pbDrawTextPositions(overlay, [[_INTL("Welcome to the Hall of Fame!"), pbDrawTextPositions(overlay, [[_INTL("Welcome to the Hall of Fame!"),
Graphics.width / 2, Graphics.height - 80, 2, BASECOLOR, SHADOWCOLOR]]) Graphics.width / 2, Graphics.height - 80, 2, BASECOLOR, SHADOWCOLOR]])
writeCurrentDate(overlay, 120 , Graphics.height - 50)
writeGameMode(overlay, (Graphics.width / 2) + 100, Graphics.height - 50)
end
def writeCurrentDate(overlay, x, y)
currentTime = Time.new
timeString = currentTime.year.to_s + "-" + ("%02d" % currentTime.month) + "-" + ("%02d" % currentTime.day)
pbDrawTextPositions(overlay, [[_INTL("{1}", timeString), x, y, 2, BASECOLOR, SHADOWCOLOR]])
end
def writeGameMode(overlay, x, y)
gameMode = "Classic mode"
if $game_switches[SWITCH_MODERN_MODE]
gameMode = "Modern mode"
end
if $game_switches[SWITCH_SINGLE_POKEMON_MODE]
pokemon_number = pbGet(VAR_SINGLE_POKEMON_MODE)
if pokemon_number.is_a?(Integer) && pokemon_number >0
pokemon = GameData::Species.get(pokemon_number)
gameMode = pokemon.real_name + " mode"
else
gameMode = "Debug mode"
end
end
if $game_switches[SWITCH_RANDOMIZED_AT_LEAST_ONCE]
gameMode = "Randomized mode"
end
if $PokemonBag.pbQuantity(:MAGICBOOTS)>=1 || $DEBUG
gameMode = "Debug mode"
end
pbDrawTextPositions(overlay, [[_INTL("{1} ({2})", gameMode, getDifficulty), x, y, 2, BASECOLOR, SHADOWCOLOR]])
end end
def pbAnimationLoop def pbAnimationLoop
@@ -444,7 +477,6 @@ class HallOfFame_Scene
return false return false
end end
def pbUpdatePC def pbUpdatePC
# Change the team # Change the team
if @battlerIndex >= @hallEntry.size if @battlerIndex >= @hallEntry.size

View File

@@ -1800,6 +1800,11 @@ class PokemonStorageScreen
index = selected[1] index = selected[1]
pokemon = @storage[box, index] pokemon = @storage[box, index]
if pokemon.egg?
pbDisplay(_INTL("You cannot rename an egg!"))
return
end
speciesname = PBSpecies.getName(pokemon.species) speciesname = PBSpecies.getName(pokemon.species)
hasNickname = speciesname == pokemon.name hasNickname = speciesname == pokemon.name
if hasNickname if hasNickname

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.