summaryrefslogtreecommitdiff
path: root/hram.asm
diff options
context:
space:
mode:
Diffstat (limited to 'hram.asm')
-rw-r--r--hram.asm6
1 files changed, 2 insertions, 4 deletions
diff --git a/hram.asm b/hram.asm
index 37eaf029..2d1a49e1 100644
--- a/hram.asm
+++ b/hram.asm
@@ -16,8 +16,6 @@ hWarpDestinationMap EQU $FF8B
hOAMTile EQU $FF8B
-hROMBankTemp EQU $FF8B
-
hPreviousTileset EQU $FF8B
hEastWestConnectedMapWidth EQU $FF8B
@@ -317,8 +315,6 @@ hLCDCPointer EQU $FFF4
hJoyInput EQU $FFF5
-hFieldMoveMonMenuTopMenuItemX EQU $FFF7
-
hReadJoypad EQU $FFF8 ; 0 to read joypad, anything else skips joypad check
; written to in palettes.asm
@@ -326,4 +322,6 @@ hReadJoypad EQU $FFF8 ; 0 to read joypad, anything else skips joypad check
; bit 1: menu is double spaced
hFlags_0xFFFA EQU $FFFA
+hFieldMoveMonMenuTopMenuItemX EQU $FFFB
+
hGBC EQU $FFFE ; 0 if DMG, != 0 if GBC