summaryrefslogtreecommitdiff
path: root/hram.asm
diff options
context:
space:
mode:
Diffstat (limited to 'hram.asm')
-rw-r--r--hram.asm20
1 files changed, 15 insertions, 5 deletions
diff --git a/hram.asm b/hram.asm
index 0607a484..0e9a61e1 100644
--- a/hram.asm
+++ b/hram.asm
@@ -332,6 +332,9 @@ hGymTrashCanRandNumMask::
NEXTU
hFFDB:: db
hFFDC:: db
+
+NEXTU
+hCanceledPrinting:: db
ENDU
ds 1
@@ -385,9 +388,15 @@ ENDU
hWhoseTurn:: db ; 0 on player's turn, 1 on enemy's turn
-hClearLetterPrintingDelayFlags:: db
+hLCDCPointer:: db
- ds 1
+hJoyInput:: db
+
+ ds 2
+
+hDisableJoypadPolling:: db
+
+hClearLetterPrintingDelayFlags:: db
; bit 0: draw HP fraction to the right of bar instead of below (for party menu)
; bit 1: menu is double spaced
@@ -395,8 +404,9 @@ hUILayoutFlags:: db
hFieldMoveMonMenuTopMenuItemX:: db
-hJoyInput:: db
+hPikachuSpriteVRAMOffset:: db
-hDisableJoypadPolling:: db
+ ds 1
- ds 5
+; 0 if DMG, != 0 if GBC
+hGBC:: db