shithub: pokecrystal

Info  •  Files  •  Log  •  Branches

Merge pull request #571 from Rangi42/master

Apply SPRITE_GFX_LIST_CAPACITY to wUsedSprites

--- a/constants/gfx_constants.asm

+++ b/constants/gfx_constants.asm

@@ -41,6 +41,8 @@

 SPRITEOAMSTRUCT_LENGTH EQU const_value

 NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM

+SPRITE_GFX_LIST_CAPACITY EQU 32 ; see wUsedSprites

+

 ; PokeAnims indexes (see engine/gfx/pic_animation.asm)

 	const_def

 	const ANIM_MON_SLOW

--- a/constants/map_data_constants.asm

+++ b/constants/map_data_constants.asm

@@ -99,6 +99,4 @@

 	const SPAWN_FAST_SHIP

 NUM_SPAWNS EQU const_value

-; outdoor sprite limits (see engine/overworld/overworld.asm)

-MAX_OUTDOOR_SPRITES EQU 23

-SPRITE_GFX_LIST_CAPACITY EQU $20

+MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm

--- a/wram.asm

+++ b/wram.asm

@@ -2004,7 +2004,7 @@

 wBGMapAnchor:: dw ; d152

 UNION ; d154

-wUsedSprites:: ds 64

+wUsedSprites:: ds SPRITE_GFX_LIST_CAPACITY * 2

 wUsedSpritesEnd::

 NEXTU ; d154