From 4dbce3f0b3fc3adf663cfbcdcb8a9ef44fc53b8a Mon Sep 17 00:00:00 2001
From: milang <milan.garnier@orange.fr>
Date: Tue, 6 Aug 2019 20:14:02 +0200
Subject: [PATCH] added water displaying

---
 BitmapWs.g1a                    | Bin 13700 -> 14264 bytes
 assets-fx/img/water.png         | Bin 0 -> 797 bytes
 build-fx/assets/img/water.png.o | Bin 0 -> 544 bytes
 build-fx/map                    | 539 ++++++++++++++++----------------
 build-fx/src/BitmapWs.bin       | Bin 13188 -> 13752 bytes
 build-fx/src/BitmapWs.elf       | Bin 21536 -> 22168 bytes
 build-fx/src/item.o             | Bin 1532 -> 1844 bytes
 build-fx/src/map.o              | Bin 1440 -> 1636 bytes
 src/item.c                      |  46 ++-
 src/item.h                      |   1 +
 src/map.c                       |  55 ++--
 src/map.h                       |  13 +-
 12 files changed, 344 insertions(+), 310 deletions(-)
 create mode 100644 assets-fx/img/water.png
 create mode 100644 build-fx/assets/img/water.png.o

diff --git a/BitmapWs.g1a b/BitmapWs.g1a
index a7f49f8f3953b30038593a118671962c71bcc923..06b1015ad6a5c59fc0a17385da4a89e336f2b41b 100644
GIT binary patch
delta 2384
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

delta 1768
zcmYLKe@qj16n}TUc1N#5uh(A7wWUQ6E7bNYQpAOsR+t*bMkgX$B9mW*s+cJv5M?O?
z=bB6gc#AQce~@XGhAq*p%VG%INX8bn_y<LF|7=++lO>zU++dhEV)ss5yl=jF_kHj4
zzVCbQz0dcqzkcS3Yy6WhuZ~3DAJV1&#PRH-boz(W-#~>Io;?1YF9z!aduvBWjhV${
z%XSYbBc+}#K400VRWXY8ory0~XQ{m<`=YR{xafhDRI+-_2!LjU)hjCR2LMHvfB-~c
z<vNgpejppWfLN=6xTk<@4g%4})~4>*nzY`RZ>V<Bnu~EGvxCuSF5;G#<X6}NjSG=p
zCVqz9LDTDk^0fASTDT%Na^@GTHS4Rm$o*D1tP0(%;<~6NRpVe-@Uwex5S{a#&`q>u
zR&giODYf6OtXv$fsFcQUzpYDwLkPd?HQZqnT6vbsjbs2>*Nevs0}-xx&xR|!7Y@~W
zKRVpv{o=@pS)pdVpNp(UsbOuDp6A;ydp~QFLxYK|00$Xk3}g&tIN70f?Uy4=O~H|s
z!z+hYfD5n8vunt!zlR3rHHy#GyP-kASV{^!%I8mG%zHpGH-{5cpa@N9<nGHQ>vlv8
zNg%2lYbg`lKy)*BM$~1^&e@Z&sBXz?%KJ^7OYheA8+m&8;ql&G`r&^%Epz4+b=w@u
zJJ~N9+Vez9k6+B`?h{18mS+$Qf<?$_X*uCHnM~GOnSx2M;%W*F*#<}Fl-Xpqie}Mn
z;>CzV;01e%7R-tfII|ftu*NK_r>0TvVfA!niYXC?bUtxNo9b1YQx=dIGbJ5ki7i0`
zM{K|)LGe*=DK%{JiPR>i)yWQPQx?XY>IF%S_{V754^*QLFrA3kEifgeq`9`KVn`oq
zSx^_34(S$p>1}r`j6`juq%O9^Hmh3HCsh8T5)7gw&7M4;)od^%(On72V7^+hmhO00
zRx?#-h~aUuw)QcUtvDOgX-F%ri}Sr%>Mr<;esy3Sg6H{CjpjYYBA4?Lon0-z!oQZ8
z^%D^DJP<wB%`zRI<|T@DT$7WAISqXdx9gCv3sp2fDKp0AOxxJgS_*Et%UGrLtRiJB
zK=SkD8Dm@K|H}<!k5%QS3rhFTo5txvsSA-#AVvKsZEGZQ`|*7b5DE2eXTQQT;)Zz4
zQcP)b^MSag<z)6Eoo$h4q*Ka~E3MtMJt<FG$2AJ!+*5Lg?bI&!7``?tsft1p`FR(&
zDZs{(E=J)OTtCobm~)8fS8xe>R&@&#+-iUf#r6a{FT3q8(Kd_RXWyZSN&6g%_()DE
zP3KI?GtOt}oS8V2E2$zmA0m-zkw_Itq!UP_7Vmd8>t7y>L_>SqmiE2rvn8JEW&%jj
zM0xX4r}0*KfNRaG|Ep<f0r*qL^ZCyDzZ(bm6MR?wQf@JSlJBlx=C?1T`5wOaH^;_|
zw$l|y7uBI{t%hCt{O!3r_wo6!@`2$8$Jvmo@xo%{-on34s(>YMbpM&-4*#a-%LC=L
zXZ_jVXZcyiqcYP{aR<G7?^}#i$rgv(mb$CAS9jEU&lkoDI{PT`(;=#pI&wKU(EiPC
z*3bHMV(s00-|80Ew!V>^Z3n7N0aiTu%qG!N7)zy_Br&^niF#D`wkY|^5}erGUgYj!
z#LvY104MfDdTR<gR-RrAFal%)PS-UcTT6iCM&rQ^28v$4Dz_HwM-iVakks0(mDmSP
zAceQ(WYJOiW%svAaV?wo)7kgsW19!GTk)P%n!%AA9nIcKyfz@l&w-fkJyzo#jQvAU
zmqcB74eEJ(b7LoCSiNO*)Z`#u=bFjJK5?V4-bNrc>`vPOxzA&Z0E;82rWzU=-T<JW
zq3>WsJ4O!_PIxAuUmGj@-IET^s_W{O%|C<RRA*Z~n2yD`KMIrF*AU~zT@SrzH}&YJ
zOm)V2^N+^mgK1|{`!S4Z$HyOfzAi&M1Wf_(Q<Zgf2jAG&RiB2Kb^!VTzMA-oc{nlQ
ki93jZ{f^(0yFXsGrAn>wy72el8XdJTNWqc#l~N=19~CJ8egFUf

diff --git a/assets-fx/img/water.png b/assets-fx/img/water.png
new file mode 100644
index 0000000000000000000000000000000000000000..233fd876f2bdd534dc7bdbbe5aa58eb1eb84481d
GIT binary patch
literal 797
zcmV+&1LFLNP)<h;3K|Lk000e1NJLTq004jh000OG1^@s6G2Qom0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ?*4}9PA+CkfG{gK~&UHt5Adrp;l<s!Q|2pp-DrM
z;^HW{799LotU9<j>+0Yt2!bCVF0M|BE>hzEl0u7E503ls?%w0>9U#<7OtU&h0Zq5f
zR3a{BvMXZX6+v_%j42Gu%ra&rDT%h@>mEM7-o<!U`*VMeu$r?N;1h{wm|@z)>%^0r
zw!wLyIKqmuN_<W{V$ubPAGxl0{KmQ9vcNMVW;!)T93d79Ev&RKE1DYd1aVZ=bjlYp
z9;=+UIBTT}YuuB+FqG4mm$*)I00}H$5fVfws9*yn*oe`plVTx7`|&pZe%CLNOCi?=
z7&+!qh6dU7ga5(rZms<In3oia1D!99^Dzhnc7b};alVfor+xzXpMfjA=`YuS=}*$D
zO)Yu^^lSqc*G)~?11@)fz9&OAWmodk6!LlC{fxdT3-sOs-K$=2jeVRx0BPzfc>^3A
z0z(DLUTgF2U~6yxo@w;=1C_IKwJSgcPyhe`24YJ`L;wH)0002_L%V+f000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2jd6^5(Y1;HabuM000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0002=Nkl<ZSi{v;%MJt~2-|M>|6gVg8xvzd3Yd9tnhaK2
zQ~;`~pPLPU`CnCC-|+A7j6Fd9t@_0y5pBLEu1aF;!-!!yRk*xee-$qt2*8%y>>vL<
z5)3&efzg`C@9~KATUbkf=D-;a8GTi}Fo(nn^ww1_#FeG?L=IR@S8I;!I}_WLmhqkG
zncjLYmW5&CS+TNwEnY0%!|w15-%h@n_!8aZwd`j~+=*7e?vZ)5nF`c-u}n3X52#ap
zD{Te9{{qa@=GxDh+iT&w)2<ia;ulTJrw+9{gm#Cx6YX=wOO)_T3GUca;&%qEj=wu+
bRW<wo(QW`*6M?e900000NkvXXu0mjf&S_l4

literal 0
HcmV?d00001

diff --git a/build-fx/assets/img/water.png.o b/build-fx/assets/img/water.png.o
new file mode 100644
index 0000000000000000000000000000000000000000..9629af3ff0a1bb936a252e976334087165a79327
GIT binary patch
literal 544
zcmb<-^>JflVq|~=Mg}b)8(AO%EN22HH5gbKSQt2f5D4o2)&GalHh=8@`#nql525{^
z*Ud|x50rmicdq_3NS)um`kx>=?VtaD5M7s6S6@`;S6>GNX+T)?ulRZ0Cx{x5Jjfgn
zu6vgL-0xHUXRz%+0%#6Ue>&J+m>4?E3~@i)4+0QA4^UkTNG+5vjo|<P$Pk~In;u`D
zSdv<V#EehPOF`xqXI7;$Fz6Lm=9VNT0qK$=2%Q0A73HTSmL!5KAs&F-0dgx7R0}Ai
z!S00eVg5i?1CrVS!~sAI^e$L03y=nSje!#?2BbiM5foS2U?zlsnI{P3g7iWGqcM=7
K4C4W5usQ(L?`<Uj

literal 0
HcmV?d00001

diff --git a/build-fx/map b/build-fx/map
index ed54f71..bf1eefb 100644
--- a/build-fx/map
+++ b/build-fx/map
@@ -70,7 +70,7 @@ Archive member included to satisfy reference by file (symbol)
 Allocating common symbols
 Common symbol       size              file
 
-map                 0x258             build-fx/src/map.o
+map                 0xc00             build-fx/src/map.o
 
 Discarded input sections
 
@@ -115,12 +115,13 @@ LOAD build-fx/src/item.o
 LOAD build-fx/src/main.o
 LOAD build-fx/src/map.o
 LOAD build-fx/assets/img/brouillard.png.o
+LOAD build-fx/assets/img/water.png.o
 LOAD build-fx/assets/img/houses.png.o
 LOAD build-fx/assets/img/wall.png.o
 LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a
 LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
                 0x0000000000300000                _brom = 0x300000
-                0x0000000000002b9c                _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks))
+                0x0000000000002dd0                _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks))
 
 .pretext        0x0000000000300200      0x8a8
  *(.pretext.entry)
@@ -160,219 +161,224 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
  *(.dtors .dtors.*)
                 0x0000000000300aa8                _etors = .
 
-.text           0x0000000000300aa8     0x20d8
+.text           0x0000000000300aa8     0x2208
  *(.text .text.*)
- .text          0x0000000000300aa8      0x1c8 build-fx/src/item.o
+ .text          0x0000000000300aa8      0x28c build-fx/src/item.o
                 0x0000000000300aa8                get_item_type
                 0x0000000000300ac4                display_item_etendu
                 0x0000000000300b60                display_brouillard
-                0x0000000000300bf0                display_item
-                0x0000000000300c64                display_case
- .text          0x0000000000300c70        0x0 build-fx/src/main.o
- .text.startup  0x0000000000300c70       0x58 build-fx/src/main.o
-                0x0000000000300c70                main
- .text          0x0000000000300cc8      0x188 build-fx/src/map.o
-                0x0000000000300cc8                create_map
-                0x0000000000300d50                get_item
-                0x0000000000300d78                get_visibility
-                0x0000000000300da8                set_item
-                0x0000000000300de0                display
- .text          0x0000000000300e50      0x1c8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o)
-                0x0000000000300e50                getkey_opt
-                0x0000000000300fd0                getkey
-                0x0000000000300fdc                getkey_repeat
- .text          0x0000000000301018      0x2c8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
-                0x00000000003011bc                pollevent
-                0x00000000003012a8                waitevent
- .text          0x00000000003012e0       0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o)
-                0x00000000003012e0                dclear
- .text          0x000000000030132c        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o)
- .text          0x000000000030132c        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o)
- .text          0x000000000030132c        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
- .text          0x000000000030132c       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o)
-                0x000000000030132c                dupdate
-                0x0000000000301344                dupdate_noint
- .text          0x0000000000301350       0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
-                0x0000000000301350                dimage
-                0x00000000003013a4                dsubimage
- .text          0x0000000000301418       0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
-                0x0000000000301418                dsize
- .text          0x00000000003014b4      0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
-                0x00000000003017d4                timer_setup
-                0x0000000000301864                timer_delay
-                0x00000000003018c4                timer_start
-                0x00000000003018f8                timer_reload
-                0x0000000000301918                timer_pause
-                0x000000000030194c                timer_stop
-                0x00000000003019a8                timer_timeout
-                0x00000000003019b4                timer_address
-                0x00000000003019f0                timer_clear
- .text          0x0000000000301a20       0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o)
-                0x0000000000301a20                gint_intlevel
-                0x0000000000301a74                gint_inthandler
- .text          0x0000000000301a98        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o)
- .text          0x0000000000301a98        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
- .text          0x0000000000301a98      0x170 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o)
-                0x0000000000301b4c                gint_install
-                0x0000000000301bf0                gint_unload
- .text          0x0000000000301c08      0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
-                0x0000000000301ca0                t6k11_display
-                0x0000000000301d74                t6k11_contrast
-                0x0000000000301da0                t6k11_backlight
- .text          0x0000000000301de0       0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o)
-                0x0000000000301de0                memcpy
-                0x0000000000301e9a                _memmove
-                0x0000000000301e9e                _memcmp
-                0x0000000000301ea2                memset
- .text          0x0000000000301ebc      0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o)
-                0x0000000000301ec8                iokbd_row
-                0x0000000000301fb0                iokbd_scan
- .text          0x0000000000301fe0      0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
-                0x0000000000302124                clock_freq
- .text          0x0000000000302130       0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o)
-                0x0000000000302130                bopti_asm_mono
-                0x0000000000302156                bopti_asm_mono_alpha
- .text          0x0000000000302188      0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
-                0x0000000000302188                bopti_grid
-                0x00000000003022fc                bopti_render
-                0x0000000000302424                bopti_render_clip
-                0x0000000000302538                bopti_render_noclip
- .text          0x0000000000302590       0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o)
-                0x0000000000302590                masks
- .text          0x000000000030262c        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
- .text          0x000000000030262c        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o)
- .text          0x000000000030262c       0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o)
-                0x000000000030262c                gint_setvbr
- .text          0x0000000000302658      0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o)
-                0x0000000000302658                tlb_addr
-                0x000000000030266c                tlb_data
-                0x0000000000302680                tlb_mapped_memory
-                0x0000000000302754                utlb_addr
-                0x0000000000302764                utlb_data
-                0x0000000000302774                utlb_mapped_memory
- .text          0x000000000030284c        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o)
- .text          0x000000000030284c        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
- .text          0x000000000030284c       0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o)
-                0x000000000030284c                __movstr
-                0x000000000030284c                __movmem
-                0x0000000000302880                __movmemSI64
-                0x0000000000302880                __movstrSI64
-                0x0000000000302884                __movstrSI60
-                0x0000000000302884                __movmemSI60
-                0x0000000000302888                __movmemSI56
-                0x0000000000302888                __movstrSI56
-                0x000000000030288c                __movstrSI52
-                0x000000000030288c                __movmemSI52
-                0x0000000000302890                __movstrSI48
-                0x0000000000302890                __movmemSI48
-                0x0000000000302894                __movstrSI44
-                0x0000000000302894                __movmemSI44
-                0x0000000000302898                __movstrSI40
-                0x0000000000302898                __movmemSI40
-                0x000000000030289c                __movstrSI36
-                0x000000000030289c                __movmemSI36
-                0x00000000003028a0                __movmemSI32
-                0x00000000003028a0                __movstrSI32
-                0x00000000003028a4                __movmemSI28
-                0x00000000003028a4                __movstrSI28
-                0x00000000003028a8                __movstrSI24
-                0x00000000003028a8                __movmemSI24
-                0x00000000003028ac                __movmemSI20
-                0x00000000003028ac                __movstrSI20
-                0x00000000003028b0                __movstrSI16
-                0x00000000003028b0                __movmemSI16
-                0x00000000003028b4                __movmemSI12
-                0x00000000003028b4                __movstrSI12
-                0x00000000003028b8                __movmemSI8
-                0x00000000003028b8                __movstrSI8
-                0x00000000003028bc                __movmemSI4
-                0x00000000003028bc                __movstrSI4
- .text          0x00000000003028c4      0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o)
-                0x00000000003028c4                __udivdi3
- .text          0x0000000000302ab4       0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o)
-                0x0000000000302ad6                __udivsi3
- .text          0x0000000000302b20       0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o)
-                0x0000000000302b20                __udiv_qrnnd_16
- .text          0x0000000000302b80        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
+                0x0000000000300bfc                display_water
+                0x0000000000300c8c                display_case
+ .text          0x0000000000300d34        0x0 build-fx/src/main.o
+ .text.startup  0x0000000000300d34       0x58 build-fx/src/main.o
+                0x0000000000300d34                main
+ .text          0x0000000000300d8c      0x1e8 build-fx/src/map.o
+                0x0000000000300d8c                create_map
+                0x0000000000300e44                get_item
+                0x0000000000300e70                get_visibility
+                0x0000000000300e9c                get_terrain
+                0x0000000000300ec8                set_item
+                0x0000000000300f04                display
+ .text          0x0000000000300f74      0x1c8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o)
+                0x0000000000300f74                getkey_opt
+                0x00000000003010f4                getkey
+                0x0000000000301100                getkey_repeat
+ .text          0x000000000030113c      0x2c8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
+                0x00000000003012e0                pollevent
+                0x00000000003013cc                waitevent
+ .text          0x0000000000301404       0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o)
+                0x0000000000301404                dclear
+ .text          0x0000000000301450        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o)
+ .text          0x0000000000301450        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o)
+ .text          0x0000000000301450        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
+ .text          0x0000000000301450       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o)
+                0x0000000000301450                dupdate
+                0x0000000000301468                dupdate_noint
+ .text          0x0000000000301474       0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
+                0x0000000000301474                dimage
+                0x00000000003014c8                dsubimage
+ .text          0x000000000030153c       0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
+                0x000000000030153c                dsize
+ .text          0x00000000003015d8      0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
+                0x00000000003018f8                timer_setup
+                0x0000000000301988                timer_delay
+                0x00000000003019e8                timer_start
+                0x0000000000301a1c                timer_reload
+                0x0000000000301a3c                timer_pause
+                0x0000000000301a70                timer_stop
+                0x0000000000301acc                timer_timeout
+                0x0000000000301ad8                timer_address
+                0x0000000000301b14                timer_clear
+ .text          0x0000000000301b44       0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o)
+                0x0000000000301b44                gint_intlevel
+                0x0000000000301b98                gint_inthandler
+ .text          0x0000000000301bbc        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o)
+ .text          0x0000000000301bbc        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
+ .text          0x0000000000301bbc      0x170 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o)
+                0x0000000000301c70                gint_install
+                0x0000000000301d14                gint_unload
+ .text          0x0000000000301d2c      0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
+                0x0000000000301dc4                t6k11_display
+                0x0000000000301e98                t6k11_contrast
+                0x0000000000301ec4                t6k11_backlight
+ .text          0x0000000000301f04       0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o)
+                0x0000000000301f04                memcpy
+                0x0000000000301fbe                _memmove
+                0x0000000000301fc2                _memcmp
+                0x0000000000301fc6                memset
+ .text          0x0000000000301fe0      0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o)
+                0x0000000000301fec                iokbd_row
+                0x00000000003020d4                iokbd_scan
+ .text          0x0000000000302104      0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
+                0x0000000000302248                clock_freq
+ .text          0x0000000000302254       0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o)
+                0x0000000000302254                bopti_asm_mono
+                0x000000000030227a                bopti_asm_mono_alpha
+ .text          0x00000000003022ac      0x410 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
+                0x00000000003022ac                bopti_grid
+                0x0000000000302420                bopti_render
+                0x0000000000302550                bopti_render_clip
+                0x0000000000302664                bopti_render_noclip
+ .text          0x00000000003026bc       0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o)
+                0x00000000003026bc                masks
+ .text          0x0000000000302758        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
+ .text          0x0000000000302758        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o)
+ .text          0x0000000000302758       0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o)
+                0x0000000000302758                gint_setvbr
+ .text          0x0000000000302784      0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o)
+                0x0000000000302784                tlb_addr
+                0x0000000000302798                tlb_data
+                0x00000000003027ac                tlb_mapped_memory
+                0x0000000000302880                utlb_addr
+                0x0000000000302890                utlb_data
+                0x00000000003028a0                utlb_mapped_memory
+ .text          0x0000000000302978        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o)
+ .text          0x0000000000302978        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
+ .text          0x0000000000302978       0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o)
+                0x0000000000302978                __movstr
+                0x0000000000302978                __movmem
+                0x00000000003029ac                __movmemSI64
+                0x00000000003029ac                __movstrSI64
+                0x00000000003029b0                __movstrSI60
+                0x00000000003029b0                __movmemSI60
+                0x00000000003029b4                __movmemSI56
+                0x00000000003029b4                __movstrSI56
+                0x00000000003029b8                __movstrSI52
+                0x00000000003029b8                __movmemSI52
+                0x00000000003029bc                __movstrSI48
+                0x00000000003029bc                __movmemSI48
+                0x00000000003029c0                __movstrSI44
+                0x00000000003029c0                __movmemSI44
+                0x00000000003029c4                __movstrSI40
+                0x00000000003029c4                __movmemSI40
+                0x00000000003029c8                __movstrSI36
+                0x00000000003029c8                __movmemSI36
+                0x00000000003029cc                __movmemSI32
+                0x00000000003029cc                __movstrSI32
+                0x00000000003029d0                __movmemSI28
+                0x00000000003029d0                __movstrSI28
+                0x00000000003029d4                __movstrSI24
+                0x00000000003029d4                __movmemSI24
+                0x00000000003029d8                __movmemSI20
+                0x00000000003029d8                __movstrSI20
+                0x00000000003029dc                __movstrSI16
+                0x00000000003029dc                __movmemSI16
+                0x00000000003029e0                __movmemSI12
+                0x00000000003029e0                __movstrSI12
+                0x00000000003029e4                __movmemSI8
+                0x00000000003029e4                __movstrSI8
+                0x00000000003029e8                __movmemSI4
+                0x00000000003029e8                __movstrSI4
+ .text          0x00000000003029f0      0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o)
+                0x00000000003029f0                __udivdi3
+ .text          0x0000000000302be0       0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o)
+                0x0000000000302c02                __udivsi3
+ *fill*         0x0000000000302c4c        0x4 
+ .text          0x0000000000302c50       0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o)
+                0x0000000000302c50                __udiv_qrnnd_16
+ .text          0x0000000000302cb0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
  *(C P)
 
-.gint.blocks    0x0000000000302b80      0x140
+.gint.blocks    0x0000000000302cb0      0x140
  *(.gint.blocks)
- .gint.blocks   0x0000000000302b80       0xe0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
-                0x0000000000302b80                inth_tmu
-                0x0000000000302c00                inth_etmu2
-                0x0000000000302c20                inth_etmu_help
-                0x0000000000302c40                inth_etmux
- .gint.blocks   0x0000000000302c60       0x20 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o)
-                0x0000000000302c60                exch_entry_7705
-                0x0000000000302c60                exch_entry_7305
- .gint.blocks   0x0000000000302c80       0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
-                0x0000000000302c80                inth_entry_7305
-                0x0000000000302ca0                inth_entry_7705
+ .gint.blocks   0x0000000000302cb0       0xe0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
+                0x0000000000302cb0                inth_tmu
+                0x0000000000302d30                inth_etmu2
+                0x0000000000302d50                inth_etmu_help
+                0x0000000000302d70                inth_etmux
+ .gint.blocks   0x0000000000302d90       0x20 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o)
+                0x0000000000302d90                exch_entry_7705
+                0x0000000000302d90                exch_entry_7305
+ .gint.blocks   0x0000000000302db0       0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
+                0x0000000000302db0                inth_entry_7305
+                0x0000000000302dd0                inth_entry_7705
 
-.gint.drivers   0x0000000000302cc0       0x90
-                0x0000000000302cc0                _bdrv = .
+.gint.drivers   0x0000000000302df0       0x90
+                0x0000000000302df0                _bdrv = .
  *(.gint.drivers.0)
  *(.gint.drivers.1)
  .gint.drivers.1
-                0x0000000000302cc0       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
-                0x0000000000302cc0                drv_cpg
+                0x0000000000302df0       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
+                0x0000000000302df0                drv_cpg
  *(.gint.drivers.2)
  .gint.drivers.2
-                0x0000000000302ce4       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
-                0x0000000000302ce4                drv_tmu
+                0x0000000000302e14       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
+                0x0000000000302e14                drv_tmu
  *(.gint.drivers.3)
  *(.gint.drivers.4)
  .gint.drivers.4
-                0x0000000000302d08       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
-                0x0000000000302d08                drv_keysc
+                0x0000000000302e38       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
+                0x0000000000302e38                drv_keysc
  *(.gint.drivers.5)
  .gint.drivers.5
-                0x0000000000302d2c       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
-                0x0000000000302d2c                drv_t6k11
+                0x0000000000302e5c       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
+                0x0000000000302e5c                drv_t6k11
  *(.gint.drivers.6)
-                0x0000000000302d50                _edrv = .
+                0x0000000000302e80                _edrv = .
 
-.rodata         0x0000000000302d50      0x6f4
+.rodata         0x0000000000302e80      0x7f8
  *(.rodata .rodata.*)
  .rodata.str1.4
-                0x0000000000302d50       0x15 build-fx/src/main.o
- *fill*         0x0000000000302d65        0x3 
- .rodata        0x0000000000302d68       0x84 build-fx/assets/img/brouillard.png.o
-                0x0000000000302d68                img_brouillard
-                0x0000000000302dec                img_brouillard_end
- .rodata        0x0000000000302dec       0x84 build-fx/assets/img/houses.png.o
-                0x0000000000302dec                img_houses
-                0x0000000000302e70                img_houses_end
- .rodata        0x0000000000302e70       0x84 build-fx/assets/img/wall.png.o
-                0x0000000000302e70                img_wall
-                0x0000000000302ef4                img_wall_end
+                0x0000000000302e80       0x15 build-fx/src/main.o
+ *fill*         0x0000000000302e95        0x3 
+ .rodata        0x0000000000302e98      0x104 build-fx/assets/img/brouillard.png.o
+                0x0000000000302e98                img_brouillard
+                0x0000000000302f9c                img_brouillard_end
+ .rodata        0x0000000000302f9c       0x84 build-fx/assets/img/water.png.o
+                0x0000000000302f9c                img_water
+                0x0000000000303020                img_water_end
+ .rodata        0x0000000000303020       0x84 build-fx/assets/img/houses.png.o
+                0x0000000000303020                img_houses
+                0x00000000003030a4                img_houses_end
+ .rodata        0x00000000003030a4       0x84 build-fx/assets/img/wall.png.o
+                0x00000000003030a4                img_wall
+                0x0000000000303128                img_wall_end
  .rodata.str1.4
-                0x0000000000302ef4        0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
- *fill*         0x0000000000302efa        0x2 
- .rodata        0x0000000000302efc        0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
- .rodata        0x0000000000302f04       0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
+                0x0000000000303128        0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
+ *fill*         0x000000000030312e        0x2 
+ .rodata        0x0000000000303130        0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
+ .rodata        0x0000000000303138       0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
  .rodata.str1.4
-                0x0000000000302f1c        0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
+                0x0000000000303150        0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
  .rodata.str1.4
-                0x0000000000302f20        0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
- *fill*         0x0000000000302f26        0x2 
- .rodata        0x0000000000302f28      0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o)
-                0x0000000000302f28                gint_font5x7
-                0x0000000000303330                gint_font5x7_end
+                0x0000000000303154        0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
+ *fill*         0x000000000030315a        0x2 
+ .rodata        0x000000000030315c      0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o)
+                0x000000000030315c                gint_font5x7
+                0x0000000000303564                gint_font5x7_end
  .rodata.str1.4
-                0x0000000000303330        0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
- .rodata        0x0000000000303334       0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
- .rodata        0x0000000000303344      0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
-                0x0000000000303344                __clz_tab
+                0x0000000000303564        0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
+ .rodata        0x0000000000303568       0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
+ .rodata        0x0000000000303578      0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
+                0x0000000000303578                __clz_tab
 
-.rela.dyn       0x0000000000303444        0x0
- .rela.text     0x0000000000303444        0x0 build-fx/src/map.o
+.rela.dyn       0x0000000000303678        0x0
+ .rela.text     0x0000000000303678        0x0 build-fx/src/map.o
  .rela.pretext.entry
-                0x0000000000303444        0x0 build-fx/src/map.o
+                0x0000000000303678        0x0 build-fx/src/map.o
                 0x0000000008100000                . = ORIGIN (ram)
 
-.bss            0x0000000008100000      0x690
+.bss            0x0000000008100000     0x1040
                 0x0000000008100000                _rbss = .
  *(.bss COMMON)
  .bss           0x0000000008100000        0x0 build-fx/src/item.o
@@ -380,97 +386,98 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
  .bss           0x0000000008100000        0x8 build-fx/src/map.o
                 0x0000000008100000                dy
                 0x0000000008100004                dx
- COMMON         0x0000000008100008      0x258 build-fx/src/map.o
+ COMMON         0x0000000008100008      0xc00 build-fx/src/map.o
                 0x0000000008100008                map
- .bss           0x0000000008100260        0xc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o)
- .bss           0x000000000810026c       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
- .bss           0x0000000008100290        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o)
- .bss           0x0000000008100290        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o)
- .bss           0x0000000008100290        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o)
- .bss           0x0000000008100290        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
- .bss           0x0000000008100290      0x400 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o)
- .bss           0x0000000008100690        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
+ .bss           0x0000000008100c08        0xc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o)
+ .bss           0x0000000008100c14       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
+ .bss           0x0000000008100c38        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o)
+ .bss           0x0000000008100c38        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o)
+ .bss           0x0000000008100c38        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o)
+ .bss           0x0000000008100c38        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
+ .bss           0x0000000008100c38      0x400 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o)
+ .bss           0x0000000008101038        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
  *(B R)
-                0x0000000008100690                . = ALIGN (0x10)
-                0x0000000000000690                _sbss = SIZEOF (.bss)
+                0x0000000008101040                . = ALIGN (0x10)
+ *fill*         0x0000000008101038        0x8 
+                0x0000000000001040                _sbss = SIZEOF (.bss)
 
-.data           0x0000000008100690       0x10 load address 0x0000000000303444
-                0x0000000000303444                _ldata = LOADADDR (.data)
-                0x0000000008100690                _rdata = .
+.data           0x0000000008101040       0x10 load address 0x0000000000303678
+                0x0000000000303678                _ldata = LOADADDR (.data)
+                0x0000000008101040                _rdata = .
  *(.data .data.*)
- .data          0x0000000008100690        0x0 build-fx/src/item.o
- .data          0x0000000008100690        0x0 build-fx/src/main.o
- .data          0x0000000008100690        0x0 build-fx/src/map.o
- .data          0x0000000008100690        0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o)
- .data          0x0000000008100698        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
- .data          0x0000000008100698        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o)
- .data          0x0000000008100698        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o)
- .data          0x0000000008100698        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o)
- .data          0x0000000008100698        0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
-                0x0000000008100698                topti_font
-                0x000000000810069c                gint_default_font
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o)
- .data          0x00000000081006a0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
+ .data          0x0000000008101040        0x0 build-fx/src/item.o
+ .data          0x0000000008101040        0x0 build-fx/src/main.o
+ .data          0x0000000008101040        0x0 build-fx/src/map.o
+ .data          0x0000000008101040        0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o)
+ .data          0x0000000008101048        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
+ .data          0x0000000008101048        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o)
+ .data          0x0000000008101048        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o)
+ .data          0x0000000008101048        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o)
+ .data          0x0000000008101048        0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
+                0x0000000008101048                topti_font
+                0x000000000810104c                gint_default_font
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o)
+ .data          0x0000000008101050        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
  *(D)
-                0x00000000081006a0                . = ALIGN (0x10)
+                0x0000000008101050                . = ALIGN (0x10)
 
-.data.4         0x00000000081006a0        0x0 load address 0x0000000000303454
+.data.4         0x0000000008101050        0x0 load address 0x0000000000303688
  *(.data.4)
-                0x00000000081006a0                . = ALIGN (0x10)
+                0x0000000008101050                . = ALIGN (0x10)
                 0x0000000000000010                _sdata = (SIZEOF (.data) + SIZEOF (.data.4))
                 0x000000008800df00                _gint_vbr = 0x8800df00
                 0x000000008800f400                . = ORIGIN (rram)
 
-.gint.data      0x000000008800f400      0x130 load address 0x0000000000303454
-                0x0000000000303454                _lgdata = LOADADDR (.gint.data)
+.gint.data      0x000000008800f400      0x130 load address 0x0000000000303688
+                0x0000000000303688                _lgdata = LOADADDR (.gint.data)
                 0x000000008800f400                _rgdata = .
  *(.gint.data .gint.data.*)
  .gint.data     0x000000008800f400       0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
@@ -488,7 +495,7 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
                 0x000000008800f530                . = ALIGN (0x10)
                 0x0000000000000130                _sgdata = SIZEOF (.gint.data)
 
-.gint.bss       0x000000008800f530      0x210 load address 0x0000000000303584
+.gint.bss       0x000000008800f530      0x210 load address 0x00000000003037b8
  *(.gint.bss .gint.bss.*)
  .gint.bss      0x000000008800f530      0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
  .gint.bss      0x000000008800f630       0x88 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
diff --git a/build-fx/src/BitmapWs.bin b/build-fx/src/BitmapWs.bin
index b16a53979e712328cfa580b65e8e4cd4088dded1..8ae0461039f9c816c7b5e81bbb8e3b8792ad3c98 100755
GIT binary patch
delta 2311
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

delta 1711
zcmYLJZ%h+s7=P}1y<K|+dcF3pTnjBy5lU@uSp2gv(+-A)k%1!O5*dFBRWMORAP!Ro
z&XG(8@r*H>AILOI!#?QjvKT^?WNcxJAE=`HvSqCdOq?IsaF{T%?m2PsE^nTDpWp9&
zpZA{U`MtL~&bHq;P3-p{7=~wnj}c^l8Dpf!0O&EssJeWg0~B5X8DJPzZ-JaQ0P>b@
zkZqM9d!|9&S`D&3x-ksLH>_=0xl5Fj^yQeD+)dH+W!&<La){2O^O5PJVrS{yB$-yN
z%rKvk{57RfC%$8=+El?tmRpsuCUn1o?IxNujYDBR!0g3WHaI^C-A63Ff<2W=Y6Ds7
zET6?0k)#7z4-H9h@ZnE=rbkR%ugvLkB07-M`tW#RkojxAbKz3or6V=IFORnPzU??U
z$5(9%u#xp)VpKm&&U5WoeK*^b&`>-h$bxR10^Nwt$&946UyV>zc^#`qSC6a$8(y7f
zHkj9+gofs6b<Op~&=6oOH3eSv_h&HXQ;^fQhT}xA5FrHFWyR0#j+hc4Ywm8OjQ4<S
zn8h=qFJtarRsxo^ExAp(kF`1E9^-(SBS+Ux^pzV&|L(Hh6O+V4F_e31KrprE3fA6$
zkloYI3%oto#G804pWV`OGGMV-Y!A|T3va{OGy<6>N7uAy5p9AfWLY>N;@~+xD@pRA
z3IZ#Npu-w7jFFf@yO%MNWl72}j2McA5q+{xD<-WVQ6eE7XJmVv1Xi{Kn*eo<%1dgY
zpjaRZoHi#js!v)eG1&)_7WpsO_MeDG17JFlZ&;xG+vVn(rqU5(sAWN0w0*>|&`0ig
zWThlx3n6tge*2te$r#rJ3jG*FO<GpsLRz!Ql)&X`NDA}Sina8_y3?8ow<(Ip#oA_#
zqiw~}m`XuPZCxA}=ZHlJ6#nkOI#gfC*iO?IRYWPtkjTtR<xs}^=^4L(EY5>$#JX8$
zVlx>MK{{?I3FAGQJdfLTDz~@_lABT}Q**j~{8cS^kJ4?b(0kWWGFFgXE@jr#mj3^A
z^UfEp68@6f{qy_;>6W^Y=>)lO0IhvPM4kYC?*&;xzsEVC>P+@PEGiTcbdC$;{23)7
zE|Hm5W!8FHJ#txQ51ExvrZOjJRdAkZrBgax?it6=Mm1H#kU)Jd;x>8MSkmQT_zmaJ
zjTq)Uat2ghoSf4<zy!CNK&N6ax$}z0_AY6+D*d+Is+qFgLlYabZzsv@DP=bM4KjN+
zMmZ!+B>M{#QVj~J6oqsWh1BBvp=#5<p~!G(f7{A|4~y;bH+!fcN;F>5ywYWUP!eQY
zbL;+WT3G<@^a&T&RrgopAa|1Mu3O0|;!bfrb<en63n{Lb>wE0jqHFu0^w^R%w4>Ej
zZglO+dFue@dXEc^K0m>PG>w;*B2O3oY0?C(!D9!{o^S*T-YyB2)SL@s{+JP9D6d8&
zrJ_!9&;E}nsf;NKx2^P4?yBsp@m+97^Sb&8;p-8ii|DvoJ=p%;9wxvP8-$ugSMmDm
z`8)c@vUeP=v;-O9)N2KT)g4Wynj|5!b%pr1_G3XR-Wg|wp7ugdFD2X*TtQaojr3LJ
zb*{d;7+?(K%{cOJfV|BQa?Wt9I@d&yo7R<9*FiL~DVL<xZ!5z-aDwc9s3Z!GDf`^t
ztHrez9walDmE(nj`fYg6s?Fd?D1^tX7(H~6&knNr8;~teUqE;dV-LybOQ0{jLHEA6
zy|J4yw9%?A#UMWC254tqE+nw(W{~aJqxQo}zsDW{2H$EeQD0ww27rM2{)UKtoE&sd
zdM9B(A9X+RrmE+(wYAU0Um;+rwXZj%qEYq_cY?hGQFbDK&4;+9*EnsdHP4Gbo1ZnL
zoC*C`Fs`4NSo7Z5i8xeSf)F6eYHJ(L9O$k~K~z5o0|2)tZ&PcNlirxa%VXE$ALSg3
a?etY>X<t4bKL2F`C<@g$7Q5y*6aNABqUOs0

diff --git a/build-fx/src/BitmapWs.elf b/build-fx/src/BitmapWs.elf
index f3a95743a69d188660bf5ace414c72c16b4a3b49..2f04ee21fe50d4390f69c90634c405a76e7cf4f8 100755
GIT binary patch
delta 5847
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
K&|HI~82ewB6Nw-I

delta 5138
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

diff --git a/build-fx/src/item.o b/build-fx/src/item.o
index 2cb3364f3e34837ddfd45aefb6b2761bdabdc819..033e3f0313a83f2053220b43292cc57ab0867ba3 100644
GIT binary patch
delta 814
zcmZ9IPiPZC6vp3dcIzgaHZg%#D>ca?X-bjpv3T0x!6b+g>ZPYm=uVTgiH0UYMRA3Q
zESUadKoD{Zh<Fif@g!1cQ3yRWBm@OPQ-oagvZqL#G+9&nhT(nh_de#$Oh?!q+Y%Y>
zaQn)S#miAKB51!=g6m03M98BS3QSf}vJ|t2c$qF-pD(E-AVh>hw~AtRnV+MZx;F+C
zRZ$CKc8^=WAh~2~&6eC~+Kzd03;8q{hV)!|DZO4<l0K~Fq|fQ=QZwKEb}6$E6~lDC
zj?{gA2G_&%20A)76XI{sHDAK@z@tJpEU5cBT1Rbf8%_xNPvkbVz~esVCD-(e8jp9H
zyjt;yLBZqGoX)5}W2B8$W5q}rAS4ZvMN`^TRFnm+Ll5-o%=*<t<!BNUSx}2Q+T;>D
zwTa~lCP7*sjrX~i-*i*%?s2uKu~C2j#NcewXgCrT>HRXn#oB040PC>Zo7b@Rdhh<=
zB3R9@Ag|bq<S+V!%H$(6yLgB4Ef)Zy`I+f)_Qm#@x=d}qD0?&Tzdh66JzW#8<w@{<
zJdf8vN#MLf#acXd7nD>cp$xd1%4O5>hsshshs{Ph-B-zbg&fY2FP4B70uXxlqk(P$
zSWSH!z;5cV0Ar^9e#-L`z%k%V8eqiK*`c4w1B{yd!EhGy7{ErkuQ!-^3UJ;u(U0Oy
ztpm8o0;@4hi8NSoggv0{L(*YIhS?)t&fiZHMByAgndPRr27SmJDRb1#QuiJ?;KXrm
Mi^^+sn{hJXAMBvYf&c&j

delta 467
zcmdnO_lJ9e5);dmi7NNKrTvw>xa&WpOwM3Vz3jzZ!kEaM(3~Ocz~KRe20RMgsh5Fr
zd|uq8{~xkC$bxtp+&~`VLpBH5YdjAb<b^Z(^o1UAT;!S@!>Gu}Ihlt^)?e6P$$`86
zPX}W^R|nG-!Su!Yo6;tyHecj-<YwSpz{0@U%c;Q8%bUKqp2c4+`&-tx%x?_b8Q-pO
zKvb@OmD+rT4WwuN)6`}L&dCdzL^v)oI%+d;0y%q_4l_=e+`z1D>A}FjP$I;@zzC$9
zffx(~AXG1u%K+ui1S;DD6ypJ@pUlEi$C6o+nmc(di#T6=N@j6EPGV(za$<2R!{oy(
z8Ywmm4BQ}7fq>Bgs0qe)VPN2du~#rKu))}C7#R3q><tVI95D741_pi@dk2y^M;I7*
zCwH^fGclf+%)_R{#(V;3(}c+;Y)VXwe<nAuiBHaF<A*TSK-3C0bylE97zHL@0jX91
Rs$M?%4^TBr#AF3_5de1HY&rk{

diff --git a/build-fx/src/map.o b/build-fx/src/map.o
index fdc71f7698f0fca491560a4eb698210b44db3fc6..c23973a6e8c3adf65b95cd866cb4f1d77cea9ba7 100644
GIT binary patch
literal 1636
zcmb7EUuauZ82?UkYi^pj+}xy1mPS|SoOP==ZI`uf3~8xb5sHJ2JxY3$Uc0Nw%yO@;
zlYoVSOhzbUWAkATLPdP=K}2K^K8!v1Y}&yD_t31{EWU^$5oIuc=l<*IqaS=dzu))$
zzVCd!=bU_eeD(wjF$#>)0bn5@Jpm6>(NPRhl;pL2k7$D}y!cqrtxfsb>(j~$r<T&m
zQ!D?D&Yn<K{<@HD=YM6J%Jng18squ?^DF<H&#q@X?8bq;>cntn;KshO=ApsMf3Kz2
z)9P+@Ph(Q;TT7*O2RNzrJqV==>&n8R3%4_cdx_LbnL^ou&R54$d(=LPsRL}Ox5<vV
z^T+w<O`;HHmav8qkNiL+gGZip62<=3vz^G{{!e?a#CkHFEajvO%hlzPd^<$3kvzpV
zh%ND6+uBxdCo5&HL@Cz;EtFw`ZY~~ZB}W_QeOpmSD+}5fJr5;A*C_A1nJA8zPwUey
z#i(q`W8<y(W94f6r$}hxK~~DKms!r1i}|)Rd9a9GDC*bo+QKIfsc^mUW#RjFy71#K
z>HF!Ed#7T*k-7S&eB|a9>38N=%ik8W?Zm>eu{<MBG~c;;cxWoN$mW(W$(Mish|R5D
zQdYLi)wX<cf3^Ew_ua19ojQ27>(0ja*kLo%(?<t~X5KpU%HR=gR2$im3`lTSBzpQs
z5CsVDxJM30Xxl)fZRX^Az$0Glmg?5;0*5Y6NqYJxa0-44KJ4Y61AZv*S5c-2{3tl?
z0Uh)7ZvZ>SMX*`q7qQm8{23>TKVJTAk4s5+ULBmz?Q_G+`+92!ujzHILZwQ>&~2jx
zMx_PAE}6DbbJ2&UWtPpVX<u}?Z8RFXd5%g}AgdX*N*(EW)2df>4k}ecZ(!wkF-Vju
zx@CZUP@l(Ue2i=Ooc{TICg7U_{#?Lc2>2@je=Xo|1pJ+VH?}duL-hA$uL-!0bM)q6
zwh+Hdw9AkGOqB5PeVl@i(Ld>9oVV&?&AM2#^)hLe-Eh~lK57_MU9*ivn>2h6owTxL
zkyd%XRx{3F^Z#Rm5cB<>@rsI|TOQ^MzYp97;2clFVPVYg+)ZA`>v;~}hW2~hdk>*J
zxM<%0Ny7-ra8bv(Z~nfc2=JN_H{tZdbq<W@d=CXt3PI0!4S#cdM&3_>^WQ4rt%m2o
Vn{eO!`S2t}opc)<?=3J#_aBN*<*5Jw

delta 700
zcmZ9IJ#5oJ6vyA$cW$Uduzm5Jahx`drPA^tMacaSszf9ZFjk^N$Cl7CQc3|2m6CxW
zOB5uJFd$}z?sVwP)K&s9FvJ9v6(KQzkl@*IAmXIw_j~XE?*32yoPVi5^P7tRphAFO
zfEhRix#MyVPFTZV_rI_y<)+apno9TQgYbsY{l4uS%b2{E8~&q~u<rT7c~Tb>k9WD?
zo^NrBJA9(icv!b>yY#NWZC=9a0EM&G<o1EIWl2a;woNg~O<s-_E}Mx6x|C?09<q<A
z4xlW>G!UKqoal_lA(OEKE|tXH%GJCh1@xK+dM~|^%*705=LDIplq$LIc<fLahu|`t
zPp7@NWGxSR>OuQ7n7?y-{aVM^X!NJp<@rv&A1Vu<9O{yD#NEjS-l2M89I5pS0h&aw
z$d6{*0wCyCz@WI?stLcpA#;p2#!RM{k@qlaS$zq)hq0K|3&`m)2I(q3>mY7r`mI45
zAk&uz^?9IXY78sbzy<!+tN&ftj8@bu(R1~B6GDKoWas4Uj&N&)pN{bB5&rm(39h1N
z?~vk1e+S_7u#aAaA*0tB0wVP#Xl4urG&7?&v_;y{67$&_PP~ZjvZ_M%qc)pP(%v9_
eVAC2o#D7zXs8-dKuQ+-?x~NqZ^;fj475@PH-)J5H

diff --git a/src/item.c b/src/item.c
index d6b2ad5..3a68f05 100644
--- a/src/item.c
+++ b/src/item.c
@@ -28,31 +28,45 @@ void display_item_etendu(image_t* res,int mx, int my, int sx, int sy)
 void display_brouillard(int mx, int my, int sx, int sy)
 {
 
-    unsigned char val=0x00; // on n'utilise que les 4 premiers bits 0<=val<=15 mais on multiplie nativement par 8
-    val|=get_visibility(mx-1,my)<<3;
-    val|=get_visibility(mx+1,my)<<4;
-    val|=get_visibility(mx,my-1)<<5;
-    val|=get_visibility(mx,my+1)<<6;
-    dsubimage(sx,sy,&img_brouillard,val,0,8,8,0);
+    char val=0x00; // on n'utilise que les 4 premiers bits 0<=val<=15 mais on multiplie nativement par 8
+    val|=(!get_visibility(mx-1,my))<<3;
+    val|=(!get_visibility(mx+1,my))<<4;
+    val|=(!get_visibility(mx,my-1))<<5;
+    val|=(!get_visibility(mx,my+1))<<6;
 
+    dsubimage(sx,sy, &img_brouillard, val, 0, 8, 8, DIMAGE_NONE);
 
 }
 
-void display_item(int mx, int my, int sx, int sy)
+void display_water(int mx, int my, int sx, int sy)
 {
-    int type=get_item_type(mx,my);
-    if (type==WALL)
-        display_item_etendu(&img_wall,mx,my,sx,sy);
 
-    if (type==HOUSE)
-        display_item_etendu(&img_houses,mx,my,sx,sy);
+    char val=0x00; // on n'utilise que les 4 premiers bits 0<=val<=15 mais on multiplie nativement par 8
+    val|=(WATER==get_terrain(mx-1,my))<<3;
+    val|=(WATER==get_terrain(mx+1,my))<<4;
+    val|=(WATER==get_terrain(mx,my-1))<<5;
+    val|=(WATER==get_terrain(mx,my+1))<<6;
+
+    dsubimage(sx,sy, &img_water, val, 0, 8, 8, DIMAGE_NONE);
 
-    if (type==EMPTY)
-        display_item_etendu(&img_brouillard,mx,my,sx,sy);
 }
 
+
 void display_case(int mx, int my, int sx, int sy)
 {
-    display_item(mx,my,sx,sy);
-    //display_brouillard(mx,my,sx,sy);
+    int type=get_item_type(mx,my);
+    switch (type)
+    {
+    case WALL:
+        display_item_etendu(&img_wall,mx,my,sx,sy);
+        return;
+    case HOUSE:
+        display_item_etendu(&img_houses,mx,my,sx,sy);
+        return;
+    default:
+        if (get_terrain(mx,my)==WATER)
+            display_water(mx,my,sx,sy);
+        if (!get_visibility(mx,my))
+            display_brouillard(mx,my,sx,sy);
+    }
 }
\ No newline at end of file
diff --git a/src/item.h b/src/item.h
index 394a197..aa6ba4d 100644
--- a/src/item.h
+++ b/src/item.h
@@ -12,6 +12,7 @@
 extern image_t img_houses;
 extern image_t img_wall;
 extern image_t img_brouillard;
+extern image_t img_water;
 
 
 
diff --git a/src/map.c b/src/map.c
index bc98fee..d77313c 100644
--- a/src/map.c
+++ b/src/map.c
@@ -3,8 +3,8 @@
 #include <gint/std/string.h>
 
 
-#define DIM_X 5
-#define DIM_Y 5
+#define DIM_X 16
+#define DIM_Y 8
 
 // la map correspond à un système par couches successives :
 
@@ -22,7 +22,7 @@ void create_map()
         for (int y=0;y<DIM_Y;y++)
         {
             map[y][x].terrain=EARTH;
-            map[y][x].explored=false;
+            map[y][x].explored=true;//false;
             map[y][x].item.type=0;
         }
     }
@@ -42,21 +42,31 @@ void create_map()
         map[y][DIM_X-1].terrain=WATER;
     }
 
-    map[0][0].item.type=WALL;
-    map[0][1].item.type=WALL;
-    map[0][2].item.type=WALL;
-
-    map[2][0].item.type=WALL;
-    map[2][1].item.type=WALL;
-    map[2][2].item.type=WALL;
-
-    map[1][0].item.type=WALL;
+    map[1][1].item.type=WALL;
     map[1][2].item.type=WALL;
-    map[1][1].item.type=HOUSE;
+    map[1][3].item.type=WALL;
+
+    map[3][1].item.type=WALL;
+    map[3][2].item.type=WALL;
+    map[3][3].item.type=WALL;
+
+    map[2][1].item.type=WALL;
+    map[2][3].item.type=WALL;
+    map[2][2].item.type=HOUSE;
+
+    map[5][3].item.type=HOUSE;
+    map[5][2].item.type=HOUSE;
+    map[6][2].item.type=HOUSE;
+
+
+    map[6][4].terrain=WATER;
+    map[6][5].terrain=WATER;
+    map[6][6].terrain=WATER;
+
+    map[5][5].terrain=WATER;
+    map[5][6].terrain=WATER;
+    map[5][7].terrain=WATER;
 
-    map[3][1].item.type=HOUSE;
-    map[3][2].item.type=HOUSE;
-    map[4][2].item.type=HOUSE;
 }
 
 
@@ -71,11 +81,16 @@ generic_item* get_item(int x, int y)
 
 bool get_visibility(int x, int y)
 {
-    if (x<0||x>=DIM_X||y<0||y>DIM_Y)
-        return true;
-    return 1-map[y][x].explored;
+    if (x<0||x>=DIM_X||y<0||y>=DIM_Y)
+        return false;
+    return map[y][x].explored;
+}
+int get_terrain(int x,int y)
+{
+    if (x<0||x>=DIM_X||y<0||y>=DIM_Y)
+        return WATER;
+    return map[y][x].terrain;
 }
-
 
 void set_item(int x, int y, generic_item const * const item)
 {
diff --git a/src/map.h b/src/map.h
index 210cbcf..07b431e 100644
--- a/src/map.h
+++ b/src/map.h
@@ -7,17 +7,13 @@ extern const int dim_y;
 #include <stdbool.h>
 #include "item.h"
 
-typedef enum
-{
-    EARTH       = 0,
-    WATER       = 1,
-    MOUNTAIN    = 2
-
-} map_terrain;
+#define EARTH 0
+#define WATER 1
+#define MOUNTAIN 2
 
 struct generic_map // map à l'échelle d'un point
 {
-    map_terrain terrain;
+    int terrain;
     bool explored; // brouillard de guerre
     generic_item item;
 };
@@ -29,6 +25,7 @@ void create_map();
 
 // hidden true, shown false
 bool get_visibility(int x, int y);
+int get_terrain(int x,int y);
 
 generic_item* get_item(int x, int y);
 void set_item(int x, int y, generic_item const * const item);