From 540adf476043e1301fca1b093a998973a13af1b0 Mon Sep 17 00:00:00 2001
From: infinitefusion <pkmninfinitefusion@gmail.com>
Date: Sat, 16 Apr 2022 22:31:49 -0400
Subject: [PATCH] Pokedex UI fix

---
 .../005_Player_Pokedex.rb                     |   4 --
 Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb   |  38 +++++++++---------
 Data/System.rxdata                            | Bin 27466 -> 27466 bytes
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb
index 8d6655aaf..fd18ffb60 100644
--- a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb	
+++ b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb	
@@ -302,18 +302,14 @@ class Player < Trainer
     # loop on @owned and @seen and add the pokemon in @owned_standard/fusion @seen_standard/fusion
     # then clear @owned and @seen
     def resync_pokedex()
-      Kernel.pbMessage(_INTL("Syncing Pokédex... This might take some time."))
       init_new_pokedex_if_needed()
-
       @seen.each { |pokemon|
         set_seen(pokemon[0])
       }
       @owned.each { |pokemon|
         set_owned(pokemon[0])
       }
-
       self.refresh_accessible_dexes
-
       @seen = {} #deprecated
       @owned = {} #deprecated
       #self.clear
diff --git a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
index 230dabe24..b21c13fe9 100644
--- a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
+++ b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
@@ -197,7 +197,7 @@ class PokemonPokedexInfo_Scene
     case page
     when 1 then drawPageInfo
     when 2 then drawPageArea
-    when 3 then drawPageForms
+    when 2 then drawPageForms
     end
   end
 
@@ -487,24 +487,24 @@ class PokemonPokedexInfo_Scene
           (@page==1) ? Pokemon.play_cry(@species, @form) : pbPlayCursorSE
           dorefresh = true
         end
-      elsif Input.trigger?(Input::LEFT)
-        oldpage = @page
-        @page -= 1
-        @page = 1 if @page<1
-        @page = 3 if @page>3
-        if @page!=oldpage
-          pbPlayCursorSE
-          dorefresh = true
-        end
-      elsif Input.trigger?(Input::RIGHT)
-        oldpage = @page
-        @page += 1
-        @page = 1 if @page<1
-        @page = 3 if @page>3
-        if @page!=oldpage
-          pbPlayCursorSE
-          dorefresh = true
-        end
+      # elsif Input.trigger?(Input::LEFT)
+      #   oldpage = @page
+      #   @page -= 1
+      #   @page = 1 if @page<1
+      #   @page = 3 if @page>3
+      #   if @page!=oldpage
+      #     pbPlayCursorSE
+      #     dorefresh = true
+      #   end
+      # elsif Input.trigger?(Input::RIGHT)
+      #   oldpage = @page
+      #   @page += 1
+      #   @page = 1 if @page<1
+      #   @page = 3 if @page>3
+      #   if @page!=oldpage
+      #     pbPlayCursorSE
+      #     dorefresh = true
+      #   end
       end
       if dorefresh
         drawPage(@page)
diff --git a/Data/System.rxdata b/Data/System.rxdata
index c8407f09c4caa4faa095a6b9b28ab92b2c521391..b1cda7ac6b7aa1034116e41c08f5660f077215b9 100644
GIT binary patch
delta 19
bcmX?gjq%hq#tnzWSQ2^}ST-LMYY71WTAc_d

delta 19
bcmX?gjq%hq#tnzWSQwaMnKmC2YY71WRb&U3