Removed Building and GameStructures modules. Restructured SW for Unit and Player, still a lot TODO

1 files changed, 477 insertions, 481 deletions

diff --git a/Exe/POCKET.MAP b/Exe/POCKET.MAP
index 8931a67..cf0c6ac 100644
--- a/Exe/POCKET.MAP
+++ b/Exe/POCKET.MAP
@@ -32,7 +32,7 @@ Archive member included to satisfy reference by file (symbol)
 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_mulsi3.o)
                               ../lib/libarduino.a(WMath.o) (__mulsi3)
 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_udivmodqi4.o)
-                              Obj/Building.o (__udivmodqi4)
+                              ../lib/libgamebuino.a(Buttons.o) (__udivmodqi4)
 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_udivmodhi4.o)
                               ../lib/libgamebuino.a(Gamebuino.o) (__udivmodhi4)
 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_divmodhi4.o)
@@ -231,6 +231,8 @@ Discarded input sections
                 0x0000000000000000       0x1c Obj/System.o
  .text.SystemArrayCompare
                 0x0000000000000000       0x34 Obj/System.o
+ .text.SystemCollisionCheck
+                0x0000000000000000       0x94 Obj/System.o
  .group         0x0000000000000000        0x8 Obj/Gfx.o
  .text          0x0000000000000000        0x0 Obj/Gfx.o
  .data          0x0000000000000000        0x0 Obj/Gfx.o
@@ -241,26 +243,31 @@ Discarded input sections
                 0x0000000000000000        0x8 Obj/Gfx.o
  .text.GfxRenderTiles
                 0x0000000000000000       0xbe Obj/Gfx.o
- .text.GfxPrintText
-                0x0000000000000000        0xc Obj/Gfx.o
+ .text.GfxDrawLine
+                0x0000000000000000       0x38 Obj/Gfx.o
  .text          0x0000000000000000        0x0 Obj/Pad.o
  .data          0x0000000000000000        0x0 Obj/Pad.o
  .bss           0x0000000000000000        0x0 Obj/Pad.o
  .text          0x0000000000000000        0x0 Obj/Player.o
  .data          0x0000000000000000        0x0 Obj/Player.o
  .bss           0x0000000000000000        0x0 Obj/Player.o
+ .text._ZN6Player24checkNewBuildingPositionEP16t_CollisionBlock
+                0x0000000000000000      0x106 Obj/Player.o
+ .text._ZN6Player19ButtonRightReleasedEv
+                0x0000000000000000        0x4 Obj/Player.o
+ .bss._ZZN6Player24checkNewBuildingPositionEP16t_CollisionBlockE9max_tries
+                0x0000000000000000        0x1 Obj/Player.o
  .text          0x0000000000000000        0x0 Obj/Camera.o
  .data          0x0000000000000000        0x0 Obj/Camera.o
  .bss           0x0000000000000000        0x0 Obj/Camera.o
  .text          0x0000000000000000        0x0 Obj/Unit.o
  .data          0x0000000000000000        0x0 Obj/Unit.o
  .bss           0x0000000000000000        0x0 Obj/Unit.o
+ .text.UnitAcceptAction
+                0x0000000000000000        0x2 Obj/Unit.o
  .text          0x0000000000000000        0x0 Obj/Menu.o
  .data          0x0000000000000000        0x0 Obj/Menu.o
  .bss           0x0000000000000000        0x0 Obj/Menu.o
- .text          0x0000000000000000        0x0 Obj/Building.o
- .data          0x0000000000000000        0x0 Obj/Building.o
- .bss           0x0000000000000000        0x0 Obj/Building.o
  .text          0x0000000000000000        0x0 ../lib/libgamebuino.a(Buttons.o)
  .data          0x0000000000000000        0x0 ../lib/libgamebuino.a(Buttons.o)
  .bss           0x0000000000000000        0x0 ../lib/libgamebuino.a(Buttons.o)
@@ -1188,7 +1195,6 @@ LOAD Obj/Player.o
 LOAD Obj/Camera.o
 LOAD Obj/Unit.o
 LOAD Obj/Menu.o
-LOAD Obj/Building.o
 LOAD ../lib/libgamebuino.a
 LOAD ../lib/libarduino.a
 LOAD /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a
@@ -1297,7 +1303,7 @@ END GROUP
 .rela.plt
  *(.rela.plt)
 
-.text           0x0000000000000000     0x5172
+.text           0x0000000000000000     0x5078
  *(.vectors)
  .vectors       0x0000000000000000       0x68 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/crtatmega328p.o
                 0x0000000000000000                __vectors
@@ -1327,28 +1333,28 @@ END GROUP
                 0x0000000000000091       0x17 Obj/Player.o
  .progmem.data._ZZN6Player4InitEvE3__c
                 0x00000000000000a8       0x1b Obj/Player.o
+ .progmem.data.BarracksShadowSpr_Data
+                0x00000000000000c3       0x4a Obj/Unit.o
+                0x00000000000000c3                BarracksShadowSpr_Data
+ .progmem.data.BarracksSpr_Data
+                0x000000000000010d       0x4a Obj/Unit.o
+                0x000000000000010d                BarracksSpr_Data
  .progmem.data.Peasant_SprData
-                0x00000000000000c3        0xa Obj/Unit.o
-                0x00000000000000c3                Peasant_SprData
+                0x0000000000000157        0xa Obj/Unit.o
+                0x0000000000000157                Peasant_SprData
  .progmem.data.Peasant_Walking_SprData
-                0x00000000000000cd        0xa Obj/Unit.o
-                0x00000000000000cd                Peasant_Walking_SprData
+                0x0000000000000161        0xa Obj/Unit.o
+                0x0000000000000161                Peasant_Walking_SprData
  .progmem.data._ZL15MainMenuOptions
-                0x00000000000000d7        0x8 Obj/Menu.o
+                0x000000000000016b        0x8 Obj/Menu.o
  .progmem.data._ZL16MainMenuOption_3
-                0x00000000000000df        0x5 Obj/Menu.o
+                0x0000000000000173        0x5 Obj/Menu.o
  .progmem.data._ZL16MainMenuOption_2
-                0x00000000000000e4        0x8 Obj/Menu.o
+                0x0000000000000178        0x8 Obj/Menu.o
  .progmem.data._ZL16MainMenuOption_1
-                0x00000000000000ec       0x11 Obj/Menu.o
+                0x0000000000000180       0x11 Obj/Menu.o
  .progmem.data._ZL16MainMenuOption_0
-                0x00000000000000fd       0x13 Obj/Menu.o
- .progmem.data.BarracksShadowSpr_Data
-                0x0000000000000110       0x4a Obj/Building.o
-                0x0000000000000110                BarracksShadowSpr_Data
- .progmem.data.BarracksSpr_Data
-                0x000000000000015a       0x4a Obj/Building.o
-                0x000000000000015a                BarracksSpr_Data
+                0x0000000000000191       0x13 Obj/Menu.o
  .progmem.data.font3x3
                 0x00000000000001a4      0x182 ../lib/libgamebuino.a(font3x3.o)
                 0x00000000000001a4                font3x3
@@ -1510,557 +1516,553 @@ END GROUP
  .text.SystemInit
                 0x000000000000088c       0x2e Obj/System.o
                 0x000000000000088c                SystemInit
- .text.SystemCollisionCheck
-                0x00000000000008ba       0x94 Obj/System.o
-                0x00000000000008ba                SystemCollisionCheck
  .text._ZL21GfxIsInsideScreenAreaaahh
-                0x000000000000094e       0x2a Obj/Gfx.o
+                0x00000000000008ba       0x2a Obj/Gfx.o
  .text._ZN7Display9drawPixelEaa
-                0x0000000000000978       0x8e Obj/Gfx.o
-                0x0000000000000978                _ZN7Display9drawPixelEaa
- .text.GfxInit  0x0000000000000a06       0x10 Obj/Gfx.o
-                0x0000000000000a06                GfxInit
+                0x00000000000008e4       0x8e Obj/Gfx.o
+                0x00000000000008e4                _ZN7Display9drawPixelEaa
+ .text.GfxInit  0x0000000000000972       0x10 Obj/Gfx.o
+                0x0000000000000972                GfxInit
  .text.GfxRefreshNeeded
-                0x0000000000000a16       0x14 Obj/Gfx.o
-                0x0000000000000a16                GfxRefreshNeeded
+                0x0000000000000982       0x14 Obj/Gfx.o
+                0x0000000000000982                GfxRefreshNeeded
  .text.GfxIsSpriteInsideScreenArea
-                0x0000000000000a2a        0xe Obj/Gfx.o
-                0x0000000000000a2a                GfxIsSpriteInsideScreenArea
+                0x0000000000000996        0xe Obj/Gfx.o
+                0x0000000000000996                GfxIsSpriteInsideScreenArea
  .text.GfxDrawSprite
-                0x0000000000000a38       0x58 Obj/Gfx.o
-                0x0000000000000a38                GfxDrawSprite
+                0x00000000000009a4       0x58 Obj/Gfx.o
+                0x00000000000009a4                GfxDrawSprite
  .text.GfxGetWidthFromSpriteData
-                0x0000000000000a90        0x6 Obj/Gfx.o
-                0x0000000000000a90                GfxGetWidthFromSpriteData
+                0x00000000000009fc        0x6 Obj/Gfx.o
+                0x00000000000009fc                GfxGetWidthFromSpriteData
  .text.GfxGetHeightFromSpriteData
-                0x0000000000000a96        0x8 Obj/Gfx.o
-                0x0000000000000a96                GfxGetHeightFromSpriteData
+                0x0000000000000a02        0x8 Obj/Gfx.o
+                0x0000000000000a02                GfxGetHeightFromSpriteData
  .text.GfxPrintText_Flash
-                0x0000000000000a9e        0xc Obj/Gfx.o
-                0x0000000000000a9e                GfxPrintText_Flash
+                0x0000000000000a0a        0xc Obj/Gfx.o
+                0x0000000000000a0a                GfxPrintText_Flash
  .text.GfxPrintTextFont
-                0x0000000000000aaa       0x5a Obj/Gfx.o
-                0x0000000000000aaa                GfxPrintTextFont
+                0x0000000000000a16       0x5a Obj/Gfx.o
+                0x0000000000000a16                GfxPrintTextFont
+ .text.GfxPrintText
+                0x0000000000000a70        0xc Obj/Gfx.o
+                0x0000000000000a70                GfxPrintText
  .text.GfxDrawCircle
-                0x0000000000000b04       0x58 Obj/Gfx.o
-                0x0000000000000b04                GfxDrawCircle
+                0x0000000000000a7c       0x58 Obj/Gfx.o
+                0x0000000000000a7c                GfxDrawCircle
  .text.GfxDrawRectangle
-                0x0000000000000b5c       0x5e Obj/Gfx.o
-                0x0000000000000b5c                GfxDrawRectangle
+                0x0000000000000ad4       0x5e Obj/Gfx.o
+                0x0000000000000ad4                GfxDrawRectangle
  .text.GfxFillRectangle
-                0x0000000000000bba       0x5e Obj/Gfx.o
-                0x0000000000000bba                GfxFillRectangle
+                0x0000000000000b32       0x5e Obj/Gfx.o
+                0x0000000000000b32                GfxFillRectangle
  .text.GfxShowResources
-                0x0000000000000c18       0xe8 Obj/Gfx.o
-                0x0000000000000c18                GfxShowResources
+                0x0000000000000b90       0xe8 Obj/Gfx.o
+                0x0000000000000b90                GfxShowResources
  .text.PadButtonReleased
-                0x0000000000000d00       0x16 Obj/Pad.o
-                0x0000000000000d00                PadButtonReleased
+                0x0000000000000c78       0x16 Obj/Pad.o
+                0x0000000000000c78                PadButtonReleased
  .text.PadButtonPressedFrames
-                0x0000000000000d16       0x1c Obj/Pad.o
-                0x0000000000000d16                PadButtonPressedFrames
+                0x0000000000000c8e       0x1c Obj/Pad.o
+                0x0000000000000c8e                PadButtonPressedFrames
  .text.PadButtonPressed
-                0x0000000000000d32        0x6 Obj/Pad.o
-                0x0000000000000d32                PadButtonPressed
+                0x0000000000000caa        0x6 Obj/Pad.o
+                0x0000000000000caa                PadButtonPressed
  .text.PadDirectionKeyPressed
-                0x0000000000000d38       0x30 Obj/Pad.o
-                0x0000000000000d38                PadDirectionKeyPressed
+                0x0000000000000cb0       0x30 Obj/Pad.o
+                0x0000000000000cb0                PadDirectionKeyPressed
  .text.PadAnyKeyPressed
-                0x0000000000000d68       0x20 Obj/Pad.o
-                0x0000000000000d68                PadAnyKeyPressed
+                0x0000000000000ce0       0x20 Obj/Pad.o
+                0x0000000000000ce0                PadAnyKeyPressed
  .text._ZN6PlayerC2Ev
-                0x0000000000000d88        0x2 Obj/Player.o
-                0x0000000000000d88                _ZN6PlayerC2Ev
-                0x0000000000000d88                _ZN6PlayerC1Ev
+                0x0000000000000d00        0x2 Obj/Player.o
+                0x0000000000000d00                _ZN6PlayerC2Ev
+                0x0000000000000d00                _ZN6PlayerC1Ev
  .text._ZN6PlayerD2Ev
-                0x0000000000000d8a        0x2 Obj/Player.o
-                0x0000000000000d8a                _ZN6PlayerD2Ev
-                0x0000000000000d8a                _ZN6PlayerD1Ev
+                0x0000000000000d02        0x2 Obj/Player.o
+                0x0000000000000d02                _ZN6PlayerD2Ev
+                0x0000000000000d02                _ZN6PlayerD1Ev
  .text._ZN6Player10showHealthEh
-                0x0000000000000d8c       0x76 Obj/Player.o
-                0x0000000000000d8c                _ZN6Player10showHealthEh
+                0x0000000000000d04       0x76 Obj/Player.o
+                0x0000000000000d04                _ZN6Player10showHealthEh
  .text._ZN6Player11DrawHandlerEv
-                0x0000000000000e02      0x128 Obj/Player.o
-                0x0000000000000e02                _ZN6Player11DrawHandlerEv
- .text._ZN6Player24checkNewBuildingPositionEP16t_CollisionBlock
-                0x0000000000000f2a      0x10e Obj/Player.o
-                0x0000000000000f2a                _ZN6Player24checkNewBuildingPositionEP16t_CollisionBlock
- .text._ZN6Player14createBuildingEh16t_CollisionBlock
-                0x0000000000001038       0xea Obj/Player.o
-                0x0000000000001038                _ZN6Player14createBuildingEh16t_CollisionBlock
- .text._ZN6Player10createUnitEh16t_CollisionBlock
-                0x0000000000001122       0xa2 Obj/Player.o
-                0x0000000000001122                _ZN6Player10createUnitEh16t_CollisionBlock
+                0x0000000000000d7a       0xcc Obj/Player.o
+                0x0000000000000d7a                _ZN6Player11DrawHandlerEv
+ .text._ZN6Player10createUnitE8t_unitid16t_CollisionBlock
+                0x0000000000000e46       0xba Obj/Player.o
+                0x0000000000000e46                _ZN6Player10createUnitE8t_unitid16t_CollisionBlock
  .text._ZN6Player4InitEv
-                0x00000000000011c4      0x178 Obj/Player.o
-                0x00000000000011c4                _ZN6Player4InitEv
+                0x0000000000000f00      0x15e Obj/Player.o
+                0x0000000000000f00                _ZN6Player4InitEv
  .text._ZN6Player12GetCursorPosEv
-                0x000000000000133c       0x58 Obj/Player.o
-                0x000000000000133c                _ZN6Player12GetCursorPosEv
+                0x000000000000105e       0x58 Obj/Player.o
+                0x000000000000105e                _ZN6Player12GetCursorPosEv
  .text._ZN6Player21UnitBuildingSelectionEv
-                0x0000000000001394      0x268 Obj/Player.o
-                0x0000000000001394                _ZN6Player21UnitBuildingSelectionEv
- .text._ZN6Player19BuildingUnitActionsEv
-                0x00000000000015fc       0x7c Obj/Player.o
-                0x00000000000015fc                _ZN6Player19BuildingUnitActionsEv
+                0x00000000000010b6      0x114 Obj/Player.o
+                0x00000000000010b6                _ZN6Player21UnitBuildingSelectionEv
+ .text._ZN6Player14ButtonAPressedEv
+                0x00000000000011ca       0x22 Obj/Player.o
+                0x00000000000011ca                _ZN6Player14ButtonAPressedEv
+ .text._ZN6Player15ButtonAReleasedEv
+                0x00000000000011ec      0x18c Obj/Player.o
+                0x00000000000011ec                _ZN6Player15ButtonAReleasedEv
+ .text._ZN6Player14ButtonBPressedEv
+                0x0000000000001378       0x52 Obj/Player.o
+                0x0000000000001378                _ZN6Player14ButtonBPressedEv
+ .text._ZN6Player15ButtonBReleasedEv
+                0x00000000000013ca       0x90 Obj/Player.o
+                0x00000000000013ca                _ZN6Player15ButtonBReleasedEv
+ .text._ZN6Player18ButtonLeftReleasedEv
+                0x000000000000145a      0x120 Obj/Player.o
+                0x000000000000145a                _ZN6Player18ButtonLeftReleasedEv
+ .text._ZN6Player28IncreaseShowActionsMenuIndexEv
+                0x000000000000157a      0x120 Obj/Player.o
+                0x000000000000157a                _ZN6Player28IncreaseShowActionsMenuIndexEv
+ .text._ZN6Player11ActionsMenuEv
+                0x000000000000169a       0x86 Obj/Player.o
+                0x000000000000169a                _ZN6Player11ActionsMenuEv
  .text._ZN6Player13ButtonHandlerEv
-                0x0000000000001678      0x1e8 Obj/Player.o
-                0x0000000000001678                _ZN6Player13ButtonHandlerEv
+                0x0000000000001720       0x90 Obj/Player.o
+                0x0000000000001720                _ZN6Player13ButtonHandlerEv
  .text._ZN6Player7HandlerEv
-                0x0000000000001860       0x5c Obj/Player.o
-                0x0000000000001860                _ZN6Player7HandlerEv
+                0x00000000000017b0       0x6c Obj/Player.o
+                0x00000000000017b0                _ZN6Player7HandlerEv
  .text.CameraInit
-                0x00000000000018bc       0x14 Obj/Camera.o
-                0x00000000000018bc                CameraInit
+                0x000000000000181c       0x16 Obj/Camera.o
+                0x000000000000181c                CameraInit
  .text.CameraApplyCoordinatesToCoordinates
-                0x00000000000018d0       0x66 Obj/Camera.o
-                0x00000000000018d0                CameraApplyCoordinatesToCoordinates
+                0x0000000000001832       0x66 Obj/Camera.o
+                0x0000000000001832                CameraApplyCoordinatesToCoordinates
  .text.CameraApplyCoordinatesToSprite
-                0x0000000000001936       0x14 Obj/Camera.o
-                0x0000000000001936                CameraApplyCoordinatesToSprite
+                0x0000000000001898       0x14 Obj/Camera.o
+                0x0000000000001898                CameraApplyCoordinatesToSprite
  .text.CameraHandler
-                0x000000000000194a      0x132 Obj/Camera.o
-                0x000000000000194a                CameraHandler
- .text.UnitBuildAccept
-                0x0000000000001a7c        0x2 Obj/Unit.o
+                0x00000000000018ac      0x13c Obj/Camera.o
+                0x00000000000018ac                CameraHandler
+ .text.CameraSetLock
+                0x00000000000019e8        0x6 Obj/Camera.o
+                0x00000000000019e8                CameraSetLock
+ .text.UnitAttackAccepted
+                0x00000000000019ee        0x8 Obj/Unit.o
+ .text.UnitBuildAccepted
+                0x00000000000019f6        0x2 Obj/Unit.o
  .text.UnitInit
-                0x0000000000001a7e       0x54 Obj/Unit.o
-                0x0000000000001a7e                UnitInit
+                0x00000000000019f8       0xa8 Obj/Unit.o
+                0x00000000000019f8                UnitInit
  .text.UnitGetWidthFromID
-                0x0000000000001ad2        0xc Obj/Unit.o
-                0x0000000000001ad2                UnitGetWidthFromID
- .text.UnitDraw
-                0x0000000000001ade      0x146 Obj/Unit.o
-                0x0000000000001ade                UnitDraw
+                0x0000000000001aa0       0x14 Obj/Unit.o
+                0x0000000000001aa0                UnitGetWidthFromID
  .text.UnitGetHeightFromID
-                0x0000000000001c24        0xc Obj/Unit.o
-                0x0000000000001c24                UnitGetHeightFromID
+                0x0000000000001ab4       0x14 Obj/Unit.o
+                0x0000000000001ab4                UnitGetHeightFromID
+ .text.UnitDraw
+                0x0000000000001ac8      0x23c Obj/Unit.o
+                0x0000000000001ac8                UnitDraw
  .text.UnitGetHpFromID
-                0x0000000000001c30        0x4 Obj/Unit.o
-                0x0000000000001c30                UnitGetHpFromID
+                0x0000000000001d04        0xc Obj/Unit.o
+                0x0000000000001d04                UnitGetHpFromID
  .text.UnitMoveTo
-                0x0000000000001c34       0x10 Obj/Unit.o
-                0x0000000000001c34                UnitMoveTo
+                0x0000000000001d10       0x10 Obj/Unit.o
+                0x0000000000001d10                UnitMoveTo
  .text.UnitHandler
-                0x0000000000001c44       0x78 Obj/Unit.o
-                0x0000000000001c44                UnitHandler
- .text.UnitSelectedOptions
-                0x0000000000001cbc       0x3e Obj/Unit.o
-                0x0000000000001cbc                UnitSelectedOptions
- .text.UnitAcceptAction
-                0x0000000000001cfa       0x4e Obj/Unit.o
-                0x0000000000001cfa                UnitAcceptAction
- .text.UnitResetMenuLevel
-                0x0000000000001d48        0x6 Obj/Unit.o
-                0x0000000000001d48                UnitResetMenuLevel
+                0x0000000000001d20       0x8c Obj/Unit.o
+                0x0000000000001d20                UnitHandler
+ .text.UnitGetAvailableActions
+                0x0000000000001dac       0x10 Obj/Unit.o
+                0x0000000000001dac                UnitGetAvailableActions
+ .text.UnitGetActionString
+                0x0000000000001dbc       0x14 Obj/Unit.o
+                0x0000000000001dbc                UnitGetActionString
  .text._Z17MenuGetPlayerNameP6Player
-                0x0000000000001d4e       0x14 Obj/Menu.o
-                0x0000000000001d4e                _Z17MenuGetPlayerNameP6Player
+                0x0000000000001dd0       0x18 Obj/Menu.o
+                0x0000000000001dd0                _Z17MenuGetPlayerNameP6Player
  .text._Z8MainMenuv
-                0x0000000000001d62       0x20 Obj/Menu.o
-                0x0000000000001d62                _Z8MainMenuv
- .text.BuildingInit
-                0x0000000000001d82       0x52 Obj/Building.o
-                0x0000000000001d82                BuildingInit
- .text.BuildingGetHpFromID
-                0x0000000000001dd4        0x4 Obj/Building.o
-                0x0000000000001dd4                BuildingGetHpFromID
- .text.BuildingSelectedOptions
-                0x0000000000001dd8        0x2 Obj/Building.o
-                0x0000000000001dd8                BuildingSelectedOptions
- .text.BuildingGetWidthFromID
-                0x0000000000001dda        0xc Obj/Building.o
-                0x0000000000001dda                BuildingGetWidthFromID
- .text.BuildingGetHeightFromID
-                0x0000000000001de6        0xc Obj/Building.o
-                0x0000000000001de6                BuildingGetHeightFromID
- .text.BuildingDraw
-                0x0000000000001df2      0x110 Obj/Building.o
-                0x0000000000001df2                BuildingDraw
+                0x0000000000001de8       0x20 Obj/Menu.o
+                0x0000000000001de8                _Z8MainMenuv
  .text._ZN7Buttons5beginEv
-                0x0000000000001f02       0x20 ../lib/libgamebuino.a(Buttons.o)
-                0x0000000000001f02                _ZN7Buttons5beginEv
+                0x0000000000001e08       0x20 ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000001e08                _ZN7Buttons5beginEv
  .text._ZN7Buttons6updateEv
-                0x0000000000001f22       0x5a ../lib/libgamebuino.a(Buttons.o)
-                0x0000000000001f22                _ZN7Buttons6updateEv
+                0x0000000000001e28       0x5a ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000001e28                _ZN7Buttons6updateEv
  .text._ZN7Buttons7pressedEh
-                0x0000000000001f7c       0x12 ../lib/libgamebuino.a(Buttons.o)
-                0x0000000000001f7c                _ZN7Buttons7pressedEh
+                0x0000000000001e82       0x12 ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000001e82                _ZN7Buttons7pressedEh
  .text._ZN7Buttons8releasedEh
-                0x0000000000001f8e       0x12 ../lib/libgamebuino.a(Buttons.o)
-                0x0000000000001f8e                _ZN7Buttons8releasedEh
+                0x0000000000001e94       0x12 ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000001e94                _ZN7Buttons8releasedEh
  .text._ZN7Buttons6repeatEhh
-                0x0000000000001fa0       0x2c ../lib/libgamebuino.a(Buttons.o)
-                0x0000000000001fa0                _ZN7Buttons6repeatEhh
+                0x0000000000001ea6       0x2c ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000001ea6                _ZN7Buttons6repeatEhh
  .text._ZN7Buttons8timeHeldEh
-                0x0000000000001fcc       0x10 ../lib/libgamebuino.a(Buttons.o)
-                0x0000000000001fcc                _ZN7Buttons8timeHeldEh
+                0x0000000000001ed2       0x10 ../lib/libgamebuino.a(Buttons.o)
+                0x0000000000001ed2                _ZN7Buttons8timeHeldEh
  .text._ZN8SPIClass8transferEh
-                0x0000000000001fdc        0xc ../lib/libgamebuino.a(Display.o)
-                0x0000000000001fdc                _ZN8SPIClass8transferEh
+                0x0000000000001ee2        0xc ../lib/libgamebuino.a(Display.o)
+                0x0000000000001ee2                _ZN8SPIClass8transferEh
  .text._ZN7Display7commandEh
-                0x0000000000001fe8       0x3c ../lib/libgamebuino.a(Display.o)
-                0x0000000000001fe8                _ZN7Display7commandEh
+                0x0000000000001eee       0x3c ../lib/libgamebuino.a(Display.o)
+                0x0000000000001eee                _ZN7Display7commandEh
  .text._ZN7Display5clearEv
-                0x0000000000002024       0x22 ../lib/libgamebuino.a(Display.o)
-                0x0000000000002024                _ZN7Display5clearEv
+                0x0000000000001f2a       0x22 ../lib/libgamebuino.a(Display.o)
+                0x0000000000001f2a                _ZN7Display5clearEv
  .text._ZN7Display6updateEv
-                0x0000000000002046       0x8a ../lib/libgamebuino.a(Display.o)
-                0x0000000000002046                _ZN7Display6updateEv
+                0x0000000000001f4c       0x8a ../lib/libgamebuino.a(Display.o)
+                0x0000000000001f4c                _ZN7Display6updateEv
  .text._ZN7Display8setColorEa
-                0x00000000000020d0        0x8 ../lib/libgamebuino.a(Display.o)
-                0x00000000000020d0                _ZN7Display8setColorEa
+                0x0000000000001fd6        0x8 ../lib/libgamebuino.a(Display.o)
+                0x0000000000001fd6                _ZN7Display8setColorEa
  .text._ZN7Display8setColorEaa
-                0x00000000000020d8        0x8 ../lib/libgamebuino.a(Display.o)
-                0x00000000000020d8                _ZN7Display8setColorEaa
+                0x0000000000001fde        0x8 ../lib/libgamebuino.a(Display.o)
+                0x0000000000001fde                _ZN7Display8setColorEaa
  .text._ZN7Display13drawFastVLineEaaa
-                0x00000000000020e0       0x38 ../lib/libgamebuino.a(Display.o)
-                0x00000000000020e0                _ZN7Display13drawFastVLineEaaa
+                0x0000000000001fe6       0x38 ../lib/libgamebuino.a(Display.o)
+                0x0000000000001fe6                _ZN7Display13drawFastVLineEaaa
  .text._ZN7Display13drawFastHLineEaaa
-                0x0000000000002118       0x38 ../lib/libgamebuino.a(Display.o)
-                0x0000000000002118                _ZN7Display13drawFastHLineEaaa
+                0x000000000000201e       0x38 ../lib/libgamebuino.a(Display.o)
+                0x000000000000201e                _ZN7Display13drawFastHLineEaaa
  .text._ZN7Display8drawRectEaaaa
-                0x0000000000002150       0x50 ../lib/libgamebuino.a(Display.o)
-                0x0000000000002150                _ZN7Display8drawRectEaaaa
+                0x0000000000002056       0x50 ../lib/libgamebuino.a(Display.o)
+                0x0000000000002056                _ZN7Display8drawRectEaaaa
  .text._ZN7Display8fillRectEaaaa
-                0x00000000000021a0       0x52 ../lib/libgamebuino.a(Display.o)
-                0x00000000000021a0                _ZN7Display8fillRectEaaaa
+                0x00000000000020a6       0x52 ../lib/libgamebuino.a(Display.o)
+                0x00000000000020a6                _ZN7Display8fillRectEaaaa
  .text._ZN7Display10drawCircleEaaa
-                0x00000000000021f2      0x100 ../lib/libgamebuino.a(Display.o)
-                0x00000000000021f2                _ZN7Display10drawCircleEaaa
+                0x00000000000020f8      0x100 ../lib/libgamebuino.a(Display.o)
+                0x00000000000020f8                _ZN7Display10drawCircleEaaa
  .text._ZN7Display16drawCircleHelperEaaah
-                0x00000000000022f2       0xfc ../lib/libgamebuino.a(Display.o)
-                0x00000000000022f2                _ZN7Display16drawCircleHelperEaaah
+                0x00000000000021f8       0xfc ../lib/libgamebuino.a(Display.o)
+                0x00000000000021f8                _ZN7Display16drawCircleHelperEaaah
  .text._ZN7Display16fillCircleHelperEaaaha
-                0x00000000000023ee       0xca ../lib/libgamebuino.a(Display.o)
-                0x00000000000023ee                _ZN7Display16fillCircleHelperEaaaha
+                0x00000000000022f4       0xca ../lib/libgamebuino.a(Display.o)
+                0x00000000000022f4                _ZN7Display16fillCircleHelperEaaaha
  .text._ZN7Display13drawRoundRectEaaaaa
-                0x00000000000024b8       0xbe ../lib/libgamebuino.a(Display.o)
-                0x00000000000024b8                _ZN7Display13drawRoundRectEaaaaa
+                0x00000000000023be       0xbe ../lib/libgamebuino.a(Display.o)
+                0x00000000000023be                _ZN7Display13drawRoundRectEaaaaa
  .text._ZN7Display13fillRoundRectEaaaaa
-                0x0000000000002576       0x6e ../lib/libgamebuino.a(Display.o)
-                0x0000000000002576                _ZN7Display13fillRoundRectEaaaaa
+                0x000000000000247c       0x6e ../lib/libgamebuino.a(Display.o)
+                0x000000000000247c                _ZN7Display13fillRoundRectEaaaaa
  .text._ZN7Display10drawBitmapEaaPKh
-                0x00000000000025e4      0x280 ../lib/libgamebuino.a(Display.o)
-                0x00000000000025e4                _ZN7Display10drawBitmapEaaPKh
+                0x00000000000024ea      0x280 ../lib/libgamebuino.a(Display.o)
+                0x00000000000024ea                _ZN7Display10drawBitmapEaaPKh
  .text._ZN7Display10drawBitmapEaaPKhhh
-                0x0000000000002864      0x1ce ../lib/libgamebuino.a(Display.o)
-                0x0000000000002864                _ZN7Display10drawBitmapEaaPKhhh
+                0x000000000000276a      0x1ce ../lib/libgamebuino.a(Display.o)
+                0x000000000000276a                _ZN7Display10drawBitmapEaaPKhhh
  .text._ZN7Display7setFontEPKh
-                0x0000000000002a32       0x28 ../lib/libgamebuino.a(Display.o)
-                0x0000000000002a32                _ZN7Display7setFontEPKh
+                0x0000000000002938       0x28 ../lib/libgamebuino.a(Display.o)
+                0x0000000000002938                _ZN7Display7setFontEPKh
  .text._ZN7Display5beginEaaaaa
-                0x0000000000002a5a      0x180 ../lib/libgamebuino.a(Display.o)
-                0x0000000000002a5a                _ZN7Display5beginEaaaaa
+                0x0000000000002960      0x180 ../lib/libgamebuino.a(Display.o)
+                0x0000000000002960                _ZN7Display5beginEaaaaa
  .text._ZN7Display8drawCharEaahh
-                0x0000000000002bda      0x15c ../lib/libgamebuino.a(Display.o)
-                0x0000000000002bda                _ZN7Display8drawCharEaahh
+                0x0000000000002ae0      0x15c ../lib/libgamebuino.a(Display.o)
+                0x0000000000002ae0                _ZN7Display8drawCharEaahh
  .text._ZN7Display5writeEh
-                0x0000000000002d36       0x66 ../lib/libgamebuino.a(Display.o)
-                0x0000000000002d36                _ZN7Display5writeEh
+                0x0000000000002c3c       0x66 ../lib/libgamebuino.a(Display.o)
+                0x0000000000002c3c                _ZN7Display5writeEh
  .text._ZN9Gamebuino5popupEPK19__FlashStringHelperh
-                0x0000000000002d9c       0x16 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000002d9c                _ZN9Gamebuino5popupEPK19__FlashStringHelperh
+                0x0000000000002ca2       0x16 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000002ca2                _ZN9Gamebuino5popupEPK19__FlashStringHelperh
  .text._ZN9Gamebuino11updatePopupEv
-                0x0000000000002db2       0xda ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000002db2                _ZN9Gamebuino11updatePopupEv
+                0x0000000000002cb8       0xda ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000002cb8                _ZN9Gamebuino11updatePopupEv
  .text._ZN9Gamebuino14displayBatteryEv
-                0x0000000000002e8c      0x160 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000002e8c                _ZN9Gamebuino14displayBatteryEv
+                0x0000000000002d92      0x160 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000002d92                _ZN9Gamebuino14displayBatteryEv
  .text._ZN9Gamebuino6updateEv
-                0x0000000000002fec      0x170 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000002fec                _ZN9Gamebuino6updateEv
+                0x0000000000002ef2      0x170 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000002ef2                _ZN9Gamebuino6updateEv
  .text._ZN9Gamebuino4menuEPKPKch
-                0x000000000000315c      0x2a0 ../lib/libgamebuino.a(Gamebuino.o)
-                0x000000000000315c                _ZN9Gamebuino4menuEPKPKch
+                0x0000000000003062      0x2a0 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000003062                _ZN9Gamebuino4menuEPKPKch
  .text._ZN9Gamebuino10changeGameEv
-                0x00000000000033fc       0x7a ../lib/libgamebuino.a(Gamebuino.o)
-                0x00000000000033fc                _ZN9Gamebuino10changeGameEv
+                0x0000000000003302       0x7a ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000003302                _ZN9Gamebuino10changeGameEv
  .text._ZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKh
-                0x0000000000003476      0x270 ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000003476                _ZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKh
+                0x000000000000337c      0x270 ../lib/libgamebuino.a(Gamebuino.o)
+                0x000000000000337c                _ZN9Gamebuino11titleScreenEPK19__FlashStringHelperPKh
  .text._ZN9Gamebuino11titleScreenEPK19__FlashStringHelper
-                0x00000000000036e6        0x8 ../lib/libgamebuino.a(Gamebuino.o)
-                0x00000000000036e6                _ZN9Gamebuino11titleScreenEPK19__FlashStringHelper
+                0x00000000000035ec        0x8 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000035ec                _ZN9Gamebuino11titleScreenEPK19__FlashStringHelper
  .text._ZN9Gamebuino17settingsAvailableEv
-                0x00000000000036ee       0x14 ../lib/libgamebuino.a(Gamebuino.o)
-                0x00000000000036ee                _ZN9Gamebuino17settingsAvailableEv
+                0x00000000000035f4       0x14 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000035f4                _ZN9Gamebuino17settingsAvailableEv
  .text._ZN9Gamebuino12readSettingsEv
-                0x0000000000003702       0xde ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000003702                _ZN9Gamebuino12readSettingsEv
+                0x0000000000003608       0xde ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000003608                _ZN9Gamebuino12readSettingsEv
  .text._ZN9Gamebuino5beginEv
-                0x00000000000037e0       0xb6 ../lib/libgamebuino.a(Gamebuino.o)
-                0x00000000000037e0                _ZN9Gamebuino5beginEv
+                0x00000000000036e6       0xb6 ../lib/libgamebuino.a(Gamebuino.o)
+                0x00000000000036e6                _ZN9Gamebuino5beginEv
  .text._ZN9Gamebuino14getDefaultNameEPc
-                0x0000000000003896       0x2c ../lib/libgamebuino.a(Gamebuino.o)
-                0x0000000000003896                _ZN9Gamebuino14getDefaultNameEPc
+                0x000000000000379c       0x2c ../lib/libgamebuino.a(Gamebuino.o)
+                0x000000000000379c                _ZN9Gamebuino14getDefaultNameEPc
  .text._ZN5Sound7commandEhhah.part.0
-                0x00000000000038c2       0x66 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000037c8       0x66 ../lib/libgamebuino.a(Sound.o)
  .text._ZN5Sound5beginEv
-                0x0000000000003928       0x68 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003928                _ZN5Sound5beginEv
+                0x000000000000382e       0x68 ../lib/libgamebuino.a(Sound.o)
+                0x000000000000382e                _ZN5Sound5beginEv
  .text._ZN5Sound7commandEhhah
-                0x0000000000003990       0x5e ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003990                _ZN5Sound7commandEhhah
+                0x0000000000003896       0x5e ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003896                _ZN5Sound7commandEhhah
  .text._ZN5Sound12updateOutputEv
-                0x00000000000039ee       0x16 ../lib/libgamebuino.a(Sound.o)
-                0x00000000000039ee                _ZN5Sound12updateOutputEv
+                0x00000000000038f4       0x16 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000038f4                _ZN5Sound12updateOutputEv
  .text._ZN5Sound8stopNoteEh.part.2
-                0x0000000000003a04       0x1c ../lib/libgamebuino.a(Sound.o)
+                0x000000000000390a       0x1c ../lib/libgamebuino.a(Sound.o)
  .text._ZN5Sound11playPatternEPKjh.part.5
-                0x0000000000003a20       0x30 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003926       0x30 ../lib/libgamebuino.a(Sound.o)
  .text._ZN5Sound11playPatternEPKjh
-                0x0000000000003a50        0xa ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003a50                _ZN5Sound11playPatternEPKjh
+                0x0000000000003956        0xa ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003956                _ZN5Sound11playPatternEPKjh
  .text._ZN5Sound11updateTrackEh
-                0x0000000000003a5a       0x5c ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003a5a                _ZN5Sound11updateTrackEh
+                0x0000000000003960       0x5c ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003960                _ZN5Sound11updateTrackEh
  .text._ZN5Sound11updateTrackEv
-                0x0000000000003ab6        0x6 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003ab6                _ZN5Sound11updateTrackEv
+                0x00000000000039bc        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000039bc                _ZN5Sound11updateTrackEv
  .text._ZN5Sound13updatePatternEh
-                0x0000000000003abc       0xe0 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003abc                _ZN5Sound13updatePatternEh
+                0x00000000000039c2       0xe0 ../lib/libgamebuino.a(Sound.o)
+                0x00000000000039c2                _ZN5Sound13updatePatternEh
  .text._ZN5Sound13updatePatternEv
-                0x0000000000003b9c        0x6 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003b9c                _ZN5Sound13updatePatternEv
+                0x0000000000003aa2        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003aa2                _ZN5Sound13updatePatternEv
  .text._ZN5Sound10updateNoteEh
-                0x0000000000003ba2      0x182 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003ba2                _ZN5Sound10updateNoteEh
+                0x0000000000003aa8      0x182 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003aa8                _ZN5Sound10updateNoteEh
  .text._ZN5Sound10updateNoteEv
-                0x0000000000003d24        0x6 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003d24                _ZN5Sound10updateNoteEv
+                0x0000000000003c2a        0x6 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003c2a                _ZN5Sound10updateNoteEv
  .text._ZN5Sound11stopPatternEh
-                0x0000000000003d2a       0x16 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003d2a                _ZN5Sound11stopPatternEh
+                0x0000000000003c30       0x16 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003c30                _ZN5Sound11stopPatternEh
  .text._ZN5Sound11stopPatternEv
-                0x0000000000003d40       0x12 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003d40                _ZN5Sound11stopPatternEv
+                0x0000000000003c46       0x12 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003c46                _ZN5Sound11stopPatternEv
  .text._ZN5Sound14generateOutputEv
-                0x0000000000003d52       0x54 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003d52                _ZN5Sound14generateOutputEv
+                0x0000000000003c58       0x54 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003c58                _ZN5Sound14generateOutputEv
  .text.__vector_11
-                0x0000000000003da6       0x48 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003da6                __vector_11
+                0x0000000000003cac       0x48 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003cac                __vector_11
  .text._ZN5Sound6playOKEv
-                0x0000000000003dee        0x8 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003dee                _ZN5Sound6playOKEv
+                0x0000000000003cf4        0x8 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003cf4                _ZN5Sound6playOKEv
  .text._ZN5Sound10playCancelEv
-                0x0000000000003df6        0x8 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003df6                _ZN5Sound10playCancelEv
+                0x0000000000003cfc        0x8 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003cfc                _ZN5Sound10playCancelEv
  .text._ZN5Sound8playTickEv
-                0x0000000000003dfe        0x8 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003dfe                _ZN5Sound8playTickEv
+                0x0000000000003d04        0x8 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003d04                _ZN5Sound8playTickEv
  .text._ZN5Sound9setVolumeEa
-                0x0000000000003e06       0x18 ../lib/libgamebuino.a(Sound.o)
-                0x0000000000003e06                _ZN5Sound9setVolumeEa
+                0x0000000000003d0c       0x18 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000003d0c                _ZN5Sound9setVolumeEa
  .text._ZN9Backlight5beginEv
-                0x0000000000003e1e        0x8 ../lib/libgamebuino.a(Backlight.o)
-                0x0000000000003e1e                _ZN9Backlight5beginEv
+                0x0000000000003d24        0x8 ../lib/libgamebuino.a(Backlight.o)
+                0x0000000000003d24                _ZN9Backlight5beginEv
  .text._ZN9Backlight3setEh
-                0x0000000000003e26        0x8 ../lib/libgamebuino.a(Backlight.o)
-                0x0000000000003e26                _ZN9Backlight3setEh
+                0x0000000000003d2c        0x8 ../lib/libgamebuino.a(Backlight.o)
+                0x0000000000003d2c                _ZN9Backlight3setEh
  .text._ZN9Backlight6updateEv
-                0x0000000000003e2e       0xbe ../lib/libgamebuino.a(Backlight.o)
-                0x0000000000003e2e                _ZN9Backlight6updateEv
+                0x0000000000003d34       0xbe ../lib/libgamebuino.a(Backlight.o)
+                0x0000000000003d34                _ZN9Backlight6updateEv
  .text._ZN7Battery5beginEv
-                0x0000000000003eec       0x14 ../lib/libgamebuino.a(Battery.o)
-                0x0000000000003eec                _ZN7Battery5beginEv
+                0x0000000000003df2       0x14 ../lib/libgamebuino.a(Battery.o)
+                0x0000000000003df2                _ZN7Battery5beginEv
  .text._ZN7Battery6updateEv
-                0x0000000000003f00       0x70 ../lib/libgamebuino.a(Battery.o)
-                0x0000000000003f00                _ZN7Battery6updateEv
+                0x0000000000003e06       0x70 ../lib/libgamebuino.a(Battery.o)
+                0x0000000000003e06                _ZN7Battery6updateEv
  .text.__vector_16
-                0x0000000000003f70       0x94 ../lib/libarduino.a(wiring.o)
-                0x0000000000003f70                __vector_16
- .text.millis   0x0000000000004004       0x18 ../lib/libarduino.a(wiring.o)
-                0x0000000000004004                millis
- .text.micros   0x000000000000401c       0x4a ../lib/libarduino.a(wiring.o)
-                0x000000000000401c                micros
- .text.delay    0x0000000000004066       0x4c ../lib/libarduino.a(wiring.o)
-                0x0000000000004066                delay
- .text.init     0x00000000000040b2       0x76 ../lib/libarduino.a(wiring.o)
-                0x00000000000040b2                init
+                0x0000000000003e76       0x94 ../lib/libarduino.a(wiring.o)
+                0x0000000000003e76                __vector_16
+ .text.millis   0x0000000000003f0a       0x18 ../lib/libarduino.a(wiring.o)
+                0x0000000000003f0a                millis
+ .text.micros   0x0000000000003f22       0x4a ../lib/libarduino.a(wiring.o)
+                0x0000000000003f22                micros
+ .text.delay    0x0000000000003f6c       0x4c ../lib/libarduino.a(wiring.o)
+                0x0000000000003f6c                delay
+ .text.init     0x0000000000003fb8       0x76 ../lib/libarduino.a(wiring.o)
+                0x0000000000003fb8                init
  .text.analogRead
-                0x0000000000004128       0x36 ../lib/libarduino.a(wiring_analog.o)
-                0x0000000000004128                analogRead
+                0x000000000000402e       0x36 ../lib/libarduino.a(wiring_analog.o)
+                0x000000000000402e                analogRead
  .text.analogWrite
-                0x000000000000415e       0xba ../lib/libarduino.a(wiring_analog.o)
-                0x000000000000415e                analogWrite
+                0x0000000000004064       0xba ../lib/libarduino.a(wiring_analog.o)
+                0x0000000000004064                analogWrite
  .text.turnOffPWM
-                0x0000000000004218       0x52 ../lib/libarduino.a(wiring_digital.o)
- .text.pinMode  0x000000000000426a       0x78 ../lib/libarduino.a(wiring_digital.o)
-                0x000000000000426a                pinMode
+                0x000000000000411e       0x52 ../lib/libarduino.a(wiring_digital.o)
+ .text.pinMode  0x0000000000004170       0x78 ../lib/libarduino.a(wiring_digital.o)
+                0x0000000000004170                pinMode
  .text.digitalWrite
-                0x00000000000042e2       0x5c ../lib/libarduino.a(wiring_digital.o)
-                0x00000000000042e2                digitalWrite
+                0x00000000000041e8       0x5c ../lib/libarduino.a(wiring_digital.o)
+                0x00000000000041e8                digitalWrite
  .text.digitalRead
-                0x000000000000433e       0x52 ../lib/libarduino.a(wiring_digital.o)
-                0x000000000000433e                digitalRead
+                0x0000000000004244       0x52 ../lib/libarduino.a(wiring_digital.o)
+                0x0000000000004244                digitalRead
  .text._ZN5Print5writeEPKhj
-                0x0000000000004390       0x50 ../lib/libarduino.a(Print.o)
-                0x0000000000004390                _ZN5Print5writeEPKhj
+                0x0000000000004296       0x50 ../lib/libarduino.a(Print.o)
+                0x0000000000004296                _ZN5Print5writeEPKhj
  .text._ZN5Print5writeEPKc.part.1
-                0x00000000000043e0       0x1e ../lib/libarduino.a(Print.o)
+                0x00000000000042e6       0x1e ../lib/libarduino.a(Print.o)
  .text._ZN5Print5printEPK19__FlashStringHelper
-                0x00000000000043fe       0x46 ../lib/libarduino.a(Print.o)
-                0x00000000000043fe                _ZN5Print5printEPK19__FlashStringHelper
+                0x0000000000004304       0x46 ../lib/libarduino.a(Print.o)
+                0x0000000000004304                _ZN5Print5printEPK19__FlashStringHelper
  .text._ZN5Print5printEPKc
-                0x0000000000004444       0x10 ../lib/libarduino.a(Print.o)
-                0x0000000000004444                _ZN5Print5printEPKc
+                0x000000000000434a       0x10 ../lib/libarduino.a(Print.o)
+                0x000000000000434a                _ZN5Print5printEPKc
  .text._ZN5Print5printEc
-                0x0000000000004454        0xe ../lib/libarduino.a(Print.o)
-                0x0000000000004454                _ZN5Print5printEc
+                0x000000000000435a        0xe ../lib/libarduino.a(Print.o)
+                0x000000000000435a                _ZN5Print5printEc
  .text._ZN5Print7printlnEv
-                0x0000000000004462       0x28 ../lib/libarduino.a(Print.o)
-                0x0000000000004462                _ZN5Print7printlnEv
+                0x0000000000004368       0x28 ../lib/libarduino.a(Print.o)
+                0x0000000000004368                _ZN5Print7printlnEv
  .text._ZN5Print7printlnEPK19__FlashStringHelper
-                0x000000000000448a       0x24 ../lib/libarduino.a(Print.o)
-                0x000000000000448a                _ZN5Print7printlnEPK19__FlashStringHelper
+                0x0000000000004390       0x24 ../lib/libarduino.a(Print.o)
+                0x0000000000004390                _ZN5Print7printlnEPK19__FlashStringHelper
  .text._ZN5Print11printNumberEmh
-                0x00000000000044ae       0xb2 ../lib/libarduino.a(Print.o)
-                0x00000000000044ae                _ZN5Print11printNumberEmh
+                0x00000000000043b4       0xb2 ../lib/libarduino.a(Print.o)
+                0x00000000000043b4                _ZN5Print11printNumberEmh
  .text._ZN5Print5printEli
-                0x0000000000004560       0x94 ../lib/libarduino.a(Print.o)
-                0x0000000000004560                _ZN5Print5printEli
+                0x0000000000004466       0x94 ../lib/libarduino.a(Print.o)
+                0x0000000000004466                _ZN5Print5printEli
  .text._ZN5Print5printEii
-                0x00000000000045f4        0xe ../lib/libarduino.a(Print.o)
-                0x00000000000045f4                _ZN5Print5printEii
+                0x00000000000044fa        0xe ../lib/libarduino.a(Print.o)
+                0x00000000000044fa                _ZN5Print5printEii
  .text._ZN5Print5printEmi
-                0x0000000000004602       0x1a ../lib/libarduino.a(Print.o)
-                0x0000000000004602                _ZN5Print5printEmi
+                0x0000000000004508       0x1a ../lib/libarduino.a(Print.o)
+                0x0000000000004508                _ZN5Print5printEmi
  .text._ZN5Print5printEji
-                0x000000000000461c        0xc ../lib/libarduino.a(Print.o)
-                0x000000000000461c                _ZN5Print5printEji
+                0x0000000000004522        0xc ../lib/libarduino.a(Print.o)
+                0x0000000000004522                _ZN5Print5printEji
  .text._Z3maplllll
-                0x0000000000004628       0x82 ../lib/libarduino.a(WMath.o)
-                0x0000000000004628                _Z3maplllll
+                0x000000000000452e       0x82 ../lib/libarduino.a(WMath.o)
+                0x000000000000452e                _Z3maplllll
  .text._ZN8SPIClass5beginEv
-                0x00000000000046aa       0x2c ../lib/libarduino.a(SPI.o)
-                0x00000000000046aa                _ZN8SPIClass5beginEv
+                0x00000000000045b0       0x2c ../lib/libarduino.a(SPI.o)
+                0x00000000000045b0                _ZN8SPIClass5beginEv
  .text._ZN8SPIClass11setBitOrderEh
-                0x00000000000046d6       0x12 ../lib/libarduino.a(SPI.o)
-                0x00000000000046d6                _ZN8SPIClass11setBitOrderEh
+                0x00000000000045dc       0x12 ../lib/libarduino.a(SPI.o)
+                0x00000000000045dc                _ZN8SPIClass11setBitOrderEh
  .text._ZN8SPIClass11setDataModeEh
-                0x00000000000046e8        0xa ../lib/libarduino.a(SPI.o)
-                0x00000000000046e8                _ZN8SPIClass11setDataModeEh
+                0x00000000000045ee        0xa ../lib/libarduino.a(SPI.o)
+                0x00000000000045ee                _ZN8SPIClass11setDataModeEh
  .text._ZN8SPIClass15setClockDividerEh
-                0x00000000000046f2       0x1e ../lib/libarduino.a(SPI.o)
-                0x00000000000046f2                _ZN8SPIClass15setClockDividerEh
+                0x00000000000045f8       0x1e ../lib/libarduino.a(SPI.o)
+                0x00000000000045f8                _ZN8SPIClass15setClockDividerEh
  .text.libgcc.mul
-                0x0000000000004710       0x20 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_mulsi3.o)
-                0x0000000000004710                __mulsi3
+                0x0000000000004616       0x20 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_mulsi3.o)
+                0x0000000000004616                __mulsi3
  .text.libgcc.div
-                0x0000000000004730       0x18 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_udivmodqi4.o)
-                0x0000000000004730                __udivmodqi4
+                0x0000000000004636       0x18 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_udivmodqi4.o)
+                0x0000000000004636                __udivmodqi4
  .text.libgcc.div
-                0x0000000000004748       0x28 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_udivmodhi4.o)
-                0x0000000000004748                __udivmodhi4
+                0x000000000000464e       0x28 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_udivmodhi4.o)
+                0x000000000000464e                __udivmodhi4
  .text.libgcc.div
-                0x0000000000004770       0x28 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_divmodhi4.o)
-                0x0000000000004770                __divmodhi4
-                0x0000000000004770                _div
+                0x0000000000004676       0x28 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_divmodhi4.o)
+                0x0000000000004676                __divmodhi4
+                0x0000000000004676                _div
  .text.libgcc.div
-                0x0000000000004798       0x44 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_udivmodsi4.o)
-                0x0000000000004798                __udivmodsi4
+                0x000000000000469e       0x44 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_udivmodsi4.o)
+                0x000000000000469e                __udivmodsi4
  .text.libgcc.div
-                0x00000000000047dc       0x2e /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_divmodsi4.o)
-                0x00000000000047dc                __divmodsi4
+                0x00000000000046e2       0x2e /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_divmodsi4.o)
+                0x00000000000046e2                __divmodsi4
  .text.libgcc.div
-                0x000000000000480a       0x10 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_negsi2.o)
-                0x000000000000480a                __negsi2
+                0x0000000000004710       0x10 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_negsi2.o)
+                0x0000000000004710                __negsi2
  .text.libgcc.mul
-                0x000000000000481a       0x16 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_muluhisi3.o)
-                0x000000000000481a                __muluhisi3
- .text.libgcc   0x0000000000004830       0x18 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_adddi3_s8.o)
-                0x0000000000004830                __adddi3_s8
- .text.libgcc   0x0000000000004848        0xc /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_tablejump2.o)
-                0x0000000000004848                __tablejump2__
+                0x0000000000004720       0x16 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_muluhisi3.o)
+                0x0000000000004720                __muluhisi3
+ .text.libgcc   0x0000000000004736       0x18 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_adddi3_s8.o)
+                0x0000000000004736                __adddi3_s8
+ .text.libgcc   0x000000000000474e        0xc /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_tablejump2.o)
+                0x000000000000474e                __tablejump2__
  .text.libgcc.mul
-                0x0000000000004854       0x1e /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_umulhisi3.o)
-                0x0000000000004854                __umulhisi3
+                0x000000000000475a       0x1e /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_umulhisi3.o)
+                0x000000000000475a                __umulhisi3
  .text.avr-libc.fplib
-                0x0000000000004872       0x5e /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fixunssfsi.o)
-                0x0000000000004872                __fixunssfsi
+                0x0000000000004778       0x5e /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fixunssfsi.o)
+                0x0000000000004778                __fixunssfsi
  .text.avr-libc.fplib
-                0x00000000000048d0       0x7a /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(floatsisf.o)
-                0x00000000000048d0                __floatunsisf
-                0x00000000000048d4                __floatsisf
+                0x00000000000047d6       0x7a /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(floatsisf.o)
+                0x00000000000047d6                __floatunsisf
+                0x00000000000047da                __floatsisf
  .text.avr-libc.fplib
-                0x000000000000494a        0xc /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_inf.o)
-                0x000000000000494a                __fp_inf
+                0x0000000000004850        0xc /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_inf.o)
+                0x0000000000004850                __fp_inf
  .text.avr-libc.fplib
-                0x0000000000004956        0x6 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_nan.o)
-                0x0000000000004956                __fp_nan
+                0x000000000000485c        0x6 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_nan.o)
+                0x000000000000485c                __fp_nan
  .text.avr-libc.fplib
-                0x000000000000495c        0xe /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_pscA.o)
-                0x000000000000495c                __fp_pscA
+                0x0000000000004862        0xe /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_pscA.o)
+                0x0000000000004862                __fp_pscA
  .text.avr-libc.fplib
-                0x000000000000496a        0xe /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_pscB.o)
-                0x000000000000496a                __fp_pscB
+                0x0000000000004870        0xe /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_pscB.o)
+                0x0000000000004870                __fp_pscB
  .text.avr-libc.fplib
-                0x0000000000004978       0x22 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_round.o)
-                0x0000000000004978                __fp_round
+                0x000000000000487e       0x22 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_round.o)
+                0x000000000000487e                __fp_round
  .text.avr-libc.fplib
-                0x000000000000499a       0x44 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_split3.o)
-                0x000000000000499a                __fp_split3
-                0x00000000000049aa                __fp_splitA
+                0x00000000000048a0       0x44 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_split3.o)
+                0x00000000000048a0                __fp_split3
+                0x00000000000048b0                __fp_splitA
  .text.avr-libc.fplib
-                0x00000000000049de        0xe /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_zero.o)
-                0x00000000000049de                __fp_zero
-                0x00000000000049e0                __fp_szero
+                0x00000000000048e4        0xe /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(fp_zero.o)
+                0x00000000000048e4                __fp_zero
+                0x00000000000048e6                __fp_szero
  .text.avr-libc.fplib
-                0x00000000000049ec        0x8 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(mulsf3.o)
-                0x00000000000049ec                __mulsf3
+                0x00000000000048f2        0x8 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(mulsf3.o)
+                0x00000000000048f2                __mulsf3
  .text.avr-libc.fplib
-                0x00000000000049f4       0xd2 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(mulsf3x.o)
-                0x0000000000004a12                __mulsf3x
-                0x0000000000004a18                __mulsf3_pse
+                0x00000000000048fa       0xd2 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libm.a(mulsf3x.o)
+                0x0000000000004918                __mulsf3x
+                0x000000000000491e                __mulsf3_pse
  .text.avr-libc
-                0x0000000000004ac6       0xb8 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(rand.o)
-                0x0000000000004b58                rand_r
-                0x0000000000004b5e                rand
-                0x0000000000004b68                srand
+                0x00000000000049cc       0xb8 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(rand.o)
+                0x0000000000004a5e                rand_r
+                0x0000000000004a64                rand
+                0x0000000000004a6e                srand
  .text.avr-libc
-                0x0000000000004b7e       0x60 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(snprintf.o)
-                0x0000000000004b7e                snprintf
+                0x0000000000004a84       0x60 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(snprintf.o)
+                0x0000000000004a84                snprintf
  .text.avr-libc
-                0x0000000000004bde      0x3b4 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(vfprintf_std.o)
-                0x0000000000004bde                vfprintf
+                0x0000000000004ae4      0x3b4 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(vfprintf_std.o)
+                0x0000000000004ae4                vfprintf
  .text.avr-libc
-                0x0000000000004f92       0x16 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(strnlen_P.o)
-                0x0000000000004f92                strnlen_P
+                0x0000000000004e98       0x16 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(strnlen_P.o)
+                0x0000000000004e98                strnlen_P
  .text.avr-libc
-                0x0000000000004fa8       0x16 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(strnlen.o)
-                0x0000000000004fa8                strnlen
+                0x0000000000004eae       0x16 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(strnlen.o)
+                0x0000000000004eae                strnlen
  .text.avr-libc
-                0x0000000000004fbe       0x60 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(fputc.o)
-                0x0000000000004fbe                fputc
+                0x0000000000004ec4       0x60 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(fputc.o)
+                0x0000000000004ec4                fputc
  .text.avr-libc
-                0x000000000000501e       0xbc /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(ultoa_invert.o)
-                0x000000000000501e                __ultoa_invert
+                0x0000000000004f24       0xbc /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(ultoa_invert.o)
+                0x0000000000004f24                __ultoa_invert
  .text.libgcc.mul
-                0x00000000000050da       0x10 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_mulshisi3.o)
-                0x00000000000050da                __mulshisi3
-                0x00000000000050e0                __mulohisi3
+                0x0000000000004fe0       0x10 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_mulshisi3.o)
+                0x0000000000004fe0                __mulshisi3
+                0x0000000000004fe6                __mulohisi3
  .text.libgcc.prologue
-                0x00000000000050ea       0x38 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_prologue.o)
-                0x00000000000050ea                __prologue_saves__
+                0x0000000000004ff0       0x38 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_prologue.o)
+                0x0000000000004ff0                __prologue_saves__
  .text.libgcc.prologue
-                0x0000000000005122       0x36 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_epilogue.o)
-                0x0000000000005122                __epilogue_restores__
-                0x0000000000005158                . = ALIGN (0x2)
+                0x0000000000005028       0x36 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_epilogue.o)
+                0x0000000000005028                __epilogue_restores__
+                0x000000000000505e                . = ALIGN (0x2)
  *(.fini9)
- .fini9         0x0000000000005158        0x0 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_exit.o)
-                0x0000000000005158                exit
-                0x0000000000005158                _exit
+ .fini9         0x000000000000505e        0x0 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_exit.o)
+                0x000000000000505e                exit
+                0x000000000000505e                _exit
  *(.fini9)
  *(.fini8)
  *(.fini8)
  *(.fini7)
  *(.fini7)
  *(.fini6)
- .fini6         0x0000000000005158       0x16 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_dtors.o)
-                0x0000000000005158                __do_global_dtors
+ .fini6         0x000000000000505e       0x16 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_dtors.o)
+                0x000000000000505e                __do_global_dtors
  *(.fini6)
  *(.fini5)
  *(.fini5)
@@ -2073,16 +2075,16 @@ END GROUP
  *(.fini1)
  *(.fini1)
  *(.fini0)
- .fini0         0x000000000000516e        0x4 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_exit.o)
+ .fini0         0x0000000000005074        0x4 /usr/local/avr/lib/gcc/avr/7.2.0/avr5/libgcc.a(_exit.o)
  *(.fini0)
  *(.hightext)
  *(.hightext*)
-                0x0000000000005172                . = ALIGN (0x2)
+                0x0000000000005078                . = ALIGN (0x2)
  *(.jumptables)
  *(.jumptables*)
-                0x0000000000005172                _etext = .
+                0x0000000000005078                _etext = .
 
-.data           0x0000000000800100       0x42 load address 0x0000000000005172
+.data           0x0000000000800100       0x5e load address 0x0000000000005078
                 0x0000000000800100                PROVIDE (__data_start, .)
  *(.data)
  .data          0x0000000000800100        0x4 /usr/local/avr/lib/gcc/avr/7.2.0/../../../../avr/lib/avr5/libc.a(rand.o)
@@ -2099,102 +2101,97 @@ END GROUP
                 0x0000000000800106        0xf Obj/Gfx.o
  .rodata._ZN6Player10showHealthEh.str1.1
                 0x0000000000800115        0x6 Obj/Player.o
+ .rodata._ZN6Player18ButtonLeftReleasedEv.str1.1
+                0x000000000080011b        0x6 Obj/Player.o
+                                          0x3 (size before relaxing)
+ .rodata.UnitShadowOffsetTable
+                0x000000000080011b        0x4 Obj/Unit.o
+ .rodata.UnitActionsTable
+                0x000000000080011f        0x5 Obj/Unit.o
  .rodata.str1.1
-                0x000000000080011b        0xf Obj/Unit.o
- .rodata.UnitActionsTable_Level1
-                0x000000000080012a        0x4 Obj/Unit.o
+                0x0000000000800124       0x14 Obj/Unit.o
  .rodata.UnitActionsTable_Level0
-                0x000000000080012e        0x4 Obj/Unit.o
+                0x0000000000800138        0xc Obj/Unit.o
+ .rodata.UnitSpeedTable
+                0x0000000000800144        0x5 Obj/Unit.o
+ .rodata.UnitHPTable
+                0x0000000000800149        0x5 Obj/Unit.o
  .rodata._ZTV7Display
-                0x0000000000800132        0x8 ../lib/libgamebuino.a(Display.o)
-                0x0000000000800132                _ZTV7Display
+                0x000000000080014e        0x8 ../lib/libgamebuino.a(Display.o)
+                0x000000000080014e                _ZTV7Display
  .rodata._ZN9Gamebuino10changeGameEv.str1.1
-                0x000000000080013a        0x7 ../lib/libgamebuino.a(Gamebuino.o)
+                0x0000000000800156        0x7 ../lib/libgamebuino.a(Gamebuino.o)
  *(.gnu.linkonce.r*)
-                0x0000000000800142                . = ALIGN (0x2)
- *fill*         0x0000000000800141        0x1 
-                0x0000000000800142                _edata = .
-                0x0000000000800142                PROVIDE (__data_end, .)
+                0x000000000080015e                . = ALIGN (0x2)
+ *fill*         0x000000000080015d        0x1 
+                0x000000000080015e                _edata = .
+                0x000000000080015e                PROVIDE (__data_end, .)
 
-.bss            0x0000000000800142      0x637
-                0x0000000000800142                PROVIDE (__bss_start, .)
+.bss            0x000000000080015e      0x607
+                0x000000000080015e                PROVIDE (__bss_start, .)
  *(.bss)
  *(.bss*)
- .bss.gb        0x0000000000800142       0x87 Obj/main.o
-                0x0000000000800142                gb
+ .bss.gb        0x000000000080015e       0x87 Obj/main.o
+                0x000000000080015e                gb
  .bss._ZL8MouseSpr
-                0x00000000008001c9        0x9 Obj/Gameplay.o
+                0x00000000008001e5        0x9 Obj/Gameplay.o
  .bss.GamePlayers
-                0x00000000008001d2      0x304 Obj/Gameplay.o
-                0x00000000008001d2                GamePlayers
+                0x00000000008001ee      0x2a3 Obj/Gameplay.o
+                0x00000000008001ee                GamePlayers
  .bss.timer_array
-                0x00000000008004d6       0x60 Obj/System.o
+                0x0000000000800491       0x60 Obj/System.o
  .bss.system_busy
-                0x0000000000800536        0x1 Obj/System.o
+                0x00000000008004f1        0x1 Obj/System.o
  .bss.one_second_timer
-                0x0000000000800537        0x1 Obj/System.o
+                0x00000000008004f2        0x1 Obj/System.o
  .bss.rand_seed
-                0x0000000000800538        0x1 Obj/System.o
+                0x00000000008004f3        0x1 Obj/System.o
  .bss.global_timer
-                0x0000000000800539        0x8 Obj/System.o
- .bss._ZZN6Player13ButtonHandlerEvE16bCancelSelection
-                0x0000000000800541        0x1 Obj/Player.o
- .bss._ZZN6Player24checkNewBuildingPositionEP16t_CollisionBlockE9max_tries
-                0x0000000000800542        0x1 Obj/Player.o
- .bss.walk_counter.2394
-                0x0000000000800543        0x1 Obj/Unit.o
- .bss.mirror.2395
-                0x0000000000800544        0x1 Obj/Unit.o
- .bss.PeasantWalkingSpr
-                0x0000000000800545        0x9 Obj/Unit.o
- .bss.PeasantSpr
-                0x000000000080054e        0x9 Obj/Unit.o
- .bss.menuLevel
-                0x0000000000800557        0x1 Obj/Unit.o
- .bss.BarracksShadowSpr
-                0x0000000000800558        0x9 Obj/Building.o
- .bss.BarracksSpr
-                0x0000000000800561        0x9 Obj/Building.o
+                0x00000000008004f4        0x8 Obj/System.o
+ .bss.UnitWalkingShadowSprTable
+                0x00000000008004fc       0x2d Obj/Unit.o
+ .bss.UnitSprTable
+                0x0000000000800529       0x2d Obj/Unit.o
  .bss._displayBuffer
-                0x000000000080056a      0x200 ../lib/libgamebuino.a(Display.o)
-                0x000000000080056a                _displayBuffer
+                0x0000000000800556      0x200 ../lib/libgamebuino.a(Display.o)
+                0x0000000000800556                _displayBuffer
  .bss._chanNoise
-                0x000000000080076a        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x000000000080076a                _chanNoise
+                0x0000000000800756        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000800756                _chanNoise
  .bss._chanOutput
-                0x000000000080076b        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x000000000080076b                _chanOutput
+                0x0000000000800757        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000800757                _chanOutput
  .bss._chanOutputVolume
-                0x000000000080076c        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x000000000080076c                _chanOutputVolume
+                0x0000000000800758        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000800758                _chanOutputVolume
  .bss._chanHalfPeriod
-                0x000000000080076d        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x000000000080076d                _chanHalfPeriod
+                0x0000000000800759        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x0000000000800759                _chanHalfPeriod
  .bss._chanState
-                0x000000000080076e        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x000000000080076e                _chanState
+                0x000000000080075a        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x000000000080075a                _chanState
  .bss._chanCount
-                0x000000000080076f        0x1 ../lib/libgamebuino.a(Sound.o)
-                0x000000000080076f                _chanCount
+                0x000000000080075b        0x1 ../lib/libgamebuino.a(Sound.o)
+                0x000000000080075b                _chanCount
  .bss.timer0_fract
-                0x0000000000800770        0x1 ../lib/libarduino.a(wiring.o)
+                0x000000000080075c        0x1 ../lib/libarduino.a(wiring.o)
  .bss.timer0_millis
-                0x0000000000800771        0x4 ../lib/libarduino.a(wiring.o)
-                0x0000000000800771                timer0_millis
+                0x000000000080075d        0x4 ../lib/libarduino.a(wiring.o)
+                0x000000000080075d                timer0_millis
  .bss.timer0_overflow_count
-                0x0000000000800775        0x4 ../lib/libarduino.a(wiring.o)
-                0x0000000000800775                timer0_overflow_count
+                0x0000000000800761        0x4 ../lib/libarduino.a(wiring.o)
+                0x0000000000800761                timer0_overflow_count
  *(COMMON)
-                0x0000000000800779                PROVIDE (__bss_end, .)
-                0x0000000000005172                __data_load_start = LOADADDR (.data)
-                0x00000000000051b4                __data_load_end = (__data_load_start + SIZEOF (.data))
+                0x0000000000800765                PROVIDE (__bss_end, .)
+                0x0000000000005078                __data_load_start = LOADADDR (.data)
+                0x00000000000050d6                __data_load_end = (__data_load_start + SIZEOF (.data))
 
-.noinit         0x0000000000800779        0x0
+.noinit         0x0000000000800765        0x0
                 [!provide]                        PROVIDE (__noinit_start, .)
  *(.noinit*)
                 [!provide]                        PROVIDE (__noinit_end, .)
-                0x0000000000800779                _end = .
-                0x0000000000800779                PROVIDE (__heap_start, .)
+                0x0000000000800765                _end = .
+                0x0000000000800765                PROVIDE (__heap_start, .)
 
 .eeprom         0x0000000000810000        0x0
  *(.eeprom*)
@@ -2242,7 +2239,6 @@ END GROUP
  .comment       0x0000000000000011       0x12 Obj/Camera.o
  .comment       0x0000000000000011       0x12 Obj/Unit.o
  .comment       0x0000000000000011       0x12 Obj/Menu.o
- .comment       0x0000000000000011       0x12 Obj/Building.o
  .comment       0x0000000000000011       0x12 ../lib/libgamebuino.a(Buttons.o)
  .comment       0x0000000000000011       0x12 ../lib/libgamebuino.a(Display.o)
  .comment       0x0000000000000011       0x12 ../lib/libgamebuino.a(font3x3.o)