DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 22:24:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolving merge conflicts between refactor and mkxp-z

Browse Source
This commit is contained in:
Maruno17
2020-11-20 21:01:47 +00:00
parent ce6bc1737f
commit 6158e42635
6 changed files with 31 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Data/Scripts/022_Compiler/003_Compiler_PBS.rb
View File

@@ -562,21 +562,13 @@ module Compiler
#=============================================================================
def compile_animations
begin
if $RPGVX
pbanims = load_data("Data/PkmnAnimations.rvdata")
else
pbanims = load_data("Data/PkmnAnimations.rxdata")
end
pbanims = load_data("Data/PkmnAnimations.rxdata")
rescue
pbanims = PBAnimations.new
end
move2anim = [[],[]]
=begin
if $RPGVX
anims = load_data("Data/Animations.rvdata")
else
anims = load_data("Data/Animations.rxdata")
end
anims = load_data("Data/Animations.rxdata")
for anim in anims
next if !anim || anim.frames.length==1
found = false