Merge branch 'master' into refactor-preprocessor

Conflicts:
	preprocessor.py

Also bump the extras submodule to a version of pokemontools with a
suitable version of the preprocessor. The changes from 'master' for
preprocessor.py have been inserted into pokemontools prior to the
submodule bump.

1 files changed, 3 insertions, 0 deletions

diff --git a/hram.asm b/hram.asm
index d8e8d0f34..051d4186a 100644
--- a/hram.asm
+++ b/hram.asm
@@ -41,6 +41,9 @@ hMathBuffer        EQU $ffb8
 
 hLCDStatCustom     EQU $ffc6
 
+hSerialSend        EQU $ffcd
+hSerialReceive     EQU $ffce
+
 hSCX               EQU $ffcf
 hSCY               EQU $ffd0
 hWX                EQU $ffd1