diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-10-27 20:24:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-27 20:24:49 -0400 |
| commit | 45f70b24d18d333f0456835c51bce62827a7d988 (patch) | |
| tree | cc0708db9b19efc80379f62174d7cb41cec70f3e | |
| parent | 31ec3365e975e8055dcac60d38fcb30d8096d52c (diff) | |
| parent | 81b147609c819d1a5d001297016fab39221dfa97 (diff) | |
Merge pull request #571 from Rangi42/master
Apply SPRITE_GFX_LIST_CAPACITY to wUsedSprites
| -rw-r--r-- | constants/gfx_constants.asm | 2 | ||||
| -rw-r--r-- | constants/map_data_constants.asm | 4 | ||||
| -rw-r--r-- | wram.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 70b243447..f1d53085b 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -41,6 +41,8 @@ HP_RED EQU 2 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 diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 5098e28df..78b3c22ac 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -99,6 +99,4 @@ const_value = -1 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 @@ -2004,7 +2004,7 @@ wPlayerStepDirection:: ; d151 wBGMapAnchor:: dw ; d152 UNION ; d154 -wUsedSprites:: ds 64 +wUsedSprites:: ds SPRITE_GFX_LIST_CAPACITY * 2 wUsedSpritesEnd:: NEXTU ; d154 |