Camera is now an independent instance, and HumanPlayer only holds a reference to it.

1 files changed, 440 insertions, 423 deletions

diff --git a/Exe/POCKET.MAP b/Exe/POCKET.MAP
index 0a1d1a9..d547e24 100644
--- a/Exe/POCKET.MAP
+++ b/Exe/POCKET.MAP
@@ -1,9 +1,9 @@
 Archive member included to satisfy reference by file (symbol)
 
 ../lib/libgamebuino.a(Buttons.o)
-                              Obj/HumanPlayer.o (_ZN7Buttons7pressedEh)
+                              Obj/Game.o (_ZN7Buttons8releasedEh)
 ../lib/libgamebuino.a(Display.o)
-                              Obj/Sprite.o (_ZN7Display8setColorEa)
+                              Obj/Sprite.o (_ZN7Display8setColorEaa)
 ../lib/libgamebuino.a(font3x5.o)
                               ../lib/libgamebuino.a(Display.o) (font3x5)
 ../lib/libgamebuino.a(Gamebuino.o)
@@ -191,8 +191,6 @@ Discarded input sections
  .text          0x0000000000000000        0x0 Obj/Camera.o
  .data          0x0000000000000000        0x0 Obj/Camera.o
  .bss           0x0000000000000000        0x0 Obj/Camera.o
- .text._ZN6Camera14getCoordinatesEPiS0_
-                0x0000000000000000       0x2c Obj/Camera.o
  .text          0x0000000000000000        0x0 Obj/BaseUnit.o
  .data          0x0000000000000000        0x0 Obj/BaseUnit.o
  .bss           0x0000000000000000        0x0 Obj/BaseUnit.o
@@ -207,8 +205,6 @@ Discarded input sections
  .bss           0x0000000000000000        0x0 ../lib/libgamebuino.a(Buttons.o)
  .text._ZN7Buttons4heldEhh
                 0x0000000000000000       0x1c ../lib/libgamebuino.a(Buttons.o)
- .text._ZN7Buttons8timeHeldEh
-                0x0000000000000000       0x10 ../lib/libgamebuino.a(Buttons.o)
  .group         0x0000000000000000        0x8 ../lib/libgamebuino.a(Display.o)
  .group         0x0000000000000000        0x8 ../lib/libgamebuino.a(Display.o)
  .group         0x0000000000000000        0x8 ../lib/libgamebuino.a(Display.o)
@@ -1142,7 +1138,7 @@ END GROUP
 .rela.plt
  *(.rela.plt)
 
-.text           0x0000000000000000     0x322c
+.text           0x0000000000000000     0x3482
  *(.vectors)
  .vectors       0x0000000000000000       0x68 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
                 0x0000000000000000                __vectors
@@ -1164,561 +1160,584 @@ END GROUP
                 0x000000000000006f        0x5 Obj/Game.o
  .progmem.data._ZZL9GamePausevE20astrPauseMenuOptions
                 0x0000000000000074        0x4 Obj/Game.o
+ .progmem.data._ZL17au8PeasantSprData
+                0x0000000000000078        0xa Obj/Unit.o
  .progmem.data._ZZ8MainMenuvE20strMainMenuOptions_0
-                0x0000000000000078       0x13 Obj/Menu.o
+                0x0000000000000082       0x13 Obj/Menu.o
  .progmem.data._ZZ8MainMenuvE20strMainMenuOptions_1
-                0x000000000000008b       0x11 Obj/Menu.o
+                0x0000000000000095       0x11 Obj/Menu.o
  .progmem.data._ZZ8MainMenuvE20strMainMenuOptions_2
-                0x000000000000009c        0x8 Obj/Menu.o
+                0x00000000000000a6        0x8 Obj/Menu.o
  .progmem.data._ZZ8MainMenuvE19astrMainMenuOptions
-                0x00000000000000a4        0x6 Obj/Menu.o
+                0x00000000000000ae        0x6 Obj/Menu.o
  .progmem.data._ZZ8MainMenuvE3__c
-                0x00000000000000aa        0xf Obj/Menu.o
+                0x00000000000000b4        0xf Obj/Menu.o
  .progmem.data.font3x5
-                0x00000000000000b9      0x182 ../lib/libgamebuino.a(font3x5.o)
-                0x00000000000000b9                font3x5
+                0x00000000000000c3      0x182 ../lib/libgamebuino.a(font3x5.o)
+                0x00000000000000c3                font3x5
  .progmem.data._ZZN9Gamebuino10changeGameEvE3__c_0
-                0x000000000000023b       0x25 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000000245       0x25 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino10changeGameEvE3__c
-                0x0000000000000260       0x28 ../lib/libgamebuino.a(Gamebuino.o)
+                0x000000000000026a       0x28 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino14displayBatteryEvE3__c_1
-                0x0000000000000288        0xb ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000000292        0xb ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino14displayBatteryEvE3__c_0
-                0x0000000000000293       0x15 ../lib/libgamebuino.a(Gamebuino.o)
+                0x000000000000029d       0x15 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino14displayBatteryEvE3__c
-                0x00000000000002a8        0xe ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002b2        0xe ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKhE3__c_3
-                0x00000000000002b6        0x4 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002c0        0x4 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKhE3__c_2
-                0x00000000000002ba        0x4 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002c4        0x4 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKhE3__c_1
-                0x00000000000002be        0x4 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002c8        0x4 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKhE3__c_0
-                0x00000000000002c2        0x4 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002cc        0x4 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKhE3__c
-                0x00000000000002c6        0x4 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002d0        0x4 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZL13gamebuinoLogo
-                0x00000000000002ca       0x70 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002d4       0x70 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZL12startupSound
-                0x000000000000033a        0xe ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000000344        0xe ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZL12_halfPeriods
-                0x0000000000000348       0x3b ../lib/libgamebuino.a(Sound.o)
+                0x0000000000000352       0x3b ../lib/libgamebuino.a(Sound.o)
  .progmem.data._ZL9playTickP
-                0x0000000000000383        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x000000000000038d        0x6 ../lib/libgamebuino.a(Sound.o)
  .progmem.data._ZL17playCancelPattern
-                0x0000000000000389        0x8 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000000393        0x8 ../lib/libgamebuino.a(Sound.o)
  .progmem.data._ZL13playOKPattern
-                0x0000000000000391        0x8 ../lib/libgamebuino.a(Sound.o)
+                0x000000000000039b        0x8 ../lib/libgamebuino.a(Sound.o)
  .progmem.data._ZL18defaultInstruments
-                0x0000000000000399        0x4 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000003a3        0x4 ../lib/libgamebuino.a(Sound.o)
  .progmem.data._ZL15noiseInstrument
-                0x000000000000039d        0x4 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000003a7        0x4 ../lib/libgamebuino.a(Sound.o)
  .progmem.data._ZL20squareWaveInstrument
-                0x00000000000003a1        0x4 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000003ab        0x4 ../lib/libgamebuino.a(Sound.o)
  .progmem.data.digital_pin_to_timer_PGM
-                0x00000000000003a5       0x14 ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000003a5                digital_pin_to_timer_PGM
+                0x00000000000003af       0x14 ../lib/libarduino.a(wiring_digital.o)
+                0x00000000000003af                digital_pin_to_timer_PGM
  .progmem.data.digital_pin_to_bit_mask_PGM
-                0x00000000000003b9       0x14 ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000003b9                digital_pin_to_bit_mask_PGM
+                0x00000000000003c3       0x14 ../lib/libarduino.a(wiring_digital.o)
+                0x00000000000003c3                digital_pin_to_bit_mask_PGM
  .progmem.data.digital_pin_to_port_PGM
-                0x00000000000003cd       0x14 ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000003cd                digital_pin_to_port_PGM
+                0x00000000000003d7       0x14 ../lib/libarduino.a(wiring_digital.o)
+                0x00000000000003d7                digital_pin_to_port_PGM
  .progmem.data.port_to_input_PGM
-                0x00000000000003e1        0xa ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000003e1                port_to_input_PGM
- .progmem.data.port_to_output_PGM
                 0x00000000000003eb        0xa ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000003eb                port_to_output_PGM
- .progmem.data.port_to_mode_PGM
+                0x00000000000003eb                port_to_input_PGM
+ .progmem.data.port_to_output_PGM
                 0x00000000000003f5        0xa ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000003f5                port_to_mode_PGM
-                0x0000000000000400                . = ALIGN (0x2)
- *fill*         0x00000000000003ff        0x1 
+                0x00000000000003f5                port_to_output_PGM
+ .progmem.data.port_to_mode_PGM
+                0x00000000000003ff        0xa ../lib/libarduino.a(wiring_digital.o)
+                0x00000000000003ff                port_to_mode_PGM
+                0x000000000000040a                . = ALIGN (0x2)
+ *fill*         0x0000000000000409        0x1 
  *(.jumptables)
  *(.jumptables*)
  *(.lowtext)
  *(.lowtext*)
-                0x0000000000000400                __ctors_start = .
+                0x000000000000040a                __ctors_start = .
  *(.ctors)
- .ctors         0x0000000000000400        0x2 Obj/System.o
-                0x0000000000000402                __ctors_end = .
-                0x0000000000000402                __dtors_start = .
+ .ctors         0x000000000000040a        0x2 Obj/System.o
+                0x000000000000040c                __ctors_end = .
+                0x000000000000040c                __dtors_start = .
  *(.dtors)
-                0x0000000000000402                __dtors_end = .
+                0x000000000000040c                __dtors_end = .
  SORT(*)(.ctors)
  SORT(*)(.dtors)
  *(.init0)
- .init0         0x0000000000000402        0x0 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
-                0x0000000000000402                __init
+ .init0         0x000000000000040c        0x0 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
+                0x000000000000040c                __init
  *(.init0)
  *(.init1)
  *(.init1)
  *(.init2)
- .init2         0x0000000000000402        0xc /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
+ .init2         0x000000000000040c        0xc /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
  *(.init2)
  *(.init3)
  *(.init3)
  *(.init4)
- .init4         0x000000000000040e       0x16 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_copy_data.o)
-                0x000000000000040e                __do_copy_data
- .init4         0x0000000000000424       0x10 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_clear_bss.o)
-                0x0000000000000424                __do_clear_bss
+ .init4         0x0000000000000418       0x16 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_copy_data.o)
+                0x0000000000000418                __do_copy_data
+ .init4         0x000000000000042e       0x10 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_clear_bss.o)
+                0x000000000000042e                __do_clear_bss
  *(.init4)
  *(.init5)
  *(.init5)
  *(.init6)
- .init6         0x0000000000000434       0x16 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_ctors.o)
-                0x0000000000000434                __do_global_ctors
+ .init6         0x000000000000043e       0x16 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_ctors.o)
+                0x000000000000043e                __do_global_ctors
  *(.init6)
  *(.init7)
  *(.init7)
  *(.init8)
  *(.init8)
  *(.init9)
- .init9         0x000000000000044a        0x8 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
+ .init9         0x0000000000000454        0x8 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
  *(.init9)
  *(.text)
- .text          0x0000000000000452        0x4 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
-                0x0000000000000452                __vector_22
-                0x0000000000000452                __vector_1
-                0x0000000000000452                __vector_24
-                0x0000000000000452                __vector_12
-                0x0000000000000452                __bad_interrupt
-                0x0000000000000452                __vector_6
-                0x0000000000000452                __vector_3
-                0x0000000000000452                __vector_23
-                0x0000000000000452                __vector_25
-                0x0000000000000452                __vector_13
-                0x0000000000000452                __vector_17
-                0x0000000000000452                __vector_19
-                0x0000000000000452                __vector_7
-                0x0000000000000452                __vector_5
-                0x0000000000000452                __vector_4
-                0x0000000000000452                __vector_9
-                0x0000000000000452                __vector_2
-                0x0000000000000452                __vector_21
-                0x0000000000000452                __vector_15
-                0x0000000000000452                __vector_8
-                0x0000000000000452                __vector_14
-                0x0000000000000452                __vector_10
-                0x0000000000000452                __vector_18
-                0x0000000000000452                __vector_20
-                0x0000000000000456                . = ALIGN (0x2)
+ .text          0x000000000000045c        0x4 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
+                0x000000000000045c                __vector_22
+                0x000000000000045c                __vector_1
+                0x000000000000045c                __vector_24
+                0x000000000000045c                __vector_12
+                0x000000000000045c                __bad_interrupt
+                0x000000000000045c                __vector_6
+                0x000000000000045c                __vector_3
+                0x000000000000045c                __vector_23
+                0x000000000000045c                __vector_25
+                0x000000000000045c                __vector_13
+                0x000000000000045c                __vector_17
+                0x000000000000045c                __vector_19
+                0x000000000000045c                __vector_7
+                0x000000000000045c                __vector_5
+                0x000000000000045c                __vector_4
+                0x000000000000045c                __vector_9
+                0x000000000000045c                __vector_2
+                0x000000000000045c                __vector_21
+                0x000000000000045c                __vector_15
+                0x000000000000045c                __vector_8
+                0x000000000000045c                __vector_14
+                0x000000000000045c                __vector_10
+                0x000000000000045c                __vector_18
+                0x000000000000045c                __vector_20
+                0x0000000000000460                . = ALIGN (0x2)
  *(.text.*)
  .text.startup.main
-                0x0000000000000456        0xa Obj/main.o
-                0x0000000000000456                main
+                0x0000000000000460        0xa Obj/main.o
+                0x0000000000000460                main
  .text._Z4GameRK11tGameConfig
-                0x0000000000000460       0x6c Obj/Game.o
-                0x0000000000000460                _Z4GameRK11tGameConfig
+                0x000000000000046a       0x7e Obj/Game.o
+                0x000000000000046a                _Z4GameRK11tGameConfig
  .text._Z10SystemInitv
-                0x00000000000004cc        0xc Obj/System.o
-                0x00000000000004cc                _Z10SystemInitv
+                0x00000000000004e8        0xc Obj/System.o
+                0x00000000000004e8                _Z10SystemInitv
  .text.startup._GLOBAL__sub_I_gb
-                0x00000000000004d8       0x16 Obj/System.o
+                0x00000000000004f4       0x16 Obj/System.o
  .text._ZN11HumanPlayer11drawHandlerEv
-                0x00000000000004ee        0x2 Obj/HumanPlayer.o
-                0x00000000000004ee                _ZN11HumanPlayer11drawHandlerEv
-                0x00000000000004ee                _ZN11HumanPlayer13onBBtnPressedEv
+                0x000000000000050a        0x2 Obj/HumanPlayer.o
+                0x000000000000050a                _ZN11HumanPlayer11drawHandlerEv
+                0x000000000000050a                _ZN11HumanPlayer13onBBtnPressedEv
  .text._ZN11HumanPlayer13onABtnPressedEv
-                0x00000000000004f0        0x2 Obj/HumanPlayer.o
-                0x00000000000004f0                _ZN11HumanPlayer13onABtnPressedEv
- .text._ZN11HumanPlayerC2EPKc
-                0x00000000000004f2       0x2c Obj/HumanPlayer.o
-                0x00000000000004f2                _ZN11HumanPlayerC2EPKc
-                0x00000000000004f2                _ZN11HumanPlayerC1EPKc
+                0x000000000000050c        0x2 Obj/HumanPlayer.o
+                0x000000000000050c                _ZN11HumanPlayer13onABtnPressedEv
+ .text._ZN11HumanPlayerC2EPKcRK6Camera
+                0x000000000000050e       0x3e Obj/HumanPlayer.o
+                0x000000000000050e                _ZN11HumanPlayerC2EPKcRK6Camera
+                0x000000000000050e                _ZN11HumanPlayerC1EPKcRK6Camera
  .text._ZN11HumanPlayer13buttonHandlerEv
-                0x000000000000051e       0xb2 Obj/HumanPlayer.o
-                0x000000000000051e                _ZN11HumanPlayer13buttonHandlerEv
+                0x000000000000054c       0xde Obj/HumanPlayer.o
+                0x000000000000054c                _ZN11HumanPlayer13buttonHandlerEv
  .text._ZN11HumanPlayer7handlerEv
-                0x00000000000005d0       0x32 Obj/HumanPlayer.o
-                0x00000000000005d0                _ZN11HumanPlayer7handlerEv
- .text._ZN6SpriteC2ERKhhh
-                0x0000000000000602       0x10 Obj/Sprite.o
-                0x0000000000000602                _ZN6SpriteC2ERKhhh
-                0x0000000000000602                _ZN6SpriteC1ERKhhh
+                0x000000000000062a       0x32 Obj/HumanPlayer.o
+                0x000000000000062a                _ZN11HumanPlayer7handlerEv
+ .text._ZN6SpriteC2EPKhbhh
+                0x000000000000065c       0x16 Obj/Sprite.o
+                0x000000000000065c                _ZN6SpriteC2EPKhbhh
+                0x000000000000065c                _ZN6SpriteC1EPKhbhh
  .text._ZN6Sprite6setPosEhh
-                0x0000000000000612        0x8 Obj/Sprite.o
-                0x0000000000000612                _ZN6Sprite6setPosEhh
+                0x0000000000000672        0x8 Obj/Sprite.o
+                0x0000000000000672                _ZN6Sprite6setPosEhh
  .text._ZN6Sprite4drawEv
-                0x000000000000061a       0x24 Obj/Sprite.o
-                0x000000000000061a                _ZN6Sprite4drawEv
+                0x000000000000067a       0x68 Obj/Sprite.o
+                0x000000000000067a                _ZN6Sprite4drawEv
  .text._ZN6PlayerC2EPKc
-                0x000000000000063e       0x8a Obj/Player.o
-                0x000000000000063e                _ZN6PlayerC1EPKc
-                0x000000000000063e                _ZN6PlayerC2EPKc
+                0x00000000000006e2       0x8c Obj/Player.o
+                0x00000000000006e2                _ZN6PlayerC1EPKc
+                0x00000000000006e2                _ZN6PlayerC2EPKc
  .text._ZN6CameraC2Ev
-                0x00000000000006c8       0x1a Obj/Camera.o
-                0x00000000000006c8                _ZN6CameraC1Ev
-                0x00000000000006c8                _ZN6CameraC2Ev
+                0x000000000000076e       0x18 Obj/Camera.o
+                0x000000000000076e                _ZN6CameraC1Ev
+                0x000000000000076e                _ZN6CameraC2Ev
+ .text._ZN6Camera7handlerEv
+                0x0000000000000786       0x5c Obj/Camera.o
+                0x0000000000000786                _ZN6Camera7handlerEv
+ .text._ZNK6Camera4getXEh
+                0x00000000000007e2        0x8 Obj/Camera.o
+                0x00000000000007e2                _ZNK6Camera4getXEh
+ .text._ZNK6Camera4getYEh
+                0x00000000000007ea        0x8 Obj/Camera.o
+                0x00000000000007ea                _ZNK6Camera4getYEh
  .text._ZN6Camera16onLeftBtnPressedEv
-                0x00000000000006e2        0x2 Obj/Camera.o
-                0x00000000000006e2                _ZN6Camera16onLeftBtnPressedEv
+                0x00000000000007f2       0x20 Obj/Camera.o
+                0x00000000000007f2                _ZN6Camera16onLeftBtnPressedEv
  .text._ZN6Camera17onRightBtnPressedEv
-                0x00000000000006e4        0x2 Obj/Camera.o
-                0x00000000000006e4                _ZN6Camera17onRightBtnPressedEv
+                0x0000000000000812       0x24 Obj/Camera.o
+                0x0000000000000812                _ZN6Camera17onRightBtnPressedEv
+ .text._ZN6Camera14onUpBtnPressedEv
+                0x0000000000000836       0x20 Obj/Camera.o
+                0x0000000000000836                _ZN6Camera14onUpBtnPressedEv
+ .text._ZN6Camera16onDownBtnPressedEv
+                0x0000000000000856       0x1c Obj/Camera.o
+                0x0000000000000856                _ZN6Camera16onDownBtnPressedEv
  .text._ZN8BaseUnitC2Ev
-                0x00000000000006e6        0xe Obj/BaseUnit.o
-                0x00000000000006e6                _ZN8BaseUnitC1Ev
-                0x00000000000006e6                _ZN8BaseUnitC2Ev
+                0x0000000000000872       0x12 Obj/BaseUnit.o
+                0x0000000000000872                _ZN8BaseUnitC1Ev
+                0x0000000000000872                _ZN8BaseUnitC2Ev
+ .text._ZN8BaseUnit6createEjj
+                0x0000000000000884       0x10 Obj/BaseUnit.o
+                0x0000000000000884                _ZN8BaseUnit6createEjj
  .text._ZN8BaseUnit7handlerEv
-                0x00000000000006f4        0x2 Obj/BaseUnit.o
-                0x00000000000006f4                _ZN8BaseUnit7handlerEv
+                0x0000000000000894        0x2 Obj/BaseUnit.o
+                0x0000000000000894                _ZN8BaseUnit7handlerEv
  .text._ZN4UnitC2ENS_7tUnitIDE
-                0x00000000000006f6       0x1e Obj/Unit.o
-                0x00000000000006f6                _ZN4UnitC2ENS_7tUnitIDE
-                0x00000000000006f6                _ZN4UnitC1ENS_7tUnitIDE
- .text._ZN4Unit6createENS_7tUnitIDE
-                0x0000000000000714        0x8 Obj/Unit.o
-                0x0000000000000714                _ZN4Unit6createENS_7tUnitIDE
+                0x0000000000000896       0x1e Obj/Unit.o
+                0x0000000000000896                _ZN4UnitC2ENS_7tUnitIDE
+                0x0000000000000896                _ZN4UnitC1ENS_7tUnitIDE
+ .text._ZN4Unit6createENS_7tUnitIDEjj
+                0x00000000000008b4       0x5c Obj/Unit.o
+                0x00000000000008b4                _ZN4Unit6createENS_7tUnitIDEjj
  .text._ZN4Unit11drawHandlerEv
-                0x000000000000071c       0x5a Obj/Unit.o
-                0x000000000000071c                _ZN4Unit11drawHandlerEv
+                0x0000000000000910       0x88 Obj/Unit.o
+                0x0000000000000910                _ZN4Unit11drawHandlerEv
  .text._ZN4Unit7handlerEv
-                0x0000000000000776       0x14 Obj/Unit.o
-                0x0000000000000776                _ZN4Unit7handlerEv
+                0x0000000000000998       0x14 Obj/Unit.o
+                0x0000000000000998                _ZN4Unit7handlerEv
  .text._Z8MainMenuv
-                0x000000000000078a       0x98 Obj/Menu.o
-                0x000000000000078a                _Z8MainMenuv
+                0x00000000000009ac       0xbc Obj/Menu.o
+                0x00000000000009ac                _Z8MainMenuv
  .text._ZN7Buttons5beginEv
-                0x0000000000000822       0x20 ../lib/libgamebuino.a(Buttons.o)
-                0x0000000000000822                _ZN7Buttons5beginEv
+                0x0000000000000a68       0x20 ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000000a68                _ZN7Buttons5beginEv
  .text._ZN7Buttons6updateEv
-                0x0000000000000842       0x5a ../lib/libgamebuino.a(Buttons.o)
-                0x0000000000000842                _ZN7Buttons6updateEv
+                0x0000000000000a88       0x5a ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000000a88                _ZN7Buttons6updateEv
  .text._ZN7Buttons7pressedEh
-                0x000000000000089c       0x12 ../lib/libgamebuino.a(Buttons.o)
-                0x000000000000089c                _ZN7Buttons7pressedEh
+                0x0000000000000ae2       0x12 ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000000ae2                _ZN7Buttons7pressedEh
  .text._ZN7Buttons8releasedEh
-                0x00000000000008ae       0x12 ../lib/libgamebuino.a(Buttons.o)
-                0x00000000000008ae                _ZN7Buttons8releasedEh
+                0x0000000000000af4       0x12 ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000000af4                _ZN7Buttons8releasedEh
  .text._ZN7Buttons6repeatEhh
-                0x00000000000008c0       0x30 ../lib/libgamebuino.a(Buttons.o)
-                0x00000000000008c0                _ZN7Buttons6repeatEhh
+                0x0000000000000b06       0x30 ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000000b06                _ZN7Buttons6repeatEhh
+ .text._ZN7Buttons8timeHeldEh
+                0x0000000000000b36       0x10 ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000000b36                _ZN7Buttons8timeHeldEh
  .text._ZN8SPIClass8transferEh
-                0x00000000000008f0        0xc ../lib/libgamebuino.a(Display.o)
-                0x00000000000008f0                _ZN8SPIClass8transferEh
+                0x0000000000000b46        0xc ../lib/libgamebuino.a(Display.o)
+                0x0000000000000b46                _ZN8SPIClass8transferEh
  .text._ZN7Display9drawPixelEaa
-                0x00000000000008fc       0xb8 ../lib/libgamebuino.a(Display.o)
-                0x00000000000008fc                _ZN7Display9drawPixelEaa
+                0x0000000000000b52       0xb8 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000b52                _ZN7Display9drawPixelEaa
  .text._ZN7Display7commandEh
-                0x00000000000009b4       0x3c ../lib/libgamebuino.a(Display.o)
-                0x00000000000009b4                _ZN7Display7commandEh
+                0x0000000000000c0a       0x3c ../lib/libgamebuino.a(Display.o)
+                0x0000000000000c0a                _ZN7Display7commandEh
  .text._ZN7Display5clearEv
-                0x00000000000009f0       0x22 ../lib/libgamebuino.a(Display.o)
-                0x00000000000009f0                _ZN7Display5clearEv
+                0x0000000000000c46       0x22 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000c46                _ZN7Display5clearEv
  .text._ZN7Display6updateEv
-                0x0000000000000a12       0x8a ../lib/libgamebuino.a(Display.o)
-                0x0000000000000a12                _ZN7Display6updateEv
+                0x0000000000000c68       0x8a ../lib/libgamebuino.a(Display.o)
+                0x0000000000000c68                _ZN7Display6updateEv
  .text._ZN7Display8setColorEa
-                0x0000000000000a9c        0x8 ../lib/libgamebuino.a(Display.o)
-                0x0000000000000a9c                _ZN7Display8setColorEa
+                0x0000000000000cf2        0x8 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000cf2                _ZN7Display8setColorEa
  .text._ZN7Display8setColorEaa
-                0x0000000000000aa4        0x8 ../lib/libgamebuino.a(Display.o)
-                0x0000000000000aa4                _ZN7Display8setColorEaa
+                0x0000000000000cfa        0x8 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000cfa                _ZN7Display8setColorEaa
  .text._ZN7Display13drawFastVLineEaaa
-                0x0000000000000aac       0x38 ../lib/libgamebuino.a(Display.o)
-                0x0000000000000aac                _ZN7Display13drawFastVLineEaaa
+                0x0000000000000d02       0x38 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000d02                _ZN7Display13drawFastVLineEaaa
  .text._ZN7Display13drawFastHLineEaaa
-                0x0000000000000ae4       0x38 ../lib/libgamebuino.a(Display.o)
-                0x0000000000000ae4                _ZN7Display13drawFastHLineEaaa
+                0x0000000000000d3a       0x38 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000d3a                _ZN7Display13drawFastHLineEaaa
  .text._ZN7Display8fillRectEaaaa
-                0x0000000000000b1c       0x52 ../lib/libgamebuino.a(Display.o)
-                0x0000000000000b1c                _ZN7Display8fillRectEaaaa
+                0x0000000000000d72       0x52 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000d72                _ZN7Display8fillRectEaaaa
  .text._ZN7Display16drawCircleHelperEaaah
-                0x0000000000000b6e       0xfc ../lib/libgamebuino.a(Display.o)
-                0x0000000000000b6e                _ZN7Display16drawCircleHelperEaaah
+                0x0000000000000dc4       0xfc ../lib/libgamebuino.a(Display.o)
+                0x0000000000000dc4                _ZN7Display16drawCircleHelperEaaah
  .text._ZN7Display16fillCircleHelperEaaaha
-                0x0000000000000c6a       0xcc ../lib/libgamebuino.a(Display.o)
-                0x0000000000000c6a                _ZN7Display16fillCircleHelperEaaaha
+                0x0000000000000ec0       0xcc ../lib/libgamebuino.a(Display.o)
+                0x0000000000000ec0                _ZN7Display16fillCircleHelperEaaaha
  .text._ZN7Display13drawRoundRectEaaaaa
-                0x0000000000000d36       0xbe ../lib/libgamebuino.a(Display.o)
-                0x0000000000000d36                _ZN7Display13drawRoundRectEaaaaa
+                0x0000000000000f8c       0xbe ../lib/libgamebuino.a(Display.o)
+                0x0000000000000f8c                _ZN7Display13drawRoundRectEaaaaa
  .text._ZN7Display13fillRoundRectEaaaaa
-                0x0000000000000df4       0x6e ../lib/libgamebuino.a(Display.o)
-                0x0000000000000df4                _ZN7Display13fillRoundRectEaaaaa
+                0x000000000000104a       0x6e ../lib/libgamebuino.a(Display.o)
+                0x000000000000104a                _ZN7Display13fillRoundRectEaaaaa
  .text._ZN7Display10drawBitmapEaaPKh
-                0x0000000000000e62      0x288 ../lib/libgamebuino.a(Display.o)
-                0x0000000000000e62                _ZN7Display10drawBitmapEaaPKh
+                0x00000000000010b8      0x288 ../lib/libgamebuino.a(Display.o)
+                0x00000000000010b8                _ZN7Display10drawBitmapEaaPKh
  .text._ZN7Display7setFontEPKh
-                0x00000000000010ea       0x28 ../lib/libgamebuino.a(Display.o)
-                0x00000000000010ea                _ZN7Display7setFontEPKh
+                0x0000000000001340       0x28 ../lib/libgamebuino.a(Display.o)
+                0x0000000000001340                _ZN7Display7setFontEPKh
  .text._ZN7Display5beginEaaaaa
-                0x0000000000001112      0x180 ../lib/libgamebuino.a(Display.o)
-                0x0000000000001112                _ZN7Display5beginEaaaaa
+                0x0000000000001368      0x180 ../lib/libgamebuino.a(Display.o)
+                0x0000000000001368                _ZN7Display5beginEaaaaa
  .text._ZN7Display8drawCharEaahh
-                0x0000000000001292      0x14a ../lib/libgamebuino.a(Display.o)
-                0x0000000000001292                _ZN7Display8drawCharEaahh
+                0x00000000000014e8      0x14a ../lib/libgamebuino.a(Display.o)
+                0x00000000000014e8                _ZN7Display8drawCharEaahh
  .text._ZN7Display5writeEh
-                0x00000000000013dc       0x66 ../lib/libgamebuino.a(Display.o)
-                0x00000000000013dc                _ZN7Display5writeEh
+                0x0000000000001632       0x66 ../lib/libgamebuino.a(Display.o)
+                0x0000000000001632                _ZN7Display5writeEh
  .text._ZN9Gamebuino11updatePopupEv
-                0x0000000000001442       0xe0 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001442                _ZN9Gamebuino11updatePopupEv
+                0x0000000000001698       0xe0 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001698                _ZN9Gamebuino11updatePopupEv
  .text._ZN9Gamebuino14displayBatteryEv
-                0x0000000000001522      0x168 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001522                _ZN9Gamebuino14displayBatteryEv
+                0x0000000000001778      0x168 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001778                _ZN9Gamebuino14displayBatteryEv
  .text._ZN9Gamebuino6updateEv
-                0x000000000000168a      0x176 ../lib/libgamebuino.a(Gamebuino.o)
-                0x000000000000168a                _ZN9Gamebuino6updateEv
+                0x00000000000018e0      0x176 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000018e0                _ZN9Gamebuino6updateEv
  .text._ZN9Gamebuino4menuEPKPKch
-                0x0000000000001800      0x29c ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001800                _ZN9Gamebuino4menuEPKPKch
+                0x0000000000001a56      0x29c ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001a56                _ZN9Gamebuino4menuEPKPKch
  .text._ZN9Gamebuino10changeGameEv
-                0x0000000000001a9c       0x7a ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001a9c                _ZN9Gamebuino10changeGameEv
+                0x0000000000001cf2       0x7a ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001cf2                _ZN9Gamebuino10changeGameEv
  .text._ZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKh
-                0x0000000000001b16      0x27c ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001b16                _ZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKh
+                0x0000000000001d6c      0x27c ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001d6c                _ZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKh
  .text._ZN9Gamebuino11titleScreenEPK19__FlashStringHelper
-                0x0000000000001d92        0x8 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001d92                _ZN9Gamebuino11titleScreenEPK19__FlashStringHelper
+                0x0000000000001fe8        0x8 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001fe8                _ZN9Gamebuino11titleScreenEPK19__FlashStringHelper
  .text._ZN9Gamebuino17settingsAvailableEv
-                0x0000000000001d9a       0x14 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001d9a                _ZN9Gamebuino17settingsAvailableEv
+                0x0000000000001ff0       0x14 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001ff0                _ZN9Gamebuino17settingsAvailableEv
  .text._ZN9Gamebuino12readSettingsEv
-                0x0000000000001dae       0xde ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001dae                _ZN9Gamebuino12readSettingsEv
+                0x0000000000002004       0xde ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000002004                _ZN9Gamebuino12readSettingsEv
  .text._ZN9Gamebuino5beginEv
-                0x0000000000001e8c       0xb6 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001e8c                _ZN9Gamebuino5beginEv
+                0x00000000000020e2       0xb6 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000020e2                _ZN9Gamebuino5beginEv
  .text._ZN9Gamebuino14getDefaultNameEPc
-                0x0000000000001f42       0x2c ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001f42                _ZN9Gamebuino14getDefaultNameEPc
+                0x0000000000002198       0x2c ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000002198                _ZN9Gamebuino14getDefaultNameEPc
  .text._ZN5Sound7commandEhhah.part.0
-                0x0000000000001f6e       0x74 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000021c4       0x74 ../lib/libgamebuino.a(Sound.o)
  .text._ZN5Sound5beginEv
-                0x0000000000001fe2       0x6a ../lib/libgamebuino.a(Sound.o)
-                0x0000000000001fe2                _ZN5Sound5beginEv
+                0x0000000000002238       0x6a ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002238                _ZN5Sound5beginEv
  .text._ZN5Sound7commandEhhah
-                0x000000000000204c       0x62 ../lib/libgamebuino.a(Sound.o)
-                0x000000000000204c                _ZN5Sound7commandEhhah
+                0x00000000000022a2       0x62 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000022a2                _ZN5Sound7commandEhhah
  .text._ZN5Sound8playNoteEhhh
-                0x00000000000020ae       0x24 ../lib/libgamebuino.a(Sound.o)
-                0x00000000000020ae                _ZN5Sound8playNoteEhhh
+                0x0000000000002304       0x24 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002304                _ZN5Sound8playNoteEhhh
  .text._ZN5Sound12updateOutputEv
-                0x00000000000020d2       0x16 ../lib/libgamebuino.a(Sound.o)
-                0x00000000000020d2                _ZN5Sound12updateOutputEv
+                0x0000000000002328       0x16 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002328                _ZN5Sound12updateOutputEv
  .text._ZN5Sound8stopNoteEh
-                0x00000000000020e8       0x22 ../lib/libgamebuino.a(Sound.o)
-                0x00000000000020e8                _ZN5Sound8stopNoteEh
+                0x000000000000233e       0x22 ../lib/libgamebuino.a(Sound.o)
+                0x000000000000233e                _ZN5Sound8stopNoteEh
  .text._ZN5Sound11stopPatternEh
-                0x000000000000210a       0x16 ../lib/libgamebuino.a(Sound.o)
-                0x000000000000210a                _ZN5Sound11stopPatternEh
+                0x0000000000002360       0x16 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002360                _ZN5Sound11stopPatternEh
  .text._ZN5Sound11playPatternEPKjh
-                0x0000000000002120       0x36 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000002120                _ZN5Sound11playPatternEPKjh
+                0x0000000000002376       0x36 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002376                _ZN5Sound11playPatternEPKjh
  .text._ZN5Sound11updateTrackEh
-                0x0000000000002156       0x72 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000002156                _ZN5Sound11updateTrackEh
+                0x00000000000023ac       0x72 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000023ac                _ZN5Sound11updateTrackEh
  .text._ZN5Sound11updateTrackEv
-                0x00000000000021c8        0x6 ../lib/libgamebuino.a(Sound.o)
-                0x00000000000021c8                _ZN5Sound11updateTrackEv
+                0x000000000000241e        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x000000000000241e                _ZN5Sound11updateTrackEv
  .text._ZN5Sound11stopPatternEv
-                0x00000000000021ce        0x6 ../lib/libgamebuino.a(Sound.o)
-                0x00000000000021ce                _ZN5Sound11stopPatternEv
+                0x0000000000002424        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002424                _ZN5Sound11stopPatternEv
  .text._ZN5Sound13updatePatternEh
-                0x00000000000021d4       0xcc ../lib/libgamebuino.a(Sound.o)
-                0x00000000000021d4                _ZN5Sound13updatePatternEh
+                0x000000000000242a       0xcc ../lib/libgamebuino.a(Sound.o)
+                0x000000000000242a                _ZN5Sound13updatePatternEh
  .text._ZN5Sound13updatePatternEv
-                0x00000000000022a0        0x6 ../lib/libgamebuino.a(Sound.o)
-                0x00000000000022a0                _ZN5Sound13updatePatternEv
+                0x00000000000024f6        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000024f6                _ZN5Sound13updatePatternEv
  .text._ZN5Sound10updateNoteEh
-                0x00000000000022a6      0x184 ../lib/libgamebuino.a(Sound.o)
-                0x00000000000022a6                _ZN5Sound10updateNoteEh
+                0x00000000000024fc      0x184 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000024fc                _ZN5Sound10updateNoteEh
  .text._ZN5Sound10updateNoteEv
-                0x000000000000242a        0x6 ../lib/libgamebuino.a(Sound.o)
-                0x000000000000242a                _ZN5Sound10updateNoteEv
+                0x0000000000002680        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002680                _ZN5Sound10updateNoteEv
  .text._ZN5Sound14generateOutputEv
-                0x0000000000002430       0x54 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000002430                _ZN5Sound14generateOutputEv
+                0x0000000000002686       0x54 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002686                _ZN5Sound14generateOutputEv
  .text.__vector_11
-                0x0000000000002484       0x48 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000002484                __vector_11
+                0x00000000000026da       0x48 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000026da                __vector_11
  .text._ZN5Sound6playOKEv
-                0x00000000000024cc       0x2c ../lib/libgamebuino.a(Sound.o)
-                0x00000000000024cc                _ZN5Sound6playOKEv
+                0x0000000000002722       0x2c ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002722                _ZN5Sound6playOKEv
  .text._ZN5Sound10playCancelEv
-                0x00000000000024f8       0x2c ../lib/libgamebuino.a(Sound.o)
-                0x00000000000024f8                _ZN5Sound10playCancelEv
+                0x000000000000274e       0x2c ../lib/libgamebuino.a(Sound.o)
+                0x000000000000274e                _ZN5Sound10playCancelEv
  .text._ZN5Sound8playTickEv
-                0x0000000000002524       0x2c ../lib/libgamebuino.a(Sound.o)
-                0x0000000000002524                _ZN5Sound8playTickEv
+                0x000000000000277a       0x2c ../lib/libgamebuino.a(Sound.o)
+                0x000000000000277a                _ZN5Sound8playTickEv
  .text._ZN5Sound9setVolumeEa
-                0x0000000000002550       0x1c ../lib/libgamebuino.a(Sound.o)
-                0x0000000000002550                _ZN5Sound9setVolumeEa
+                0x00000000000027a6       0x1c ../lib/libgamebuino.a(Sound.o)
+                0x00000000000027a6                _ZN5Sound9setVolumeEa
  .text._ZN9Backlight5beginEv
-                0x000000000000256c        0x8 ../lib/libgamebuino.a(Backlight.o)
-                0x000000000000256c                _ZN9Backlight5beginEv
+                0x00000000000027c2        0x8 ../lib/libgamebuino.a(Backlight.o)
+                0x00000000000027c2                _ZN9Backlight5beginEv
  .text._ZN9Backlight3setEh
-                0x0000000000002574        0x8 ../lib/libgamebuino.a(Backlight.o)
-                0x0000000000002574                _ZN9Backlight3setEh
+                0x00000000000027ca        0x8 ../lib/libgamebuino.a(Backlight.o)
+                0x00000000000027ca                _ZN9Backlight3setEh
  .text._ZN9Backlight6updateEv
-                0x000000000000257c       0xbe ../lib/libgamebuino.a(Backlight.o)
-                0x000000000000257c                _ZN9Backlight6updateEv
+                0x00000000000027d2       0xbe ../lib/libgamebuino.a(Backlight.o)
+                0x00000000000027d2                _ZN9Backlight6updateEv
  .text._ZN7Battery5beginEv
-                0x000000000000263a       0x14 ../lib/libgamebuino.a(Battery.o)
-                0x000000000000263a                _ZN7Battery5beginEv
+                0x0000000000002890       0x14 ../lib/libgamebuino.a(Battery.o)
+                0x0000000000002890                _ZN7Battery5beginEv
  .text._ZN7Battery6updateEv
-                0x000000000000264e       0x72 ../lib/libgamebuino.a(Battery.o)
-                0x000000000000264e                _ZN7Battery6updateEv
+                0x00000000000028a4       0x72 ../lib/libgamebuino.a(Battery.o)
+                0x00000000000028a4                _ZN7Battery6updateEv
  .text.__vector_16
-                0x00000000000026c0       0x94 ../lib/libarduino.a(wiring.o)
-                0x00000000000026c0                __vector_16
- .text.millis   0x0000000000002754       0x18 ../lib/libarduino.a(wiring.o)
-                0x0000000000002754                millis
- .text.micros   0x000000000000276c       0x4a ../lib/libarduino.a(wiring.o)
-                0x000000000000276c                micros
- .text.delay    0x00000000000027b6       0x4c ../lib/libarduino.a(wiring.o)
-                0x00000000000027b6                delay
- .text.init     0x0000000000002802       0x76 ../lib/libarduino.a(wiring.o)
-                0x0000000000002802                init
+                0x0000000000002916       0x94 ../lib/libarduino.a(wiring.o)
+                0x0000000000002916                __vector_16
+ .text.millis   0x00000000000029aa       0x18 ../lib/libarduino.a(wiring.o)
+                0x00000000000029aa                millis
+ .text.micros   0x00000000000029c2       0x4a ../lib/libarduino.a(wiring.o)
+                0x00000000000029c2                micros
+ .text.delay    0x0000000000002a0c       0x4c ../lib/libarduino.a(wiring.o)
+                0x0000000000002a0c                delay
+ .text.init     0x0000000000002a58       0x76 ../lib/libarduino.a(wiring.o)
+                0x0000000000002a58                init
  .text.analogRead
-                0x0000000000002878       0x3a ../lib/libarduino.a(wiring_analog.o)
-                0x0000000000002878                analogRead
+                0x0000000000002ace       0x3a ../lib/libarduino.a(wiring_analog.o)
+                0x0000000000002ace                analogRead
  .text.analogWrite
-                0x00000000000028b2       0xbe ../lib/libarduino.a(wiring_analog.o)
-                0x00000000000028b2                analogWrite
+                0x0000000000002b08       0xbe ../lib/libarduino.a(wiring_analog.o)
+                0x0000000000002b08                analogWrite
  .text.turnOffPWM
-                0x0000000000002970       0x52 ../lib/libarduino.a(wiring_digital.o)
- .text.pinMode  0x00000000000029c2       0x78 ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000029c2                pinMode
+                0x0000000000002bc6       0x52 ../lib/libarduino.a(wiring_digital.o)
+ .text.pinMode  0x0000000000002c18       0x78 ../lib/libarduino.a(wiring_digital.o)
+                0x0000000000002c18                pinMode
  .text.digitalWrite
-                0x0000000000002a3a       0x5e ../lib/libarduino.a(wiring_digital.o)
-                0x0000000000002a3a                digitalWrite
+                0x0000000000002c90       0x5e ../lib/libarduino.a(wiring_digital.o)
+                0x0000000000002c90                digitalWrite
  .text.digitalRead
-                0x0000000000002a98       0x52 ../lib/libarduino.a(wiring_digital.o)
-                0x0000000000002a98                digitalRead
+                0x0000000000002cee       0x52 ../lib/libarduino.a(wiring_digital.o)
+                0x0000000000002cee                digitalRead
  .text._ZN5Print5writeEPKhj
-                0x0000000000002aea       0x50 ../lib/libarduino.a(Print.o)
-                0x0000000000002aea                _ZN5Print5writeEPKhj
+                0x0000000000002d40       0x50 ../lib/libarduino.a(Print.o)
+                0x0000000000002d40                _ZN5Print5writeEPKhj
  .text._ZN5Print5writeEPKc
-                0x0000000000002b3a       0x2a ../lib/libarduino.a(Print.o)
-                0x0000000000002b3a                _ZN5Print5writeEPKc
+                0x0000000000002d90       0x2a ../lib/libarduino.a(Print.o)
+                0x0000000000002d90                _ZN5Print5writeEPKc
  .text._ZN5Print5printEPK19__FlashStringHelper
-                0x0000000000002b64       0x46 ../lib/libarduino.a(Print.o)
-                0x0000000000002b64                _ZN5Print5printEPK19__FlashStringHelper
+                0x0000000000002dba       0x46 ../lib/libarduino.a(Print.o)
+                0x0000000000002dba                _ZN5Print5printEPK19__FlashStringHelper
  .text._ZN5Print5printEc
-                0x0000000000002baa        0xe ../lib/libarduino.a(Print.o)
-                0x0000000000002baa                _ZN5Print5printEc
+                0x0000000000002e00        0xe ../lib/libarduino.a(Print.o)
+                0x0000000000002e00                _ZN5Print5printEc
  .text._ZN5Print7printlnEv
-                0x0000000000002bb8       0x28 ../lib/libarduino.a(Print.o)
-                0x0000000000002bb8                _ZN5Print7printlnEv
+                0x0000000000002e0e       0x28 ../lib/libarduino.a(Print.o)
+                0x0000000000002e0e                _ZN5Print7printlnEv
  .text._ZN5Print7printlnEPK19__FlashStringHelper
-                0x0000000000002be0       0x24 ../lib/libarduino.a(Print.o)
-                0x0000000000002be0                _ZN5Print7printlnEPK19__FlashStringHelper
+                0x0000000000002e36       0x24 ../lib/libarduino.a(Print.o)
+                0x0000000000002e36                _ZN5Print7printlnEPK19__FlashStringHelper
  .text._ZN5Print11printNumberEmh
-                0x0000000000002c04       0xac ../lib/libarduino.a(Print.o)
-                0x0000000000002c04                _ZN5Print11printNumberEmh
+                0x0000000000002e5a       0xac ../lib/libarduino.a(Print.o)
+                0x0000000000002e5a                _ZN5Print11printNumberEmh
  .text._ZN5Print5printEmi
-                0x0000000000002cb0       0x1a ../lib/libarduino.a(Print.o)
-                0x0000000000002cb0                _ZN5Print5printEmi
+                0x0000000000002f06       0x1a ../lib/libarduino.a(Print.o)
+                0x0000000000002f06                _ZN5Print5printEmi
  .text._ZN5Print5printEji
-                0x0000000000002cca        0xc ../lib/libarduino.a(Print.o)
-                0x0000000000002cca                _ZN5Print5printEji
+                0x0000000000002f20        0xc ../lib/libarduino.a(Print.o)
+                0x0000000000002f20                _ZN5Print5printEji
  .text._ZN5Print5printEli
-                0x0000000000002cd6       0x90 ../lib/libarduino.a(Print.o)
-                0x0000000000002cd6                _ZN5Print5printEli
+                0x0000000000002f2c       0x90 ../lib/libarduino.a(Print.o)
+                0x0000000000002f2c                _ZN5Print5printEli
  .text._ZN5Print5printEii
-                0x0000000000002d66        0xe ../lib/libarduino.a(Print.o)
-                0x0000000000002d66                _ZN5Print5printEii
+                0x0000000000002fbc        0xe ../lib/libarduino.a(Print.o)
+                0x0000000000002fbc                _ZN5Print5printEii
  .text._Z3maplllll
-                0x0000000000002d74       0x82 ../lib/libarduino.a(WMath.o)
-                0x0000000000002d74                _Z3maplllll
+                0x0000000000002fca       0x82 ../lib/libarduino.a(WMath.o)
+                0x0000000000002fca                _Z3maplllll
  .text.__cxa_pure_virtual
-                0x0000000000002df6        0x2 ../lib/libarduino.a(forward.o)
-                0x0000000000002df6                __cxa_pure_virtual
+                0x000000000000304c        0x2 ../lib/libarduino.a(forward.o)
+                0x000000000000304c                __cxa_pure_virtual
  .text._ZN8SPIClass5beginEv
-                0x0000000000002df8       0x2c ../lib/libarduino.a(SPI.o)
-                0x0000000000002df8                _ZN8SPIClass5beginEv
+                0x000000000000304e       0x2c ../lib/libarduino.a(SPI.o)
+                0x000000000000304e                _ZN8SPIClass5beginEv
  .text._ZN8SPIClass11setBitOrderEh
-                0x0000000000002e24       0x12 ../lib/libarduino.a(SPI.o)
-                0x0000000000002e24                _ZN8SPIClass11setBitOrderEh
+                0x000000000000307a       0x12 ../lib/libarduino.a(SPI.o)
+                0x000000000000307a                _ZN8SPIClass11setBitOrderEh
  .text._ZN8SPIClass11setDataModeEh
-                0x0000000000002e36        0xa ../lib/libarduino.a(SPI.o)
-                0x0000000000002e36                _ZN8SPIClass11setDataModeEh
+                0x000000000000308c        0xa ../lib/libarduino.a(SPI.o)
+                0x000000000000308c                _ZN8SPIClass11setDataModeEh
  .text._ZN8SPIClass15setClockDividerEh
-                0x0000000000002e40       0x1e ../lib/libarduino.a(SPI.o)
-                0x0000000000002e40                _ZN8SPIClass15setClockDividerEh
+                0x0000000000003096       0x1e ../lib/libarduino.a(SPI.o)
+                0x0000000000003096                _ZN8SPIClass15setClockDividerEh
  .text.libgcc.mul
-                0x0000000000002e5e       0x20 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_mulsi3.o)
-                0x0000000000002e5e                __mulsi3
+                0x00000000000030b4       0x20 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_mulsi3.o)
+                0x00000000000030b4                __mulsi3
  .text.libgcc.div
-                0x0000000000002e7e       0x18 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_udivmodqi4.o)
-                0x0000000000002e7e                __udivmodqi4
+                0x00000000000030d4       0x18 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_udivmodqi4.o)
+                0x00000000000030d4                __udivmodqi4
  .text.libgcc.div
-                0x0000000000002e96       0x28 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_udivmodhi4.o)
-                0x0000000000002e96                __udivmodhi4
+                0x00000000000030ec       0x28 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_udivmodhi4.o)
+                0x00000000000030ec                __udivmodhi4
  .text.libgcc.div
-                0x0000000000002ebe       0x28 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_divmodhi4.o)
-                0x0000000000002ebe                __divmodhi4
-                0x0000000000002ebe                _div
+                0x0000000000003114       0x28 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_divmodhi4.o)
+                0x0000000000003114                __divmodhi4
+                0x0000000000003114                _div
  .text.libgcc.div
-                0x0000000000002ee6       0x44 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_udivmodsi4.o)
-                0x0000000000002ee6                __udivmodsi4
+                0x000000000000313c       0x44 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_udivmodsi4.o)
+                0x000000000000313c                __udivmodsi4
  .text.libgcc.div
-                0x0000000000002f2a       0x2e /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_divmodsi4.o)
-                0x0000000000002f2a                __divmodsi4
+                0x0000000000003180       0x2e /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_divmodsi4.o)
+                0x0000000000003180                __divmodsi4
  .text.libgcc.div
-                0x0000000000002f58       0x10 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_negsi2.o)
-                0x0000000000002f58                __negsi2
+                0x00000000000031ae       0x10 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_negsi2.o)
+                0x00000000000031ae                __negsi2
  .text.libgcc.mul
-                0x0000000000002f68       0x16 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_muluhisi3.o)
-                0x0000000000002f68                __muluhisi3
- .text.libgcc   0x0000000000002f7e        0xc /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_tablejump2.o)
-                0x0000000000002f7e                __tablejump2__
+                0x00000000000031be       0x16 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_muluhisi3.o)
+                0x00000000000031be                __muluhisi3
+ .text.libgcc   0x00000000000031d4        0xc /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_tablejump2.o)
+                0x00000000000031d4                __tablejump2__
  .text.libgcc.mul
-                0x0000000000002f8a       0x1e /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_umulhisi3.o)
-                0x0000000000002f8a                __umulhisi3
+                0x00000000000031e0       0x1e /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_umulhisi3.o)
+                0x00000000000031e0                __umulhisi3
  .text.avr-libc.fplib
-                0x0000000000002fa8       0x5e /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fixunssfsi.o)
-                0x0000000000002fa8                __fixunssfsi
+                0x00000000000031fe       0x5e /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fixunssfsi.o)
+                0x00000000000031fe                __fixunssfsi
  .text.avr-libc.fplib
-                0x0000000000003006       0x7a /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(floatsisf.o)
-                0x0000000000003006                __floatunsisf
-                0x000000000000300a                __floatsisf
+                0x000000000000325c       0x7a /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(floatsisf.o)
+                0x000000000000325c                __floatunsisf
+                0x0000000000003260                __floatsisf
  .text.avr-libc.fplib
-                0x0000000000003080        0xc /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_inf.o)
-                0x0000000000003080                __fp_inf
+                0x00000000000032d6        0xc /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_inf.o)
+                0x00000000000032d6                __fp_inf
  .text.avr-libc.fplib
-                0x000000000000308c        0x6 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_nan.o)
-                0x000000000000308c                __fp_nan
+                0x00000000000032e2        0x6 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_nan.o)
+                0x00000000000032e2                __fp_nan
  .text.avr-libc.fplib
-                0x0000000000003092        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_pscA.o)
-                0x0000000000003092                __fp_pscA
+                0x00000000000032e8        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_pscA.o)
+                0x00000000000032e8                __fp_pscA
  .text.avr-libc.fplib
-                0x00000000000030a0        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_pscB.o)
-                0x00000000000030a0                __fp_pscB
+                0x00000000000032f6        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_pscB.o)
+                0x00000000000032f6                __fp_pscB
  .text.avr-libc.fplib
-                0x00000000000030ae       0x22 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_round.o)
-                0x00000000000030ae                __fp_round
+                0x0000000000003304       0x22 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_round.o)
+                0x0000000000003304                __fp_round
  .text.avr-libc.fplib
-                0x00000000000030d0       0x44 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_split3.o)
-                0x00000000000030d0                __fp_split3
-                0x00000000000030e0                __fp_splitA
+                0x0000000000003326       0x44 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_split3.o)
+                0x0000000000003326                __fp_split3
+                0x0000000000003336                __fp_splitA
  .text.avr-libc.fplib
-                0x0000000000003114        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_zero.o)
-                0x0000000000003114                __fp_zero
-                0x0000000000003116                __fp_szero
+                0x000000000000336a        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_zero.o)
+                0x000000000000336a                __fp_zero
+                0x000000000000336c                __fp_szero
  .text.avr-libc.fplib
-                0x0000000000003122        0x8 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(mulsf3.o)
-                0x0000000000003122                __mulsf3
+                0x0000000000003378        0x8 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(mulsf3.o)
+                0x0000000000003378                __mulsf3
  .text.avr-libc.fplib
-                0x000000000000312a       0xd2 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(mulsf3x.o)
-                0x0000000000003148                __mulsf3x
-                0x000000000000314e                __mulsf3_pse
+                0x0000000000003380       0xd2 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(mulsf3x.o)
+                0x000000000000339e                __mulsf3x
+                0x00000000000033a4                __mulsf3_pse
  .text.avr-libc
-                0x00000000000031fc        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(memset.o)
-                0x00000000000031fc                memset
+                0x0000000000003452        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(memset.o)
+                0x0000000000003452                memset
  .text.avr-libc
-                0x000000000000320a       0x1e /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(strncpy.o)
-                0x000000000000320a                strncpy
-                0x0000000000003228                . = ALIGN (0x2)
+                0x0000000000003460       0x1e /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(strncpy.o)
+                0x0000000000003460                strncpy
+                0x000000000000347e                . = ALIGN (0x2)
  *(.fini9)
- .fini9         0x0000000000003228        0x0 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_exit.o)
-                0x0000000000003228                exit
-                0x0000000000003228                _exit
+ .fini9         0x000000000000347e        0x0 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_exit.o)
+                0x000000000000347e                exit
+                0x000000000000347e                _exit
  *(.fini9)
  *(.fini8)
  *(.fini8)
@@ -1737,11 +1756,11 @@ END GROUP
  *(.fini1)
  *(.fini1)
  *(.fini0)
- .fini0         0x0000000000003228        0x4 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_exit.o)
+ .fini0         0x000000000000347e        0x4 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_exit.o)
  *(.fini0)
-                0x000000000000322c                _etext = .
+                0x0000000000003482                _etext = .
 
-.data           0x0000000000800100       0x66 load address 0x000000000000322c
+.data           0x0000000000800100       0x58 load address 0x0000000000003482
                 0x0000000000800100                PROVIDE (__data_start, .)
  *(.data)
  *(.data*)
@@ -1751,78 +1770,76 @@ END GROUP
                 0x0000000000800101        0x1 ../lib/libarduino.a(wiring_analog.o)
                 0x0000000000800101                analog_reference
  *(.rodata)
+ .rodata        0x0000000000800102        0x3 Obj/Unit.o
  *(.rodata*)
  .rodata._ZZN11HumanPlayer13buttonHandlerEvE23apBtnCameraHandlerTable
-                0x0000000000800102       0x1c Obj/HumanPlayer.o
+                0x0000000000800105       0x1c Obj/HumanPlayer.o
  .rodata._ZZN11HumanPlayer13buttonHandlerEvE17apBtnHandlerTable
-                0x000000000080011e       0x1c Obj/HumanPlayer.o
+                0x0000000000800121       0x1c Obj/HumanPlayer.o
  .rodata._ZTV11HumanPlayer
-                0x000000000080013a        0x6 Obj/HumanPlayer.o
-                0x000000000080013a                _ZTV11HumanPlayer
+                0x000000000080013d        0x6 Obj/HumanPlayer.o
+                0x000000000080013d                _ZTV11HumanPlayer
  .rodata._ZTV6Player
-                0x0000000000800140        0x6 Obj/Player.o
-                0x0000000000800140                _ZTV6Player
- .rodata._ZZN4Unit11drawHandlerEvE17au8PeasantSprData
-                0x0000000000800146        0xa Obj/Unit.o
- .rodata._ZZN4Unit11drawHandlerEvE23apu8UnitSpriteDataTable
-                0x0000000000800150        0x6 Obj/Unit.o
+                0x0000000000800143        0x6 Obj/Player.o
+                0x0000000000800143                _ZTV6Player
  .rodata._ZTV7Display
-                0x0000000000800156        0x8 ../lib/libgamebuino.a(Display.o)
-                0x0000000000800156                _ZTV7Display
+                0x0000000000800149        0x8 ../lib/libgamebuino.a(Display.o)
+                0x0000000000800149                _ZTV7Display
  .rodata.str1.1
-                0x000000000080015e        0x7 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000800151        0x7 ../lib/libgamebuino.a(Gamebuino.o)
  *(.gnu.linkonce.d*)
-                0x0000000000800166                . = ALIGN (0x2)
- *fill*         0x0000000000800165        0x1 
-                0x0000000000800166                _edata = .
-                0x0000000000800166                PROVIDE (__data_end, .)
+                0x0000000000800158                . = ALIGN (0x2)
+                0x0000000000800158                _edata = .
+                0x0000000000800158                PROVIDE (__data_end, .)
 
-.bss            0x0000000000800166      0x296
-                0x0000000000800166                PROVIDE (__bss_start, .)
+.bss            0x0000000000800158      0x298
+                0x0000000000800158                PROVIDE (__bss_start, .)
  *(.bss)
  *(.bss*)
- .bss.gb        0x0000000000800166       0x87 Obj/System.o
-                0x0000000000800166                gb
+ .bss.gb        0x0000000000800158       0x87 Obj/System.o
+                0x0000000000800158                gb
+ .bss._cam      0x00000000008001df        0x2 Obj/Sprite.o
+                0x00000000008001df                _cam
  .bss._displayBuffer
-                0x00000000008001ed      0x200 ../lib/libgamebuino.a(Display.o)
-                0x00000000008001ed                _displayBuffer
+                0x00000000008001e1      0x200 ../lib/libgamebuino.a(Display.o)
+                0x00000000008001e1                _displayBuffer
  .bss._chanNoise
-                0x00000000008003ed        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x00000000008003ed                _chanNoise
+                0x00000000008003e1        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x00000000008003e1                _chanNoise
  .bss._chanOutput
-                0x00000000008003ee        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x00000000008003ee                _chanOutput
+                0x00000000008003e2        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x00000000008003e2                _chanOutput
  .bss._chanOutputVolume
-                0x00000000008003ef        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x00000000008003ef                _chanOutputVolume
+                0x00000000008003e3        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x00000000008003e3                _chanOutputVolume
  .bss._chanHalfPeriod
-                0x00000000008003f0        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x00000000008003f0                _chanHalfPeriod
+                0x00000000008003e4        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x00000000008003e4                _chanHalfPeriod
  .bss._chanState
-                0x00000000008003f1        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x00000000008003f1                _chanState
+                0x00000000008003e5        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x00000000008003e5                _chanState
  .bss._chanCount
-                0x00000000008003f2        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x00000000008003f2                _chanCount
+                0x00000000008003e6        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x00000000008003e6                _chanCount
  .bss.timer0_fract
-                0x00000000008003f3        0x1 ../lib/libarduino.a(wiring.o)
+                0x00000000008003e7        0x1 ../lib/libarduino.a(wiring.o)
  .bss.timer0_millis
-                0x00000000008003f4        0x4 ../lib/libarduino.a(wiring.o)
-                0x00000000008003f4                timer0_millis
+                0x00000000008003e8        0x4 ../lib/libarduino.a(wiring.o)
+                0x00000000008003e8                timer0_millis
  .bss.timer0_overflow_count
-                0x00000000008003f8        0x4 ../lib/libarduino.a(wiring.o)
-                0x00000000008003f8                timer0_overflow_count
+                0x00000000008003ec        0x4 ../lib/libarduino.a(wiring.o)
+                0x00000000008003ec                timer0_overflow_count
  *(COMMON)
-                0x00000000008003fc                PROVIDE (__bss_end, .)
-                0x000000000000322c                __data_load_start = LOADADDR (.data)
-                0x0000000000003292                __data_load_end = (__data_load_start + SIZEOF (.data))
+                0x00000000008003f0                PROVIDE (__bss_end, .)
+                0x0000000000003482                __data_load_start = LOADADDR (.data)
+                0x00000000000034da                __data_load_end = (__data_load_start + SIZEOF (.data))
 
-.noinit         0x00000000008003fc        0x0
+.noinit         0x00000000008003f0        0x0
                 [!provide]                        PROVIDE (__noinit_start, .)
  *(.noinit*)
                 [!provide]                        PROVIDE (__noinit_end, .)
-                0x00000000008003fc                _end = .
-                0x00000000008003fc                PROVIDE (__heap_start, .)
+                0x00000000008003f0                _end = .
+                0x00000000008003f0                PROVIDE (__heap_start, .)
 
 .eeprom         0x0000000000810000        0x0
  *(.eeprom*)