Renamed ABC inputs

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

View File

@@ -275,7 +275,7 @@ def pbChooseNumber(msgwindow,params)
cmdwindow.update
msgwindow.update if msgwindow
yield if block_given?
if Input.trigger?(Input::C)
if Input.trigger?(Input::USE)
ret=cmdwindow.number
if ret>maximum
pbPlayBuzzerSE()
@@ -285,7 +285,7 @@ def pbChooseNumber(msgwindow,params)
pbPlayDecisionSE()
break
end
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
pbPlayCancelSE()
ret=cancelNumber
break
@@ -736,7 +736,7 @@ def pbMessageDisplay(msgwindow,message,letterbyletter=true,commandProc=nil)
msgwindow.resume if msgwindow.busy?
break if !msgwindow.busy?
end
if Input.trigger?(Input::C) || Input.trigger?(Input::B)
if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
if msgwindow.busy?
pbPlayDecisionSE if msgwindow.pausing?
msgwindow.resume
@@ -834,7 +834,7 @@ def pbShowCommands(msgwindow,commands=nil,cmdIfCancel=0,defaultCmd=0)
cmdwindow.update
msgwindow.update if msgwindow
yield if block_given?
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
if cmdIfCancel>0
command=cmdIfCancel-1
break
@@ -843,7 +843,7 @@ def pbShowCommands(msgwindow,commands=nil,cmdIfCancel=0,defaultCmd=0)
break
end
end
if Input.trigger?(Input::C)
if Input.trigger?(Input::USE)
command=cmdwindow.index
break
end
@@ -880,7 +880,7 @@ def pbShowCommandsWithHelp(msgwindow,commands,help,cmdIfCancel=0,defaultCmd=0)
end
msgwin.update
yield if block_given?
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
if cmdIfCancel>0
command=cmdIfCancel-1
break
@@ -889,7 +889,7 @@ def pbShowCommandsWithHelp(msgwindow,commands,help,cmdIfCancel=0,defaultCmd=0)
break
end
end
if Input.trigger?(Input::C)
if Input.trigger?(Input::USE)
command=cmdwindow.index
break
end
@@ -914,7 +914,7 @@ def pbMessageWaitForInput(msgwindow,frames,showPause=false)
Input.update
msgwindow.update if msgwindow
pbUpdateSceneMap
if Input.trigger?(Input::C) || Input.trigger?(Input::B)
if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
break
end
yield if block_given?

View File

@@ -226,19 +226,19 @@ class Window_TextEntry < SpriteWindow_Base
self.refresh if (@frame%10)==0
return if !self.active
# Moving cursor
if Input.repeat?(Input::LEFT) && Input.press?(Input::A)
if Input.repeat?(Input::LEFT) && Input.press?(Input::SPECIAL)
if @helper.cursor > 0
@helper.cursor -= 1
@frame = 0
self.refresh
end
elsif Input.repeat?(Input::RIGHT) && Input.press?(Input::A)
elsif Input.repeat?(Input::RIGHT) && Input.press?(Input::SPECIAL)
if @helper.cursor < self.text.scan(/./m).length
@helper.cursor += 1
@frame = 0
self.refresh
end
elsif Input.repeat?(Input::B) # Backspace
elsif Input.repeat?(Input::BACK) # Backspace
self.delete if @helper.cursor > 0
end
end
@@ -837,7 +837,7 @@ class PokemonEntryScene
@sprites["entry"].update
@sprites["entry2"].update
@sprites["subject"].update if @sprites["subject"]
if Input.trigger?(Input::C)
if Input.trigger?(Input::USE)
index=@sprites["entry2"].command
if index==-3 # Confirm text
ret=@sprites["entry"].text
@@ -1311,16 +1311,16 @@ class PokemonEntryScene2
Input.update
pbUpdate
next if pbMoveCursor
if Input.trigger?(Input::F5)
if Input.trigger?(Input::Z)
pbChangeTab
elsif Input.trigger?(Input::A)
elsif Input.trigger?(Input::SPECIAL)
@cursorpos = OK
@sprites["cursor"].setCursorPos(@cursorpos)
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
@helper.delete
pbPlayCancelSE()
pbUpdateOverlay
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
case @cursorpos
when BACK # Backspace
@helper.delete