DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-08 13:44:59 +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/017_UI/001_PScreen_PauseMenu.rb
View File

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

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

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

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

@@ -951,14 +951,14 @@ class PokemonPokedex_Scene
pbPlayCursorSE if index!=oldindex
end
end
if Input.trigger?(Input::A)
if Input.trigger?(Input::SPECIAL)
index = -2
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE
ret = nil
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
if index==-2 # OK
pbPlayDecisionSE
ret = selindex
@@ -1066,13 +1066,13 @@ class PokemonPokedex_Scene
elsif index==7 || index==8; index += 1
end
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::A)
elsif Input.trigger?(Input::SPECIAL)
index = 8
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
pbPlayDecisionSE if index!=9
case index
when 0 # Choose sort order
@@ -1159,12 +1159,12 @@ class PokemonPokedex_Scene
$PokemonGlobal.pokedexIndex[pbGetSavePositionIndex] = @sprites["pokedex"].index if !@searchResults
pbRefresh
end
if Input.trigger?(Input::A)
if Input.trigger?(Input::SPECIAL)
pbPlayDecisionSE
@sprites["pokedex"].active = false
pbDexSearch
@sprites["pokedex"].active = true
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
if @searchResults
pbPlayCancelSE
pbCloseSearch
@@ -1172,7 +1172,7 @@ class PokemonPokedex_Scene
pbPlayCloseMenuSE
break
end
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
if $Trainer.seen?(@sprites["pokedex"].species)
pbPlayDecisionSE
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)
pbPlayCursorSE
index = (index+1)%@available.length
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
pbPlayCancelSE
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
pbPlayDecisionSE
break
end
@@ -455,13 +455,13 @@ class PokemonPokedexInfo_Scene
Input.update
pbUpdate
dorefresh = false
if Input.trigger?(Input::A)
if Input.trigger?(Input::SPECIAL)
pbSEStop
GameData::Species.play_cry_from_species(@species, @form) if @page == 1
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
if @page==2 # Area
# dorefresh = true
elsif @page==3 # Forms
@@ -523,13 +523,13 @@ class PokemonPokedexInfo_Scene
Graphics.update
Input.update
pbUpdate
if Input.trigger?(Input::A)
if Input.trigger?(Input::SPECIAL)
pbSEStop
GameData::Species.play_cry_from_species(@species, @form)
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
pbPlayDecisionSE
break
end

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

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

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

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

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

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

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

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

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

@@ -315,7 +315,7 @@ class PokemonRegionMap_Scene
newX = @sprites["cursor"].x+xOffset
newY = @sprites["cursor"].y+yOffset
end
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
if @editor && @changed
if pbConfirmMessage(_INTL("Save changes?")) { pbUpdate }
pbSaveMapData
@@ -326,14 +326,14 @@ class PokemonRegionMap_Scene
else
break
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)
if healspot
if $PokemonGlobal.visitedMaps[healspot[0]] || ($DEBUG && Input.press?(Input::CTRL))
return healspot
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)
end
end

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

@@ -131,10 +131,10 @@ class PokemonPhoneScene
end
end
end
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
pbPlayCloseMenuSE
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
index = @sprites["list"].index
if index>=0
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
Input.update
pbUpdate
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
ret = @sprites["commands"].index
break
end

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

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

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

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

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

@@ -448,9 +448,9 @@ class PokemonOption_Scene
oldFont = $PokemonSystem.font
end
end
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
break if @sprites["option"].index==@PokemonOptions.length
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
@index[2] = 1
pbChangeSide
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE
ret = -1
break
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
ret = [@index[2],cmdwindow.index]
break
end

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

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

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

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

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

@@ -549,7 +549,7 @@ class PokemonEvolutionScene
Graphics.update
Input.update
pbUpdate(true)
if Input.trigger?(Input::B) && cancancel
if Input.trigger?(Input::BACK) && cancancel
pbBGMStop
pbPlayCancelSE
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
pbDrawMoveList
end
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
return 0
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
return @moves[@sprites["commands"].index]
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
pbPlayCursorSE()
return [1,nextset]
elsif Input.trigger?(Input::C)
elsif Input.trigger?(Input::USE)
pbPlayDecisionSE()
return [0,@sprites["setview"].cursor]
elsif Input.trigger?(Input::B)
elsif Input.trigger?(Input::BACK)
pbPlayCancelSE()
return [3,0]
end
@@ -1207,11 +1207,11 @@ class PurifyChamberScene
@sprites["setview"].set=oldindex
end
Graphics.update; Input.update; pbUpdate
if Input.trigger?(Input::C)
if Input.trigger?(Input::USE)
pbPlayDecisionSE()
return @sprites["setwindow"].index
end
if Input.trigger?(Input::B)
if Input.trigger?(Input::BACK)
pbPlayCancelSE()
return -1
end

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

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

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

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