summaryrefslogtreecommitdiff
path: root/hram.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-04-18 17:31:51 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-04-18 17:31:51 -0400
commit576cbf5b3e4ae7cd377dfeb0d75dca54b44518bc (patch)
tree3ba8cb1bc06c9cb26b35f7ddde9ac1b2c51a7f6c /hram.asm
parentceb747c622cd90e9796515e917f2a0e00ebd7764 (diff)
Miscellaneous fixes, including one for the Pokédex design flaw by ax6
Diffstat (limited to 'hram.asm')
-rw-r--r--hram.asm13
1 files changed, 9 insertions, 4 deletions
diff --git a/hram.asm b/hram.asm
index 722ea2573..82e21ec4c 100644
--- a/hram.asm
+++ b/hram.asm
@@ -95,12 +95,17 @@ NEXTU ; ffb3
hMGStatusFlags:: db ; ffbc
ENDU ; ffbd
+UNION
hUsedSpriteIndex:: db ; ffbd
hUsedSpriteTile:: db ; ffbe
-hFFBF:: db ; ffbf
-hFFC0:: db ; ffc0
-hFFC1:: db ; ffc1
-hFFC2:: db ; ffc2
+NEXTU
+hCurSpriteXCoord:: db ; ffbd
+hCurSpriteYCoord:: db ; ffbe
+hCurSpriteXPixel:: db ; ffbf
+hCurSpriteYPixel:: db ; ffc0
+hCurSpriteTile:: db ; ffc1
+hCurSpriteOAMFlags:: db ; ffc2
+ENDU
UNION ; ffc3
hMoneyTemp:: ds 3 ; ffc3