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

Renamed ABC inputs

Browse Source
This commit is contained in:
Maruno17
2021-02-27 22:02:46 +00:00
parent 19fe83f932
commit a112a21a87
59 changed files with 303 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Data/Scripts/012_Battle/005_Battle scene/006_PokeBattle_Scene.rb
View File

@@ -44,7 +44,7 @@ class PokeBattle_Scene
def pbInputUpdate
Input.update
if Input.trigger?(Input::B) && @abortable && !@aborted
if Input.trigger?(Input::BACK) && @abortable && !@aborted
@aborted = true
@battle.pbAbort
end
@@ -140,7 +140,7 @@ class PokeBattle_Scene
end
i += 1
end
if Input.trigger?(Input::B) || Input.trigger?(Input::C) || @abortable
if Input.trigger?(Input::BACK) || Input.trigger?(Input::USE) || @abortable
if cw.busy?
pbPlayDecisionSE if cw.pausing? && !@abortable
cw.skipAhead
@@ -182,7 +182,7 @@ class PokeBattle_Scene
i += 1
end
end
if Input.trigger?(Input::B) || Input.trigger?(Input::C) || @abortable
if Input.trigger?(Input::BACK) || Input.trigger?(Input::USE) || @abortable
if cw.busy?
pbPlayDecisionSE if cw.pausing? && !@abortable
cw.skipAhead
@@ -215,7 +215,7 @@ class PokeBattle_Scene
cw.visible = (!dw.busy?)
pbUpdate(cw)
dw.update
if Input.trigger?(Input::B) && defaultValue>=0
if Input.trigger?(Input::BACK) && defaultValue>=0
if dw.busy?
pbPlayDecisionSE if dw.pausing?
dw.resume
@@ -224,7 +224,7 @@ class PokeBattle_Scene
dw.text = ""
return defaultValue
end
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
if dw.busy?
pbPlayDecisionSE if dw.pausing?
dw.resume

16
Data/Scripts/012_Battle/005_Battle scene/008_Scene_Commands.rb
View File

@@ -45,12 +45,12 @@ class PokeBattle_Scene
end
pbPlayCursorSE if cw.index!=oldIndex
# Actions
if Input.trigger?(Input::C) # Confirm choice
if Input.trigger?(Input::USE) # Confirm choice
pbPlayDecisionSE
ret = cw.index
@lastCmd[idxBattler] = ret
break
elsif Input.trigger?(Input::B) && mode==1 # Cancel
elsif Input.trigger?(Input::BACK) && mode==1 # Cancel
pbPlayCancelSE
break
elsif Input.trigger?(Input::F9) && $DEBUG # Debug menu
@@ -110,22 +110,22 @@ class PokeBattle_Scene
end
pbPlayCursorSE if cw.index!=oldIndex
# Actions
if Input.trigger?(Input::C) # Confirm choice
if Input.trigger?(Input::USE) # Confirm choice
pbPlayDecisionSE
break if yield cw.index
needFullRefresh = true
needRefresh = true
elsif Input.trigger?(Input::B) # Cancel fight menu
elsif Input.trigger?(Input::BACK) # Cancel fight menu
pbPlayCancelSE
break if yield -1
needRefresh = true
elsif Input.trigger?(Input::A) # Toggle Mega Evolution
elsif Input.trigger?(Input::SPECIAL) # Toggle Mega Evolution
if megaEvoPossible
pbPlayDecisionSE
break if yield -2
needRefresh = true
end
elsif Input.trigger?(Input::F5) # Shift
elsif Input.trigger?(Input::Z) # Shift
if cw.shiftMode>0
pbPlayDecisionSE
break if yield -3
@@ -420,11 +420,11 @@ class PokeBattle_Scene
pbSelectBattler(cw.index,2) # Select the new battler/data box
end
end
if Input.trigger?(Input::C) # Confirm
if Input.trigger?(Input::USE) # Confirm
ret = cw.index
pbPlayDecisionSE
break
elsif Input.trigger?(Input::B) # Cancel
elsif Input.trigger?(Input::BACK) # Cancel
ret = -1
pbPlayCancelSE
break