DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-01-24 15:26:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mkxp-z

Browse Source
This commit is contained in:
Maruno17
2020-11-09 19:26:44 +00:00
parent 5d4a342415 0301e2e947
commit e7fcc27907
79 changed files with 3367 additions and 3235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/020_System and utilities/004_PSystem_PokemonUtilities.rb
View File

@@ -77,7 +77,7 @@ def pbAddPokemon(pokemon,level=nil,seeform=true)
pokemon = pbNewPkmn(pokemon,level)
end
speciesname = PBSpecies.getName(pokemon.species)
pbMessage(_INTL("\\me[Pkmn get]{1} obtained {2}!\1",$Trainer.name,speciesname))
pbMessage(_INTL("{1} obtained {2}!\\me[Pkmn get]\\wtnp[80]\1",$Trainer.name,speciesname))
pbNicknameAndStore(pokemon)
pbSeenForm(pokemon) if seeform
return true
@@ -113,7 +113,7 @@ def pbAddToParty(pokemon,level=nil,seeform=true)
pokemon = pbNewPkmn(pokemon,level)
end
speciesname = PBSpecies.getName(pokemon.species)
pbMessage(_INTL("\\me[Pkmn get]{1} obtained {2}!\1",$Trainer.name,speciesname))
pbMessage(_INTL("{1} obtained {2}!\\me[Pkmn get]\\wtnp[80]\1",$Trainer.name,speciesname))
pbNicknameAndStore(pokemon)
pbSeenForm(pokemon) if seeform
return true

6
Data/Scripts/020_System and utilities/005_PSystem_Utilities.rb
View File

@@ -286,7 +286,7 @@ end
#===============================================================================
# JavaScript-related utilities
# Json-related utilities
#===============================================================================
# Returns true if the given string represents a valid object in JavaScript
# Object Notation, and false otherwise.
@@ -1172,10 +1172,10 @@ def pbLoadRpgxpScene(scene)
end
Graphics.transition(20)
Graphics.freeze
oldscene.createSpritesets
$scene = oldscene
$scene.createSpritesets
pbShowObjects(visibleObjects)
Graphics.transition(20)
$scene = oldscene
end