DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 14:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Playing ME is stopped if a battle is skipped, fixed bug in Encounters Editor, sprite renamer now recognises 4+ digit ID numbers

Browse Source
This commit is contained in:
Maruno17
2021-05-18 20:01:01 +01:00
parent 6d7bae913e
commit be61441755
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb
View File

@@ -217,6 +217,7 @@ def pbWildBattleCore(*args)
$PokemonGlobal.nextBattleME = nil
$PokemonGlobal.nextBattleCaptureME = nil
$PokemonGlobal.nextBattleBack = nil
pbMEStop
return 1 # Treat it as a win
end
# Record information about party Pokémon to be used at the end of battle (e.g.
@@ -355,6 +356,7 @@ def pbTrainerBattleCore(*args)
$PokemonGlobal.nextBattleME = nil
$PokemonGlobal.nextBattleCaptureME = nil
$PokemonGlobal.nextBattleBack = nil
pbMEStop
return ($Trainer.able_pokemon_count == 0) ? 0 : 1 # Treat it as undecided/a win
end
# Record information about party Pokémon to be used at the end of battle (e.g.