Fix for Pokémon editor deleting a moveset move when "changing" which move it is to the same move, fixed typo in def addBackgroundOrColoredPlane.

This commit is contained in:
Maruno17
2021-07-28 18:42:32 +01:00
parent 1bd5652a3a
commit c8b1b6251b
2 changed files with 3 additions and 2 deletions

View File

@@ -742,7 +742,7 @@ def addBackgroundOrColoredPlane(sprites,planename,background,color,viewport=nil)
bitmapName=pbResolveBitmap("Graphics/Pictures/#{background}")
if bitmapName==nil
# Plane should exist in any case
sprites[planename]=ColoredPlane.new(color,@viewport)
sprites[planename]=ColoredPlane.new(color,viewport)
else
sprites[planename]=AnimatedPlane.new(viewport)
sprites[planename].setBitmap(bitmapName)

View File

@@ -1004,7 +1004,7 @@ module MovePoolProperty
end
when 1 # Change move
newmove = pbChooseMoveList(entry[1])
if newmove
if newmove && newmove != entry[1]
havemove = -1
realcmds.each do |e|
havemove = e[2] if e[0] == entry[0] && e[1] == newmove
@@ -1012,6 +1012,7 @@ module MovePoolProperty
if havemove >= 0 # New move already known at level; delete this move
realcmds[cmd[1]] = nil
realcmds.compact!
cmd[1] = [cmd[1], realcmds.length - 1].min
oldsel = havemove
else # Apply the new move
entry[1] = newmove