followed PIF commits

kurayamiblackheart · Nov 17, 2023 · 89a3534 · 89a3534
1 parent e035958
commit 89a3534
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 4 deletions.
diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
diff --git a/Data/Map296.rxdata b/Data/Map296.rxdata
diff --git a/Data/Map469.rxdata b/Data/Map469.rxdata
diff --git a/Data/Map560.rxdata b/Data/Map560.rxdata
diff --git a/Data/Map731.rxdata b/Data/Map731.rxdata
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
diff --git a/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb b/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb
@@ -81,20 +81,25 @@ def initializeDataBoxGraphic(sideSize)
     # Determine the co-ordinates of the data box and the left edge padding width
     if onPlayerSide
       @spriteX = Graphics.width - 244
-      @spriteY = Graphics.height - 192
+      @spriteY = Graphics.height - 176#192
       @spriteBaseX = 34
     else
       @spriteX = 8 #-16
       @spriteY = 36
-      @spriteBaseX = 8 #16
+      @spriteBaseX = 0#16
     end
     case sideSize
     when 2
       @spriteX += [-12,  12,  0,  0][@battler.index]
-      @spriteY += [-20, -34, 34, 20][@battler.index]
+      # @spriteY += [-20, -34, 34, 20][@battler.index]
+      #@spriteY += [-38, -6, 16, 48][@battler.index]    #standard
+      #@spriteY += [-32, -6, 16, 42][@battler.index]     #smaller gap
+      @spriteY += [-18, -6, 16, 28][@battler.index]     #overlap
     when 3
       @spriteX += [-12,  12, -6,  6,  0,  0][@battler.index]
-      @spriteY += [-42, -46,  4,  0, 50, 46][@battler.index]
+      # @spriteY += [-42, -46,  4,  0, 50, 46][@battler.index]
+      #@spriteY += [-74, -8,  -28,  38, 16, 84][@battler.index]    #standard
+      @spriteY += [-54, -8,  -18,  26, 16, 58][@battler.index]    #overlap
     end
   end
 

diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
diff --git a/Data/States.rxdata b/Data/States.rxdata
diff --git a/Data/System.rxdata b/Data/System.rxdata
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
diff --git a/Graphics/Tilesets/caves.png → Graphics/Tilesets/cave.png b/Graphics/Tilesets/caves.png → Graphics/Tilesets/cave.png