Fixed some buttons and bumpers/triggers...

Back/Select instead of Y button as Y button doesn't work and Triggers instead of Bumpers to make sure the chat box doesn't open during Voltorb Flip or PC Box switching
This commit is contained in:
JappaWakka 2025-03-20 17:40:01 +01:00
parent 1c9effb03f
commit af89b308c7
6 changed files with 10 additions and 10 deletions

View File

@ -184,7 +184,7 @@
End Select
If Me.menuIndex <> MenuScreens.TradeRequest Then
If KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Or ControllerHandler.ButtonPressed(Buttons.Y) = True Then
If KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Or ControllerHandler.ButtonPressed(Buttons.Back) = True Then
If Me.menuIndex <> MenuScreens.UserView Then Player.Temp.LastPokegearPage = Me.menuIndex
SoundManager.PlaySound("Pokegear\pokegear_off")
Core.SetScreen(Me.PreScreen)

View File

@ -194,7 +194,7 @@
End If
Core.GameOptions.LoadOffsetMaps = Core.GameOptions.LoadOffsetMaps.Clamp(0, 100)
If KeyBoardHandler.KeyPressed(Keys.R) = True Or ControllerHandler.ButtonPressed(Buttons.Y) = True Then
If KeyBoardHandler.KeyPressed(Keys.R) = True Or ControllerHandler.ButtonPressed(Buttons.Back) = True Then
Core.OffsetMaps.Clear()
Level.Load(Level.LevelFile)
End If

View File

@ -304,7 +304,7 @@
End Sub
Private Sub UpdateMenu()
If KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Or ControllerHandler.ButtonPressed(Buttons.Y) = True Then
If KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Or ControllerHandler.ButtonPressed(Buttons.Back) = True Then
Me.Entries.Reverse()
End If

View File

@ -174,7 +174,7 @@ Public Class StorageSystemScreen
Public Overrides Sub Update()
TextBox.Update()
If ControllerHandler.ButtonPressed(Buttons.Y) = True Or KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Then
If ControllerHandler.ButtonPressed(Buttons.Back) = True Or KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Then
Core.SetScreen(New StorageSystemFilterScreen(Me))
End If
@ -217,13 +217,13 @@ Public Class StorageSystemScreen
If CursorMoving = True Then
MoveCursor()
Else
If ControllerHandler.ButtonPressed(Buttons.RightShoulder) = True Or Controls.Right(True, False, True, False, False, False) = True Then
If ControllerHandler.ButtonPressed(Buttons.RightTrigger) = True Or Controls.Right(True, False, True, False, False, False) = True Then
Me.CurrentBox += 1
If CurrentBox > Me.Boxes.Count - 1 Then
CurrentBox = 0
End If
End If
If ControllerHandler.ButtonPressed(Buttons.LeftShoulder) = True Or Controls.Left(True, False, True, False, False, False) = True Then
If ControllerHandler.ButtonPressed(Buttons.LeftTrigger) = True Or Controls.Left(True, False, True, False, False, False) = True Then
Me.CurrentBox -= 1
If CurrentBox < 0 Then
CurrentBox = Me.Boxes.Count - 1

View File

@ -607,7 +607,7 @@ Public Class TradeScreen
Me.Cursor = Me.BuyItemsList.Count - 1
End If
If ControllerHandler.ButtonPressed(Buttons.Y) = True Or KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Then
If ControllerHandler.ButtonPressed(Buttons.Back) = True Or KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Then
Me.BuyItemsShowDescription = Not Me.BuyItemsShowDescription
End If
@ -1015,7 +1015,7 @@ Public Class TradeScreen
End If
End If
If ControllerHandler.ButtonPressed(Buttons.Y) = True Or KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Then
If ControllerHandler.ButtonPressed(Buttons.Back) = True Or KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Then
Me.SellItemsShowDescription = Not Me.SellItemsShowDescription
End If

View File

@ -880,14 +880,14 @@ TryAgain:
End If
'Cycling through the 4 Memo types (Voltorb, One, Two, Three)
If Controls.Left(True, False, True, False, False, False) = True OrElse ControllerHandler.ButtonPressed(Buttons.LeftShoulder) Then
If Controls.Left(True, False, True, False, False, False) = True OrElse ControllerHandler.ButtonPressed(Buttons.LeftTrigger) Then
MemoIndex -= 1
If MemoIndex < 0 Then
MemoIndex = 3
End If
SoundManager.PlaySound("select")
End If
If Controls.Right(True, False, True, False, False, False) = True OrElse ControllerHandler.ButtonPressed(Buttons.RightShoulder) Then
If Controls.Right(True, False, True, False, False, False) = True OrElse ControllerHandler.ButtonPressed(Buttons.RightTrigger) Then
MemoIndex += 1
If MemoIndex > 3 Then
MemoIndex = 0