summaryrefslogtreecommitdiff
path: root/hram.asm
diff options
context:
space:
mode:
Diffstat (limited to 'hram.asm')
-rw-r--r--hram.asm16
1 files changed, 11 insertions, 5 deletions
diff --git a/hram.asm b/hram.asm
index f5817fa4..29d38ecb 100644
--- a/hram.asm
+++ b/hram.asm
@@ -311,13 +311,19 @@ hSpriteAnimFrameCounter EQU $FFEA
H_WHOSETURN EQU $FFF3 ; 0 on player’s turn, 1 on enemy’s turn
-; bit 0: draw HP fraction to the right of bar instead of below (for party menu)
-; bit 1: menu is double spaced
-hFlags_0xFFF6 EQU $FFF6
+hLCDCPointer EQU $FFF4
+
+hJoyInput EQU $FFF5
hFieldMoveMonMenuTopMenuItemX EQU $FFF7
-hDisableJoypadPolling EQU $FFF9
+hReadJoypad EQU $FFF8 ; 0 to read joypad, anything else skips joypad check
+ ; written to in palettes.asm
+
+; bit 0: draw HP fraction to the right of bar instead of below (for party menu)
+; bit 1: menu is double spaced
+hFlags_0xFFF6 EQU $FFFA
-hJoyInput EQU $FFF8
+hFlags_0xFFFA EQU $FFFA
+hGBC EQU $FFFE ; 0 if DMG, 1 if GBC