diff options
| author | Aroymart <andrewrmartinek@gmail.com> | 2020-12-06 21:06:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 21:06:54 -0500 |
| commit | d7f996687fa01473b08cb572d7b1f59275eaa851 (patch) | |
| tree | c46cfba092c5797e9787fe190e8f21cfcb7fd120 /src/wram.asm | |
| parent | 6c44ebb86d6d45150e69fbab82d4e1a251c7366b (diff) | |
| parent | db90dae74cc91f53e9ec815531572bdd295efacc (diff) | |
Merge branch 'master' into rgbds
Diffstat (limited to 'src/wram.asm')
| -rw-r--r-- | src/wram.asm | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/wram.asm b/src/wram.asm index 894c15c..2765d52 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -2319,7 +2319,13 @@ wd4af:: ; d4af wd4b0:: ; d4b0 ds $1 - ds $d +wd4b1:: ; d4b1 + ds $1 + +wd4b2:: ; d4b2 + ds $1 + + ds $b wd4be:: ; d4be ds $1 @@ -2384,22 +2390,22 @@ wSpriteAnimBuffer:: ; d4d0 sprite_anim_struct wSprite15 sprite_anim_struct wSprite16 -wd5d0:: ; d5d0 +wCurrSpriteAttributes:: ; d5d0 ds $1 -wd5d1:: ; d5d1 +wCurrSpriteXPos:: ; d5d1 ds $1 -wd5d2:: ; d5d2 +wCurrSpriteYPos:: ; d5d2 ds $1 -wd5d3:: ; d5d3 +wCurrSpriteTileID:: ; d5d3 ds $1 -wd5d4:: ; d5d4 +wCurrSpriteRightEdgeCheck:: ; d5d4 ds $1 -wd5d5:: ; d5d5 +wCurrSpriteBottomEdgeCheck:: ; d5d5 ds $1 wd5d6:: ; d5d6 |