Global addresses now in hex and listed in order

src/globals.asm

@@ -1,28 +1,28 @@
 ; Addresses of global variables
 
-; If not double buffering these point to the same buffer
+pub const MAGIC_ADDRESS_LONG = 0x0c       ; U32 Location of the magic value
-; If double buffering they must the same size
-pub const FB_DISPLAY_PTR     = 16 ; U32 Currently displayed buffer
-pub const FB_DISPLAY_STRIDE  = 20 ; U32 Bytes in each row of the displayed buffer
-pub const FB_DRAW_PTR        = 24 ; U32 Draw to this buffer
-pub const FB_DRAW_STRIDE     = 28 ; U32 Bytes in each row of the draw buffer
-pub const FB_SIZE_BYTE       = 32 ; U32 In bytes
-pub const FB_WIDTH_PX        = 36 ; U16 Width of screen in pixels
-pub const FB_HEIGHT_PX       = 38 ; U16 Height of screen in pixels
-
-; Log2 of width in pixels, e.g.
-; * 10 => 1024 * 768
-; *  8 =>  256 * 192
-pub const FB_LOG_WIDTH       = 40 ; U8
-pub const FB_LOG_STRIDE      = 41 ; U8 Log2 of FB_xxx_STRIDE in bytes
-
-pub const FB_BYTES_PER_PIXEL = 42 ; U8 Specialisations should hardcode this
-; Log2 of bytes per pixel
-; * 0 => 8 bits per pixel
-; * 2 => 32 bits per pixel
-pub const FB_LOG_BPP         = 43 ; U8 Specialisations should hardcode this
-
-pub const MAGIC_ADDRESS_LONG = 12 ; U32 Location of the magic value
 pub const MAGIC_VALUE_LONG   = 0xb301534c ; U32 Full 32 bits of the magic value
-pub const MAGIC_ADDRESS      = 14 ; U16 Location of the low 16 bits of magic value
+pub const MAGIC_ADDRESS      = 0x0e       ; U16 Location of the low 16 bits of magic value
-pub const MAGIC_VALUE        = 0x534c ; U16 Low 16 bits of the magic value
+pub const MAGIC_VALUE        = 0x534c     ; U16 Low 16 bits of the magic value
+      
+       ; If not double buffering these point to the same buffer
+       ; If double buffering they must the same size
+pub const FB_DISPLAY_PTR     = 0x10       ; U32 Currently displayed buffer
+pub const FB_DISPLAY_STRIDE  = 0x14       ; U32 Bytes in each row of the displayed buffer
+pub const FB_DRAW_PTR        = 0x18       ; U32 Draw to this buffer
+pub const FB_DRAW_STRIDE     = 0x1c       ; U32 Bytes in each row of the draw buffer
+pub const FB_SIZE_BYTE       = 0x20       ; U32 In bytes
+pub const FB_WIDTH_PX        = 0x24       ; U16 Width of screen in pixels
+pub const FB_HEIGHT_PX       = 0x26       ; U16 Height of screen in pixels
+      
+       ; Log2 of width in pixels, e.g.
+       ; * 10 => 1024 * 768
+       ; *  8 =>  256 * 192
+pub const FB_LOG_WIDTH       = 0x28       ; U8
+pub const FB_LOG_STRIDE      = 0x29       ; U8 Log2 of FB_xxx_STRIDE in bytes
+      
+pub const FB_BYTES_PER_PIXEL = 0x2a       ; U8 Specialisations should hardcode this
+       ; Log2 of bytes per pixel
+       ; * 0 => 8 bits per pixel
+       ; * 2 => 32 bits per pixel
+pub const FB_LOG_BPP         = 0x2b       ; U8 Specialisations should hardcode this