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

Renamed some constants

Browse Source
This commit is contained in:
infinitefusion
2022-04-30 17:22:44 -04:00
parent 9d73e88afd
commit 2a76ee27e9
18 changed files with 120 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb
View File

@@ -83,9 +83,9 @@ class PokeBattle_Battler
def updateSpirits()
if $PokemonBag.pbQuantity(:ODDKEYSTONE)>=1 && @pokemon.hasType?(:GHOST)
nbSpirits = pbGet(ODDKEYSTONE_NB_VARIABLE)
nbSpirits = pbGet(VAR_ODDKEYSTONE_NB)
if nbSpirits < 108
pbSet(ODDKEYSTONE_NB_VARIABLE,nbSpirits+1)
pbSet(VAR_ODDKEYSTONE_NB, nbSpirits+1)
end
end
end

6
Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb
View File

@@ -337,7 +337,7 @@ class PokeBattle_Battle
# End of battle
#=============================================================================
def pbGainMoney
return if $game_switches[IS_REMATCH_SWITCH] #is rematch
return if $game_switches[SWITCH_IS_REMATCH] #is rematch
return if !@internalBattle || !@moneyGain
# Money rewarded from opposing trainers
if trainerBattle?
@@ -455,7 +455,7 @@ class PokeBattle_Battle
# Register captured Pokémon in the Pokédex, and store them
pbRecordAndStoreCaughtPokemon
isRematch = $game_switches[IS_REMATCH_SWITCH]
isRematch = $game_switches[SWITCH_IS_REMATCH]
begin
if isRematch
if @opponent.is_a?(Array)
@@ -469,7 +469,7 @@ class PokeBattle_Battle
end
end
rescue
$game_switches[IS_REMATCH_SWITCH]=false
$game_switches[SWITCH_IS_REMATCH]=false
end

2
Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb
View File

@@ -8,7 +8,7 @@ class PokeBattle_Battle
return if !@internalBattle || !@expGain
# Go through each battler in turn to find the Pokémon that participated in
# battle against it, and award those Pokémon Exp/EVs
expAll = (GameData::Item.exists?(:EXPALL) && $PokemonBag.pbHasItem?(:EXPALL)) || $game_switches[GAME_DIFFICULTY_EASY]
expAll = (GameData::Item.exists?(:EXPALL) && $PokemonBag.pbHasItem?(:EXPALL)) || $game_switches[SWITCH_GAME_DIFFICULTY_EASY]
p1 = pbParty(0)
@battlers.each do |b|
next unless b && b.opposes? # Can only gain Exp from fainted foes

2
Data/Scripts/011_Battle/003_Battle/006_Battle_Action_Switching.rb
View File

@@ -174,7 +174,7 @@ class PokeBattle_Battle
end
switchMessageHard = _INTL("{1} is about to send in a new Pokémon. Will you switch your Pokémon?", opponent.fullname)
switchMessageNormal = _INTL("{1} is about to send in {2}. Will you switch your Pokémon?", opponent.full_name, enemyParty[idxPartyForName].name)
switchMessage = $game_switches[GAME_DIFFICULTY_HARD] ? switchMessageHard : switchMessageNormal
switchMessage = $game_switches[SWITCH_GAME_DIFFICULTY_HARD] ? switchMessageHard : switchMessageNormal
if pbDisplayConfirm(switchMessage)
idxPlayerPartyNew = pbSwitchInBetween(0, false, true)
if idxPlayerPartyNew >= 0