DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 13:15:01 +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

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

@@ -98,7 +98,7 @@ def pbDebugMenu(show_all = true)
end
Graphics.update
Input.update
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
parent = commands.getParent
if parent
pbPlayCancelSE
@@ -110,7 +110,7 @@ def pbDebugMenu(show_all = true)
ret = -1
break
end
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
ret = cmdwindow.index
break
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."),
"effect" => proc {
pbListScreenBlock(_INTL("ADD ITEM"), ItemLister.new) { |button, item|
if button == Input::C && item
if button == Input::USE && item
params = ChooseNumberParams.new
params.setRange(1, Settings::BAG_MAX_PER_SLOT)
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
Input.update
pbUpdateSpriteHash(sprites)
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
pbPlayCancelSE
break
end
current_id = right_window.index+1
if mode==0 # Switches
if Input.trigger?(Input::C)
if Input.trigger?(Input::USE)
pbPlayDecisionSE
$game_switches[current_id] = !$game_switches[current_id]
right_window.refresh
@@ -174,7 +174,7 @@ def pbDebugVariables(mode)
elsif Input.repeat?(Input::RIGHT)
pbDebugSetVariable(current_id,1)
right_window.refresh
elsif Input.trigger?(Input::A)
elsif Input.trigger?(Input::SPECIAL)
if $game_variables[current_id]==0
$game_variables[current_id] = ""
elsif $game_variables[current_id]==""
@@ -186,7 +186,7 @@ def pbDebugVariables(mode)
end
right_window.refresh
$game_map.need_refresh = true
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
pbPlayDecisionSE
pbDebugVariableScreen(current_id)
right_window.refresh
@@ -284,9 +284,9 @@ def pbDebugDayCare
pbUpdateSpriteHash(sprites)
Graphics.update
Input.update
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
case cmdwindow.index
when 0 # Withdraw Pokémon 1
if !$PokemonGlobal.daycare[0][0]
@@ -451,7 +451,7 @@ def pbDebugRoamers
Graphics.update
Input.update
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]]) &&
$PokemonGlobal.roamPokemon[cmdwindow.index]!=true
# Roam selected Pokémon
@@ -473,10 +473,10 @@ def pbDebugRoamers
$PokemonGlobal.roamedAlready = false
cmdwindow.refresh
end
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
pbPlayCancelSE
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
if cmdwindow.index<cmdwindow.roamerCount
pbPlayDecisionSE
# Toggle through roaming, not roaming, defeated
@@ -871,12 +871,12 @@ class PokemonDebugPartyScreen
Input.update
pbUpdate
if @messageBox.busy?
if Input.trigger?(Input::C)
if Input.trigger?(Input::USE)
pbPlayDecisionSE if @messageBox.pausing?
@messageBox.resume
end
else
if Input.trigger?(Input::B) || Input.trigger?(Input::C)
if Input.trigger?(Input::BACK) || Input.trigger?(Input::USE)
break
end
end
@@ -902,10 +902,10 @@ class PokemonDebugPartyScreen
cmdwindow.update
pbUpdate
if !@messageBox.busy?
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
ret = false
break
elsif Input.trigger?(Input::C) && @messageBox.resume
elsif Input.trigger?(Input::USE) && @messageBox.resume
ret = (cmdwindow.index==0)
break
end
@@ -932,11 +932,11 @@ class PokemonDebugPartyScreen
Input.update
cmdwindow.update
pbUpdate
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
pbPlayCancelSE
ret = -1
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
pbPlayDecisionSE
ret = cmdwindow.index
break

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

@@ -145,12 +145,12 @@ def pbTrackPopupMenu(commands)
menuwindow.dispose
return hit
end
if Input.trigger?(Input::C)
if Input.trigger?(Input::USE)
hit=menuwindow.index
menuwindow.dispose
return hit
end
if Input.trigger?(Input::B) # Escape
if Input.trigger?(Input::BACK) # Escape
break
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
Graphics.update
Input.update
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
break
end
if Input.trigger?(Input::MOUSELEFT)
@@ -426,7 +426,7 @@ def pbDefinePath(canvas)
cel[AnimFrame::Y]=path[i-canvas.currentframe][1]
end
break
elsif sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B)
elsif sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break
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
Input.update
cmdwin.update
if Input.trigger?(Input::C) && animfiles.length>0
if Input.trigger?(Input::USE) && animfiles.length>0
begin
textdata=loadBase64Anim(IO.read(animfiles[cmdwin.index]))
throw "Bad data" if !textdata.is_a?(PBAnimation)
@@ -74,7 +74,7 @@ def pbImportAnim(animations,canvas,animwin)
animwin.animbitmap=canvas.animbitmap
break
end
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
break
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
ctlwin.update
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
canvas.animation.graphic=cmdwin.commands[cmdwin.index]
canvas.animation.hue=ctlwin.value(0)
@@ -54,7 +54,7 @@ def pbSelectAnim(canvas,animwin)
animwin.animbitmap=bitmap
break
end
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
break
end
end
@@ -79,7 +79,7 @@ def pbChangeMaximum(canvas)
canvas.animation.resize(sliderwin2.value(0))
break
end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B)
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break
end
end
@@ -149,7 +149,7 @@ def pbAnimList(animations,canvas,animwin)
cmdwin.index=animations.selected
next
end
if Input.trigger?(Input::C) && animations.length>0
if Input.trigger?(Input::USE) && animations.length>0
cmd2=pbShowCommands(helpwindow,[
_INTL("Load Animation"),
_INTL("Rename"),
@@ -171,7 +171,7 @@ def pbAnimList(animations,canvas,animwin)
end
end
end
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
break
end
end
@@ -199,7 +199,7 @@ def pbChooseNum(cel)
ret=sliderwin2.value(1)
break
end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B)
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
ret=-1
break
end
@@ -234,7 +234,7 @@ def pbSetTone(cel,previewsprite)
cel[AnimFrame::TONEGRAY]=sliderwin2.value(3)
break
end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B)
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break
end
end
@@ -268,7 +268,7 @@ def pbSetFlash(cel,previewsprite)
cel[AnimFrame::COLORALPHA]=sliderwin2.value(3)
break
end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B)
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break
end
end
@@ -366,7 +366,7 @@ def pbCellProperties(canvas)
thiscel[0,thiscel.length]=cel
break
end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B)
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break
end
end
@@ -435,7 +435,7 @@ def pbTimingList(canvas)
next
end
end
if Input.trigger?(Input::C)
if Input.trigger?(Input::USE)
redrawcmds=false
if cmdwin.index==cmdNewSound # Add new sound
newaudio=PBAnimTiming.new(0)
@@ -500,7 +500,7 @@ def pbTimingList(canvas)
cmdwin.commands[cmdEditFO=cmdwin.commands.length]=_INTL("Add: Edit Foreground Color/Location...")
cmdwin.refresh
end
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
break
end
end
@@ -562,11 +562,11 @@ def pbSelectSE(canvas,audio)
if maxsizewindow.changed?(6) # Cancel
break
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]
displayname=(filename!="") ? filename : _INTL("<user's cry>")
maxsizewindow.controls[0].text=_INTL("File: \"{1}\"",displayname)
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
break
end
end
@@ -625,10 +625,10 @@ def pbSelectBG(canvas,timing)
if maxsizewindow.changed?(9) # Cancel
break
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]
maxsizewindow.controls[0].text=_INTL("File: \"{1}\"",filename)
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
break
end
end
@@ -688,7 +688,7 @@ def pbEditBG(canvas,timing)
if maxsizewindow.changed?(9) # Cancel
break
end
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
break
end
end
@@ -735,7 +735,7 @@ def pbCopyFrames(canvas)
end
break
end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B)
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break
end
end
@@ -763,7 +763,7 @@ def pbClearFrames(canvas)
end
break
end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B)
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break
end
end
@@ -788,7 +788,7 @@ def pbTweening(canvas)
Graphics.update
Input.update
sliderwin2.update
if sliderwin2.changed?(okbutton) || Input.trigger?(Input::C)
if sliderwin2.changed?(okbutton) || Input.trigger?(Input::USE)
startframe=sliderwin2.value(s1set0)-1
endframe=sliderwin2.value(s1set1)-1
break if startframe>=endframe
@@ -841,7 +841,7 @@ def pbTweening(canvas)
canvas.invalidate
break
end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B)
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break
end
end
@@ -880,7 +880,7 @@ def pbCellBatch(canvas)
Input.update
sliderwin1.update
sliderwin2.update
if sliderwin2.changed?(okbutton) || Input.trigger?(Input::C)
if sliderwin2.changed?(okbutton) || Input.trigger?(Input::USE)
startframe=sliderwin1.value(s1set0)-1
endframe=sliderwin1.value(s1set1)-1
startcel=sliderwin1.value(s1set2)
@@ -905,7 +905,7 @@ def pbCellBatch(canvas)
canvas.invalidate
break
end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B)
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break
end
end
@@ -937,7 +937,7 @@ def pbEntireSlide(canvas)
end
break
end
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::B)
if sliderwin2.changed?(cancelbutton) || Input.trigger?(Input::BACK)
break
end
end
@@ -960,7 +960,7 @@ def pbAnimEditorHelpWindow
Graphics.update
Input.update
cmdwin.update
break if Input.trigger?(Input::B) || Input.trigger?(Input::C)
break if Input.trigger?(Input::BACK) || Input.trigger?(Input::USE)
end
cmdwin.dispose
end
@@ -1013,7 +1013,7 @@ def animationEditorMain(animation)
if animwin.changed?
canvas.pattern=animwin.selected
end
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
if pbConfirmMessage(_INTL("Save changes?"))
save_data(animation,"Data/PkmnAnimations.rxdata")
$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|
if tr_type
if button == Input::A
if button == Input::SPECIAL
if tr_type.is_a?(Symbol)
if pbConfirmMessageSerious("Delete this trainer type?")
id_number = GameData::TrainerType.get(tr_type).id_number
@@ -364,7 +364,7 @@ def pbTrainerTypeEditor
pbMessage(_INTL("The Trainer type was deleted."))
end
end
elsif button == Input::C
elsif button == Input::USE
if tr_type.is_a?(Symbol)
t_data = GameData::TrainerType.get(tr_type)
data = [
@@ -501,7 +501,7 @@ def pbTrainerBattleEditor
modified = false
pbListScreenBlock(_INTL("Trainer Battles"), TrainerBattleLister.new(0, true)) { |button, trainer_id|
if trainer_id
if button == Input::A
if button == Input::SPECIAL
if trainer_id.is_a?(Array)
if pbConfirmMessageSerious("Delete this trainer battle?")
tr_data = GameData::Trainer::DATA[trainer_id]
@@ -511,7 +511,7 @@ def pbTrainerBattleEditor
pbMessage(_INTL("The Trainer battle was deleted."))
end
end
elsif button == Input::C
elsif button == Input::USE
if trainer_id.is_a?(Array) # Edit existing trainer
tr_data = GameData::Trainer::DATA[trainer_id]
old_type = tr_data.trainer_type
@@ -826,7 +826,7 @@ def pbItemEditor
]
pbListScreenBlock(_INTL("Items"), ItemLister.new(0, true)) { |button, item|
if item
if button == Input::A
if button == Input::SPECIAL
if item.is_a?(Symbol)
if pbConfirmMessageSerious("Delete this item?")
id_number = GameData::Item.get(item).id_number
@@ -837,7 +837,7 @@ def pbItemEditor
pbMessage(_INTL("The item was deleted."))
end
end
elsif button == Input::C
elsif button == Input::USE
if item.is_a?(Symbol)
itm = GameData::Item.get(item)
data = [
@@ -993,7 +993,7 @@ def pbPokemonEditor
]
pbListScreenBlock(_INTL("Pokémon species"), SpeciesLister.new(0, false)) { |button, species|
if species
if button == Input::A
if button == Input::SPECIAL
if species.is_a?(Symbol)
if pbConfirmMessageSerious("Delete this species?")
id_number = GameData::Species.get(species).id_number
@@ -1004,7 +1004,7 @@ def pbPokemonEditor
pbMessage(_INTL("The species was deleted."))
end
end
elsif button == Input::C
elsif button == Input::USE
if species.is_a?(Symbol)
spec = GameData::Species.get(species)
moves = []

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

@@ -646,7 +646,7 @@ def chooseMapPoint(map,rgnmap=false)
ret=xy
break
end
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
ret=nil
break
end
@@ -1485,7 +1485,7 @@ def pbPropertyList(title,data,properties,saveprompt=false)
desc.text = properties[list.index][2]
selectedmap = list.index
end
if Input.trigger?(Input::A)
if Input.trigger?(Input::SPECIAL)
propobj = properties[selectedmap][1]
if propobj!=ReadOnlyProperty && !propobj.is_a?(ReadOnlyProperty) &&
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])))
end
list.commands = commands
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
selectedmap = -1
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
propobj = properties[selectedmap][1]
oldsetting = data[selectedmap]
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)
selectedmap = list.index
end
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
selectedmap = -1
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
break
end
end
@@ -88,17 +88,17 @@ def pbListScreenBlock(title,lister)
lister.refresh(list.index)
selectedmap = list.index
end
if Input.trigger?(Input::A)
yield(Input::A, lister.value(selectedmap))
if Input.trigger?(Input::SPECIAL)
yield(Input::SPECIAL, lister.value(selectedmap))
list.commands = lister.commands
if list.index==list.commands.length
list.index = list.commands.length
end
lister.refresh(list.index)
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
break
elsif Input.trigger?(Input::C)
yield(Input::C, lister.value(selectedmap))
elsif Input.trigger?(Input::USE)
yield(Input::USE, lister.value(selectedmap))
list.commands = lister.commands
if 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
# 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
# list sorting between numerical and alphabetical.
# the ID of the species to initially select. Pressing Input::SPECIAL will toggle
# the list sorting between numerical and alphabetical.
def pbChooseSpeciesList(default = nil)
commands = []
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
# 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
# numerical and alphabetical.
# to initially select. Pressing Input::SPECIAL will toggle the list sorting
# between numerical and alphabetical.
def pbChooseMoveList(default = nil)
commands = []
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
# 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
# numerical and alphabetical.
# to initially select. Pressing Input::SPECIAL will toggle the list sorting
# between numerical and alphabetical.
def pbChooseTypeList(default = nil)
commands = []
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
# 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
# numerical and alphabetical.
# to initially select. Pressing Input::SPECIAL will toggle the list sorting
# between numerical and alphabetical.
def pbChooseItemList(default = nil)
commands = []
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
# (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.
def pbChooseAbilityList(default = nil)
commands = []
@@ -253,7 +253,7 @@ def pbCommands2(cmdwindow,commands,cmdIfCancel,defaultindex=-1,noresize=false)
Graphics.update
Input.update
cmdwindow.update
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
if cmdIfCancel>0
command = cmdIfCancel-1
break
@@ -261,7 +261,7 @@ def pbCommands2(cmdwindow,commands,cmdIfCancel,defaultindex=-1,noresize=false)
command = cmdIfCancel
break
end
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
command = cmdwindow.index
break
end
@@ -290,10 +290,10 @@ def pbCommands3(cmdwindow,commands,cmdIfCancel,defaultindex=-1,noresize=false)
Graphics.update
Input.update
cmdwindow.update
if Input.trigger?(Input::F5)
if Input.trigger?(Input::Z)
command = [5,cmdwindow.index]
break
elsif Input.press?(Input::A)
elsif Input.press?(Input::SPECIAL)
if Input.repeat?(Input::UP)
command = [1,cmdwindow.index]
break
@@ -307,7 +307,7 @@ def pbCommands3(cmdwindow,commands,cmdIfCancel,defaultindex=-1,noresize=false)
command = [4,cmdwindow.index]
break
end
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
if cmdIfCancel>0
command = [0,cmdIfCancel-1]
break
@@ -315,7 +315,7 @@ def pbCommands3(cmdwindow,commands,cmdIfCancel,defaultindex=-1,noresize=false)
command = [0,cmdIfCancel]
break
end
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
command = [0,cmdwindow.index]
break
end
@@ -381,13 +381,13 @@ def pbCommandsSortable(cmdwindow,commands,cmdIfCancel,defaultindex=-1,sortable=f
Graphics.update
Input.update
cmdwindow.update
if Input.trigger?(Input::A) && sortable
if Input.trigger?(Input::SPECIAL) && sortable
command = [1,cmdwindow.index]
break
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
command = [0,(cmdIfCancel>0) ? cmdIfCancel-1 : cmdIfCancel]
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
command = [0,cmdwindow.index]
break
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)
elsif Input.repeat?(Input::R)
update_cursor_position(0, Graphics.height / TILE_SIZE)
elsif Input.trigger?(Input::A)
elsif Input.trigger?(Input::SPECIAL)
commands = [
_INTL("Go to bottom"),
_INTL("Go to top"),
@@ -191,7 +191,7 @@ class PokemonTilesetScene
when 2
pbChooseTileset
end
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
if pbConfirmMessage(_INTL("Save changes?"))
@tilesetwrapper.save
$data_tilesets = @tilesetwrapper.data
@@ -206,7 +206,7 @@ class PokemonTilesetScene
pbMessage(_INTL("To ensure that the changes remain, close and reopen RPG Maker XP."))
end
break if pbConfirmMessage(_INTL("Exit from the editor?"))
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
selected = pbGetSelected(@x, @y)
params = ChooseNumberParams.new
params.setRange(0, 99)

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

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

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

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