summaryrefslogtreecommitdiff
path: root/hram.asm
diff options
context:
space:
mode:
Diffstat (limited to 'hram.asm')
-rw-r--r--hram.asm22
1 files changed, 16 insertions, 6 deletions
diff --git a/hram.asm b/hram.asm
index d6282018..f3ffc564 100644
--- a/hram.asm
+++ b/hram.asm
@@ -332,6 +332,9 @@ hGymTrashCanRandNumMask::
NEXTU
hFFDB:: db
hFFDC:: db
+
+NEXTU
+hCanceledPrinting:: db
ENDU
ds 1
@@ -385,18 +388,25 @@ 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
-hFlagsFFF6:: db
+hFlagsFFFA:: db
hFieldMoveMonMenuTopMenuItemX:: db
-hJoyInput:: db
+hFFFC:: db
-hDisableJoypadPolling:: db
+ ds 1
- ds 5
+; 0 if DMG, != 0 if GBC
+hGBC:: db