merge with newest update

hram.asm

@@ -15,9 +15,12 @@ hMinutes           EQU $ff96
 
 hSeconds           EQU $ff98
 
+hVBlankCounter     EQU $ff9b
+
 hROMBank           EQU $ff9d
 hVBlank            EQU $ff9e
 hMapEntryMethod    EQU $ff9f
+hMenuReturn        EQU $ffa0
 
 hJoypadReleased    EQU $ffa2
 hJoypadPressed     EQU $ffa3
@@ -27,6 +30,7 @@ hJoyReleased       EQU $ffa6
 hJoyPressed        EQU $ffa7
 hJoyDown           EQU $ffa8
 hJoyLast           EQU $ffa9
+hInMenu            EQU $ffaa
 
 hConnectionStripLength EQU $ffaf
 hConnectedMapWidth EQU $ffb0
@@ -44,6 +48,8 @@ hMultiplicand      EQU $ffb4 ; 3 bytes long
 hMultiplier        EQU $ffb7 ; 1 byte long
 hProduct           EQU $ffb3 ; result (4 bytes long)
 
+hMathBuffer        EQU $ffb8
+
 hPrintNum1         EQU $ffb3
 hPrintNum2         EQU $ffb4
 hPrintNum3         EQU $ffb5
@@ -51,7 +57,6 @@ hPrintNum4         EQU $ffb6
 hPrintNum5         EQU $ffb7
 hPrintNum6         EQU $ffb8
 hPrintNum7         EQU $ffb9
-hMathBuffer        EQU $ffb8
 
 hMoneyTemp         EQU $ffc3
 
@@ -81,9 +86,10 @@ hLastTalked        EQU $ffe0
 hRandom            EQU $ffe1
 hRandomAdd         EQU $ffe1
 hRandomSub         EQU $ffe2
-
+hSecondsBackup     EQU $ffe3
 hBattleTurn        EQU $ffe4 ; Which trainers turn is it? 0: Player, 1: Opponent Trainer
 hCGBPalUpdate      EQU $ffe5
 hCGB               EQU $ffe6
 hSGB               EQU $ffe7
 hDMATransfer       EQU $ffe8
+hMobile            EQU $ffe9