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

Data/Scripts/001_Settings.rb

@@ -5,8 +5,8 @@
 #==============================================================================#
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
-  GAME_VERSION = '6.2.2'
+  GAME_VERSION = '6.2.3'
-  GAME_VERSION_NUMBER = "6.2.2"
+  GAME_VERSION_NUMBER = "6.2.3"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18

Data/Scripts/004_Game classes/004_Game_Map.rb

@@ -36,6 +36,7 @@ class Game_Map
   attr_reader :display_x # display x-coordinate * 128
   attr_reader :display_y # display y-coordinate * 128
   attr_accessor :need_refresh # refresh request flag
+  attr_accessor :scroll_direction
 
   TILE_WIDTH = 32
   TILE_HEIGHT = 32

Data/Scripts/004_Game classes/009_Game_Player.rb

@@ -178,6 +178,12 @@ class Game_Player < Game_Character
     self.map.display_y = y * Game_Map::REAL_RES_Y - SCREEN_CENTER_Y
   end
 
+
+  def isCentered()
+    x_centered = self.map.display_x == x * Game_Map::REAL_RES_X - SCREEN_CENTER_X
+    y_centered = self.map.display_y == y * Game_Map::REAL_RES_Y - SCREEN_CENTER_Y
+    return x_centered && y_centered
+  end
   #-----------------------------------------------------------------------------
   # * Move to Designated Position
   #     x : x-coordinate

Data/Scripts/005_Sprites/013_Sprite_Wearable.rb

@@ -28,6 +28,31 @@ class Sprite_Wearable < RPG::Sprite
     @sprite.y  += offsets_array[current_frame][1]
   end
 
+  def adjustPositionForScreenScrolling
+    return if !$game_map.scrolling? && !@was_just_scrolling
+    if $game_map.scrolling?
+      @was_just_scrolling=true
+    else
+      @was_just_scrolling=false
+    end
+    offset_x = 0
+    offset_y = 0
+    case $game_map.scroll_direction
+    when DIRECTION_RIGHT
+      offset_x=-8
+    when DIRECTION_LEFT
+      offset_x=8
+    when DIRECTION_UP
+      offset_y=8
+      @sprite.z+=50 #weird layering glitch for some reason otherwise. It's reset to the correct value in the next animation frame
+    when DIRECTION_DOWN
+      offset_y=-8
+    end
+    @sprite.x+=offset_x
+    @sprite.y+=offset_y
+  end
+
+
   def set_sprite_position(action, direction, current_frame)
     @sprite.x = @player_sprite.x - @player_sprite.ox
     @sprite.y = @player_sprite.y - @player_sprite.oy
@@ -86,6 +111,8 @@ class Sprite_Wearable < RPG::Sprite
       @sprite.x = @player_sprite.x - @player_sprite.ox
       @sprite.y = @player_sprite.y - @player_sprite.oy
     end
+    adjustPositionForScreenScrolling()
+
     @sprite.y -= 2 if current_frame % 2 == 1
   end
 
@@ -95,8 +122,8 @@ class Sprite_Wearable < RPG::Sprite
     current_frame = @player_sprite.character.pattern if !frame
     direction = @player_sprite.character.direction
     crop_spritesheet(direction)
-    set_sprite_position(@action, direction, current_frame)
     adjust_layer()
+    set_sprite_position(@action, direction, current_frame)
   end
 
   def update(action, filename,color)

Data/Scripts/005_Sprites/016_Sprite_Player.rb

@@ -17,6 +17,7 @@ class Sprite_Player < Sprite_Character
     getClothedPlayerSprite(true)
   end
 
+
   def updateCharacterBitmap
     skinTone = $Trainer.skin_tone ? $Trainer.skin_tone : 0
     baseBitmapFilename = getBaseOverworldSpriteFilename(@character_name, skinTone)
@@ -78,9 +79,7 @@ class Sprite_Player < Sprite_Character
     return baseBitmap
   end
 
-  def positionHair(baseBitmap, hairBirmap, offset)
+
-    baseBitmap.blt(offset[0], offset[1], hairBirmap, hairBirmap.rect)
-  end
 
 
   def update

Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb

@@ -18,6 +18,9 @@ def pbLoadTrainer(tr_type, tr_name, tr_version = 0)
   raise _INTL("Trainer type {1} does not exist.", tr_type) if !tr_type_data
   tr_type = tr_type_data.id
   trainer_data = getTrainersDataMode.try_get(tr_type, tr_name, tr_version)
+  if !trainer_data
+    trainer_data = GameData::Trainer.try_get(tr_type, tr_name, tr_version)
+  end
   return (trainer_data) ? trainer_data.to_trainer : nil
 end
 

Data/Scripts/016_UI/020_UI_PokeMart.rb

@@ -587,6 +587,7 @@ class PokemonMartScreen
     @scene.pbStartBuyScene(@stock,@adapter)
     item=nil
     loop do
+      pbWait(4)
       item=@scene.pbChooseBuyItem
       break if !item
       quantity=0

Data/Scripts/051_AddOns/GameplayUtils.rb

@@ -176,11 +176,11 @@ end
 
 
 def playPokeFluteAnimation
-  return if $Trainer.outfit != 0
+  # return if $Trainer.outfit != 0
-  $game_player.setDefaultCharName("players/pokeflute", 0, false)
+  # $game_player.setDefaultCharName("players/pokeflute", 0, false)
-  Graphics.update
+  # Graphics.update
-  Input.update
+  # Input.update
-  pbUpdateSceneMap
+  # pbUpdateSceneMap
 end
 
 def restoreDefaultCharacterSprite(charset_number = 0)

Data/Scripts/051_AddOns/New Balls.rb

@@ -30,7 +30,9 @@ next catchRate
 })
 BallHandlers::OnCatch.add(:ABILITYBALL,proc{|ball,battle,pokemon|
   species = getSpecies(dexNum(pokemon))
-  pokemon.ability_index= getAbilityIndexFromID(species.hidden_abilities[-1],pokemon)
+  ability = species.hidden_abilities[-1]
+  pokemon.ability = ability
+  pokemon.ability_index= getAbilityIndexFromID(ability,pokemon)
 })
 
 #VIRUS BALL 27  - give pokerus