Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases

Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb

@@ -110,7 +110,6 @@ Knuckles
 UnworthyPie
 Doctor Miawoo
 Chardub
-elupsis
 TCGrunler#4583
 
 The following free ressources were also used 

Data/Scripts/049_Compatibility/Constants.rb

@@ -140,7 +140,7 @@ SWITCH_BATTLE_FACTORY_INCLUDE_ALL = 775
 SWITCH_SUPER_SLOW_SPEED=649
 SWITCH_LOUNGE_BATTLE_LEVEL = 240
 SWITCH_CANNOT_CATCH_POKEMON = 75
-SWITCH_UNLOCKED_POKEMON_HATS = 700
+SWITCH_UNLOCKED_POKEMON_HATS = 770
 
 SWITCH_LOCK_PLAYER_MOVEMENT = 815
 

Data/Scripts/050_Outfits/001_OutfitsMain/LayeredClothes.rb

@@ -215,7 +215,7 @@ def add_hat_to_bitmap(bitmap, hat_id, x_pos, y_pos, scale = 1, mirrored = false)
   hat_filename = getTrainerSpriteHatFilename(hat_id)
   hatBitmapWrapper = AnimatedBitmap.new(hat_filename, 0) if pbResolveBitmap(hat_filename)
   hatBitmapWrapper.scale_bitmap(adjusted_scale) if hatBitmapWrapper
-  hatBitmapWrapper.mirror if mirrored
+  hatBitmapWrapper.mirror if hatBitmapWrapper && mirrored
   bitmap.blt(x_pos * adjusted_scale, y_pos * adjusted_scale, hatBitmapWrapper.bitmap, hatBitmapWrapper.bitmap.rect) if hatBitmapWrapper
 end
 

Data/Scripts/050_Outfits/UI/PokemonHatScreenPresenter.rb

@@ -58,8 +58,8 @@ class PokemonHatPresenter
     loop do
       Graphics.update
       Input.update
-      @hat_id = selector.selectNextOutfit(@hat_id, 1, selector.hats_list, [], false, "hat_trainer") if Input.trigger?(Input::RIGHT)
-      @hat_id = selector.selectNextOutfit(@hat_id, -1, selector.hats_list, [], false, "hat_trainer") if Input.trigger?(Input::LEFT)
+      @hat_id = selector.selectNextOutfit(@hat_id, 1, selector.hats_list, [], false, "hat",$Trainer.unlocked_hats,false) if Input.trigger?(Input::RIGHT)
+      @hat_id = selector.selectNextOutfit(@hat_id, -1, selector.hats_list, [], false, "hat",$Trainer.unlocked_hats,false) if Input.trigger?(Input::LEFT)
       break if Input.trigger?(Input::USE)
       return false if Input.trigger?(Input::BACK)
       @view.update()

Data/Scripts/050_Outfits/UI/PokemonHatScreenView.rb

@@ -79,7 +79,6 @@ class PokemonHatView
 
     @sprites["rightarrow"].play
     @sprites["leftarrow"].play
-    echoln @sprites["rightarrow"].frame
   end
 
   def hide_select_arrows