DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-02-02 19:31:03 +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

6
Data/Scripts/001_Technical/011_Input.rb
View File

@@ -1,3 +1,9 @@
module Input
USE = C
BACK = B
SPECIAL = A
end
module Mouse module Mouse
module_function module_function

2
Data/Scripts/003_Game classes/002_Game_System.rb
View File

@@ -276,7 +276,7 @@ class Game_System
def update def update
@timer -= 1 if @timer_working and @timer>0 @timer -= 1 if @timer_working and @timer>0
if Input.trigger?(Input::F5) && pbCurrentEventCommentInput(1,"Cut Scene") if Input.trigger?(Input::Z) && pbCurrentEventCommentInput(1,"Cut Scene")
event = @map_interpreter.get_character(0) event = @map_interpreter.get_character(0)
@map_interpreter.pbSetSelfSwitch(event.id,"A",true) @map_interpreter.pbSetSelfSwitch(event.id,"A",true)
@map_interpreter.command_end @map_interpreter.command_end

2
Data/Scripts/003_Game classes/007_Game_Player.rb
View File

@@ -401,7 +401,7 @@ class Game_Player < Game_Character
pbOnStepTaken(result) pbOnStepTaken(result)
end end
# If C button was pressed, try to manually interact with events # If C button was pressed, try to manually interact with events
if Input.trigger?(Input::C) && !$PokemonTemp.miniupdate if Input.trigger?(Input::USE) && !$PokemonTemp.miniupdate
# Same position and front event determinant # Same position and front event determinant
check_event_trigger_here([0]) check_event_trigger_here([0])
check_event_trigger_there([0,2]) check_event_trigger_there([0,2])

2
Data/Scripts/003_Game classes/008_Game_Player_Visuals.rb
View File

@@ -24,7 +24,7 @@ class Game_Player < Game_Character
@move_route_forcing || $game_temp.message_window_showing || @move_route_forcing || $game_temp.message_window_showing ||
pbMapInterpreterRunning? pbMapInterpreterRunning?
terrain = pbGetTerrainTag terrain = pbGetTerrainTag
input = ($PokemonSystem.runstyle==1) ? $PokemonGlobal.runtoggle : Input.press?(Input::A) input = ($PokemonSystem.runstyle==1) ? $PokemonGlobal.runtoggle : Input.press?(Input::SPECIAL)
return input && $PokemonGlobal.runningShoes && !jumping? && return input && $PokemonGlobal.runningShoes && !jumping? &&
!$PokemonGlobal.diving && !$PokemonGlobal.surfing && !$PokemonGlobal.diving && !$PokemonGlobal.surfing &&
!$PokemonGlobal.bicycle && !PBTerrain.onlyWalk?(terrain) !$PokemonGlobal.bicycle && !PBTerrain.onlyWalk?(terrain)

8
Data/Scripts/006_Game processing/002_Scene_Map.rb
View File

@@ -176,18 +176,18 @@ class Scene_Map
end end
return if $game_temp.message_window_showing return if $game_temp.message_window_showing
if !pbMapInterpreterRunning? if !pbMapInterpreterRunning?
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
$PokemonTemp.hiddenMoveEventCalling = true $PokemonTemp.hiddenMoveEventCalling = true
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
unless $game_system.menu_disabled or $game_player.moving? unless $game_system.menu_disabled or $game_player.moving?
$game_temp.menu_calling = true $game_temp.menu_calling = true
$game_temp.menu_beep = true $game_temp.menu_beep = true
end end
elsif Input.trigger?(Input::F5) elsif Input.trigger?(Input::Z)
unless $game_player.moving? unless $game_player.moving?
$PokemonTemp.keyItemCalling = true $PokemonTemp.keyItemCalling = true
end end
elsif Input.trigger?(Input::A) elsif Input.trigger?(Input::SPECIAL)
if $PokemonSystem.runstyle==1 if $PokemonSystem.runstyle==1
$PokemonGlobal.runtoggle = !$PokemonGlobal.runtoggle $PokemonGlobal.runtoggle = !$PokemonGlobal.runtoggle
end end

16
Data/Scripts/009_Objects and windows/011_Messages.rb
View File

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

16
Data/Scripts/009_Objects and windows/012_TextEntry.rb
View File

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

4
Data/Scripts/010_Scenes/002_EventScene.rb
View File

@@ -167,9 +167,9 @@ class EventScene
sprite.update sprite.update
end end
@onUpdate.trigger(self) @onUpdate.trigger(self)
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
@onBTrigger.trigger(self) @onBTrigger.trigger(self)
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
@onCTrigger.trigger(self) @onCTrigger.trigger(self)
end end
end end

2
Data/Scripts/010_Scenes/003_Scene_Intro.rb
View File

@@ -111,7 +111,7 @@ class IntroEventScene < EventScene
@pic2.moveOpacity(TICKS_PER_ENTER_FLASH*6/10,TICKS_PER_ENTER_FLASH*4/10,255) @pic2.moveOpacity(TICKS_PER_ENTER_FLASH*6/10,TICKS_PER_ENTER_FLASH*4/10,255)
end end
if Input.press?(Input::DOWN) && if Input.press?(Input::DOWN) &&
Input.press?(Input::B) && Input.press?(Input::BACK) &&
Input.press?(Input::CTRL) Input.press?(Input::CTRL)
closeSplashDelete(scene,args) closeSplashDelete(scene,args)
end end

2
Data/Scripts/010_Scenes/005_Scene_Credits.rb
View File

@@ -196,7 +196,7 @@ _END_
# Check if the credits should be cancelled # Check if the credits should be cancelled
def cancel? def cancel?
if Input.trigger?(Input::C) && $PokemonGlobal.creditsPlayed if Input.trigger?(Input::USE) && $PokemonGlobal.creditsPlayed
$scene = Scene_Map.new $scene = Scene_Map.new
pbBGMFade(1.0) pbBGMFade(1.0)
return true return true

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

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

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

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

4
Data/Scripts/013_Overworld/002_PField_Field.rb
View File

@@ -961,7 +961,7 @@ def pbWaitMessage(msgWindow,time)
Graphics.update Graphics.update
Input.update Input.update
pbUpdateSceneMap pbUpdateSceneMap
if Input.trigger?(Input::C) || Input.trigger?(Input::B) if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
return true return true
end end
end end
@@ -987,7 +987,7 @@ def pbWaitForInput(msgWindow,message,frames)
else else
$game_player.pattern = 0 $game_player.pattern = 0
end end
if Input.trigger?(Input::C) || Input.trigger?(Input::B) if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
$game_player.pattern = 0 $game_player.pattern = 0
return true return true
end end

2
Data/Scripts/013_Overworld/014_PField_DependentEvents.rb
View File

@@ -394,7 +394,7 @@ class DependentEvents
events[i][5]=event.direction events[i][5]=event.direction
end end
# Check event triggers # Check event triggers
if Input.trigger?(Input::C) && !$game_temp.in_menu && !$game_temp.in_battle && if Input.trigger?(Input::USE) && !$game_temp.in_menu && !$game_temp.in_battle &&
!$game_player.move_route_forcing && !$game_temp.message_window_showing && !$game_player.move_route_forcing && !$game_temp.message_window_showing &&
!pbMapInterpreterRunning? !pbMapInterpreterRunning?
# Get position of tile facing the player # Get position of tile facing the player

2
Data/Scripts/015_Items/001_PItem_Items.rb
View File

@@ -200,7 +200,7 @@ def pbTopRightWindow(text, scene = nil)
Input.update Input.update
window.update window.update
scene.pbUpdate if scene scene.pbUpdate if scene
break if Input.trigger?(Input::C) break if Input.trigger?(Input::USE)
end end
window.dispose window.dispose
end end

2
Data/Scripts/015_Items/006_PItem_Mail.rb
View File

@@ -96,7 +96,7 @@ def pbDisplayMail(mail,_bearer=nil)
Graphics.update Graphics.update
Input.update Input.update
pbUpdateSpriteHash(sprites) pbUpdateSpriteHash(sprites)
if Input.trigger?(Input::B) || Input.trigger?(Input::C) if Input.trigger?(Input::BACK) || Input.trigger?(Input::USE)
break break
end end
end end

4
Data/Scripts/017_UI/001_PScreen_PauseMenu.rb
View File

@@ -59,11 +59,11 @@ class PokemonPauseMenu_Scene
Graphics.update Graphics.update
Input.update Input.update
pbUpdateSceneMap pbUpdateSceneMap
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
ret = -1 ret = -1
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
ret = cmdwindow.index ret = cmdwindow.index
$PokemonTemp.menuLastChoice = ret $PokemonTemp.menuLastChoice = ret

4
Data/Scripts/017_UI/002_PScreen_PokedexMenu.rb
View File

@@ -63,10 +63,10 @@ class PokemonPokedexMenu_Scene
Graphics.update Graphics.update
Input.update Input.update
pbUpdate pbUpdate
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
ret = @sprites["commands"].index ret = @sprites["commands"].index
(ret==@commands.length-1) ? pbPlayCloseMenuSE : pbPlayDecisionSE (ret==@commands.length-1) ? pbPlayCloseMenuSE : pbPlayDecisionSE
break break

18
Data/Scripts/017_UI/003_PScreen_PokedexMain.rb
View File

@@ -951,14 +951,14 @@ class PokemonPokedex_Scene
pbPlayCursorSE if index!=oldindex pbPlayCursorSE if index!=oldindex
end end
end end
if Input.trigger?(Input::A) if Input.trigger?(Input::SPECIAL)
index = -2 index = -2
pbPlayCursorSE if index!=oldindex pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
ret = nil ret = nil
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
if index==-2 # OK if index==-2 # OK
pbPlayDecisionSE pbPlayDecisionSE
ret = selindex ret = selindex
@@ -1066,13 +1066,13 @@ class PokemonPokedex_Scene
elsif index==7 || index==8; index += 1 elsif index==7 || index==8; index += 1
end end
pbPlayCursorSE if index!=oldindex pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::A) elsif Input.trigger?(Input::SPECIAL)
index = 8 index = 8
pbPlayCursorSE if index!=oldindex pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE if index!=9 pbPlayDecisionSE if index!=9
case index case index
when 0 # Choose sort order when 0 # Choose sort order
@@ -1159,12 +1159,12 @@ class PokemonPokedex_Scene
$PokemonGlobal.pokedexIndex[pbGetSavePositionIndex] = @sprites["pokedex"].index if !@searchResults $PokemonGlobal.pokedexIndex[pbGetSavePositionIndex] = @sprites["pokedex"].index if !@searchResults
pbRefresh pbRefresh
end end
if Input.trigger?(Input::A) if Input.trigger?(Input::SPECIAL)
pbPlayDecisionSE pbPlayDecisionSE
@sprites["pokedex"].active = false @sprites["pokedex"].active = false
pbDexSearch pbDexSearch
@sprites["pokedex"].active = true @sprites["pokedex"].active = true
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
if @searchResults if @searchResults
pbPlayCancelSE pbPlayCancelSE
pbCloseSearch pbCloseSearch
@@ -1172,7 +1172,7 @@ class PokemonPokedex_Scene
pbPlayCloseMenuSE pbPlayCloseMenuSE
break break
end end
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
if $Trainer.seen?(@sprites["pokedex"].species) if $Trainer.seen?(@sprites["pokedex"].species)
pbPlayDecisionSE pbPlayDecisionSE
pbDexEntry(@sprites["pokedex"].index) pbDexEntry(@sprites["pokedex"].index)

16
Data/Scripts/017_UI/004_PScreen_PokedexEntry.rb
View File

@@ -436,10 +436,10 @@ class PokemonPokedexInfo_Scene
elsif Input.trigger?(Input::DOWN) elsif Input.trigger?(Input::DOWN)
pbPlayCursorSE pbPlayCursorSE
index = (index+1)%@available.length index = (index+1)%@available.length
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCancelSE pbPlayCancelSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
break break
end end
@@ -455,13 +455,13 @@ class PokemonPokedexInfo_Scene
Input.update Input.update
pbUpdate pbUpdate
dorefresh = false dorefresh = false
if Input.trigger?(Input::A) if Input.trigger?(Input::SPECIAL)
pbSEStop pbSEStop
GameData::Species.play_cry_from_species(@species, @form) if @page == 1 GameData::Species.play_cry_from_species(@species, @form) if @page == 1
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
if @page==2 # Area if @page==2 # Area
# dorefresh = true # dorefresh = true
elsif @page==3 # Forms elsif @page==3 # Forms
@@ -523,13 +523,13 @@ class PokemonPokedexInfo_Scene
Graphics.update Graphics.update
Input.update Input.update
pbUpdate pbUpdate
if Input.trigger?(Input::A) if Input.trigger?(Input::SPECIAL)
pbSEStop pbSEStop
GameData::Species.play_cry_from_species(@species, @form) GameData::Species.play_cry_from_species(@species, @form)
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
break break
end end

20
Data/Scripts/017_UI/005_PScreen_Party.rb
View File

@@ -489,12 +489,12 @@ class PokemonParty_Scene
Input.update Input.update
self.update self.update
if @sprites["messagebox"].busy? if @sprites["messagebox"].busy?
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
pbPlayDecisionSE if @sprites["messagebox"].pausing? pbPlayDecisionSE if @sprites["messagebox"].pausing?
@sprites["messagebox"].resume @sprites["messagebox"].resume
end end
else else
if Input.trigger?(Input::B) || Input.trigger?(Input::C) if Input.trigger?(Input::BACK) || Input.trigger?(Input::USE)
break break
end end
end end
@@ -520,10 +520,10 @@ class PokemonParty_Scene
cmdwindow.update cmdwindow.update
self.update self.update
if !@sprites["messagebox"].busy? if !@sprites["messagebox"].busy?
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
ret = false ret = false
break break
elsif Input.trigger?(Input::C) && @sprites["messagebox"].resume elsif Input.trigger?(Input::USE) && @sprites["messagebox"].resume
ret = (cmdwindow.index==0) ret = (cmdwindow.index==0)
break break
end end
@@ -551,11 +551,11 @@ class PokemonParty_Scene
Input.update Input.update
cmdwindow.update cmdwindow.update
self.update self.update
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCancelSE pbPlayCancelSE
ret = -1 ret = -1
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
ret = cmdwindow.index ret = cmdwindow.index
break break
@@ -706,15 +706,15 @@ class PokemonParty_Scene
end end
end end
cancelsprite = Settings::MAX_PARTY_SIZE + ((@multiselect) ? 1 : 0) cancelsprite = Settings::MAX_PARTY_SIZE + ((@multiselect) ? 1 : 0)
if Input.trigger?(Input::A) && canswitch==1 && @activecmd!=cancelsprite if Input.trigger?(Input::SPECIAL) && canswitch==1 && @activecmd!=cancelsprite
pbPlayDecisionSE pbPlayDecisionSE
return [1,@activecmd] return [1,@activecmd]
elsif Input.trigger?(Input::A) && canswitch==2 elsif Input.trigger?(Input::SPECIAL) && canswitch==2
return -1 return -1
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE if !switching pbPlayCloseMenuSE if !switching
return -1 return -1
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
if @activecmd==cancelsprite if @activecmd==cancelsprite
(switching) ? pbPlayDecisionSE : pbPlayCloseMenuSE (switching) ? pbPlayDecisionSE : pbPlayCloseMenuSE
return -1 return -1

34
Data/Scripts/017_UI/006_PScreen_Summary.rb
View File

@@ -213,11 +213,11 @@ class PokemonSummary_Scene
Input.update Input.update
pbUpdate pbUpdate
if @sprites["messagebox"].busy? if @sprites["messagebox"].busy?
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
pbPlayDecisionSE() if @sprites["messagebox"].pausing? pbPlayDecisionSE() if @sprites["messagebox"].pausing?
@sprites["messagebox"].resume @sprites["messagebox"].resume
end end
elsif Input.trigger?(Input::C) || Input.trigger?(Input::B) elsif Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
break break
end end
end end
@@ -240,10 +240,10 @@ class PokemonSummary_Scene
cmdwindow.update cmdwindow.update
pbUpdate pbUpdate
if !@sprites["messagebox"].busy? if !@sprites["messagebox"].busy?
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
ret = false ret = false
break break
elsif Input.trigger?(Input::C) && @sprites["messagebox"].resume elsif Input.trigger?(Input::USE) && @sprites["messagebox"].resume
ret = (cmdwindow.index==0) ret = (cmdwindow.index==0)
break break
end end
@@ -265,11 +265,11 @@ class PokemonSummary_Scene
Input.update Input.update
cmdwindow.update cmdwindow.update
pbUpdate pbUpdate
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCancelSE pbPlayCancelSE
ret = -1 ret = -1
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
ret = cmdwindow.index ret = cmdwindow.index
break break
@@ -929,12 +929,12 @@ class PokemonSummary_Scene
else else
@sprites["movepresel"].z = @sprites["movesel"].z @sprites["movepresel"].z = @sprites["movesel"].z
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
(switching) ? pbPlayCancelSE : pbPlayCloseMenuSE (switching) ? pbPlayCancelSE : pbPlayCloseMenuSE
break if !switching break if !switching
@sprites["movepresel"].visible = false @sprites["movepresel"].visible = false
switching = false switching = false
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
if selmove==Pokemon::MAX_MOVES if selmove==Pokemon::MAX_MOVES
break if !switching break if !switching
@@ -1001,12 +1001,12 @@ class PokemonSummary_Scene
@sprites["ribbonpresel"].z = @sprites["ribbonsel"].z @sprites["ribbonpresel"].z = @sprites["ribbonsel"].z
end end
hasMovedCursor = false hasMovedCursor = false
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
(switching) ? pbPlayCancelSE : pbPlayCloseMenuSE (switching) ? pbPlayCancelSE : pbPlayCloseMenuSE
break if !switching break if !switching
@sprites["ribbonpresel"].visible = false @sprites["ribbonpresel"].visible = false
switching = false switching = false
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
if !switching if !switching
if @pokemon.ribbons[selribbon] if @pokemon.ribbons[selribbon]
pbPlayDecisionSE pbPlayDecisionSE
@@ -1110,10 +1110,10 @@ class PokemonSummary_Scene
Graphics.update Graphics.update
Input.update Input.update
pbUpdate pbUpdate
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
if index==6 # OK if index==6 # OK
ret = markings ret = markings
@@ -1216,11 +1216,11 @@ class PokemonSummary_Scene
Graphics.update Graphics.update
Input.update Input.update
pbUpdate pbUpdate
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
selmove = Pokemon::MAX_MOVES selmove = Pokemon::MAX_MOVES
pbPlayCloseMenuSE if new_move pbPlayCloseMenuSE if new_move
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
break break
elsif Input.trigger?(Input::UP) elsif Input.trigger?(Input::UP)
@@ -1253,13 +1253,13 @@ class PokemonSummary_Scene
Input.update Input.update
pbUpdate pbUpdate
dorefresh = false dorefresh = false
if Input.trigger?(Input::A) if Input.trigger?(Input::SPECIAL)
pbSEStop pbSEStop
GameData::Species.play_cry_from_pokemon(@pokemon) GameData::Species.play_cry_from_pokemon(@pokemon)
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
if @page==4 if @page==4
pbPlayDecisionSE pbPlayDecisionSE
pbMoveSelection pbMoveSelection

14
Data/Scripts/017_UI/007_PScreen_Bag.rb
View File

@@ -356,12 +356,12 @@ class PokemonBag_Scene
pbRefresh pbRefresh
end end
if itemwindow.sorting if itemwindow.sorting
if Input.trigger?(Input::A) || if Input.trigger?(Input::SPECIAL) ||
Input.trigger?(Input::C) Input.trigger?(Input::USE)
itemwindow.sorting = false itemwindow.sorting = false
pbPlayDecisionSE pbPlayDecisionSE
pbRefresh pbRefresh
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
thispocket.insert(swapinitialpos,thispocket.delete_at(itemwindow.index)) thispocket.insert(swapinitialpos,thispocket.delete_at(itemwindow.index))
itemwindow.index = swapinitialpos itemwindow.index = swapinitialpos
itemwindow.sorting = false itemwindow.sorting = false
@@ -406,7 +406,7 @@ class PokemonBag_Scene
pbPlayCursorSE pbPlayCursorSE
pbRefresh pbRefresh
end end
# elsif Input.trigger?(Input::F5) # Register/unregister selected item # elsif Input.trigger?(Input::Z) # Register/unregister selected item
# if !@choosing && itemwindow.index<thispocket.length # if !@choosing && itemwindow.index<thispocket.length
# if @bag.pbIsRegistered?(itemwindow.item) # if @bag.pbIsRegistered?(itemwindow.item)
# @bag.pbUnregisterItem(itemwindow.item) # @bag.pbUnregisterItem(itemwindow.item)
@@ -416,7 +416,7 @@ class PokemonBag_Scene
# pbPlayDecisionSE # pbPlayDecisionSE
# pbRefresh # pbRefresh
# end # end
elsif Input.trigger?(Input::A) # Start switching the selected item elsif Input.trigger?(Input::SPECIAL) # Start switching the selected item
if !@choosing if !@choosing
if thispocket.length>1 && itemwindow.index<thispocket.length && if thispocket.length>1 && itemwindow.index<thispocket.length &&
!Settings::BAG_POCKET_AUTO_SORT[itemwindow.pocket] !Settings::BAG_POCKET_AUTO_SORT[itemwindow.pocket]
@@ -426,10 +426,10 @@ class PokemonBag_Scene
pbRefresh pbRefresh
end end
end end
elsif Input.trigger?(Input::B) # Cancel the item screen elsif Input.trigger?(Input::BACK) # Cancel the item screen
pbPlayCloseMenuSE pbPlayCloseMenuSE
return nil return nil
elsif Input.trigger?(Input::C) # Choose selected item elsif Input.trigger?(Input::USE) # Choose selected item
(itemwindow.item) ? pbPlayDecisionSE : pbPlayCloseMenuSE (itemwindow.item) ? pbPlayDecisionSE : pbPlayCloseMenuSE
return itemwindow.item return itemwindow.item
end end

4
Data/Scripts/017_UI/008_PScreen_Pokegear.rb
View File

@@ -88,10 +88,10 @@ class PokemonPokegear_Scene
Graphics.update Graphics.update
Input.update Input.update
pbUpdate pbUpdate
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
ret = @index ret = @index
break break

6
Data/Scripts/017_UI/009_PScreen_RegionMap.rb
View File

@@ -315,7 +315,7 @@ class PokemonRegionMap_Scene
newX = @sprites["cursor"].x+xOffset newX = @sprites["cursor"].x+xOffset
newY = @sprites["cursor"].y+yOffset newY = @sprites["cursor"].y+yOffset
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
if @editor && @changed if @editor && @changed
if pbConfirmMessage(_INTL("Save changes?")) { pbUpdate } if pbConfirmMessage(_INTL("Save changes?")) { pbUpdate }
pbSaveMapData pbSaveMapData
@@ -326,14 +326,14 @@ class PokemonRegionMap_Scene
else else
break break
end end
elsif Input.trigger?(Input::C) && mode==1 # Choosing an area to fly to elsif Input.trigger?(Input::USE) && mode==1 # Choosing an area to fly to
healspot = pbGetHealingSpot(@mapX,@mapY) healspot = pbGetHealingSpot(@mapX,@mapY)
if healspot if healspot
if $PokemonGlobal.visitedMaps[healspot[0]] || ($DEBUG && Input.press?(Input::CTRL)) if $PokemonGlobal.visitedMaps[healspot[0]] || ($DEBUG && Input.press?(Input::CTRL))
return healspot return healspot
end end
end end
elsif Input.trigger?(Input::C) && @editor # Intentionally after other C input check elsif Input.trigger?(Input::USE) && @editor # Intentionally after other C input check
pbChangeMapLocation(@mapX,@mapY) pbChangeMapLocation(@mapX,@mapY)
end end
end end

4
Data/Scripts/017_UI/010_PScreen_Phone.rb
View File

@@ -131,10 +131,10 @@ class PokemonPhoneScene
end end
end end
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
index = @sprites["list"].index index = @sprites["list"].index
if index>=0 if index>=0
pbCallTrainer(@trainers[index][0],@trainers[index][1]) pbCallTrainer(@trainers[index][0],@trainers[index][1])

4
Data/Scripts/017_UI/011_PScreen_Jukebox.rb
View File

@@ -30,9 +30,9 @@ class PokemonJukebox_Scene
Graphics.update Graphics.update
Input.update Input.update
pbUpdate pbUpdate
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
ret = @sprites["commands"].index ret = @sprites["commands"].index
break break
end end

2
Data/Scripts/017_UI/012_PScreen_TrainerCard.rb
View File

@@ -81,7 +81,7 @@ class PokemonTrainerCard_Scene
Graphics.update Graphics.update
Input.update Input.update
pbUpdate pbUpdate
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
break break
end end

2
Data/Scripts/017_UI/013_PScreen_Load.rb
View File

@@ -188,7 +188,7 @@ class PokemonLoad_Scene
Graphics.update Graphics.update
Input.update Input.update
pbUpdate pbUpdate
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
return @sprites["cmdwindow"].index return @sprites["cmdwindow"].index
end end
end end

4
Data/Scripts/017_UI/015_PScreen_Options.rb
View File

@@ -448,9 +448,9 @@ class PokemonOption_Scene
oldFont = $PokemonSystem.font oldFont = $PokemonSystem.font
end end
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
break if @sprites["option"].index==@PokemonOptions.length break if @sprites["option"].index==@PokemonOptions.length
end end
end end

4
Data/Scripts/017_UI/016_PScreen_ReadyMenu.rb
View File

@@ -170,11 +170,11 @@ class PokemonReadyMenu_Scene
elsif Input.trigger?(Input::RIGHT) && @index[2]==0 && @itemcommands.length>0 elsif Input.trigger?(Input::RIGHT) && @index[2]==0 && @itemcommands.length>0
@index[2] = 1 @index[2] = 1
pbChangeSide pbChangeSide
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
ret = -1 ret = -1
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
ret = [@index[2],cmdwindow.index] ret = [@index[2],cmdwindow.index]
break break
end end

24
Data/Scripts/017_UI/017_PScreen_PokemonStorage.rb
View File

@@ -647,7 +647,7 @@ class PokemonStorageScene
loop do loop do
Graphics.update Graphics.update
Input.update Input.update
if Input.trigger?(Input::B) || Input.trigger?(Input::C) if Input.trigger?(Input::BACK) || Input.trigger?(Input::USE)
break break
end end
msgwindow.update msgwindow.update
@@ -679,10 +679,10 @@ class PokemonStorageScene
Input.update Input.update
msgwindow.update msgwindow.update
cmdwindow.update cmdwindow.update
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
ret = -1 ret = -1
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
ret = cmdwindow.index ret = cmdwindow.index
break break
end end
@@ -858,7 +858,7 @@ class PokemonStorageScene
@storage.currentBox = nextbox @storage.currentBox = nextbox
pbUpdateOverlay(selection) pbUpdateOverlay(selection)
pbSetMosaic(selection) pbSetMosaic(selection)
elsif Input.trigger?(Input::F5) # Jump to box name elsif Input.trigger?(Input::Z) # Jump to box name
if selection!=-1 if selection!=-1
pbPlayCursorSE pbPlayCursorSE
selection = -1 selection = -1
@@ -866,13 +866,13 @@ class PokemonStorageScene
pbUpdateOverlay(selection) pbUpdateOverlay(selection)
pbSetMosaic(selection) pbSetMosaic(selection)
end end
elsif Input.trigger?(Input::A) && @command==0 # Organize only elsif Input.trigger?(Input::SPECIAL) && @command==0 # Organize only
pbPlayDecisionSE pbPlayDecisionSE
pbSetQuickSwap(!@quickswap) pbSetQuickSwap(!@quickswap)
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
@selection = selection @selection = selection
return nil return nil
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
@selection = selection @selection = selection
if selection>=0 if selection>=0
return [@storage.currentBox,selection] return [@storage.currentBox,selection]
@@ -945,13 +945,13 @@ class PokemonStorageScene
pbSetMosaic(selection) pbSetMosaic(selection)
end end
self.update self.update
if Input.trigger?(Input::A) && @command == 0 # Organize only if Input.trigger?(Input::SPECIAL) && @command == 0 # Organize only
pbPlayDecisionSE pbPlayDecisionSE
pbSetQuickSwap(!@quickswap) pbSetQuickSwap(!@quickswap)
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
@selection = selection @selection = selection
return -1 return -1
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
if selection >= 0 && selection < Settings::MAX_PARTY_SIZE if selection >= 0 && selection < Settings::MAX_PARTY_SIZE
@selection = selection @selection = selection
return selection return selection
@@ -1337,10 +1337,10 @@ class PokemonStorageScene
pbMarkingSetArrow(@sprites["arrow"],index) pbMarkingSetArrow(@sprites["arrow"],index)
end end
self.update self.update
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCancelSE pbPlayCancelSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
if index==6 # OK if index==6 # OK
pokemon.markings = markings pokemon.markings = markings

20
Data/Scripts/017_UI/018_PScreen_ItemStorage.rb
View File

@@ -158,9 +158,9 @@ class ItemStorage_Scene
olditem = itemwindow.item olditem = itemwindow.item
self.update self.update
pbRefresh if itemwindow.item!=olditem pbRefresh if itemwindow.item!=olditem
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
return nil return nil
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
if itemwindow.index<@bag.length if itemwindow.index<@bag.length
pbRefresh pbRefresh
return @bag[itemwindow.index][0] return @bag[itemwindow.index][0]
@@ -210,7 +210,7 @@ module UIHelper
Input.update Input.update
(block_given?) ? yield : cw.update (block_given?) ? yield : cw.update
if !cw.busy? if !cw.busy?
if brief || (Input.trigger?(Input::C) && cw.resume) if brief || (Input.trigger?(Input::USE) && cw.resume)
break break
end end
end end
@@ -230,7 +230,7 @@ module UIHelper
Graphics.update Graphics.update
Input.update Input.update
(block_given?) ? yield : msgwindow.update (block_given?) ? yield : msgwindow.update
if Input.trigger?(Input::B) || Input.trigger?(Input::C) if Input.trigger?(Input::BACK) || Input.trigger?(Input::USE)
break break
end end
end end
@@ -261,10 +261,10 @@ module UIHelper
cw.update cw.update
(block_given?) ? yield : dw.update (block_given?) ? yield : dw.update
if !dw.busy? && dw.resume if !dw.busy? && dw.resume
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCancelSE pbPlayCancelSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
ret = (cw.index==0) ret = (cw.index==0)
break break
@@ -296,11 +296,11 @@ module UIHelper
Input.update Input.update
numwindow.update numwindow.update
(block_given?) ? yield : helpwindow.update (block_given?) ? yield : helpwindow.update
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
ret = 0 ret = 0
pbPlayCancelSE pbPlayCancelSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
ret = curnumber ret = curnumber
pbPlayDecisionSE pbPlayDecisionSE
break break
@@ -349,12 +349,12 @@ module UIHelper
Input.update Input.update
yield yield
cmdwindow.update cmdwindow.update
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
ret = -1 ret = -1
pbPlayCancelSE pbPlayCancelSE
break break
end end
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
ret = cmdwindow.index ret = cmdwindow.index
pbPlayDecisionSE pbPlayDecisionSE
break break

2
Data/Scripts/017_UI/021_PScreen_Evolution.rb
View File

@@ -549,7 +549,7 @@ class PokemonEvolutionScene
Graphics.update Graphics.update
Input.update Input.update
pbUpdate(true) pbUpdate(true)
if Input.trigger?(Input::B) && cancancel if Input.trigger?(Input::BACK) && cancancel
pbBGMStop pbBGMStop
pbPlayCancelSE pbPlayCancelSE
canceled = true canceled = true

4
Data/Scripts/017_UI/023_PScreen_MoveRelearner.rb
View File

@@ -126,9 +126,9 @@ class MoveRelearner_Scene
@sprites["background"].y=78+(@sprites["commands"].index-@sprites["commands"].top_item)*64 @sprites["background"].y=78+(@sprites["commands"].index-@sprites["commands"].top_item)*64
pbDrawMoveList pbDrawMoveList
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
return 0 return 0
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
return @moves[@sprites["commands"].index] return @moves[@sprites["commands"].index]
end end
end end

8
Data/Scripts/017_UI/024_PScreen_PurifyChamber.rb
View File

@@ -1187,10 +1187,10 @@ class PurifyChamberScene
nextset=(@sprites["setview"].set==PurifyChamber::NUMSETS-1) ? 0 : @sprites["setview"].set+1 nextset=(@sprites["setview"].set==PurifyChamber::NUMSETS-1) ? 0 : @sprites["setview"].set+1
pbPlayCursorSE() pbPlayCursorSE()
return [1,nextset] return [1,nextset]
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE() pbPlayDecisionSE()
return [0,@sprites["setview"].cursor] return [0,@sprites["setview"].cursor]
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCancelSE() pbPlayCancelSE()
return [3,0] return [3,0]
end end
@@ -1207,11 +1207,11 @@ class PurifyChamberScene
@sprites["setview"].set=oldindex @sprites["setview"].set=oldindex
end end
Graphics.update; Input.update; pbUpdate Graphics.update; Input.update; pbUpdate
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
pbPlayDecisionSE() pbPlayDecisionSE()
return @sprites["setwindow"].index return @sprites["setwindow"].index
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCancelSE() pbPlayCancelSE()
return -1 return -1
end end

16
Data/Scripts/017_UI/025_PScreen_Mart.rb
View File

@@ -341,7 +341,7 @@ class PokemonMart_Scene
return if brief return if brief
pbRefresh if i == 0 pbRefresh if i == 0
end end
if Input.trigger?(Input::C) && cw.busy? if Input.trigger?(Input::USE) && cw.busy?
cw.resume cw.resume
end end
return if i >= Graphics.frame_rate * 3 / 2 return if i >= Graphics.frame_rate * 3 / 2
@@ -367,7 +367,7 @@ class PokemonMart_Scene
yielded = true yielded = true
end end
pbRefresh if !cw.busy? && wasbusy pbRefresh if !cw.busy? && wasbusy
if Input.trigger?(Input::C) && cw.resume && !cw.busy? if Input.trigger?(Input::USE) && cw.resume && !cw.busy?
@sprites["helpwindow"].visible = false @sprites["helpwindow"].visible = false
return return
end end
@@ -393,12 +393,12 @@ class PokemonMart_Scene
Input.update Input.update
cw.update cw.update
self.update self.update
if Input.trigger?(Input::B) && dw.resume && !dw.busy? if Input.trigger?(Input::BACK) && dw.resume && !dw.busy?
cw.dispose cw.dispose
@sprites["helpwindow"].visible = false @sprites["helpwindow"].visible = false
return false return false
end end
if Input.trigger?(Input::C) && dw.resume && !dw.busy? if Input.trigger?(Input::USE) && dw.resume && !dw.busy?
cw.dispose cw.dispose
@sprites["helpwindow"].visible = false @sprites["helpwindow"].visible = false
return (cw.index == 0) return (cw.index == 0)
@@ -461,11 +461,11 @@ class PokemonMart_Scene
curnumber -= 1 curnumber -= 1
curnumber = maximum if curnumber < 1 curnumber = maximum if curnumber < 1
numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted) numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
ret = curnumber ret = curnumber
break break
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCancelSE pbPlayCancelSE
ret = 0 ret = 0
break break
@@ -492,10 +492,10 @@ class PokemonMart_Scene
@sprites["itemtextwindow"].text = @sprites["itemtextwindow"].text =
(itemwindow.item) ? @adapter.getDescription(itemwindow.item) : _INTL("Quit shopping.") (itemwindow.item) ? @adapter.getDescription(itemwindow.item) : _INTL("Quit shopping.")
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCloseMenuSE pbPlayCloseMenuSE
return nil return nil
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
if itemwindow.index < @stock.length if itemwindow.index < @stock.length
pbRefresh pbRefresh
return @stock[itemwindow.index] return @stock[itemwindow.index]

4
Data/Scripts/017_UI/027_PScreen_HallOfFame.rb
View File

@@ -346,8 +346,8 @@ class HallOfFame_Scene
Input.update Input.update
pbUpdate pbUpdate
continueScene=true continueScene=true
break if Input.trigger?(Input::B) # Exits break if Input.trigger?(Input::BACK) # Exits
if Input.trigger?(Input::C) # Moves the selection one entry backward if Input.trigger?(Input::USE) # Moves the selection one entry backward
@battlerIndex+=10 @battlerIndex+=10
continueScene=pbUpdatePC continueScene=pbUpdatePC
end end

30
Data/Scripts/018_Minigames/002_PMinigame_TripleTriad.rb
View File

@@ -227,7 +227,7 @@ class TriadScene
Graphics.update Graphics.update
Input.update Input.update
pbUpdate pbUpdate
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
if @sprites["helpwindow"].busy? if @sprites["helpwindow"].busy?
pbPlayDecisionSE if @sprites["helpwindow"].pausing? pbPlayDecisionSE if @sprites["helpwindow"].pausing?
@sprites["helpwindow"].resume @sprites["helpwindow"].resume
@@ -277,7 +277,7 @@ class TriadScene
end end
index = command.index index = command.index
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
if chosenCards.length>0 if chosenCards.length>0
item = chosenCards.pop item = chosenCards.pop
@battle.pbAdd(cardStorage,item) @battle.pbAdd(cardStorage,item)
@@ -290,7 +290,7 @@ class TriadScene
else else
pbPlayBuzzerSE pbPlayBuzzerSE
end end
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
break if chosenCards.length==@battle.maxCards break if chosenCards.length==@battle.maxCards
item = cardStorage[command.index] item = cardStorage[command.index]
if !item || @battle.pbQuantity(cardStorage,item[0])==0 if !item || @battle.pbQuantity(cardStorage,item[0])==0
@@ -312,7 +312,7 @@ class TriadScene
index = -1 index = -1
end end
end end
if Input.trigger?(Input::C) || Input.trigger?(Input::B) if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
for i in 0...@battle.maxCards for i in 0...@battle.maxCards
@sprites["player#{i}"].visible = (i<chosenCards.length) @sprites["player#{i}"].visible = (i<chosenCards.length)
end end
@@ -386,7 +386,7 @@ class TriadScene
pbPlayCursorSE pbPlayCursorSE
choice -= 1 choice -= 1
choice = numCards-1 if choice<0 choice = numCards-1 if choice<0
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCancelSE pbPlayCancelSE
choice = -1 choice = -1
end end
@@ -425,10 +425,10 @@ class TriadScene
pbPlayCursorSE pbPlayCursorSE
choice -= 1 choice -= 1
choice = numCards-1 if choice<0 choice = numCards-1 if choice<0
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
break break
elsif Input.trigger?(Input::A) && @battle.openHand elsif Input.trigger?(Input::SPECIAL) && @battle.openHand
pbPlayDecisionSE pbPlayDecisionSE
pbViewOpponentCards(numCards) pbViewOpponentCards(numCards)
@sprites["helpwindow"].text = _INTL("Choose a card, or check opponent with Z.") @sprites["helpwindow"].text = _INTL("Choose a card, or check opponent with Z.")
@@ -484,9 +484,9 @@ class TriadScene
boardX += 1 boardX += 1
boardX = 0 if boardX>=@battle.width boardX = 0 if boardX>=@battle.width
doRefresh = true doRefresh = true
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
return nil return nil
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
if @battle.isOccupied?(boardX,boardY) if @battle.isOccupied?(boardX,boardY)
pbPlayBuzzerSE pbPlayBuzzerSE
else else
@@ -1089,9 +1089,9 @@ def pbBuyTriads
preview.bitmap = TriadCard.new(commands[cmdwindow.index][3]).createBitmap(1) preview.bitmap = TriadCard.new(commands[cmdwindow.index][3]).createBitmap(1)
olditem = commands[cmdwindow.index][3] olditem = commands[cmdwindow.index][3]
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
price = commands[cmdwindow.index][0] price = commands[cmdwindow.index][0]
item = commands[cmdwindow.index][3] item = commands[cmdwindow.index][3]
itemname = commands[cmdwindow.index][1] itemname = commands[cmdwindow.index][1]
@@ -1181,11 +1181,11 @@ def pbSellTriads
end end
olditem = item olditem = item
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
done = true done = true
break break
end end
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
if cmdwindow.index>=$PokemonGlobal.triads.length if cmdwindow.index>=$PokemonGlobal.triads.length
done = true done = true
break break
@@ -1271,11 +1271,11 @@ def pbTriadList
end end
lastIndex = cmdwindow.index lastIndex = cmdwindow.index
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
done = true done = true
break break
end end
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
if cmdwindow.index>=$PokemonGlobal.triads.length if cmdwindow.index>=$PokemonGlobal.triads.length
done = true done = true
break break

8
Data/Scripts/018_Minigames/003_PMinigame_SlotMachine.rb
View File

@@ -212,7 +212,7 @@ class SlotMachineScene
update update
@sprites["payout"].score -= 1 @sprites["payout"].score -= 1
@sprites["credit"].score += 1 @sprites["credit"].score += 1
if Input.trigger?(Input::C) || @sprites["credit"].score == Settings::MAX_COINS if Input.trigger?(Input::USE) || @sprites["credit"].score == Settings::MAX_COINS
@sprites["credit"].score += @sprites["payout"].score @sprites["credit"].score += @sprites["payout"].score
@sprites["payout"].score = 0 @sprites["payout"].score = 0
end end
@@ -295,7 +295,7 @@ class SlotMachineScene
elsif @gameRunning # Reels are spinning elsif @gameRunning # Reels are spinning
@sprites["window1"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/stop")) @sprites["window1"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/stop"))
@sprites["window1"].src_rect.set(152*((frame/spinFrameTime)%4),0,152,208) @sprites["window1"].src_rect.set(152*((frame/spinFrameTime)%4),0,152,208)
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
pbSEPlay("Slots stop") pbSEPlay("Slots stop")
if @sprites["reel1"].spinning if @sprites["reel1"].spinning
@sprites["reel1"].stopSpinning(@replay) @sprites["reel1"].stopSpinning(@replay)
@@ -343,7 +343,7 @@ class SlotMachineScene
@sprites["row1"].visible=true @sprites["row1"].visible=true
end end
elsif @wager>=3 || (@wager>0 && @sprites["credit"].score==0) || elsif @wager>=3 || (@wager>0 && @sprites["credit"].score==0) ||
(Input.trigger?(Input::C) && @wager>0) || @replay (Input.trigger?(Input::USE) && @wager>0) || @replay
if @replay if @replay
@wager=3 @wager=3
for i in 1..5 for i in 1..5
@@ -355,7 +355,7 @@ class SlotMachineScene
@sprites["reel3"].startSpinning @sprites["reel3"].startSpinning
frame=0 frame=0
@gameRunning=true @gameRunning=true
elsif Input.trigger?(Input::B) && @wager==0 elsif Input.trigger?(Input::BACK) && @wager==0
break break
end end
end end

6
Data/Scripts/018_Minigames/004_PMinigame_VoltorbFlip.rb
View File

@@ -255,7 +255,7 @@ class VoltorbFlip
@index[0]=0 @index[0]=0
@sprites["cursor"].x=0 @sprites["cursor"].x=0
end end
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
if @cursor[0][3]==64 # If in mark mode if @cursor[0][3]==64 # If in mark mode
for i in 0...@squares.length for i in 0...@squares.length
if @index[0]*64+128==@squares[i][0] && @index[1]*64==@squares[i][1] && @squares[i][3]==false if @index[0]*64+128==@squares[i][0] && @index[1]*64==@squares[i][1] && @squares[i][3]==false
@@ -404,7 +404,7 @@ class VoltorbFlip
@cursor[0]=[@directory+"cursor",128,0,0,0,64,64] @cursor[0]=[@directory+"cursor",128,0,0,0,64,64]
@sprites["memo"].visible=false @sprites["memo"].visible=false
end end
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
@sprites["curtain"].opacity=100 @sprites["curtain"].opacity=100
if @points==0 if @points==0
if pbConfirmMessage("You haven't found any Coins! Are you sure you want to quit?") if pbConfirmMessage("You haven't found any Coins! Are you sure you want to quit?")
@@ -518,7 +518,7 @@ class VoltorbFlip
Graphics.update Graphics.update
Input.update Input.update
update update
if Input.trigger?(Input::C) || Input.trigger?(Input::B) if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
break break
end end
end end

6
Data/Scripts/018_Minigames/006_PMinigame_Mining.rb
View File

@@ -561,15 +561,15 @@ class MiningGameScene
pbSEPlay("Mining cursor") pbSEPlay("Mining cursor")
@sprites["cursor"].position+=1 @sprites["cursor"].position+=1
end end
elsif Input.trigger?(Input::A) # Change tool mode elsif Input.trigger?(Input::SPECIAL) # Change tool mode
pbSEPlay("Mining tool change") pbSEPlay("Mining tool change")
newmode=(@sprites["cursor"].mode+1)%2 newmode=(@sprites["cursor"].mode+1)%2
@sprites["cursor"].mode=newmode @sprites["cursor"].mode=newmode
@sprites["tool"].src_rect.set(newmode*68,0,68,100) @sprites["tool"].src_rect.set(newmode*68,0,68,100)
@sprites["tool"].y=254-144*newmode @sprites["tool"].y=254-144*newmode
elsif Input.trigger?(Input::C) # Hit elsif Input.trigger?(Input::USE) # Hit
pbHit pbHit
elsif Input.trigger?(Input::B) # Quit elsif Input.trigger?(Input::BACK) # Quit
break if pbConfirmMessage(_INTL("Are you sure you want to give up?")) break if pbConfirmMessage(_INTL("Are you sure you want to give up?"))
end end
end end

14
Data/Scripts/018_Minigames/007_PMinigame_TilePuzzles.rb
View File

@@ -512,12 +512,12 @@ class TilePuzzleScene
loop do loop do
Graphics.update Graphics.update
Input.update Input.update
break if Input.trigger?(Input::C) || Input.trigger?(Input::B) break if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
end end
return true return true
end end
# Input # Input
@sprites["cursor"].selected=(Input.press?(Input::C) && @game>=3 && @game<=6) @sprites["cursor"].selected=(Input.press?(Input::USE) && @game>=3 && @game<=6)
dir=0 dir=0
dir=2 if Input.trigger?(Input::DOWN) || Input.repeat?(Input::DOWN) dir=2 if Input.trigger?(Input::DOWN) || Input.repeat?(Input::DOWN)
dir=4 if Input.trigger?(Input::LEFT) || Input.repeat?(Input::LEFT) dir=4 if Input.trigger?(Input::LEFT) || Input.repeat?(Input::LEFT)
@@ -535,13 +535,13 @@ class TilePuzzleScene
@sprites["cursor"].position=pbMoveCursor(@sprites["cursor"].position,dir) @sprites["cursor"].position=pbMoveCursor(@sprites["cursor"].position,dir)
end end
end end
elsif (@game==1 || @game==2) && Input.trigger?(Input::C) elsif (@game==1 || @game==2) && Input.trigger?(Input::USE)
pbGrabTile(@sprites["cursor"].position) pbGrabTile(@sprites["cursor"].position)
elsif (@game==2 && Input.trigger?(Input::A)) || elsif (@game==2 && Input.trigger?(Input::SPECIAL)) ||
(@game==5 && Input.trigger?(Input::A)) || (@game==5 && Input.trigger?(Input::SPECIAL)) ||
(@game==7 && Input.trigger?(Input::C)) (@game==7 && Input.trigger?(Input::USE))
pbRotateTile(@sprites["cursor"].position) pbRotateTile(@sprites["cursor"].position)
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
return false return false
end end
end end

4
Data/Scripts/019_Other battles/006_PBattle_BattleSwap.rb
View File

@@ -92,10 +92,10 @@ class BattleSwapScene
Graphics.update Graphics.update
Input.update Input.update
pbUpdate pbUpdate
if Input.trigger?(Input::B) && canCancel if Input.trigger?(Input::BACK) && canCancel
return -1 return -1
end end
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
index=@sprites["list"].index index=@sprites["list"].index
if index==@sprites["list"].commands.length-1 && canCancel if index==@sprites["list"].commands.length-1 && canCancel
return -1 return -1

4
Data/Scripts/021_Debug/001_Debug menus/001_Debug_Menus.rb
View File

@@ -98,7 +98,7 @@ def pbDebugMenu(show_all = true)
end end
Graphics.update Graphics.update
Input.update Input.update
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
parent = commands.getParent parent = commands.getParent
if parent if parent
pbPlayCancelSE pbPlayCancelSE
@@ -110,7 +110,7 @@ def pbDebugMenu(show_all = true)
ret = -1 ret = -1
break break
end end
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
ret = cmdwindow.index ret = cmdwindow.index
break break
end end

2
Data/Scripts/021_Debug/001_Debug menus/002_Debug_MenuCommands.rb
View File

@@ -448,7 +448,7 @@ DebugMenuCommands.register("additem", {
"description" => _INTL("Choose an item and a quantity of it to add to the Bag."), "description" => _INTL("Choose an item and a quantity of it to add to the Bag."),
"effect" => proc { "effect" => proc {
pbListScreenBlock(_INTL("ADD ITEM"), ItemLister.new) { |button, item| pbListScreenBlock(_INTL("ADD ITEM"), ItemLister.new) { |button, item|
if button == Input::C && item if button == Input::USE && item
params = ChooseNumberParams.new params = ChooseNumberParams.new
params.setRange(1, Settings::BAG_MAX_PER_SLOT) params.setRange(1, Settings::BAG_MAX_PER_SLOT)
params.setInitialValue(1) params.setInitialValue(1)

30
Data/Scripts/021_Debug/001_Debug menus/003_Debug_MenuExtraCode.rb
View File

@@ -155,13 +155,13 @@ def pbDebugVariables(mode)
Graphics.update Graphics.update
Input.update Input.update
pbUpdateSpriteHash(sprites) pbUpdateSpriteHash(sprites)
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCancelSE pbPlayCancelSE
break break
end end
current_id = right_window.index+1 current_id = right_window.index+1
if mode==0 # Switches if mode==0 # Switches
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
$game_switches[current_id] = !$game_switches[current_id] $game_switches[current_id] = !$game_switches[current_id]
right_window.refresh right_window.refresh
@@ -174,7 +174,7 @@ def pbDebugVariables(mode)
elsif Input.repeat?(Input::RIGHT) elsif Input.repeat?(Input::RIGHT)
pbDebugSetVariable(current_id,1) pbDebugSetVariable(current_id,1)
right_window.refresh right_window.refresh
elsif Input.trigger?(Input::A) elsif Input.trigger?(Input::SPECIAL)
if $game_variables[current_id]==0 if $game_variables[current_id]==0
$game_variables[current_id] = "" $game_variables[current_id] = ""
elsif $game_variables[current_id]=="" elsif $game_variables[current_id]==""
@@ -186,7 +186,7 @@ def pbDebugVariables(mode)
end end
right_window.refresh right_window.refresh
$game_map.need_refresh = true $game_map.need_refresh = true
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
pbDebugVariableScreen(current_id) pbDebugVariableScreen(current_id)
right_window.refresh right_window.refresh
@@ -284,9 +284,9 @@ def pbDebugDayCare
pbUpdateSpriteHash(sprites) pbUpdateSpriteHash(sprites)
Graphics.update Graphics.update
Input.update Input.update
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
case cmdwindow.index case cmdwindow.index
when 0 # Withdraw Pokémon 1 when 0 # Withdraw Pokémon 1
if !$PokemonGlobal.daycare[0][0] if !$PokemonGlobal.daycare[0][0]
@@ -451,7 +451,7 @@ def pbDebugRoamers
Graphics.update Graphics.update
Input.update Input.update
pbUpdateSpriteHash(sprites) pbUpdateSpriteHash(sprites)
if Input.trigger?(Input::A) && cmdwindow.index<cmdwindow.roamerCount && if Input.trigger?(Input::SPECIAL) && cmdwindow.index<cmdwindow.roamerCount &&
(pkmn[2]<=0 || $game_switches[pkmn[2]]) && (pkmn[2]<=0 || $game_switches[pkmn[2]]) &&
$PokemonGlobal.roamPokemon[cmdwindow.index]!=true $PokemonGlobal.roamPokemon[cmdwindow.index]!=true
# Roam selected Pokémon # Roam selected Pokémon
@@ -473,10 +473,10 @@ def pbDebugRoamers
$PokemonGlobal.roamedAlready = false $PokemonGlobal.roamedAlready = false
cmdwindow.refresh cmdwindow.refresh
end end
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCancelSE pbPlayCancelSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
if cmdwindow.index<cmdwindow.roamerCount if cmdwindow.index<cmdwindow.roamerCount
pbPlayDecisionSE pbPlayDecisionSE
# Toggle through roaming, not roaming, defeated # Toggle through roaming, not roaming, defeated
@@ -871,12 +871,12 @@ class PokemonDebugPartyScreen
Input.update Input.update
pbUpdate pbUpdate
if @messageBox.busy? if @messageBox.busy?
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
pbPlayDecisionSE if @messageBox.pausing? pbPlayDecisionSE if @messageBox.pausing?
@messageBox.resume @messageBox.resume
end end
else else
if Input.trigger?(Input::B) || Input.trigger?(Input::C) if Input.trigger?(Input::BACK) || Input.trigger?(Input::USE)
break break
end end
end end
@@ -902,10 +902,10 @@ class PokemonDebugPartyScreen
cmdwindow.update cmdwindow.update
pbUpdate pbUpdate
if !@messageBox.busy? if !@messageBox.busy?
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
ret = false ret = false
break break
elsif Input.trigger?(Input::C) && @messageBox.resume elsif Input.trigger?(Input::USE) && @messageBox.resume
ret = (cmdwindow.index==0) ret = (cmdwindow.index==0)
break break
end end
@@ -932,11 +932,11 @@ class PokemonDebugPartyScreen
Input.update Input.update
cmdwindow.update cmdwindow.update
pbUpdate pbUpdate
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbPlayCancelSE pbPlayCancelSE
ret = -1 ret = -1
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
ret = cmdwindow.index ret = cmdwindow.index
break break

4
Data/Scripts/021_Debug/002_Animation editor/001_AnimEditor_SceneElements.rb
View File

@@ -145,12 +145,12 @@ def pbTrackPopupMenu(commands)
menuwindow.dispose menuwindow.dispose
return hit return hit
end end
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
hit=menuwindow.index hit=menuwindow.index
menuwindow.dispose menuwindow.dispose
return hit return hit
end end
if Input.trigger?(Input::B) # Escape if Input.trigger?(Input::BACK) # Escape
break break
end end
end end

4
Data/Scripts/021_Debug/002_Animation editor/003_AnimEditor_Interpolation.rb
View File

@@ -289,7 +289,7 @@ def pbDefinePath(canvas)
loop do loop do
Graphics.update Graphics.update
Input.update Input.update
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
break break
end end
if Input.trigger?(Input::MOUSELEFT) if Input.trigger?(Input::MOUSELEFT)
@@ -426,7 +426,7 @@ def pbDefinePath(canvas)
cel[AnimFrame::Y]=path[i-canvas.currentframe][1] cel[AnimFrame::Y]=path[i-canvas.currentframe][1]
end end
break break
elsif sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B) elsif sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break break
end end
end end

4
Data/Scripts/021_Debug/002_Animation editor/004_AnimEditor_ExportImport.rb
View File

@@ -54,7 +54,7 @@ def pbImportAnim(animations,canvas,animwin)
Graphics.update Graphics.update
Input.update Input.update
cmdwin.update cmdwin.update
if Input.trigger?(Input::C) && animfiles.length>0 if Input.trigger?(Input::USE) && animfiles.length>0
begin begin
textdata=loadBase64Anim(IO.read(animfiles[cmdwin.index])) textdata=loadBase64Anim(IO.read(animfiles[cmdwin.index]))
throw "Bad data" if !textdata.is_a?(PBAnimation) throw "Bad data" if !textdata.is_a?(PBAnimation)
@@ -74,7 +74,7 @@ def pbImportAnim(animations,canvas,animwin)
animwin.animbitmap=canvas.animbitmap animwin.animbitmap=canvas.animbitmap
break break
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
break break
end end
end end

50
Data/Scripts/021_Debug/002_Animation editor/005_AnimEditor_Functions.rb
View File

@@ -46,7 +46,7 @@ def pbSelectAnim(canvas,animwin)
bmpwin.update bmpwin.update
ctlwin.update ctlwin.update
bmpwin.hue=ctlwin.value(0) if ctlwin.changed?(0) bmpwin.hue=ctlwin.value(0) if ctlwin.changed?(0)
if Input.trigger?(Input::C) && animfiles.length>0 if Input.trigger?(Input::USE) && animfiles.length>0
bitmap=AnimatedBitmap.new("Graphics/Animations/"+cmdwin.commands[cmdwin.index],ctlwin.value(0)).deanimate bitmap=AnimatedBitmap.new("Graphics/Animations/"+cmdwin.commands[cmdwin.index],ctlwin.value(0)).deanimate
canvas.animation.graphic=cmdwin.commands[cmdwin.index] canvas.animation.graphic=cmdwin.commands[cmdwin.index]
canvas.animation.hue=ctlwin.value(0) canvas.animation.hue=ctlwin.value(0)
@@ -54,7 +54,7 @@ def pbSelectAnim(canvas,animwin)
animwin.animbitmap=bitmap animwin.animbitmap=bitmap
break break
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
break break
end end
end end
@@ -79,7 +79,7 @@ def pbChangeMaximum(canvas)
canvas.animation.resize(sliderwin2.value(0)) canvas.animation.resize(sliderwin2.value(0))
break break
end end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B) if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break break
end end
end end
@@ -149,7 +149,7 @@ def pbAnimList(animations,canvas,animwin)
cmdwin.index=animations.selected cmdwin.index=animations.selected
next next
end end
if Input.trigger?(Input::C) && animations.length>0 if Input.trigger?(Input::USE) && animations.length>0
cmd2=pbShowCommands(helpwindow,[ cmd2=pbShowCommands(helpwindow,[
_INTL("Load Animation"), _INTL("Load Animation"),
_INTL("Rename"), _INTL("Rename"),
@@ -171,7 +171,7 @@ def pbAnimList(animations,canvas,animwin)
end end
end end
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
break break
end end
end end
@@ -199,7 +199,7 @@ def pbChooseNum(cel)
ret=sliderwin2.value(1) ret=sliderwin2.value(1)
break break
end end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B) if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
ret=-1 ret=-1
break break
end end
@@ -234,7 +234,7 @@ def pbSetTone(cel,previewsprite)
cel[AnimFrame::TONEGRAY]=sliderwin2.value(3) cel[AnimFrame::TONEGRAY]=sliderwin2.value(3)
break break
end end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B) if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break break
end end
end end
@@ -268,7 +268,7 @@ def pbSetFlash(cel,previewsprite)
cel[AnimFrame::COLORALPHA]=sliderwin2.value(3) cel[AnimFrame::COLORALPHA]=sliderwin2.value(3)
break break
end end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B) if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break break
end end
end end
@@ -366,7 +366,7 @@ def pbCellProperties(canvas)
thiscel[0,thiscel.length]=cel thiscel[0,thiscel.length]=cel
break break
end end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B) if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break break
end end
end end
@@ -435,7 +435,7 @@ def pbTimingList(canvas)
next next
end end
end end
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
redrawcmds=false redrawcmds=false
if cmdwin.index==cmdNewSound # Add new sound if cmdwin.index==cmdNewSound # Add new sound
newaudio=PBAnimTiming.new(0) newaudio=PBAnimTiming.new(0)
@@ -500,7 +500,7 @@ def pbTimingList(canvas)
cmdwin.commands[cmdEditFO=cmdwin.commands.length]=_INTL("Add: Edit Foreground Color/Location...") cmdwin.commands[cmdEditFO=cmdwin.commands.length]=_INTL("Add: Edit Foreground Color/Location...")
cmdwin.refresh cmdwin.refresh
end end
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
break break
end end
end end
@@ -562,11 +562,11 @@ def pbSelectSE(canvas,audio)
if maxsizewindow.changed?(6) # Cancel if maxsizewindow.changed?(6) # Cancel
break break
end end
if Input.trigger?(Input::C) && animfiles.length>0 if Input.trigger?(Input::USE) && animfiles.length>0
filename=(cmdwin.index==0) ? "" : cmdwin.commands[cmdwin.index] filename=(cmdwin.index==0) ? "" : cmdwin.commands[cmdwin.index]
displayname=(filename!="") ? filename : _INTL("<user's cry>") displayname=(filename!="") ? filename : _INTL("<user's cry>")
maxsizewindow.controls[0].text=_INTL("File: \"{1}\"",displayname) maxsizewindow.controls[0].text=_INTL("File: \"{1}\"",displayname)
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
break break
end end
end end
@@ -625,10 +625,10 @@ def pbSelectBG(canvas,timing)
if maxsizewindow.changed?(9) # Cancel if maxsizewindow.changed?(9) # Cancel
break break
end end
if Input.trigger?(Input::C) && animfiles.length>0 if Input.trigger?(Input::USE) && animfiles.length>0
filename=(cmdwin.index==cmdErase) ? "" : cmdwin.commands[cmdwin.index] filename=(cmdwin.index==cmdErase) ? "" : cmdwin.commands[cmdwin.index]
maxsizewindow.controls[0].text=_INTL("File: \"{1}\"",filename) maxsizewindow.controls[0].text=_INTL("File: \"{1}\"",filename)
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
break break
end end
end end
@@ -688,7 +688,7 @@ def pbEditBG(canvas,timing)
if maxsizewindow.changed?(9) # Cancel if maxsizewindow.changed?(9) # Cancel
break break
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
break break
end end
end end
@@ -735,7 +735,7 @@ def pbCopyFrames(canvas)
end end
break break
end end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B) if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break break
end end
end end
@@ -763,7 +763,7 @@ def pbClearFrames(canvas)
end end
break break
end end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B) if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break break
end end
end end
@@ -788,7 +788,7 @@ def pbTweening(canvas)
Graphics.update Graphics.update
Input.update Input.update
sliderwin2.update sliderwin2.update
if sliderwin2.changed?(okbutton) || Input.trigger?(Input::C) if sliderwin2.changed?(okbutton) || Input.trigger?(Input::USE)
startframe=sliderwin2.value(s1set0)-1 startframe=sliderwin2.value(s1set0)-1
endframe=sliderwin2.value(s1set1)-1 endframe=sliderwin2.value(s1set1)-1
break if startframe>=endframe break if startframe>=endframe
@@ -841,7 +841,7 @@ def pbTweening(canvas)
canvas.invalidate canvas.invalidate
break break
end end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B) if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break break
end end
end end
@@ -880,7 +880,7 @@ def pbCellBatch(canvas)
Input.update Input.update
sliderwin1.update sliderwin1.update
sliderwin2.update sliderwin2.update
if sliderwin2.changed?(okbutton) || Input.trigger?(Input::C) if sliderwin2.changed?(okbutton) || Input.trigger?(Input::USE)
startframe=sliderwin1.value(s1set0)-1 startframe=sliderwin1.value(s1set0)-1
endframe=sliderwin1.value(s1set1)-1 endframe=sliderwin1.value(s1set1)-1
startcel=sliderwin1.value(s1set2) startcel=sliderwin1.value(s1set2)
@@ -905,7 +905,7 @@ def pbCellBatch(canvas)
canvas.invalidate canvas.invalidate
break break
end end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B) if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break break
end end
end end
@@ -937,7 +937,7 @@ def pbEntireSlide(canvas)
end end
break break
end end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B) if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break break
end end
end end
@@ -960,7 +960,7 @@ def pbAnimEditorHelpWindow
Graphics.update Graphics.update
Input.update Input.update
cmdwin.update cmdwin.update
break if Input.trigger?(Input::B) || Input.trigger?(Input::C) break if Input.trigger?(Input::BACK) || Input.trigger?(Input::USE)
end end
cmdwin.dispose cmdwin.dispose
end end
@@ -1013,7 +1013,7 @@ def animationEditorMain(animation)
if animwin.changed? if animwin.changed?
canvas.pattern=animwin.selected canvas.pattern=animwin.selected
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
if pbConfirmMessage(_INTL("Save changes?")) if pbConfirmMessage(_INTL("Save changes?"))
save_data(animation,"Data/PkmnAnimations.rxdata") save_data(animation,"Data/PkmnAnimations.rxdata")
$PokemonTemp.battleAnims = nil $PokemonTemp.battleAnims = nil

16
Data/Scripts/021_Debug/004_Editor_Screens.rb
View File

@@ -353,7 +353,7 @@ def pbTrainerTypeEditor
] ]
pbListScreenBlock(_INTL("Trainer Types"), TrainerTypeLister.new(0, true)) { |button, tr_type| pbListScreenBlock(_INTL("Trainer Types"), TrainerTypeLister.new(0, true)) { |button, tr_type|
if tr_type if tr_type
if button == Input::A if button == Input::SPECIAL
if tr_type.is_a?(Symbol) if tr_type.is_a?(Symbol)
if pbConfirmMessageSerious("Delete this trainer type?") if pbConfirmMessageSerious("Delete this trainer type?")
id_number = GameData::TrainerType.get(tr_type).id_number id_number = GameData::TrainerType.get(tr_type).id_number
@@ -364,7 +364,7 @@ def pbTrainerTypeEditor
pbMessage(_INTL("The Trainer type was deleted.")) pbMessage(_INTL("The Trainer type was deleted."))
end end
end end
elsif button == Input::C elsif button == Input::USE
if tr_type.is_a?(Symbol) if tr_type.is_a?(Symbol)
t_data = GameData::TrainerType.get(tr_type) t_data = GameData::TrainerType.get(tr_type)
data = [ data = [
@@ -501,7 +501,7 @@ def pbTrainerBattleEditor
modified = false modified = false
pbListScreenBlock(_INTL("Trainer Battles"), TrainerBattleLister.new(0, true)) { |button, trainer_id| pbListScreenBlock(_INTL("Trainer Battles"), TrainerBattleLister.new(0, true)) { |button, trainer_id|
if trainer_id if trainer_id
if button == Input::A if button == Input::SPECIAL
if trainer_id.is_a?(Array) if trainer_id.is_a?(Array)
if pbConfirmMessageSerious("Delete this trainer battle?") if pbConfirmMessageSerious("Delete this trainer battle?")
tr_data = GameData::Trainer::DATA[trainer_id] tr_data = GameData::Trainer::DATA[trainer_id]
@@ -511,7 +511,7 @@ def pbTrainerBattleEditor
pbMessage(_INTL("The Trainer battle was deleted.")) pbMessage(_INTL("The Trainer battle was deleted."))
end end
end end
elsif button == Input::C elsif button == Input::USE
if trainer_id.is_a?(Array) # Edit existing trainer if trainer_id.is_a?(Array) # Edit existing trainer
tr_data = GameData::Trainer::DATA[trainer_id] tr_data = GameData::Trainer::DATA[trainer_id]
old_type = tr_data.trainer_type old_type = tr_data.trainer_type
@@ -826,7 +826,7 @@ def pbItemEditor
] ]
pbListScreenBlock(_INTL("Items"), ItemLister.new(0, true)) { |button, item| pbListScreenBlock(_INTL("Items"), ItemLister.new(0, true)) { |button, item|
if item if item
if button == Input::A if button == Input::SPECIAL
if item.is_a?(Symbol) if item.is_a?(Symbol)
if pbConfirmMessageSerious("Delete this item?") if pbConfirmMessageSerious("Delete this item?")
id_number = GameData::Item.get(item).id_number id_number = GameData::Item.get(item).id_number
@@ -837,7 +837,7 @@ def pbItemEditor
pbMessage(_INTL("The item was deleted.")) pbMessage(_INTL("The item was deleted."))
end end
end end
elsif button == Input::C elsif button == Input::USE
if item.is_a?(Symbol) if item.is_a?(Symbol)
itm = GameData::Item.get(item) itm = GameData::Item.get(item)
data = [ data = [
@@ -993,7 +993,7 @@ def pbPokemonEditor
] ]
pbListScreenBlock(_INTL("Pokémon species"), SpeciesLister.new(0, false)) { |button, species| pbListScreenBlock(_INTL("Pokémon species"), SpeciesLister.new(0, false)) { |button, species|
if species if species
if button == Input::A if button == Input::SPECIAL
if species.is_a?(Symbol) if species.is_a?(Symbol)
if pbConfirmMessageSerious("Delete this species?") if pbConfirmMessageSerious("Delete this species?")
id_number = GameData::Species.get(species).id_number id_number = GameData::Species.get(species).id_number
@@ -1004,7 +1004,7 @@ def pbPokemonEditor
pbMessage(_INTL("The species was deleted.")) pbMessage(_INTL("The species was deleted."))
end end
end end
elsif button == Input::C elsif button == Input::USE
if species.is_a?(Symbol) if species.is_a?(Symbol)
spec = GameData::Species.get(species) spec = GameData::Species.get(species)
moves = [] moves = []

8
Data/Scripts/021_Debug/007_Editor_DataTypes.rb
View File

@@ -646,7 +646,7 @@ def chooseMapPoint(map,rgnmap=false)
ret=xy ret=xy
break break
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
ret=nil ret=nil
break break
end end
@@ -1485,7 +1485,7 @@ def pbPropertyList(title,data,properties,saveprompt=false)
desc.text = properties[list.index][2] desc.text = properties[list.index][2]
selectedmap = list.index selectedmap = list.index
end end
if Input.trigger?(Input::A) if Input.trigger?(Input::SPECIAL)
propobj = properties[selectedmap][1] propobj = properties[selectedmap][1]
if propobj!=ReadOnlyProperty && !propobj.is_a?(ReadOnlyProperty) && if propobj!=ReadOnlyProperty && !propobj.is_a?(ReadOnlyProperty) &&
pbConfirmMessage(_INTL("Reset the setting {1}?",properties[selectedmap][0])) pbConfirmMessage(_INTL("Reset the setting {1}?",properties[selectedmap][0]))
@@ -1501,10 +1501,10 @@ def pbPropertyList(title,data,properties,saveprompt=false)
commands.push(sprintf("%s=%s",properties[i][0],propobj.format(data[i]))) commands.push(sprintf("%s=%s",properties[i][0],propobj.format(data[i])))
end end
list.commands = commands list.commands = commands
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
selectedmap = -1 selectedmap = -1
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
propobj = properties[selectedmap][1] propobj = properties[selectedmap][1]
oldsetting = data[selectedmap] oldsetting = data[selectedmap]
newsetting = propobj.set(properties[selectedmap][0],oldsetting) newsetting = propobj.set(properties[selectedmap][0],oldsetting)

14
Data/Scripts/021_Debug/008_Editor_Listers.rb
View File

@@ -41,10 +41,10 @@ def pbListScreen(title,lister)
lister.refresh(list.index) lister.refresh(list.index)
selectedmap = list.index selectedmap = list.index
end end
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
selectedmap = -1 selectedmap = -1
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
break break
end end
end end
@@ -88,17 +88,17 @@ def pbListScreenBlock(title,lister)
lister.refresh(list.index) lister.refresh(list.index)
selectedmap = list.index selectedmap = list.index
end end
if Input.trigger?(Input::A) if Input.trigger?(Input::SPECIAL)
yield(Input::A, lister.value(selectedmap)) yield(Input::SPECIAL, lister.value(selectedmap))
list.commands = lister.commands list.commands = lister.commands
if list.index==list.commands.length if list.index==list.commands.length
list.index = list.commands.length list.index = list.commands.length
end end
lister.refresh(list.index) lister.refresh(list.index)
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
yield(Input::C, lister.value(selectedmap)) yield(Input::USE, lister.value(selectedmap))
list.commands = lister.commands list.commands = lister.commands
if list.index==list.commands.length if list.index==list.commands.length
list.index = list.commands.length list.index = list.commands.length

36
Data/Scripts/021_Debug/009_Editor_Utilities.rb
View File

@@ -113,8 +113,8 @@ end
#=============================================================================== #===============================================================================
# Displays a list of all Pokémon species, and returns the ID of the species # Displays a list of all Pokémon species, and returns the ID of the species
# selected (or nil if the selection was canceled). "default", if specified, is # selected (or nil if the selection was canceled). "default", if specified, is
# the ID of the species to initially select. Pressing Input::A will toggle the # the ID of the species to initially select. Pressing Input::SPECIAL will toggle
# list sorting between numerical and alphabetical. # the list sorting between numerical and alphabetical.
def pbChooseSpeciesList(default = nil) def pbChooseSpeciesList(default = nil)
commands = [] commands = []
GameData::Species.each { |s| commands.push([s.id_number, s.real_name, s.id]) if s.form == 0 } GameData::Species.each { |s| commands.push([s.id_number, s.real_name, s.id]) if s.form == 0 }
@@ -132,8 +132,8 @@ end
# Displays a list of all moves, and returns the ID of the move selected (or nil # Displays a list of all moves, and returns the ID of the move selected (or nil
# if the selection was canceled). "default", if specified, is the ID of the move # if the selection was canceled). "default", if specified, is the ID of the move
# to initially select. Pressing Input::A will toggle the list sorting between # to initially select. Pressing Input::SPECIAL will toggle the list sorting
# numerical and alphabetical. # between numerical and alphabetical.
def pbChooseMoveList(default = nil) def pbChooseMoveList(default = nil)
commands = [] commands = []
GameData::Move.each { |i| commands.push([i.id_number, i.real_name, i.id]) } GameData::Move.each { |i| commands.push([i.id_number, i.real_name, i.id]) }
@@ -178,8 +178,8 @@ end
# Displays a list of all types, and returns the ID of the type selected (or nil # Displays a list of all types, and returns the ID of the type selected (or nil
# if the selection was canceled). "default", if specified, is the ID of the type # if the selection was canceled). "default", if specified, is the ID of the type
# to initially select. Pressing Input::A will toggle the list sorting between # to initially select. Pressing Input::SPECIAL will toggle the list sorting
# numerical and alphabetical. # between numerical and alphabetical.
def pbChooseTypeList(default = nil) def pbChooseTypeList(default = nil)
commands = [] commands = []
GameData::Type.each { |t| commands.push([t.id_number, t.name, t.id]) if !t.pseudo_type } GameData::Type.each { |t| commands.push([t.id_number, t.name, t.id]) if !t.pseudo_type }
@@ -188,8 +188,8 @@ end
# Displays a list of all items, and returns the ID of the item selected (or nil # Displays a list of all items, and returns the ID of the item selected (or nil
# if the selection was canceled). "default", if specified, is the ID of the item # if the selection was canceled). "default", if specified, is the ID of the item
# to initially select. Pressing Input::A will toggle the list sorting between # to initially select. Pressing Input::SPECIAL will toggle the list sorting
# numerical and alphabetical. # between numerical and alphabetical.
def pbChooseItemList(default = nil) def pbChooseItemList(default = nil)
commands = [] commands = []
GameData::Item.each { |i| commands.push([i.id_number, i.name, i.id]) } GameData::Item.each { |i| commands.push([i.id_number, i.name, i.id]) }
@@ -198,7 +198,7 @@ end
# Displays a list of all abilities, and returns the ID of the ability selected # Displays a list of all abilities, and returns the ID of the ability selected
# (or nil if the selection was canceled). "default", if specified, is the ID of # (or nil if the selection was canceled). "default", if specified, is the ID of
# the ability to initially select. Pressing Input::A will toggle the list # the ability to initially select. Pressing Input::SPECIAL will toggle the list
# sorting between numerical and alphabetical. # sorting between numerical and alphabetical.
def pbChooseAbilityList(default = nil) def pbChooseAbilityList(default = nil)
commands = [] commands = []
@@ -253,7 +253,7 @@ def pbCommands2(cmdwindow,commands,cmdIfCancel,defaultindex=-1,noresize=false)
Graphics.update Graphics.update
Input.update Input.update
cmdwindow.update cmdwindow.update
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
if cmdIfCancel>0 if cmdIfCancel>0
command = cmdIfCancel-1 command = cmdIfCancel-1
break break
@@ -261,7 +261,7 @@ def pbCommands2(cmdwindow,commands,cmdIfCancel,defaultindex=-1,noresize=false)
command = cmdIfCancel command = cmdIfCancel
break break
end end
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
command = cmdwindow.index command = cmdwindow.index
break break
end end
@@ -290,10 +290,10 @@ def pbCommands3(cmdwindow,commands,cmdIfCancel,defaultindex=-1,noresize=false)
Graphics.update Graphics.update
Input.update Input.update
cmdwindow.update cmdwindow.update
if Input.trigger?(Input::F5) if Input.trigger?(Input::Z)
command = [5,cmdwindow.index] command = [5,cmdwindow.index]
break break
elsif Input.press?(Input::A) elsif Input.press?(Input::SPECIAL)
if Input.repeat?(Input::UP) if Input.repeat?(Input::UP)
command = [1,cmdwindow.index] command = [1,cmdwindow.index]
break break
@@ -307,7 +307,7 @@ def pbCommands3(cmdwindow,commands,cmdIfCancel,defaultindex=-1,noresize=false)
command = [4,cmdwindow.index] command = [4,cmdwindow.index]
break break
end end
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
if cmdIfCancel>0 if cmdIfCancel>0
command = [0,cmdIfCancel-1] command = [0,cmdIfCancel-1]
break break
@@ -315,7 +315,7 @@ def pbCommands3(cmdwindow,commands,cmdIfCancel,defaultindex=-1,noresize=false)
command = [0,cmdIfCancel] command = [0,cmdIfCancel]
break break
end end
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
command = [0,cmdwindow.index] command = [0,cmdwindow.index]
break break
end end
@@ -381,13 +381,13 @@ def pbCommandsSortable(cmdwindow,commands,cmdIfCancel,defaultindex=-1,sortable=f
Graphics.update Graphics.update
Input.update Input.update
cmdwindow.update cmdwindow.update
if Input.trigger?(Input::A) && sortable if Input.trigger?(Input::SPECIAL) && sortable
command = [1,cmdwindow.index] command = [1,cmdwindow.index]
break break
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
command = [0,(cmdIfCancel>0) ? cmdIfCancel-1 : cmdIfCancel] command = [0,(cmdIfCancel>0) ? cmdIfCancel-1 : cmdIfCancel]
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
command = [0,cmdwindow.index] command = [0,cmdwindow.index]
break break
end end

6
Data/Scripts/021_Debug/010_Editor_TilesetTerrainTags.rb
View File

@@ -172,7 +172,7 @@ class PokemonTilesetScene
update_cursor_position(0, -Graphics.height / TILE_SIZE) update_cursor_position(0, -Graphics.height / TILE_SIZE)
elsif Input.repeat?(Input::R) elsif Input.repeat?(Input::R)
update_cursor_position(0, Graphics.height / TILE_SIZE) update_cursor_position(0, Graphics.height / TILE_SIZE)
elsif Input.trigger?(Input::A) elsif Input.trigger?(Input::SPECIAL)
commands = [ commands = [
_INTL("Go to bottom"), _INTL("Go to bottom"),
_INTL("Go to top"), _INTL("Go to top"),
@@ -191,7 +191,7 @@ class PokemonTilesetScene
when 2 when 2
pbChooseTileset pbChooseTileset
end end
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
if pbConfirmMessage(_INTL("Save changes?")) if pbConfirmMessage(_INTL("Save changes?"))
@tilesetwrapper.save @tilesetwrapper.save
$data_tilesets = @tilesetwrapper.data $data_tilesets = @tilesetwrapper.data
@@ -206,7 +206,7 @@ class PokemonTilesetScene
pbMessage(_INTL("To ensure that the changes remain, close and reopen RPG Maker XP.")) pbMessage(_INTL("To ensure that the changes remain, close and reopen RPG Maker XP."))
end end
break if pbConfirmMessage(_INTL("Exit from the editor?")) break if pbConfirmMessage(_INTL("Exit from the editor?"))
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
selected = pbGetSelected(@x, @y) selected = pbGetSelected(@x, @y)
params = ChooseNumberParams.new params = ChooseNumberParams.new
params.setRange(0, 99) params.setRange(0, 99)

4
Data/Scripts/021_Debug/011_Editor_MapConnections.rb
View File

@@ -367,7 +367,7 @@ class MapScreenScene
loop do loop do
Graphics.update Graphics.update
Input.update Input.update
break if Input.trigger?(Input::B) || Input.trigger?(Input::C) break if Input.trigger?(Input::BACK) || Input.trigger?(Input::USE)
end end
Input.update Input.update
title.dispose title.dispose
@@ -560,7 +560,7 @@ class MapScreenScene
Graphics.update Graphics.update
Input.update Input.update
update update
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
if pbConfirmMessage(_INTL("Save changes?")) if pbConfirmMessage(_INTL("Save changes?"))
serializeConnectionData serializeConnectionData
MapFactoryHelper.clear MapFactoryHelper.clear

20
Data/Scripts/021_Debug/012_Editor_SpritePositioning.rb
View File

@@ -195,16 +195,16 @@ class SpritePositioner
pbChangeSpecies(@species) pbChangeSpecies(@species)
refresh refresh
end end
if Input.trigger?(Input::A) # Cycle to next option if Input.trigger?(Input::SPECIAL) # Cycle to next option
pbPlayDecisionSE pbPlayDecisionSE
@metricsChanged = true if species_data.shadow_size != oldval @metricsChanged = true if species_data.shadow_size != oldval
ret = true ret = true
break break
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
species_data.shadow_size = oldval species_data.shadow_size = oldval
pbPlayCancelSE pbPlayCancelSE
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
break break
end end
@@ -266,12 +266,12 @@ class SpritePositioner
end end
refresh refresh
end end
if Input.repeat?(Input::A) && param != 3 # Cycle to next option if Input.repeat?(Input::SPECIAL) && param != 3 # Cycle to next option
@metricsChanged = true if xpos != oldxpos || ypos != oldypos @metricsChanged = true if xpos != oldxpos || ypos != oldypos
ret = true ret = true
pbPlayDecisionSE pbPlayDecisionSE
break break
elsif Input.repeat?(Input::B) elsif Input.repeat?(Input::BACK)
case param case param
when 0 when 0
species_data.back_sprite_x = oldxpos species_data.back_sprite_x = oldxpos
@@ -285,7 +285,7 @@ class SpritePositioner
pbPlayCancelSE pbPlayCancelSE
refresh refresh
break break
elsif Input.repeat?(Input::C) elsif Input.repeat?(Input::USE)
@metricsChanged = true if xpos != oldxpos || (param != 3 && ypos != oldypos) @metricsChanged = true if xpos != oldxpos || (param != 3 && ypos != oldypos)
pbPlayDecisionSE pbPlayDecisionSE
break break
@@ -315,11 +315,11 @@ class SpritePositioner
Input.update Input.update
cw.update cw.update
self.update self.update
if Input.trigger?(Input::C) if Input.trigger?(Input::USE)
pbPlayDecisionSE pbPlayDecisionSE
ret = cw.index ret = cw.index
break break
elsif Input.trigger?(Input::B) elsif Input.trigger?(Input::BACK)
pbPlayCancelSE pbPlayCancelSE
break break
end end
@@ -360,11 +360,11 @@ class SpritePositioner
refresh refresh
end end
self.update self.update
if Input.trigger?(Input::B) if Input.trigger?(Input::BACK)
pbChangeSpecies(nil) pbChangeSpecies(nil)
refresh refresh
break break
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::USE)
pbChangeSpecies(allspecies[cw.index][0]) pbChangeSpecies(allspecies[cw.index][0])
ret = allspecies[cw.index][0] ret = allspecies[cw.index][0]
break break

8
mkxp.json
View File

@@ -194,6 +194,14 @@
// "allowSymlinks": false, // "allowSymlinks": false,
// Names of the input buttons in the F1 key bindings
// window. This only affects the names displayed
// there, and won't enable those names as Input
// constants in the scripts.
"bindingNames": {"c": "Use",
"b": "Back",
"a": "Special"},
// Organisation / company and application / game // Organisation / company and application / game
// name to build the directory path where mkxp // name to build the directory path where mkxp
// will store game specific data (eg. key bindings). // will store game specific data (eg. key bindings).