summaryrefslogtreecommitdiff
path: root/hram.asm
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2016-07-21 07:58:36 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2016-07-21 07:58:36 -0400
commit803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch)
tree94632a90406f3b185d82cabee2beb834bd711215 /hram.asm
parentc33ba049a5a993fc678fd1698645039ce4974022 (diff)
parenta32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff)
Merge github.com:pikalaxalt/pokecrystal
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 dc6c480bf..d036085bc 100644
--- a/hram.asm
+++ b/hram.asm
@@ -1,5 +1,5 @@
HRAM_START EQU $ff80
-hPushOAM EQU $ff80
+hPushOAM EQU $ff80 ; 10 bytes
hROMBankBackup EQU $ff8a
hBuffer EQU $ff8b
@@ -69,6 +69,8 @@ hPrintNum8 EQU $ffba
hPrintNum9 EQU $ffbb
hPrintNum10 EQU $ffbc
+hMGStatusFlags EQU $ffbc
+
hUsedSpriteIndex EQU $ffbd
hUsedSpriteTile EQU $ffbe
hFFBF EQU $ffbf
@@ -77,9 +79,12 @@ hFFC1 EQU $ffc1
hFFC2 EQU $ffc2
hMoneyTemp EQU $ffc3
-hFFC6 EQU $ffc6
-hFFC7 EQU $ffc7
-hFFC8 EQU $ffc8
+hMGJoypadPressed EQU $ffc3
+hMGJoypadReleased EQU $ffc4
+
+hLCDCPointer EQU $ffc6
+hLYOverrideStart EQU $ffc7
+hLYOverrideEnd EQU $ffc8
hMobileReceive EQU $ffc9
hFFCA EQU $ffca
hLinkPlayerNumber EQU $ffcb