More work on Unit/BaseUnit concepts.

1 files changed, 446 insertions, 397 deletions

diff --git a/Exe/POCKET.MAP b/Exe/POCKET.MAP
index 79825c3..0a1d1a9 100644
--- a/Exe/POCKET.MAP
+++ b/Exe/POCKET.MAP
@@ -3,7 +3,7 @@ Archive member included to satisfy reference by file (symbol)
 ../lib/libgamebuino.a(Buttons.o)
                               Obj/HumanPlayer.o (_ZN7Buttons7pressedEh)
 ../lib/libgamebuino.a(Display.o)
-                              Obj/System.o (_ZTV7Display)
+                              Obj/Sprite.o (_ZN7Display8setColorEa)
 ../lib/libgamebuino.a(font3x5.o)
                               ../lib/libgamebuino.a(Display.o) (font3x5)
 ../lib/libgamebuino.a(Gamebuino.o)
@@ -44,7 +44,7 @@ Archive member included to satisfy reference by file (symbol)
 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_exit.o)
                               /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o (exit)
 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_copy_data.o)
-                              Obj/Game.o (__do_copy_data)
+                              Obj/HumanPlayer.o (__do_copy_data)
 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_clear_bss.o)
                               Obj/System.o (__do_clear_bss)
 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_ctors.o)
@@ -114,7 +114,7 @@ Archive member included to satisfy reference by file (symbol)
 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(memmove.o)
                               ../lib/libarduino.a(WString.o) (memmove)
 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(memset.o)
-                              ../lib/libgamebuino.a(Display.o) (memset)
+                              Obj/Player.o (memset)
 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(strchr.o)
                               ../lib/libarduino.a(WString.o) (strchr)
 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(strcmp.o)
@@ -181,16 +181,9 @@ Discarded input sections
  .text          0x0000000000000000        0x0 Obj/HumanPlayer.o
  .data          0x0000000000000000        0x0 Obj/HumanPlayer.o
  .bss           0x0000000000000000        0x0 Obj/HumanPlayer.o
- .text._ZN11HumanPlayer13buttonHandlerEv
-                0x0000000000000000      0x152 Obj/HumanPlayer.o
- .text._ZN11HumanPlayer16onLeftBtnPressedEv
-                0x0000000000000000        0x6 Obj/HumanPlayer.o
  .text          0x0000000000000000        0x0 Obj/Sprite.o
  .data          0x0000000000000000        0x0 Obj/Sprite.o
  .bss           0x0000000000000000        0x0 Obj/Sprite.o
- .text._ZN6SpriteC2ERKh
-                0x0000000000000000        0x8 Obj/Sprite.o
- .comment       0x0000000000000000       0x12 Obj/Sprite.o
  .group         0x0000000000000000        0x8 Obj/Player.o
  .text          0x0000000000000000        0x0 Obj/Player.o
  .data          0x0000000000000000        0x0 Obj/Player.o
@@ -200,16 +193,12 @@ Discarded input sections
  .bss           0x0000000000000000        0x0 Obj/Camera.o
  .text._ZN6Camera14getCoordinatesEPiS0_
                 0x0000000000000000       0x2c Obj/Camera.o
- .text._ZN6Camera16onLeftBtnPressedEv
-                0x0000000000000000        0x2 Obj/Camera.o
- .text._ZN6Camera17onRightBtnPressedEv
-                0x0000000000000000        0x2 Obj/Camera.o
+ .text          0x0000000000000000        0x0 Obj/BaseUnit.o
+ .data          0x0000000000000000        0x0 Obj/BaseUnit.o
+ .bss           0x0000000000000000        0x0 Obj/BaseUnit.o
  .text          0x0000000000000000        0x0 Obj/Unit.o
  .data          0x0000000000000000        0x0 Obj/Unit.o
  .bss           0x0000000000000000        0x0 Obj/Unit.o
- .text._ZN4UnitC2Ev
-                0x0000000000000000        0x2 Obj/Unit.o
- .comment       0x0000000000000000       0x12 Obj/Unit.o
  .text          0x0000000000000000        0x0 Obj/Menu.o
  .data          0x0000000000000000        0x0 Obj/Menu.o
  .bss           0x0000000000000000        0x0 Obj/Menu.o
@@ -882,8 +871,6 @@ Discarded input sections
  .text          0x0000000000000000        0x0 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(memset.o)
  .data          0x0000000000000000        0x0 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(memset.o)
  .bss           0x0000000000000000        0x0 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(memset.o)
- .text.avr-libc
-                0x0000000000000000        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(memset.o)
  .text          0x0000000000000000        0x0 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(strchr.o)
  .data          0x0000000000000000        0x0 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(strchr.o)
  .bss           0x0000000000000000        0x0 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(strchr.o)
@@ -1044,6 +1031,7 @@ LOAD Obj/HumanPlayer.o
 LOAD Obj/Sprite.o
 LOAD Obj/Player.o
 LOAD Obj/Camera.o
+LOAD Obj/BaseUnit.o
 LOAD Obj/Unit.o
 LOAD Obj/Menu.o
 LOAD ../lib/libgamebuino.a
@@ -1154,7 +1142,7 @@ END GROUP
 .rela.plt
  *(.rela.plt)
 
-.text           0x0000000000000000     0x2f8c
+.text           0x0000000000000000     0x322c
  *(.vectors)
  .vectors       0x0000000000000000       0x68 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
                 0x0000000000000000                __vectors
@@ -1170,515 +1158,567 @@ END GROUP
  *libprintf_flt.a:*(.progmem.data)
  *libc.a:*(.progmem.data)
  *(.progmem*)
+ .progmem.data._ZZL9GamePausevE20strPauseMenuOption_0
+                0x0000000000000068        0x7 Obj/Game.o
+ .progmem.data._ZZL9GamePausevE20strPauseMenuOption_1
+                0x000000000000006f        0x5 Obj/Game.o
  .progmem.data._ZZL9GamePausevE20astrPauseMenuOptions
-                0x0000000000000068        0x4 Obj/Game.o
+                0x0000000000000074        0x4 Obj/Game.o
  .progmem.data._ZZ8MainMenuvE20strMainMenuOptions_0
-                0x000000000000006c       0x13 Obj/Menu.o
+                0x0000000000000078       0x13 Obj/Menu.o
  .progmem.data._ZZ8MainMenuvE20strMainMenuOptions_1
-                0x000000000000007f       0x11 Obj/Menu.o
+                0x000000000000008b       0x11 Obj/Menu.o
  .progmem.data._ZZ8MainMenuvE20strMainMenuOptions_2
-                0x0000000000000090        0x8 Obj/Menu.o
+                0x000000000000009c        0x8 Obj/Menu.o
  .progmem.data._ZZ8MainMenuvE19astrMainMenuOptions
-                0x0000000000000098        0x6 Obj/Menu.o
+                0x00000000000000a4        0x6 Obj/Menu.o
  .progmem.data._ZZ8MainMenuvE3__c
-                0x000000000000009e        0xf Obj/Menu.o
+                0x00000000000000aa        0xf Obj/Menu.o
  .progmem.data.font3x5
-                0x00000000000000ad      0x182 ../lib/libgamebuino.a(font3x5.o)
-                0x00000000000000ad                font3x5
+                0x00000000000000b9      0x182 ../lib/libgamebuino.a(font3x5.o)
+                0x00000000000000b9                font3x5
  .progmem.data._ZZN9Gamebuino10changeGameEvE3__c_0
-                0x000000000000022f       0x25 ../lib/libgamebuino.a(Gamebuino.o)
+                0x000000000000023b       0x25 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino10changeGameEvE3__c
-                0x0000000000000254       0x28 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000000260       0x28 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino14displayBatteryEvE3__c_1
-                0x000000000000027c        0xb ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000000288        0xb ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino14displayBatteryEvE3__c_0
-                0x0000000000000287       0x15 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000000293       0x15 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino14displayBatteryEvE3__c
-                0x000000000000029c        0xe ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002a8        0xe ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKhE3__c_3
-                0x00000000000002aa        0x4 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002b6        0x4 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKhE3__c_2
-                0x00000000000002ae        0x4 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002ba        0x4 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKhE3__c_1
-                0x00000000000002b2        0x4 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002be        0x4 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKhE3__c_0
-                0x00000000000002b6        0x4 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002c2        0x4 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKhE3__c
-                0x00000000000002ba        0x4 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002c6        0x4 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZL13gamebuinoLogo
-                0x00000000000002be       0x70 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000002ca       0x70 ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZL12startupSound
-                0x000000000000032e        0xe ../lib/libgamebuino.a(Gamebuino.o)
+                0x000000000000033a        0xe ../lib/libgamebuino.a(Gamebuino.o)
  .progmem.data._ZL12_halfPeriods
-                0x000000000000033c       0x3b ../lib/libgamebuino.a(Sound.o)
+                0x0000000000000348       0x3b ../lib/libgamebuino.a(Sound.o)
  .progmem.data._ZL9playTickP
-                0x0000000000000377        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000000383        0x6 ../lib/libgamebuino.a(Sound.o)
  .progmem.data._ZL17playCancelPattern
-                0x000000000000037d        0x8 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000000389        0x8 ../lib/libgamebuino.a(Sound.o)
  .progmem.data._ZL13playOKPattern
-                0x0000000000000385        0x8 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000000391        0x8 ../lib/libgamebuino.a(Sound.o)
  .progmem.data._ZL18defaultInstruments
-                0x000000000000038d        0x4 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000000399        0x4 ../lib/libgamebuino.a(Sound.o)
  .progmem.data._ZL15noiseInstrument
-                0x0000000000000391        0x4 ../lib/libgamebuino.a(Sound.o)
+                0x000000000000039d        0x4 ../lib/libgamebuino.a(Sound.o)
  .progmem.data._ZL20squareWaveInstrument
-                0x0000000000000395        0x4 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000003a1        0x4 ../lib/libgamebuino.a(Sound.o)
  .progmem.data.digital_pin_to_timer_PGM
-                0x0000000000000399       0x14 ../lib/libarduino.a(wiring_digital.o)
-                0x0000000000000399                digital_pin_to_timer_PGM
+                0x00000000000003a5       0x14 ../lib/libarduino.a(wiring_digital.o)
+                0x00000000000003a5                digital_pin_to_timer_PGM
  .progmem.data.digital_pin_to_bit_mask_PGM
-                0x00000000000003ad       0x14 ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000003ad                digital_pin_to_bit_mask_PGM
+                0x00000000000003b9       0x14 ../lib/libarduino.a(wiring_digital.o)
+                0x00000000000003b9                digital_pin_to_bit_mask_PGM
  .progmem.data.digital_pin_to_port_PGM
-                0x00000000000003c1       0x14 ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000003c1                digital_pin_to_port_PGM
+                0x00000000000003cd       0x14 ../lib/libarduino.a(wiring_digital.o)
+                0x00000000000003cd                digital_pin_to_port_PGM
  .progmem.data.port_to_input_PGM
-                0x00000000000003d5        0xa ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000003d5                port_to_input_PGM
+                0x00000000000003e1        0xa ../lib/libarduino.a(wiring_digital.o)
+                0x00000000000003e1                port_to_input_PGM
  .progmem.data.port_to_output_PGM
-                0x00000000000003df        0xa ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000003df                port_to_output_PGM
+                0x00000000000003eb        0xa ../lib/libarduino.a(wiring_digital.o)
+                0x00000000000003eb                port_to_output_PGM
  .progmem.data.port_to_mode_PGM
-                0x00000000000003e9        0xa ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000003e9                port_to_mode_PGM
-                0x00000000000003f4                . = ALIGN (0x2)
- *fill*         0x00000000000003f3        0x1 
+                0x00000000000003f5        0xa ../lib/libarduino.a(wiring_digital.o)
+                0x00000000000003f5                port_to_mode_PGM
+                0x0000000000000400                . = ALIGN (0x2)
+ *fill*         0x00000000000003ff        0x1 
  *(.jumptables)
  *(.jumptables*)
  *(.lowtext)
  *(.lowtext*)
-                0x00000000000003f4                __ctors_start = .
+                0x0000000000000400                __ctors_start = .
  *(.ctors)
- .ctors         0x00000000000003f4        0x2 Obj/System.o
-                0x00000000000003f6                __ctors_end = .
-                0x00000000000003f6                __dtors_start = .
+ .ctors         0x0000000000000400        0x2 Obj/System.o
+                0x0000000000000402                __ctors_end = .
+                0x0000000000000402                __dtors_start = .
  *(.dtors)
-                0x00000000000003f6                __dtors_end = .
+                0x0000000000000402                __dtors_end = .
  SORT(*)(.ctors)
  SORT(*)(.dtors)
  *(.init0)
- .init0         0x00000000000003f6        0x0 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
-                0x00000000000003f6                __init
+ .init0         0x0000000000000402        0x0 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
+                0x0000000000000402                __init
  *(.init0)
  *(.init1)
  *(.init1)
  *(.init2)
- .init2         0x00000000000003f6        0xc /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
+ .init2         0x0000000000000402        0xc /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
  *(.init2)
  *(.init3)
  *(.init3)
  *(.init4)
- .init4         0x0000000000000402       0x16 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_copy_data.o)
-                0x0000000000000402                __do_copy_data
- .init4         0x0000000000000418       0x10 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_clear_bss.o)
-                0x0000000000000418                __do_clear_bss
+ .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)
  *(.init5)
  *(.init5)
  *(.init6)
- .init6         0x0000000000000428       0x16 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_ctors.o)
-                0x0000000000000428                __do_global_ctors
+ .init6         0x0000000000000434       0x16 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_ctors.o)
+                0x0000000000000434                __do_global_ctors
  *(.init6)
  *(.init7)
  *(.init7)
  *(.init8)
  *(.init8)
  *(.init9)
- .init9         0x000000000000043e        0x8 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
+ .init9         0x000000000000044a        0x8 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
  *(.init9)
  *(.text)
- .text          0x0000000000000446        0x4 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/crtatmega328p.o
-                0x0000000000000446                __vector_22
-                0x0000000000000446                __vector_1
-                0x0000000000000446                __vector_24
-                0x0000000000000446                __vector_12
-                0x0000000000000446                __bad_interrupt
-                0x0000000000000446                __vector_6
-                0x0000000000000446                __vector_3
-                0x0000000000000446                __vector_23
-                0x0000000000000446                __vector_25
-                0x0000000000000446                __vector_13
-                0x0000000000000446                __vector_17
-                0x0000000000000446                __vector_19
-                0x0000000000000446                __vector_7
-                0x0000000000000446                __vector_5
-                0x0000000000000446                __vector_4
-                0x0000000000000446                __vector_9
-                0x0000000000000446                __vector_2
-                0x0000000000000446                __vector_21
-                0x0000000000000446                __vector_15
-                0x0000000000000446                __vector_8
-                0x0000000000000446                __vector_14
-                0x0000000000000446                __vector_10
-                0x0000000000000446                __vector_18
-                0x0000000000000446                __vector_20
-                0x000000000000044a                . = ALIGN (0x2)
+ .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.*)
  .text.startup.main
-                0x000000000000044a        0xa Obj/main.o
-                0x000000000000044a                main
+                0x0000000000000456        0xa Obj/main.o
+                0x0000000000000456                main
  .text._Z4GameRK11tGameConfig
-                0x0000000000000454       0x2e Obj/Game.o
-                0x0000000000000454                _Z4GameRK11tGameConfig
+                0x0000000000000460       0x6c Obj/Game.o
+                0x0000000000000460                _Z4GameRK11tGameConfig
  .text._Z10SystemInitv
-                0x0000000000000482        0xc Obj/System.o
-                0x0000000000000482                _Z10SystemInitv
+                0x00000000000004cc        0xc Obj/System.o
+                0x00000000000004cc                _Z10SystemInitv
  .text.startup._GLOBAL__sub_I_gb
-                0x000000000000048e       0x16 Obj/System.o
+                0x00000000000004d8       0x16 Obj/System.o
  .text._ZN11HumanPlayer11drawHandlerEv
-                0x00000000000004a4        0x2 Obj/HumanPlayer.o
-                0x00000000000004a4                _ZN11HumanPlayer13onABtnPressedEv
-                0x00000000000004a4                _ZN11HumanPlayer11drawHandlerEv
+                0x00000000000004ee        0x2 Obj/HumanPlayer.o
+                0x00000000000004ee                _ZN11HumanPlayer11drawHandlerEv
+                0x00000000000004ee                _ZN11HumanPlayer13onBBtnPressedEv
+ .text._ZN11HumanPlayer13onABtnPressedEv
+                0x00000000000004f0        0x2 Obj/HumanPlayer.o
+                0x00000000000004f0                _ZN11HumanPlayer13onABtnPressedEv
  .text._ZN11HumanPlayerC2EPKc
-                0x00000000000004a6       0x1e Obj/HumanPlayer.o
-                0x00000000000004a6                _ZN11HumanPlayerC2EPKc
-                0x00000000000004a6                _ZN11HumanPlayerC1EPKc
+                0x00000000000004f2       0x2c Obj/HumanPlayer.o
+                0x00000000000004f2                _ZN11HumanPlayerC2EPKc
+                0x00000000000004f2                _ZN11HumanPlayerC1EPKc
+ .text._ZN11HumanPlayer13buttonHandlerEv
+                0x000000000000051e       0xb2 Obj/HumanPlayer.o
+                0x000000000000051e                _ZN11HumanPlayer13buttonHandlerEv
+ .text._ZN11HumanPlayer7handlerEv
+                0x00000000000005d0       0x32 Obj/HumanPlayer.o
+                0x00000000000005d0                _ZN11HumanPlayer7handlerEv
+ .text._ZN6SpriteC2ERKhhh
+                0x0000000000000602       0x10 Obj/Sprite.o
+                0x0000000000000602                _ZN6SpriteC2ERKhhh
+                0x0000000000000602                _ZN6SpriteC1ERKhhh
+ .text._ZN6Sprite6setPosEhh
+                0x0000000000000612        0x8 Obj/Sprite.o
+                0x0000000000000612                _ZN6Sprite6setPosEhh
+ .text._ZN6Sprite4drawEv
+                0x000000000000061a       0x24 Obj/Sprite.o
+                0x000000000000061a                _ZN6Sprite4drawEv
  .text._ZN6PlayerC2EPKc
-                0x00000000000004c4       0x30 Obj/Player.o
-                0x00000000000004c4                _ZN6PlayerC1EPKc
-                0x00000000000004c4                _ZN6PlayerC2EPKc
+                0x000000000000063e       0x8a Obj/Player.o
+                0x000000000000063e                _ZN6PlayerC1EPKc
+                0x000000000000063e                _ZN6PlayerC2EPKc
  .text._ZN6CameraC2Ev
-                0x00000000000004f4       0x1a Obj/Camera.o
-                0x00000000000004f4                _ZN6CameraC1Ev
-                0x00000000000004f4                _ZN6CameraC2Ev
+                0x00000000000006c8       0x1a Obj/Camera.o
+                0x00000000000006c8                _ZN6CameraC1Ev
+                0x00000000000006c8                _ZN6CameraC2Ev
+ .text._ZN6Camera16onLeftBtnPressedEv
+                0x00000000000006e2        0x2 Obj/Camera.o
+                0x00000000000006e2                _ZN6Camera16onLeftBtnPressedEv
+ .text._ZN6Camera17onRightBtnPressedEv
+                0x00000000000006e4        0x2 Obj/Camera.o
+                0x00000000000006e4                _ZN6Camera17onRightBtnPressedEv
+ .text._ZN8BaseUnitC2Ev
+                0x00000000000006e6        0xe Obj/BaseUnit.o
+                0x00000000000006e6                _ZN8BaseUnitC1Ev
+                0x00000000000006e6                _ZN8BaseUnitC2Ev
+ .text._ZN8BaseUnit7handlerEv
+                0x00000000000006f4        0x2 Obj/BaseUnit.o
+                0x00000000000006f4                _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
+ .text._ZN4Unit11drawHandlerEv
+                0x000000000000071c       0x5a Obj/Unit.o
+                0x000000000000071c                _ZN4Unit11drawHandlerEv
+ .text._ZN4Unit7handlerEv
+                0x0000000000000776       0x14 Obj/Unit.o
+                0x0000000000000776                _ZN4Unit7handlerEv
  .text._Z8MainMenuv
-                0x000000000000050e       0x82 Obj/Menu.o
-                0x000000000000050e                _Z8MainMenuv
+                0x000000000000078a       0x98 Obj/Menu.o
+                0x000000000000078a                _Z8MainMenuv
  .text._ZN7Buttons5beginEv
-                0x0000000000000590       0x20 ../lib/libgamebuino.a(Buttons.o)
-                0x0000000000000590                _ZN7Buttons5beginEv
+                0x0000000000000822       0x20 ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000000822                _ZN7Buttons5beginEv
  .text._ZN7Buttons6updateEv
-                0x00000000000005b0       0x5a ../lib/libgamebuino.a(Buttons.o)
-                0x00000000000005b0                _ZN7Buttons6updateEv
+                0x0000000000000842       0x5a ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000000842                _ZN7Buttons6updateEv
  .text._ZN7Buttons7pressedEh
-                0x000000000000060a       0x12 ../lib/libgamebuino.a(Buttons.o)
-                0x000000000000060a                _ZN7Buttons7pressedEh
+                0x000000000000089c       0x12 ../lib/libgamebuino.a(Buttons.o)
+                0x000000000000089c                _ZN7Buttons7pressedEh
  .text._ZN7Buttons8releasedEh
-                0x000000000000061c       0x12 ../lib/libgamebuino.a(Buttons.o)
-                0x000000000000061c                _ZN7Buttons8releasedEh
+                0x00000000000008ae       0x12 ../lib/libgamebuino.a(Buttons.o)
+                0x00000000000008ae                _ZN7Buttons8releasedEh
  .text._ZN7Buttons6repeatEhh
-                0x000000000000062e       0x30 ../lib/libgamebuino.a(Buttons.o)
-                0x000000000000062e                _ZN7Buttons6repeatEhh
+                0x00000000000008c0       0x30 ../lib/libgamebuino.a(Buttons.o)
+                0x00000000000008c0                _ZN7Buttons6repeatEhh
  .text._ZN8SPIClass8transferEh
-                0x000000000000065e        0xc ../lib/libgamebuino.a(Display.o)
-                0x000000000000065e                _ZN8SPIClass8transferEh
+                0x00000000000008f0        0xc ../lib/libgamebuino.a(Display.o)
+                0x00000000000008f0                _ZN8SPIClass8transferEh
  .text._ZN7Display9drawPixelEaa
-                0x000000000000066a       0xb8 ../lib/libgamebuino.a(Display.o)
-                0x000000000000066a                _ZN7Display9drawPixelEaa
+                0x00000000000008fc       0xb8 ../lib/libgamebuino.a(Display.o)
+                0x00000000000008fc                _ZN7Display9drawPixelEaa
  .text._ZN7Display7commandEh
-                0x0000000000000722       0x3c ../lib/libgamebuino.a(Display.o)
-                0x0000000000000722                _ZN7Display7commandEh
+                0x00000000000009b4       0x3c ../lib/libgamebuino.a(Display.o)
+                0x00000000000009b4                _ZN7Display7commandEh
  .text._ZN7Display5clearEv
-                0x000000000000075e       0x22 ../lib/libgamebuino.a(Display.o)
-                0x000000000000075e                _ZN7Display5clearEv
+                0x00000000000009f0       0x22 ../lib/libgamebuino.a(Display.o)
+                0x00000000000009f0                _ZN7Display5clearEv
  .text._ZN7Display6updateEv
-                0x0000000000000780       0x8a ../lib/libgamebuino.a(Display.o)
-                0x0000000000000780                _ZN7Display6updateEv
+                0x0000000000000a12       0x8a ../lib/libgamebuino.a(Display.o)
+                0x0000000000000a12                _ZN7Display6updateEv
  .text._ZN7Display8setColorEa
-                0x000000000000080a        0x8 ../lib/libgamebuino.a(Display.o)
-                0x000000000000080a                _ZN7Display8setColorEa
+                0x0000000000000a9c        0x8 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000a9c                _ZN7Display8setColorEa
  .text._ZN7Display8setColorEaa
-                0x0000000000000812        0x8 ../lib/libgamebuino.a(Display.o)
-                0x0000000000000812                _ZN7Display8setColorEaa
+                0x0000000000000aa4        0x8 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000aa4                _ZN7Display8setColorEaa
  .text._ZN7Display13drawFastVLineEaaa
-                0x000000000000081a       0x38 ../lib/libgamebuino.a(Display.o)
-                0x000000000000081a                _ZN7Display13drawFastVLineEaaa
+                0x0000000000000aac       0x38 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000aac                _ZN7Display13drawFastVLineEaaa
  .text._ZN7Display13drawFastHLineEaaa
-                0x0000000000000852       0x38 ../lib/libgamebuino.a(Display.o)
-                0x0000000000000852                _ZN7Display13drawFastHLineEaaa
+                0x0000000000000ae4       0x38 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000ae4                _ZN7Display13drawFastHLineEaaa
  .text._ZN7Display8fillRectEaaaa
-                0x000000000000088a       0x52 ../lib/libgamebuino.a(Display.o)
-                0x000000000000088a                _ZN7Display8fillRectEaaaa
+                0x0000000000000b1c       0x52 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000b1c                _ZN7Display8fillRectEaaaa
  .text._ZN7Display16drawCircleHelperEaaah
-                0x00000000000008dc       0xfc ../lib/libgamebuino.a(Display.o)
-                0x00000000000008dc                _ZN7Display16drawCircleHelperEaaah
+                0x0000000000000b6e       0xfc ../lib/libgamebuino.a(Display.o)
+                0x0000000000000b6e                _ZN7Display16drawCircleHelperEaaah
  .text._ZN7Display16fillCircleHelperEaaaha
-                0x00000000000009d8       0xcc ../lib/libgamebuino.a(Display.o)
-                0x00000000000009d8                _ZN7Display16fillCircleHelperEaaaha
+                0x0000000000000c6a       0xcc ../lib/libgamebuino.a(Display.o)
+                0x0000000000000c6a                _ZN7Display16fillCircleHelperEaaaha
  .text._ZN7Display13drawRoundRectEaaaaa
-                0x0000000000000aa4       0xbe ../lib/libgamebuino.a(Display.o)
-                0x0000000000000aa4                _ZN7Display13drawRoundRectEaaaaa
+                0x0000000000000d36       0xbe ../lib/libgamebuino.a(Display.o)
+                0x0000000000000d36                _ZN7Display13drawRoundRectEaaaaa
  .text._ZN7Display13fillRoundRectEaaaaa
-                0x0000000000000b62       0x6e ../lib/libgamebuino.a(Display.o)
-                0x0000000000000b62                _ZN7Display13fillRoundRectEaaaaa
+                0x0000000000000df4       0x6e ../lib/libgamebuino.a(Display.o)
+                0x0000000000000df4                _ZN7Display13fillRoundRectEaaaaa
  .text._ZN7Display10drawBitmapEaaPKh
-                0x0000000000000bd0      0x288 ../lib/libgamebuino.a(Display.o)
-                0x0000000000000bd0                _ZN7Display10drawBitmapEaaPKh
+                0x0000000000000e62      0x288 ../lib/libgamebuino.a(Display.o)
+                0x0000000000000e62                _ZN7Display10drawBitmapEaaPKh
  .text._ZN7Display7setFontEPKh
-                0x0000000000000e58       0x28 ../lib/libgamebuino.a(Display.o)
-                0x0000000000000e58                _ZN7Display7setFontEPKh
+                0x00000000000010ea       0x28 ../lib/libgamebuino.a(Display.o)
+                0x00000000000010ea                _ZN7Display7setFontEPKh
  .text._ZN7Display5beginEaaaaa
-                0x0000000000000e80      0x180 ../lib/libgamebuino.a(Display.o)
-                0x0000000000000e80                _ZN7Display5beginEaaaaa
+                0x0000000000001112      0x180 ../lib/libgamebuino.a(Display.o)
+                0x0000000000001112                _ZN7Display5beginEaaaaa
  .text._ZN7Display8drawCharEaahh
-                0x0000000000001000      0x14a ../lib/libgamebuino.a(Display.o)
-                0x0000000000001000                _ZN7Display8drawCharEaahh
+                0x0000000000001292      0x14a ../lib/libgamebuino.a(Display.o)
+                0x0000000000001292                _ZN7Display8drawCharEaahh
  .text._ZN7Display5writeEh
-                0x000000000000114a       0x66 ../lib/libgamebuino.a(Display.o)
-                0x000000000000114a                _ZN7Display5writeEh
+                0x00000000000013dc       0x66 ../lib/libgamebuino.a(Display.o)
+                0x00000000000013dc                _ZN7Display5writeEh
  .text._ZN9Gamebuino11updatePopupEv
-                0x00000000000011b0       0xe0 ../lib/libgamebuino.a(Gamebuino.o)
-                0x00000000000011b0                _ZN9Gamebuino11updatePopupEv
+                0x0000000000001442       0xe0 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001442                _ZN9Gamebuino11updatePopupEv
  .text._ZN9Gamebuino14displayBatteryEv
-                0x0000000000001290      0x168 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001290                _ZN9Gamebuino14displayBatteryEv
+                0x0000000000001522      0x168 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001522                _ZN9Gamebuino14displayBatteryEv
  .text._ZN9Gamebuino6updateEv
-                0x00000000000013f8      0x176 ../lib/libgamebuino.a(Gamebuino.o)
-                0x00000000000013f8                _ZN9Gamebuino6updateEv
+                0x000000000000168a      0x176 ../lib/libgamebuino.a(Gamebuino.o)
+                0x000000000000168a                _ZN9Gamebuino6updateEv
  .text._ZN9Gamebuino4menuEPKPKch
-                0x000000000000156e      0x29c ../lib/libgamebuino.a(Gamebuino.o)
-                0x000000000000156e                _ZN9Gamebuino4menuEPKPKch
+                0x0000000000001800      0x29c ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001800                _ZN9Gamebuino4menuEPKPKch
  .text._ZN9Gamebuino10changeGameEv
-                0x000000000000180a       0x7a ../lib/libgamebuino.a(Gamebuino.o)
-                0x000000000000180a                _ZN9Gamebuino10changeGameEv
+                0x0000000000001a9c       0x7a ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001a9c                _ZN9Gamebuino10changeGameEv
  .text._ZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKh
-                0x0000000000001884      0x27c ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001884                _ZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKh
+                0x0000000000001b16      0x27c ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001b16                _ZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKh
  .text._ZN9Gamebuino11titleScreenEPK19__FlashStringHelper
-                0x0000000000001b00        0x8 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001b00                _ZN9Gamebuino11titleScreenEPK19__FlashStringHelper
+                0x0000000000001d92        0x8 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001d92                _ZN9Gamebuino11titleScreenEPK19__FlashStringHelper
  .text._ZN9Gamebuino17settingsAvailableEv
-                0x0000000000001b08       0x14 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001b08                _ZN9Gamebuino17settingsAvailableEv
+                0x0000000000001d9a       0x14 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001d9a                _ZN9Gamebuino17settingsAvailableEv
  .text._ZN9Gamebuino12readSettingsEv
-                0x0000000000001b1c       0xde ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001b1c                _ZN9Gamebuino12readSettingsEv
+                0x0000000000001dae       0xde ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001dae                _ZN9Gamebuino12readSettingsEv
  .text._ZN9Gamebuino5beginEv
-                0x0000000000001bfa       0xb6 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001bfa                _ZN9Gamebuino5beginEv
+                0x0000000000001e8c       0xb6 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001e8c                _ZN9Gamebuino5beginEv
  .text._ZN9Gamebuino14getDefaultNameEPc
-                0x0000000000001cb0       0x2c ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000001cb0                _ZN9Gamebuino14getDefaultNameEPc
+                0x0000000000001f42       0x2c ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000001f42                _ZN9Gamebuino14getDefaultNameEPc
  .text._ZN5Sound7commandEhhah.part.0
-                0x0000000000001cdc       0x74 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000001f6e       0x74 ../lib/libgamebuino.a(Sound.o)
  .text._ZN5Sound5beginEv
-                0x0000000000001d50       0x6a ../lib/libgamebuino.a(Sound.o)
-                0x0000000000001d50                _ZN5Sound5beginEv
+                0x0000000000001fe2       0x6a ../lib/libgamebuino.a(Sound.o)
+                0x0000000000001fe2                _ZN5Sound5beginEv
  .text._ZN5Sound7commandEhhah
-                0x0000000000001dba       0x62 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000001dba                _ZN5Sound7commandEhhah
+                0x000000000000204c       0x62 ../lib/libgamebuino.a(Sound.o)
+                0x000000000000204c                _ZN5Sound7commandEhhah
  .text._ZN5Sound8playNoteEhhh
-                0x0000000000001e1c       0x24 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000001e1c                _ZN5Sound8playNoteEhhh
+                0x00000000000020ae       0x24 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000020ae                _ZN5Sound8playNoteEhhh
  .text._ZN5Sound12updateOutputEv
-                0x0000000000001e40       0x16 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000001e40                _ZN5Sound12updateOutputEv
+                0x00000000000020d2       0x16 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000020d2                _ZN5Sound12updateOutputEv
  .text._ZN5Sound8stopNoteEh
-                0x0000000000001e56       0x22 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000001e56                _ZN5Sound8stopNoteEh
+                0x00000000000020e8       0x22 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000020e8                _ZN5Sound8stopNoteEh
  .text._ZN5Sound11stopPatternEh
-                0x0000000000001e78       0x16 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000001e78                _ZN5Sound11stopPatternEh
+                0x000000000000210a       0x16 ../lib/libgamebuino.a(Sound.o)
+                0x000000000000210a                _ZN5Sound11stopPatternEh
  .text._ZN5Sound11playPatternEPKjh
-                0x0000000000001e8e       0x36 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000001e8e                _ZN5Sound11playPatternEPKjh
+                0x0000000000002120       0x36 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002120                _ZN5Sound11playPatternEPKjh
  .text._ZN5Sound11updateTrackEh
-                0x0000000000001ec4       0x72 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000001ec4                _ZN5Sound11updateTrackEh
+                0x0000000000002156       0x72 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002156                _ZN5Sound11updateTrackEh
  .text._ZN5Sound11updateTrackEv
-                0x0000000000001f36        0x6 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000001f36                _ZN5Sound11updateTrackEv
+                0x00000000000021c8        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000021c8                _ZN5Sound11updateTrackEv
  .text._ZN5Sound11stopPatternEv
-                0x0000000000001f3c        0x6 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000001f3c                _ZN5Sound11stopPatternEv
+                0x00000000000021ce        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000021ce                _ZN5Sound11stopPatternEv
  .text._ZN5Sound13updatePatternEh
-                0x0000000000001f42       0xcc ../lib/libgamebuino.a(Sound.o)
-                0x0000000000001f42                _ZN5Sound13updatePatternEh
+                0x00000000000021d4       0xcc ../lib/libgamebuino.a(Sound.o)
+                0x00000000000021d4                _ZN5Sound13updatePatternEh
  .text._ZN5Sound13updatePatternEv
-                0x000000000000200e        0x6 ../lib/libgamebuino.a(Sound.o)
-                0x000000000000200e                _ZN5Sound13updatePatternEv
+                0x00000000000022a0        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000022a0                _ZN5Sound13updatePatternEv
  .text._ZN5Sound10updateNoteEh
-                0x0000000000002014      0x184 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000002014                _ZN5Sound10updateNoteEh
+                0x00000000000022a6      0x184 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000022a6                _ZN5Sound10updateNoteEh
  .text._ZN5Sound10updateNoteEv
-                0x0000000000002198        0x6 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000002198                _ZN5Sound10updateNoteEv
+                0x000000000000242a        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x000000000000242a                _ZN5Sound10updateNoteEv
  .text._ZN5Sound14generateOutputEv
-                0x000000000000219e       0x54 ../lib/libgamebuino.a(Sound.o)
-                0x000000000000219e                _ZN5Sound14generateOutputEv
+                0x0000000000002430       0x54 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002430                _ZN5Sound14generateOutputEv
  .text.__vector_11
-                0x00000000000021f2       0x48 ../lib/libgamebuino.a(Sound.o)
-                0x00000000000021f2                __vector_11
+                0x0000000000002484       0x48 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002484                __vector_11
  .text._ZN5Sound6playOKEv
-                0x000000000000223a       0x2c ../lib/libgamebuino.a(Sound.o)
-                0x000000000000223a                _ZN5Sound6playOKEv
+                0x00000000000024cc       0x2c ../lib/libgamebuino.a(Sound.o)
+                0x00000000000024cc                _ZN5Sound6playOKEv
  .text._ZN5Sound10playCancelEv
-                0x0000000000002266       0x2c ../lib/libgamebuino.a(Sound.o)
-                0x0000000000002266                _ZN5Sound10playCancelEv
+                0x00000000000024f8       0x2c ../lib/libgamebuino.a(Sound.o)
+                0x00000000000024f8                _ZN5Sound10playCancelEv
  .text._ZN5Sound8playTickEv
-                0x0000000000002292       0x2c ../lib/libgamebuino.a(Sound.o)
-                0x0000000000002292                _ZN5Sound8playTickEv
+                0x0000000000002524       0x2c ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002524                _ZN5Sound8playTickEv
  .text._ZN5Sound9setVolumeEa
-                0x00000000000022be       0x1c ../lib/libgamebuino.a(Sound.o)
-                0x00000000000022be                _ZN5Sound9setVolumeEa
+                0x0000000000002550       0x1c ../lib/libgamebuino.a(Sound.o)
+                0x0000000000002550                _ZN5Sound9setVolumeEa
  .text._ZN9Backlight5beginEv
-                0x00000000000022da        0x8 ../lib/libgamebuino.a(Backlight.o)
-                0x00000000000022da                _ZN9Backlight5beginEv
+                0x000000000000256c        0x8 ../lib/libgamebuino.a(Backlight.o)
+                0x000000000000256c                _ZN9Backlight5beginEv
  .text._ZN9Backlight3setEh
-                0x00000000000022e2        0x8 ../lib/libgamebuino.a(Backlight.o)
-                0x00000000000022e2                _ZN9Backlight3setEh
+                0x0000000000002574        0x8 ../lib/libgamebuino.a(Backlight.o)
+                0x0000000000002574                _ZN9Backlight3setEh
  .text._ZN9Backlight6updateEv
-                0x00000000000022ea       0xbe ../lib/libgamebuino.a(Backlight.o)
-                0x00000000000022ea                _ZN9Backlight6updateEv
+                0x000000000000257c       0xbe ../lib/libgamebuino.a(Backlight.o)
+                0x000000000000257c                _ZN9Backlight6updateEv
  .text._ZN7Battery5beginEv
-                0x00000000000023a8       0x14 ../lib/libgamebuino.a(Battery.o)
-                0x00000000000023a8                _ZN7Battery5beginEv
+                0x000000000000263a       0x14 ../lib/libgamebuino.a(Battery.o)
+                0x000000000000263a                _ZN7Battery5beginEv
  .text._ZN7Battery6updateEv
-                0x00000000000023bc       0x72 ../lib/libgamebuino.a(Battery.o)
-                0x00000000000023bc                _ZN7Battery6updateEv
+                0x000000000000264e       0x72 ../lib/libgamebuino.a(Battery.o)
+                0x000000000000264e                _ZN7Battery6updateEv
  .text.__vector_16
-                0x000000000000242e       0x94 ../lib/libarduino.a(wiring.o)
-                0x000000000000242e                __vector_16
- .text.millis   0x00000000000024c2       0x18 ../lib/libarduino.a(wiring.o)
-                0x00000000000024c2                millis
- .text.micros   0x00000000000024da       0x4a ../lib/libarduino.a(wiring.o)
-                0x00000000000024da                micros
- .text.delay    0x0000000000002524       0x4c ../lib/libarduino.a(wiring.o)
-                0x0000000000002524                delay
- .text.init     0x0000000000002570       0x76 ../lib/libarduino.a(wiring.o)
-                0x0000000000002570                init
+                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
  .text.analogRead
-                0x00000000000025e6       0x3a ../lib/libarduino.a(wiring_analog.o)
-                0x00000000000025e6                analogRead
+                0x0000000000002878       0x3a ../lib/libarduino.a(wiring_analog.o)
+                0x0000000000002878                analogRead
  .text.analogWrite
-                0x0000000000002620       0xbe ../lib/libarduino.a(wiring_analog.o)
-                0x0000000000002620                analogWrite
+                0x00000000000028b2       0xbe ../lib/libarduino.a(wiring_analog.o)
+                0x00000000000028b2                analogWrite
  .text.turnOffPWM
-                0x00000000000026de       0x52 ../lib/libarduino.a(wiring_digital.o)
- .text.pinMode  0x0000000000002730       0x78 ../lib/libarduino.a(wiring_digital.o)
-                0x0000000000002730                pinMode
+                0x0000000000002970       0x52 ../lib/libarduino.a(wiring_digital.o)
+ .text.pinMode  0x00000000000029c2       0x78 ../lib/libarduino.a(wiring_digital.o)
+                0x00000000000029c2                pinMode
  .text.digitalWrite
-                0x00000000000027a8       0x5e ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000027a8                digitalWrite
+                0x0000000000002a3a       0x5e ../lib/libarduino.a(wiring_digital.o)
+                0x0000000000002a3a                digitalWrite
  .text.digitalRead
-                0x0000000000002806       0x52 ../lib/libarduino.a(wiring_digital.o)
-                0x0000000000002806                digitalRead
+                0x0000000000002a98       0x52 ../lib/libarduino.a(wiring_digital.o)
+                0x0000000000002a98                digitalRead
  .text._ZN5Print5writeEPKhj
-                0x0000000000002858       0x50 ../lib/libarduino.a(Print.o)
-                0x0000000000002858                _ZN5Print5writeEPKhj
+                0x0000000000002aea       0x50 ../lib/libarduino.a(Print.o)
+                0x0000000000002aea                _ZN5Print5writeEPKhj
  .text._ZN5Print5writeEPKc
-                0x00000000000028a8       0x2a ../lib/libarduino.a(Print.o)
-                0x00000000000028a8                _ZN5Print5writeEPKc
+                0x0000000000002b3a       0x2a ../lib/libarduino.a(Print.o)
+                0x0000000000002b3a                _ZN5Print5writeEPKc
  .text._ZN5Print5printEPK19__FlashStringHelper
-                0x00000000000028d2       0x46 ../lib/libarduino.a(Print.o)
-                0x00000000000028d2                _ZN5Print5printEPK19__FlashStringHelper
+                0x0000000000002b64       0x46 ../lib/libarduino.a(Print.o)
+                0x0000000000002b64                _ZN5Print5printEPK19__FlashStringHelper
  .text._ZN5Print5printEc
-                0x0000000000002918        0xe ../lib/libarduino.a(Print.o)
-                0x0000000000002918                _ZN5Print5printEc
+                0x0000000000002baa        0xe ../lib/libarduino.a(Print.o)
+                0x0000000000002baa                _ZN5Print5printEc
  .text._ZN5Print7printlnEv
-                0x0000000000002926       0x28 ../lib/libarduino.a(Print.o)
-                0x0000000000002926                _ZN5Print7printlnEv
+                0x0000000000002bb8       0x28 ../lib/libarduino.a(Print.o)
+                0x0000000000002bb8                _ZN5Print7printlnEv
  .text._ZN5Print7printlnEPK19__FlashStringHelper
-                0x000000000000294e       0x24 ../lib/libarduino.a(Print.o)
-                0x000000000000294e                _ZN5Print7printlnEPK19__FlashStringHelper
+                0x0000000000002be0       0x24 ../lib/libarduino.a(Print.o)
+                0x0000000000002be0                _ZN5Print7printlnEPK19__FlashStringHelper
  .text._ZN5Print11printNumberEmh
-                0x0000000000002972       0xac ../lib/libarduino.a(Print.o)
-                0x0000000000002972                _ZN5Print11printNumberEmh
+                0x0000000000002c04       0xac ../lib/libarduino.a(Print.o)
+                0x0000000000002c04                _ZN5Print11printNumberEmh
  .text._ZN5Print5printEmi
-                0x0000000000002a1e       0x1a ../lib/libarduino.a(Print.o)
-                0x0000000000002a1e                _ZN5Print5printEmi
+                0x0000000000002cb0       0x1a ../lib/libarduino.a(Print.o)
+                0x0000000000002cb0                _ZN5Print5printEmi
  .text._ZN5Print5printEji
-                0x0000000000002a38        0xc ../lib/libarduino.a(Print.o)
-                0x0000000000002a38                _ZN5Print5printEji
+                0x0000000000002cca        0xc ../lib/libarduino.a(Print.o)
+                0x0000000000002cca                _ZN5Print5printEji
  .text._ZN5Print5printEli
-                0x0000000000002a44       0x90 ../lib/libarduino.a(Print.o)
-                0x0000000000002a44                _ZN5Print5printEli
+                0x0000000000002cd6       0x90 ../lib/libarduino.a(Print.o)
+                0x0000000000002cd6                _ZN5Print5printEli
  .text._ZN5Print5printEii
-                0x0000000000002ad4        0xe ../lib/libarduino.a(Print.o)
-                0x0000000000002ad4                _ZN5Print5printEii
+                0x0000000000002d66        0xe ../lib/libarduino.a(Print.o)
+                0x0000000000002d66                _ZN5Print5printEii
  .text._Z3maplllll
-                0x0000000000002ae2       0x82 ../lib/libarduino.a(WMath.o)
-                0x0000000000002ae2                _Z3maplllll
+                0x0000000000002d74       0x82 ../lib/libarduino.a(WMath.o)
+                0x0000000000002d74                _Z3maplllll
  .text.__cxa_pure_virtual
-                0x0000000000002b64        0x2 ../lib/libarduino.a(forward.o)
-                0x0000000000002b64                __cxa_pure_virtual
+                0x0000000000002df6        0x2 ../lib/libarduino.a(forward.o)
+                0x0000000000002df6                __cxa_pure_virtual
  .text._ZN8SPIClass5beginEv
-                0x0000000000002b66       0x2c ../lib/libarduino.a(SPI.o)
-                0x0000000000002b66                _ZN8SPIClass5beginEv
+                0x0000000000002df8       0x2c ../lib/libarduino.a(SPI.o)
+                0x0000000000002df8                _ZN8SPIClass5beginEv
  .text._ZN8SPIClass11setBitOrderEh
-                0x0000000000002b92       0x12 ../lib/libarduino.a(SPI.o)
-                0x0000000000002b92                _ZN8SPIClass11setBitOrderEh
+                0x0000000000002e24       0x12 ../lib/libarduino.a(SPI.o)
+                0x0000000000002e24                _ZN8SPIClass11setBitOrderEh
  .text._ZN8SPIClass11setDataModeEh
-                0x0000000000002ba4        0xa ../lib/libarduino.a(SPI.o)
-                0x0000000000002ba4                _ZN8SPIClass11setDataModeEh
+                0x0000000000002e36        0xa ../lib/libarduino.a(SPI.o)
+                0x0000000000002e36                _ZN8SPIClass11setDataModeEh
  .text._ZN8SPIClass15setClockDividerEh
-                0x0000000000002bae       0x1e ../lib/libarduino.a(SPI.o)
-                0x0000000000002bae                _ZN8SPIClass15setClockDividerEh
+                0x0000000000002e40       0x1e ../lib/libarduino.a(SPI.o)
+                0x0000000000002e40                _ZN8SPIClass15setClockDividerEh
  .text.libgcc.mul
-                0x0000000000002bcc       0x20 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_mulsi3.o)
-                0x0000000000002bcc                __mulsi3
+                0x0000000000002e5e       0x20 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_mulsi3.o)
+                0x0000000000002e5e                __mulsi3
  .text.libgcc.div
-                0x0000000000002bec       0x18 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_udivmodqi4.o)
-                0x0000000000002bec                __udivmodqi4
+                0x0000000000002e7e       0x18 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_udivmodqi4.o)
+                0x0000000000002e7e                __udivmodqi4
  .text.libgcc.div
-                0x0000000000002c04       0x28 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_udivmodhi4.o)
-                0x0000000000002c04                __udivmodhi4
+                0x0000000000002e96       0x28 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_udivmodhi4.o)
+                0x0000000000002e96                __udivmodhi4
  .text.libgcc.div
-                0x0000000000002c2c       0x28 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_divmodhi4.o)
-                0x0000000000002c2c                __divmodhi4
-                0x0000000000002c2c                _div
+                0x0000000000002ebe       0x28 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_divmodhi4.o)
+                0x0000000000002ebe                __divmodhi4
+                0x0000000000002ebe                _div
  .text.libgcc.div
-                0x0000000000002c54       0x44 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_udivmodsi4.o)
-                0x0000000000002c54                __udivmodsi4
+                0x0000000000002ee6       0x44 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_udivmodsi4.o)
+                0x0000000000002ee6                __udivmodsi4
  .text.libgcc.div
-                0x0000000000002c98       0x2e /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_divmodsi4.o)
-                0x0000000000002c98                __divmodsi4
+                0x0000000000002f2a       0x2e /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_divmodsi4.o)
+                0x0000000000002f2a                __divmodsi4
  .text.libgcc.div
-                0x0000000000002cc6       0x10 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_negsi2.o)
-                0x0000000000002cc6                __negsi2
+                0x0000000000002f58       0x10 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_negsi2.o)
+                0x0000000000002f58                __negsi2
  .text.libgcc.mul
-                0x0000000000002cd6       0x16 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_muluhisi3.o)
-                0x0000000000002cd6                __muluhisi3
- .text.libgcc   0x0000000000002cec        0xc /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_tablejump2.o)
-                0x0000000000002cec                __tablejump2__
+                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__
  .text.libgcc.mul
-                0x0000000000002cf8       0x1e /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_umulhisi3.o)
-                0x0000000000002cf8                __umulhisi3
+                0x0000000000002f8a       0x1e /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_umulhisi3.o)
+                0x0000000000002f8a                __umulhisi3
  .text.avr-libc.fplib
-                0x0000000000002d16       0x5e /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fixunssfsi.o)
-                0x0000000000002d16                __fixunssfsi
+                0x0000000000002fa8       0x5e /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fixunssfsi.o)
+                0x0000000000002fa8                __fixunssfsi
  .text.avr-libc.fplib
-                0x0000000000002d74       0x7a /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(floatsisf.o)
-                0x0000000000002d74                __floatunsisf
-                0x0000000000002d78                __floatsisf
+                0x0000000000003006       0x7a /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(floatsisf.o)
+                0x0000000000003006                __floatunsisf
+                0x000000000000300a                __floatsisf
  .text.avr-libc.fplib
-                0x0000000000002dee        0xc /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_inf.o)
-                0x0000000000002dee                __fp_inf
+                0x0000000000003080        0xc /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_inf.o)
+                0x0000000000003080                __fp_inf
  .text.avr-libc.fplib
-                0x0000000000002dfa        0x6 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_nan.o)
-                0x0000000000002dfa                __fp_nan
+                0x000000000000308c        0x6 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_nan.o)
+                0x000000000000308c                __fp_nan
  .text.avr-libc.fplib
-                0x0000000000002e00        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_pscA.o)
-                0x0000000000002e00                __fp_pscA
+                0x0000000000003092        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_pscA.o)
+                0x0000000000003092                __fp_pscA
  .text.avr-libc.fplib
-                0x0000000000002e0e        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_pscB.o)
-                0x0000000000002e0e                __fp_pscB
+                0x00000000000030a0        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_pscB.o)
+                0x00000000000030a0                __fp_pscB
  .text.avr-libc.fplib
-                0x0000000000002e1c       0x22 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_round.o)
-                0x0000000000002e1c                __fp_round
+                0x00000000000030ae       0x22 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_round.o)
+                0x00000000000030ae                __fp_round
  .text.avr-libc.fplib
-                0x0000000000002e3e       0x44 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_split3.o)
-                0x0000000000002e3e                __fp_split3
-                0x0000000000002e4e                __fp_splitA
+                0x00000000000030d0       0x44 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_split3.o)
+                0x00000000000030d0                __fp_split3
+                0x00000000000030e0                __fp_splitA
  .text.avr-libc.fplib
-                0x0000000000002e82        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_zero.o)
-                0x0000000000002e82                __fp_zero
-                0x0000000000002e84                __fp_szero
+                0x0000000000003114        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(fp_zero.o)
+                0x0000000000003114                __fp_zero
+                0x0000000000003116                __fp_szero
  .text.avr-libc.fplib
-                0x0000000000002e90        0x8 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(mulsf3.o)
-                0x0000000000002e90                __mulsf3
+                0x0000000000003122        0x8 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(mulsf3.o)
+                0x0000000000003122                __mulsf3
  .text.avr-libc.fplib
-                0x0000000000002e98       0xd2 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(mulsf3x.o)
-                0x0000000000002eb6                __mulsf3x
-                0x0000000000002ebc                __mulsf3_pse
+                0x000000000000312a       0xd2 /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libm.a(mulsf3x.o)
+                0x0000000000003148                __mulsf3x
+                0x000000000000314e                __mulsf3_pse
+ .text.avr-libc
+                0x00000000000031fc        0xe /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(memset.o)
+                0x00000000000031fc                memset
  .text.avr-libc
-                0x0000000000002f6a       0x1e /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(strncpy.o)
-                0x0000000000002f6a                strncpy
-                0x0000000000002f88                . = ALIGN (0x2)
+                0x000000000000320a       0x1e /usr/lib/gcc/avr/5.4.0/../../../avr/lib/avr5/libc.a(strncpy.o)
+                0x000000000000320a                strncpy
+                0x0000000000003228                . = ALIGN (0x2)
  *(.fini9)
- .fini9         0x0000000000002f88        0x0 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_exit.o)
-                0x0000000000002f88                exit
-                0x0000000000002f88                _exit
+ .fini9         0x0000000000003228        0x0 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_exit.o)
+                0x0000000000003228                exit
+                0x0000000000003228                _exit
  *(.fini9)
  *(.fini8)
  *(.fini8)
@@ -1697,11 +1737,11 @@ END GROUP
  *(.fini1)
  *(.fini1)
  *(.fini0)
- .fini0         0x0000000000002f88        0x4 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_exit.o)
+ .fini0         0x0000000000003228        0x4 /usr/lib/gcc/avr/5.4.0/avr5/libgcc.a(_exit.o)
  *(.fini0)
-                0x0000000000002f8c                _etext = .
+                0x000000000000322c                _etext = .
 
-.data           0x0000000000800100       0x2a load address 0x0000000000002f8c
+.data           0x0000000000800100       0x66 load address 0x000000000000322c
                 0x0000000000800100                PROVIDE (__data_start, .)
  *(.data)
  *(.data*)
@@ -1712,71 +1752,77 @@ END GROUP
                 0x0000000000800101                analog_reference
  *(.rodata)
  *(.rodata*)
- .rodata.str1.1
-                0x0000000000800102        0xc Obj/Game.o
+ .rodata._ZZN11HumanPlayer13buttonHandlerEvE23apBtnCameraHandlerTable
+                0x0000000000800102       0x1c Obj/HumanPlayer.o
+ .rodata._ZZN11HumanPlayer13buttonHandlerEvE17apBtnHandlerTable
+                0x000000000080011e       0x1c Obj/HumanPlayer.o
  .rodata._ZTV11HumanPlayer
-                0x000000000080010e        0x6 Obj/HumanPlayer.o
-                0x000000000080010e                _ZTV11HumanPlayer
+                0x000000000080013a        0x6 Obj/HumanPlayer.o
+                0x000000000080013a                _ZTV11HumanPlayer
  .rodata._ZTV6Player
-                0x0000000000800114        0x6 Obj/Player.o
-                0x0000000000800114                _ZTV6Player
+                0x0000000000800140        0x6 Obj/Player.o
+                0x0000000000800140                _ZTV6Player
+ .rodata._ZZN4Unit11drawHandlerEvE17au8PeasantSprData
+                0x0000000000800146        0xa Obj/Unit.o
+ .rodata._ZZN4Unit11drawHandlerEvE23apu8UnitSpriteDataTable
+                0x0000000000800150        0x6 Obj/Unit.o
  .rodata._ZTV7Display
-                0x000000000080011a        0x8 ../lib/libgamebuino.a(Display.o)
-                0x000000000080011a                _ZTV7Display
+                0x0000000000800156        0x8 ../lib/libgamebuino.a(Display.o)
+                0x0000000000800156                _ZTV7Display
  .rodata.str1.1
-                0x0000000000800122        0x7 ../lib/libgamebuino.a(Gamebuino.o)
+                0x000000000080015e        0x7 ../lib/libgamebuino.a(Gamebuino.o)
  *(.gnu.linkonce.d*)
-                0x000000000080012a                . = ALIGN (0x2)
- *fill*         0x0000000000800129        0x1 
-                0x000000000080012a                _edata = .
-                0x000000000080012a                PROVIDE (__data_end, .)
+                0x0000000000800166                . = ALIGN (0x2)
+ *fill*         0x0000000000800165        0x1 
+                0x0000000000800166                _edata = .
+                0x0000000000800166                PROVIDE (__data_end, .)
 
-.bss            0x000000000080012a      0x296
-                0x000000000080012a                PROVIDE (__bss_start, .)
+.bss            0x0000000000800166      0x296
+                0x0000000000800166                PROVIDE (__bss_start, .)
  *(.bss)
  *(.bss*)
- .bss.gb        0x000000000080012a       0x87 Obj/System.o
-                0x000000000080012a                gb
+ .bss.gb        0x0000000000800166       0x87 Obj/System.o
+                0x0000000000800166                gb
  .bss._displayBuffer
-                0x00000000008001b1      0x200 ../lib/libgamebuino.a(Display.o)
-                0x00000000008001b1                _displayBuffer
+                0x00000000008001ed      0x200 ../lib/libgamebuino.a(Display.o)
+                0x00000000008001ed                _displayBuffer
  .bss._chanNoise
-                0x00000000008003b1        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x00000000008003b1                _chanNoise
+                0x00000000008003ed        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x00000000008003ed                _chanNoise
  .bss._chanOutput
-                0x00000000008003b2        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x00000000008003b2                _chanOutput
+                0x00000000008003ee        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x00000000008003ee                _chanOutput
  .bss._chanOutputVolume
-                0x00000000008003b3        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x00000000008003b3                _chanOutputVolume
+                0x00000000008003ef        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x00000000008003ef                _chanOutputVolume
  .bss._chanHalfPeriod
-                0x00000000008003b4        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x00000000008003b4                _chanHalfPeriod
+                0x00000000008003f0        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x00000000008003f0                _chanHalfPeriod
  .bss._chanState
-                0x00000000008003b5        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x00000000008003b5                _chanState
+                0x00000000008003f1        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x00000000008003f1                _chanState
  .bss._chanCount
-                0x00000000008003b6        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x00000000008003b6                _chanCount
+                0x00000000008003f2        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x00000000008003f2                _chanCount
  .bss.timer0_fract
-                0x00000000008003b7        0x1 ../lib/libarduino.a(wiring.o)
+                0x00000000008003f3        0x1 ../lib/libarduino.a(wiring.o)
  .bss.timer0_millis
-                0x00000000008003b8        0x4 ../lib/libarduino.a(wiring.o)
-                0x00000000008003b8                timer0_millis
+                0x00000000008003f4        0x4 ../lib/libarduino.a(wiring.o)
+                0x00000000008003f4                timer0_millis
  .bss.timer0_overflow_count
-                0x00000000008003bc        0x4 ../lib/libarduino.a(wiring.o)
-                0x00000000008003bc                timer0_overflow_count
+                0x00000000008003f8        0x4 ../lib/libarduino.a(wiring.o)
+                0x00000000008003f8                timer0_overflow_count
  *(COMMON)
-                0x00000000008003c0                PROVIDE (__bss_end, .)
-                0x0000000000002f8c                __data_load_start = LOADADDR (.data)
-                0x0000000000002fb6                __data_load_end = (__data_load_start + SIZEOF (.data))
+                0x00000000008003fc                PROVIDE (__bss_end, .)
+                0x000000000000322c                __data_load_start = LOADADDR (.data)
+                0x0000000000003292                __data_load_end = (__data_load_start + SIZEOF (.data))
 
-.noinit         0x00000000008003c0        0x0
+.noinit         0x00000000008003fc        0x0
                 [!provide]                        PROVIDE (__noinit_start, .)
  *(.noinit*)
                 [!provide]                        PROVIDE (__noinit_end, .)
-                0x00000000008003c0                _end = .
-                0x00000000008003c0                PROVIDE (__heap_start, .)
+                0x00000000008003fc                _end = .
+                0x00000000008003fc                PROVIDE (__heap_start, .)
 
 .eeprom         0x0000000000810000        0x0
  *(.eeprom*)
@@ -1822,8 +1868,11 @@ END GROUP
  .comment       0x0000000000000011       0x12 Obj/Game.o
  .comment       0x0000000000000011       0x12 Obj/System.o
  .comment       0x0000000000000011       0x12 Obj/HumanPlayer.o
+ .comment       0x0000000000000011       0x12 Obj/Sprite.o
  .comment       0x0000000000000011       0x12 Obj/Player.o
  .comment       0x0000000000000011       0x12 Obj/Camera.o
+ .comment       0x0000000000000011       0x12 Obj/BaseUnit.o
+ .comment       0x0000000000000011       0x12 Obj/Unit.o
  .comment       0x0000000000000011       0x12 Obj/Menu.o
  .comment       0x0000000000000011       0x12 ../lib/libgamebuino.a(Buttons.o)
  .comment       0x0000000000000011       0x12 ../lib/libgamebuino.a(Display.o)