Merge branch 'master' into dev

This commit is contained in:
Maruno17
2021-08-24 13:46:03 +01:00

View File

@@ -160,7 +160,7 @@ class PokeBattle_Scene
trainer = pbAddSprite("player_#{idxTrainer+1}",spriteX,spriteY,trainerFile,@viewport)
return if !trainer.bitmap
# Alter position of sprite
trainer.z = 30+idxTrainer
trainer.z = 80+idxTrainer
if trainer.bitmap.width>trainer.bitmap.height*2
trainer.src_rect.x = 0
trainer.src_rect.width = trainer.bitmap.width/5