Removed all uses of SpriteWrapper (#184)

This commit is contained in:
Golisopod-User
2022-06-19 22:17:23 +05:30
committed by GitHub
parent 8b3d95943a
commit ad93eb7774
25 changed files with 50 additions and 61 deletions

View File

@@ -33,7 +33,7 @@ class PokemonEggHatch_Scene
crackfilename = pbResolveBitmap(crackfilename)
@hatchSheet = AnimatedBitmap.new(crackfilename)
# Create egg cracks sprite
@sprites["hatch"] = SpriteWrapper.new(@viewport)
@sprites["hatch"] = Sprite.new(@viewport)
@sprites["hatch"].x = @sprites["pokemon"].x
@sprites["hatch"].y = @sprites["pokemon"].y
@sprites["hatch"].ox = @sprites["pokemon"].ox

View File

@@ -75,7 +75,7 @@ end
#===============================================================================
#
#===============================================================================
class PokedexSearchSelectionSprite < SpriteWrapper
class PokedexSearchSelectionSprite < Sprite
attr_reader :index
attr_accessor :cmds
attr_accessor :minmax

View File

@@ -1,7 +1,7 @@
#===============================================================================
# Pokémon party buttons and menu
#===============================================================================
class PokemonPartyConfirmCancelSprite < SpriteWrapper
class PokemonPartyConfirmCancelSprite < Sprite
attr_reader :selected
def initialize(text, x, y, narrowbox = false, viewport = nil)
@@ -133,7 +133,7 @@ end
#===============================================================================
# Blank party panel
#===============================================================================
class PokemonPartyBlankPanel < SpriteWrapper
class PokemonPartyBlankPanel < Sprite
attr_accessor :text
def initialize(_pokemon, index, viewport = nil)
@@ -162,7 +162,7 @@ end
#===============================================================================
# Pokémon party panel
#===============================================================================
class PokemonPartyPanel < SpriteWrapper
class PokemonPartyPanel < Sprite
attr_reader :pokemon
attr_reader :active
attr_reader :selected

View File

@@ -1,7 +1,7 @@
#===============================================================================
#
#===============================================================================
class MoveSelectionSprite < SpriteWrapper
class MoveSelectionSprite < Sprite
attr_reader :preselected
attr_reader :index

View File

@@ -1,7 +1,7 @@
#===============================================================================
#
#===============================================================================
class PokegearButton < SpriteWrapper
class PokegearButton < Sprite
attr_reader :index
attr_reader :name
attr_reader :selected

View File

@@ -1,7 +1,7 @@
#===============================================================================
#
#===============================================================================
class MapBottomSprite < SpriteWrapper
class MapBottomSprite < Sprite
attr_reader :mapname, :maplocation
TEXT_MAIN_COLOR = Color.new(248, 248, 248)

View File

@@ -1,7 +1,7 @@
#===============================================================================
#
#===============================================================================
class PokemonLoadPanel < SpriteWrapper
class PokemonLoadPanel < Sprite
attr_reader :selected
TEXTCOLOR = Color.new(232, 232, 232)

View File

@@ -1,7 +1,7 @@
#===============================================================================
#
#===============================================================================
class ReadyMenuButton < SpriteWrapper
class ReadyMenuButton < Sprite
attr_reader :index # ID of button
attr_reader :selected
attr_reader :side

View File

@@ -117,7 +117,7 @@ end
#===============================================================================
# Cursor
#===============================================================================
class PokemonBoxArrow < SpriteWrapper
class PokemonBoxArrow < Sprite
attr_accessor :quickswap
def initialize(viewport = nil)
@@ -288,7 +288,7 @@ end
#===============================================================================
# Box
#===============================================================================
class PokemonBoxSprite < SpriteWrapper
class PokemonBoxSprite < Sprite
attr_accessor :refreshBox
attr_accessor :refreshSprites
@@ -443,7 +443,7 @@ end
#===============================================================================
# Party pop-up panel
#===============================================================================
class PokemonBoxPartySprite < SpriteWrapper
class PokemonBoxPartySprite < Sprite
def initialize(party, viewport = nil)
super(viewport)
@party = party

View File

@@ -843,7 +843,7 @@ end
#===============================================================================
#
#===============================================================================
class PurifyChamberSetView < SpriteWrapper
class PurifyChamberSetView < Sprite
attr_reader :set
attr_reader :cursor
attr_reader :heldpkmn

View File

@@ -279,7 +279,7 @@ class PokemonEntryScene2
class NameEntryCursor
def initialize(viewport)
@sprite = SpriteWrapper.new(viewport)
@sprite = Sprite.new(viewport)
@cursortype = 0
@cursor1 = AnimatedBitmap.new("Graphics/Pictures/Naming/cursor_1")
@cursor2 = AnimatedBitmap.new("Graphics/Pictures/Naming/cursor_2")
@@ -468,16 +468,16 @@ class PokemonEntryScene2
@minlength = minlength
@maxlength = maxlength
@maxlength.times { |i|
@sprites["blank#{i}"] = SpriteWrapper.new(@viewport)
@sprites["blank#{i}"] = Sprite.new(@viewport)
@sprites["blank#{i}"].x = 160 + (24 * i)
@sprites["blank#{i}"].bitmap = @bitmaps[@bitmaps.length - 1]
@blanks[i] = 0
}
@sprites["bottomtab"] = SpriteWrapper.new(@viewport) # Current tab
@sprites["bottomtab"] = Sprite.new(@viewport) # Current tab
@sprites["bottomtab"].x = 22
@sprites["bottomtab"].y = 162
@sprites["bottomtab"].bitmap = @bitmaps[@@Characters.length]
@sprites["toptab"] = SpriteWrapper.new(@viewport) # Next tab
@sprites["toptab"] = Sprite.new(@viewport) # Next tab
@sprites["toptab"].x = 22 - 504
@sprites["toptab"].y = 162
@sprites["toptab"].bitmap = @bitmaps[@@Characters.length + 1]