From 0ebcca21b574c7bde5848f407df91a266da02dbb Mon Sep 17 00:00:00 2001
From: milangames-art <milan.garnier@orange.fr>
Date: Thu, 21 Nov 2019 19:56:37 +0100
Subject: [PATCH] bug to be fixed in boxes physics, but now jump is done

---
 MARIOBRS.g1a              | Bin 23744 -> 23872 bytes
 build-fx/map              | 498 +++++++++++++++++++-------------------
 build-fx/src/MARIOBRS.bin | Bin 23232 -> 23360 bytes
 build-fx/src/MARIOBRS.elf | Bin 34312 -> 34464 bytes
 build-fx/src/box.o        | Bin 1020 -> 1172 bytes
 build-fx/src/main.o       | Bin 1668 -> 1668 bytes
 build-fx/src/mario.o      | Bin 1524 -> 1588 bytes
 src/box.c                 |  37 +--
 src/main.c                |   2 +-
 src/mario.c               |  27 +--
 10 files changed, 267 insertions(+), 297 deletions(-)

diff --git a/MARIOBRS.g1a b/MARIOBRS.g1a
index 2044f53d2ecbd7319c4515961f7a2e7be851a267..d86c847f72ec9428730b68f16bafa637627a2b7b 100644
GIT binary patch
delta 1692
zcmY*ZZ%k8H6hHStYfDS}Xlbnsq;{pEpzqR_iBPpIBqQ@rq3sm4Gt4l>e@kb~LW~h*
z#MKQ1a@8!3Y-SQ?HZoamvaroLvYCYsd?=YSd~lhWfNmq3TS(`JPIq1(D%_XfyXXAQ
zx%ZrR&$(~pOEU5mv3xT4&DGw-g>L=hzwkN!=<(x^zFpL3@d%aP&tJMigjf80mh2|&
zG0=#rIDpU#bbEZt4$7c0m;$8bA<N{M44{f@MA;Di5TM~AP=ExaZUZfv0lM@K(87E~
z8fYy=i~!9^Di9l#xoGg!$Q#Ch_Se4y{HLr+qF$E`G?M0`YNMJA@tAHs*>7-4r&?>J
z^DPnSvh;=YgLErtmZn1vziwZ|uIVW_kQH*ho;s8|m^zT!pW2rKU2E#)lPw*U!<%*9
zLHlnB@-EDfqonbzijTYhDIYz3@9MPe+|OCR!wg)V{qsN20@cNU8l0?O|0pLHGpH{G
zYKpOe+^s@xHcRJz5YF8sothA(^NnvymzUW>jviBcdS6FU@7J}kwVE9#lRA_xHJ*O$
z(zZmUMly|SZfOE&YtIh3o+JfYjkw5<fm#rU*^J?E(BK@`OQ%APfDW|dy09r?cGNgZ
zyR%!(NzF~IUpJ+1Jh{8$rn;gusm{+2x%_3VDLLOftQBa0>ib!z@dZ;!ot!Vw%~%3c
z70?178#68^gv}baRBy3k4V*wl8&D@YJwJxBi1M{e?Wh@TC3SPDod9agRyHw?vSZ?B
zY6~v2jxw6p;lgaQ?upa>7Sp&8D4PP%CSVqTdgJ3HP=<M7W~M4Ok+)HsR4i-LtlYFW
zcTTIpsK{J2?GZ}qn8v)zP*AVrlaISNukj=1r9`kb^RxNy5W!+&cB@04>a2UoC>yla
z;QPLHT3CFLB^Or<i`%%~b|&N4zofuW8BdZa@Rv;%1GV+?8%y3KTjg(4-Nu&cQu47!
zfrcNTj`1Scn-MH@6my6SB8Cw+5J|+Oat7f$D7PUR5I#f;Vu1BN_ls&o?rL_V@c8PW
zh)s`bkYW(r#GS?)u}N<51l++3aTkGyMSa;=h<au(Do|&{PVO(dE09U<w0|nB=)}cd
z+@t|#+(^DfwIa$`F&{<#!3p`I(O{B4ba;qr7U()Vqt0oeL}a#-qj;kHY>AtwH;A%@
zkGYCT-gTfZ8{X;|q8aG&29{p_$5Xahw#Y1hSo%J($j%rvv*4NO%F2*XgtX_$UQbPU
za@ZQta-P4cXKu9;MhTe-H@y0LOB$X0vg7<jc(3##A=lXi{Vs=MA@I!P^ad)zLPd-{
ztZ)c!FDrB}l_#G&qcyv&sPQ&;86o%CfM)}~Cp|xs`+V5jlSQuc`YH!8)U@K~>oHst
z&^1lGZLOJ*G1gVRjg0Zh>J5aXxzo2x$Z3iL4Gban@UHbM=j&|5e~4EER77sls^B&Z
z(;IZ;M5FTg1FanD>s#WXQB2y7U9)U5L*tJx0sj^vH-TJphNIyLWj1#KHOKq<EX6ds
zNufN734q|T0lY#QL^=1>T8-*87-fx%H-#^#gW(wZYvw@khPN%$!<`HDdU^kO{*43N
zyZviI`q_gW#qIdLD~_SV!Xa~X)q4v`)M!~bP|5d{r==${vdljj3*;!CJ!0O#KaBmE
P%FgUuMmqV>PLcc%69KZG

delta 1601
zcmY*ZUrd`-6hHTa)<R49XbUR{qjVi~E3=34CtGPo%ScAt9MF<6U9;d)g&9q7$qX@#
z)Wx`JrUNfA%OqxTiy^vb&E)|VlScQj2Of$t(+857ZOkPuaYlkX5azl4V8CsD-#zzt
z&OPVcbI)!12bTVxm40>Or*B7-S3WX5`I~-gYfqkBYr8O3+Nk(^-#tIclxSKkvD0ki
zWWu28h5(dNz!Q%b9iR<7nOFp(<&ZMllmT=@230D0s{y(lfB;EYUI45b1l$<~e3pDw
z4g<EQ01pKL3o{yuXSKP?{c_~Z;!wfee?sDRUNh4N5`dAoP<2Q2tX@Qo2boed!}E*Q
z3QZG$hbI9`vfN}ou9zlx%=~%Sbl>}aR`q_`bHV#%jlIix$vU!n=6uE!G{*P=!%OdG
zj3iy_`M_^@<(k)WPMI^r`0s|0u`fB2-&OnC@|k5Y4lWziXDGR%RX}qg?=3!CTQoDL
z?{bEWQ1Gj6Uf)x5+L_TcxNWwer>hnU0M$61+rSNKi^Y|eIRU=lpm_?ge42Nwbqx5h
zddz<gsRma8i^l<Xk<qSBk}m?f_UGz`7Sg%WT6nXa!qXw8lj8nQO1{zCXjfSWpDH;o
z6UzHjeGrUU=9G|U5uhLmO90sTXpV(EloBOXGR32oBL&@>=D;vdSq6&MSAGggjLZ6}
z;!5+2)>G#4n_4>7xJ*Z^Sa&jI$AYkze#jKtIKN)zl+&%U0oK8BM=O0_-|;{xd&qn3
zex+<ljM_iW89FK|%uSCnY!QN<`_+JUljy8?iyfCo(=E_#nzVeX>FUEngam;O7N)z5
z+#=Ky_7ge?-GrD{f^a|CtPteB8Nz+ixwx(JjxH!0imz0@b1XDU{gws{r6|ZWpl_I(
z@u=*rB>X|Wc#lBE!qx=c!_6ezk^PySQ!;tC^Man3MV4_ntLZC2+^o8%uzoS=_*&UR
zmP<|KnLI6_*46E!BuB~m1|=|*kd2S+-6FoLk<r7!zyzOiJy2X1`NZzGsm#J&>tp(Z
zRQbS!=&q|~C4Ru&<Mhg+gnq!<S)OqJ^_1<G8p(?Ip3hh*8P}dz->|8w_jD;$L^p2u
zda9!GTqfKQm-k&-->rqwLgvB+yuXwVlTlh4ZcRkk@GxV39&Px!&^wwdq)gB43oDrA
zai3FZNb#$_opMV1oD~hJE@vixWYv2%XdL)gz9pc?0@#oet3D57G45_^qwiqTZ!9JP
z&6o0+U(D`zGP9rVF_5JAS-_Tgv3kJDSSMFo`&g$KY;9v~SWE^^DTRHHsrU#OyerhU
zy<6A3BlJcd)n24RdM4X>y1kD=sfV0}k$HJ3fX($|W95w)p+0lC0c-kmH2pgz;lE1a
zdI<|T4#Ow3*=hi^JQ^D-t;Wc#Mm6@XZ)3FWI@SC=!lalvR938SiBtMth-~<ZzP(4f
zGOU9E9$neK4(D%QAC~^N*!Q@^)QdkdR>_A>R*%qoa7zc<hvaadZ97RT+&c;Q-1Ji(
j>sE8J<Tu7PIr5Nd|8PSkXZkC0Y_7RETEjqKRAv7I`XQTA

diff --git a/build-fx/map b/build-fx/map
index d386a5e..db57e72 100644
--- a/build-fx/map
+++ b/build-fx/map
@@ -146,7 +146,7 @@ LOAD build-fx/assets/img/stone.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
-                0x0000000000005020                _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks))
+                0x00000000000050a0                _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks))
 
 .pretext        0x0000000000300200      0x8d0
  *(.pretext.entry)
@@ -186,7 +186,7 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
  *(.dtors .dtors.*)
                 0x0000000000300ad0                _etors = .
 
-.text           0x0000000000300ad0     0x36c0
+.text           0x0000000000300ad0     0x3740
                 0x0000000000300ad0                _gint_exch_tlbh_start = .
  *(.gint.exch_tlbh)
  .gint.exch_tlbh
@@ -196,270 +196,270 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
  *(.text .text.*)
  .text          0x0000000000300b1c       0x40 build-fx/src/tile.o
                 0x0000000000300b1c                draw_tile
- .text          0x0000000000300b5c      0x140 build-fx/src/box.o
+ .text          0x0000000000300b5c      0x1a8 build-fx/src/box.o
                 0x0000000000300b5c                sgn
                 0x0000000000300b6e                box_move
- .text          0x0000000000300c9c      0x200 build-fx/src/world.o
-                0x0000000000300c9c                world_get
-                0x0000000000300ce4                display_cell
-                0x0000000000300dbc                world_get_ctg
-                0x0000000000300dfc                world_get_real_x0
-                0x0000000000300e0a                world_get_real_y0
-                0x0000000000300e18                world_draw
- .text          0x0000000000300e9c       0xf0 build-fx/src/mario.o
-                0x0000000000300e9c                mario_draw
-                0x0000000000300ef4                test_sol_le_plus_proche
-                0x0000000000300f60                mario_move
- .text          0x0000000000300f8c       0x40 build-fx/src/main.o
-                0x0000000000300f8c                callback
-                0x0000000000300f94                system_error
- .text.startup  0x0000000000300fcc       0xb0 build-fx/src/main.o
-                0x0000000000300fcc                main
- .text          0x000000000030107c       0xbc build-fx/src/keyboard.o
-                0x000000000030107c                update_keyboard
- .text          0x0000000000301138       0x7c build-fx/src/sprite.o
-                0x0000000000301138                hitbox
- .text          0x00000000003011b4       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o)
-                0x00000000003011b4                dupdate
-                0x00000000003011cc                dupdate_noint
- .text          0x00000000003011d8       0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
-                0x00000000003011d8                dimage
-                0x000000000030122c                dsubimage
- .text          0x00000000003012a0       0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o)
-                0x00000000003012a0                dclear
- .text          0x00000000003012ec      0x3fc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
-                0x0000000000301494                pollevent
-                0x00000000003015d8                waitevent
-                0x0000000000301624                clearevents
-                0x0000000000301644                keydown
-                0x0000000000301670                keydown_all
-                0x00000000003016ac                keydown_any
- .text          0x00000000003016e8      0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o)
-                0x00000000003016f4                iokbd_row
-                0x00000000003017dc                iokbd_scan
- .text          0x000000000030180c      0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o)
-                0x000000000030180c                getkey_opt
-                0x00000000003019b8                getkey
-                0x00000000003019c4                getkey_repeat
- .text          0x0000000000301a00        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
- .text          0x0000000000301a00      0x1c4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o)
-                0x0000000000301b90                gint_panic
-                0x0000000000301ba0                gint_panic_set
-                0x0000000000301bac                gint_exc_catch
-                0x0000000000301bb8                gint_exc_skip
- .text          0x0000000000301bc4      0x17c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o)
-                0x0000000000301c78                gint_install
-                0x0000000000301d28                gint_unload
- .text          0x0000000000301d40        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o)
- .text          0x0000000000301d40        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o)
- .text          0x0000000000301d40      0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o)
-                0x0000000000301d40                tlb_addr
-                0x0000000000301d54                tlb_data
-                0x0000000000301d68                tlb_mapped_memory
-                0x0000000000301e3c                utlb_addr
-                0x0000000000301e4c                utlb_data
-                0x0000000000301e5c                utlb_mapped_memory
- .text          0x0000000000301f34       0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
-                0x0000000000301f34                dsize
- .text          0x0000000000301fd0       0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o)
-                0x0000000000301fd0                dprint
- .text          0x0000000000302028      0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
-                0x0000000000302348                timer_setup
-                0x00000000003023d8                timer_delay
-                0x0000000000302438                timer_start
-                0x000000000030246c                timer_reload
-                0x000000000030248c                timer_pause
-                0x00000000003024c0                timer_stop
-                0x000000000030251c                timer_timeout
-                0x0000000000302528                timer_address
-                0x0000000000302564                timer_clear
- .text          0x0000000000302594      0xce4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o)
-                0x0000000000302f90                kprint_opt
-                0x00000000003030d8                kprint
-                0x00000000003031b0                kvsprint
-                0x00000000003031f8                sprintf
-                0x0000000000303220                vsprintf
-                0x0000000000303240                snprintf
-                0x0000000000303260                vsnprintf
- .text          0x0000000000303278       0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o)
-                0x0000000000303278                memcpy
-                0x0000000000303332                _memmove
-                0x0000000000303336                _memcmp
-                0x000000000030333a                memset
- .text          0x0000000000303354      0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
-                0x00000000003033ec                t6k11_display
-                0x00000000003034c0                t6k11_contrast
-                0x00000000003034ec                t6k11_backlight
- .text          0x000000000030352c      0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
-                0x0000000000303670                clock_freq
- .text          0x000000000030367c        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o)
- .text          0x000000000030367c       0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o)
-                0x000000000030367c                bopti_asm_mono
-                0x00000000003036a2                bopti_asm_mono_alpha
- .text          0x00000000003036d4        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
- .text          0x00000000003036d4      0x410 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
-                0x00000000003036d4                bopti_grid
-                0x0000000000303848                bopti_render
-                0x0000000000303978                bopti_render_clip
-                0x0000000000303a8c                bopti_render_noclip
- .text          0x0000000000303ae4       0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o)
-                0x0000000000303ae4                masks
- .text          0x0000000000303b80       0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o)
-                0x0000000000303b80                gint_setvbr
- .text          0x0000000000303bac        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o)
- .text          0x0000000000303bac       0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o)
-                0x0000000000303bac                gint_intlevel
-                0x0000000000303c00                gint_inthandler
- .text          0x0000000000303c24        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
- .text          0x0000000000303c24        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
- .text          0x0000000000303c24        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o)
- .text          0x0000000000303c24       0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o)
-                0x0000000000303c24                __movstr
-                0x0000000000303c24                __movmem
-                0x0000000000303c58                __movmemSI64
-                0x0000000000303c58                __movstrSI64
-                0x0000000000303c5c                __movstrSI60
-                0x0000000000303c5c                __movmemSI60
-                0x0000000000303c60                __movmemSI56
-                0x0000000000303c60                __movstrSI56
-                0x0000000000303c64                __movstrSI52
-                0x0000000000303c64                __movmemSI52
-                0x0000000000303c68                __movstrSI48
-                0x0000000000303c68                __movmemSI48
-                0x0000000000303c6c                __movstrSI44
-                0x0000000000303c6c                __movmemSI44
-                0x0000000000303c70                __movstrSI40
-                0x0000000000303c70                __movmemSI40
-                0x0000000000303c74                __movstrSI36
-                0x0000000000303c74                __movmemSI36
-                0x0000000000303c78                __movmemSI32
-                0x0000000000303c78                __movstrSI32
-                0x0000000000303c7c                __movmemSI28
-                0x0000000000303c7c                __movstrSI28
-                0x0000000000303c80                __movstrSI24
-                0x0000000000303c80                __movmemSI24
-                0x0000000000303c84                __movmemSI20
-                0x0000000000303c84                __movstrSI20
-                0x0000000000303c88                __movstrSI16
-                0x0000000000303c88                __movmemSI16
-                0x0000000000303c8c                __movmemSI12
-                0x0000000000303c8c                __movstrSI12
-                0x0000000000303c90                __movmemSI8
-                0x0000000000303c90                __movstrSI8
-                0x0000000000303c94                __movmemSI4
-                0x0000000000303c94                __movstrSI4
- .text          0x0000000000303c9c      0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o)
-                0x0000000000303c9c                __udivdi3
- .text          0x0000000000303e8c      0x234 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o)
-                0x0000000000303e8c                __umoddi3
- .text          0x00000000003040c0       0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o)
-                0x00000000003040e2                __udivsi3
- *fill*         0x000000000030412c        0x4 
- .text          0x0000000000304130       0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o)
-                0x0000000000304130                __udiv_qrnnd_16
- .text          0x0000000000304190        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
+                0x0000000000300c9c                box_jump
+ .text          0x0000000000300d04      0x200 build-fx/src/world.o
+                0x0000000000300d04                world_get
+                0x0000000000300d4c                display_cell
+                0x0000000000300e24                world_get_ctg
+                0x0000000000300e64                world_get_real_x0
+                0x0000000000300e72                world_get_real_y0
+                0x0000000000300e80                world_draw
+ .text          0x0000000000300f04      0x10c build-fx/src/mario.o
+                0x0000000000300f04                mario_draw
+                0x0000000000300f5c                test_sol_le_plus_proche
+                0x0000000000300fc8                mario_move
+ .text          0x0000000000301010       0x40 build-fx/src/main.o
+                0x0000000000301010                callback
+                0x0000000000301018                system_error
+ .text.startup  0x0000000000301050       0xb0 build-fx/src/main.o
+                0x0000000000301050                main
+ .text          0x0000000000301100       0xbc build-fx/src/keyboard.o
+                0x0000000000301100                update_keyboard
+ .text          0x00000000003011bc       0x7c build-fx/src/sprite.o
+                0x00000000003011bc                hitbox
+ .text          0x0000000000301238       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o)
+                0x0000000000301238                dupdate
+                0x0000000000301250                dupdate_noint
+ .text          0x000000000030125c       0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
+                0x000000000030125c                dimage
+                0x00000000003012b0                dsubimage
+ .text          0x0000000000301324       0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o)
+                0x0000000000301324                dclear
+ .text          0x0000000000301370      0x3fc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
+                0x0000000000301518                pollevent
+                0x000000000030165c                waitevent
+                0x00000000003016a8                clearevents
+                0x00000000003016c8                keydown
+                0x00000000003016f4                keydown_all
+                0x0000000000301730                keydown_any
+ .text          0x000000000030176c      0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o)
+                0x0000000000301778                iokbd_row
+                0x0000000000301860                iokbd_scan
+ .text          0x0000000000301890      0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o)
+                0x0000000000301890                getkey_opt
+                0x0000000000301a3c                getkey
+                0x0000000000301a48                getkey_repeat
+ .text          0x0000000000301a84        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
+ .text          0x0000000000301a84      0x1c4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o)
+                0x0000000000301c14                gint_panic
+                0x0000000000301c24                gint_panic_set
+                0x0000000000301c30                gint_exc_catch
+                0x0000000000301c3c                gint_exc_skip
+ .text          0x0000000000301c48      0x17c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o)
+                0x0000000000301cfc                gint_install
+                0x0000000000301dac                gint_unload
+ .text          0x0000000000301dc4        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o)
+ .text          0x0000000000301dc4        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o)
+ .text          0x0000000000301dc4      0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o)
+                0x0000000000301dc4                tlb_addr
+                0x0000000000301dd8                tlb_data
+                0x0000000000301dec                tlb_mapped_memory
+                0x0000000000301ec0                utlb_addr
+                0x0000000000301ed0                utlb_data
+                0x0000000000301ee0                utlb_mapped_memory
+ .text          0x0000000000301fb8       0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
+                0x0000000000301fb8                dsize
+ .text          0x0000000000302054       0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o)
+                0x0000000000302054                dprint
+ .text          0x00000000003020ac      0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
+                0x00000000003023cc                timer_setup
+                0x000000000030245c                timer_delay
+                0x00000000003024bc                timer_start
+                0x00000000003024f0                timer_reload
+                0x0000000000302510                timer_pause
+                0x0000000000302544                timer_stop
+                0x00000000003025a0                timer_timeout
+                0x00000000003025ac                timer_address
+                0x00000000003025e8                timer_clear
+ .text          0x0000000000302618      0xce4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o)
+                0x0000000000303014                kprint_opt
+                0x000000000030315c                kprint
+                0x0000000000303234                kvsprint
+                0x000000000030327c                sprintf
+                0x00000000003032a4                vsprintf
+                0x00000000003032c4                snprintf
+                0x00000000003032e4                vsnprintf
+ .text          0x00000000003032fc       0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o)
+                0x00000000003032fc                memcpy
+                0x00000000003033b6                _memmove
+                0x00000000003033ba                _memcmp
+                0x00000000003033be                memset
+ .text          0x00000000003033d8      0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
+                0x0000000000303470                t6k11_display
+                0x0000000000303544                t6k11_contrast
+                0x0000000000303570                t6k11_backlight
+ .text          0x00000000003035b0      0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
+                0x00000000003036f4                clock_freq
+ .text          0x0000000000303700        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o)
+ .text          0x0000000000303700       0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o)
+                0x0000000000303700                bopti_asm_mono
+                0x0000000000303726                bopti_asm_mono_alpha
+ .text          0x0000000000303758        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
+ .text          0x0000000000303758      0x410 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
+                0x0000000000303758                bopti_grid
+                0x00000000003038cc                bopti_render
+                0x00000000003039fc                bopti_render_clip
+                0x0000000000303b10                bopti_render_noclip
+ .text          0x0000000000303b68       0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o)
+                0x0000000000303b68                masks
+ .text          0x0000000000303c04       0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o)
+                0x0000000000303c04                gint_setvbr
+ .text          0x0000000000303c30        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o)
+ .text          0x0000000000303c30       0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o)
+                0x0000000000303c30                gint_intlevel
+                0x0000000000303c84                gint_inthandler
+ .text          0x0000000000303ca8        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
+ .text          0x0000000000303ca8        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
+ .text          0x0000000000303ca8        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o)
+ .text          0x0000000000303ca8       0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o)
+                0x0000000000303ca8                __movstr
+                0x0000000000303ca8                __movmem
+                0x0000000000303cdc                __movmemSI64
+                0x0000000000303cdc                __movstrSI64
+                0x0000000000303ce0                __movstrSI60
+                0x0000000000303ce0                __movmemSI60
+                0x0000000000303ce4                __movmemSI56
+                0x0000000000303ce4                __movstrSI56
+                0x0000000000303ce8                __movstrSI52
+                0x0000000000303ce8                __movmemSI52
+                0x0000000000303cec                __movstrSI48
+                0x0000000000303cec                __movmemSI48
+                0x0000000000303cf0                __movstrSI44
+                0x0000000000303cf0                __movmemSI44
+                0x0000000000303cf4                __movstrSI40
+                0x0000000000303cf4                __movmemSI40
+                0x0000000000303cf8                __movstrSI36
+                0x0000000000303cf8                __movmemSI36
+                0x0000000000303cfc                __movmemSI32
+                0x0000000000303cfc                __movstrSI32
+                0x0000000000303d00                __movmemSI28
+                0x0000000000303d00                __movstrSI28
+                0x0000000000303d04                __movstrSI24
+                0x0000000000303d04                __movmemSI24
+                0x0000000000303d08                __movmemSI20
+                0x0000000000303d08                __movstrSI20
+                0x0000000000303d0c                __movstrSI16
+                0x0000000000303d0c                __movmemSI16
+                0x0000000000303d10                __movmemSI12
+                0x0000000000303d10                __movstrSI12
+                0x0000000000303d14                __movmemSI8
+                0x0000000000303d14                __movstrSI8
+                0x0000000000303d18                __movmemSI4
+                0x0000000000303d18                __movstrSI4
+ .text          0x0000000000303d20      0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o)
+                0x0000000000303d20                __udivdi3
+ .text          0x0000000000303f10      0x234 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o)
+                0x0000000000303f10                __umoddi3
+ .text          0x0000000000304144       0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o)
+                0x0000000000304166                __udivsi3
+ .text          0x00000000003041b0       0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o)
+                0x00000000003041b0                __udiv_qrnnd_16
+ .text          0x0000000000304210        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
  *(C P)
 
-.gint.blocks    0x0000000000304190      0x120
+.gint.blocks    0x0000000000304210      0x120
  *(.gint.blocks)
- .gint.blocks   0x0000000000304190       0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
-                0x0000000000304190                gint_inth_7305
-                0x00000000003041b0                gint_inth_7705
- .gint.blocks   0x00000000003041d0       0xe0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
-                0x00000000003041d0                inth_tmu
-                0x0000000000304250                inth_etmu2
-                0x0000000000304270                inth_etmu_help
-                0x0000000000304290                inth_etmux
+ .gint.blocks   0x0000000000304210       0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
+                0x0000000000304210                gint_inth_7305
+                0x0000000000304230                gint_inth_7705
+ .gint.blocks   0x0000000000304250       0xe0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
+                0x0000000000304250                inth_tmu
+                0x00000000003042d0                inth_etmu2
+                0x00000000003042f0                inth_etmu_help
+                0x0000000000304310                inth_etmux
 
-.gint.drivers   0x00000000003042b0       0x90
-                0x00000000003042b0                _bdrv = .
+.gint.drivers   0x0000000000304330       0x90
+                0x0000000000304330                _bdrv = .
  *(.gint.drivers.0)
  *(.gint.drivers.1)
  .gint.drivers.1
-                0x00000000003042b0       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
-                0x00000000003042b0                drv_cpg
+                0x0000000000304330       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
+                0x0000000000304330                drv_cpg
  *(.gint.drivers.2)
  .gint.drivers.2
-                0x00000000003042d4       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
-                0x00000000003042d4                drv_tmu
+                0x0000000000304354       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
+                0x0000000000304354                drv_tmu
  *(.gint.drivers.3)
  *(.gint.drivers.4)
  .gint.drivers.4
-                0x00000000003042f8       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
-                0x00000000003042f8                drv_keysc
+                0x0000000000304378       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
+                0x0000000000304378                drv_keysc
  *(.gint.drivers.5)
  .gint.drivers.5
-                0x000000000030431c       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
-                0x000000000030431c                drv_t6k11
+                0x000000000030439c       0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
+                0x000000000030439c                drv_t6k11
  *(.gint.drivers.6)
-                0x0000000000304340                _edrv = .
+                0x00000000003043c0                _edrv = .
 
-.rodata         0x0000000000304340     0x15b0
+.rodata         0x00000000003043c0     0x15b0
  *(.rodata.4)
  *(.rodata .rodata.*)
- .rodata        0x0000000000304340      0x404 build-fx/assets/img/level.png.o
-                0x0000000000304340                img_level
-                0x0000000000304744                img_level_end
- .rodata        0x0000000000304744       0x64 build-fx/assets/img/mario.png.o
-                0x0000000000304744                img_mario
-                0x00000000003047a8                img_mario_end
- .rodata        0x00000000003047a8       0x24 build-fx/assets/img/death.png.o
-                0x00000000003047a8                img_death
-                0x00000000003047cc                img_death_end
- .rodata        0x00000000003047cc       0x4c build-fx/assets/img/brick.png.o
-                0x00000000003047cc                img_brick
-                0x0000000000304818                img_brick_end
- .rodata        0x0000000000304818      0x404 build-fx/assets/img/main.png.o
-                0x0000000000304818                img_main
-                0x0000000000304c1c                img_main_end
- .rodata        0x0000000000304c1c       0xdc build-fx/assets/img/mariosmall.png.o
-                0x0000000000304c1c                img_mariosmall
-                0x0000000000304cf8                img_mariosmall_end
- .rodata        0x0000000000304cf8       0x28 build-fx/assets/img/gift.png.o
-                0x0000000000304cf8                img_gift
-                0x0000000000304d20                img_gift_end
- .rodata        0x0000000000304d20      0x404 build-fx/assets/img/error.png.o
-                0x0000000000304d20                img_error
-                0x0000000000305124                img_error_end
- .rodata        0x0000000000305124       0xb8 build-fx/assets/img/tuyau.png.o
-                0x0000000000305124                img_tuyau
-                0x00000000003051dc                img_tuyau_end
- .rodata        0x00000000003051dc       0x28 build-fx/assets/img/coin.png.o
-                0x00000000003051dc                img_coin
-                0x0000000000305204                img_coin_end
- .rodata        0x0000000000305204       0x4c build-fx/assets/img/stone.png.o
-                0x0000000000305204                img_stone
-                0x0000000000305250                img_stone_end
- .rodata        0x0000000000305250        0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
+ .rodata        0x00000000003043c0      0x404 build-fx/assets/img/level.png.o
+                0x00000000003043c0                img_level
+                0x00000000003047c4                img_level_end
+ .rodata        0x00000000003047c4       0x64 build-fx/assets/img/mario.png.o
+                0x00000000003047c4                img_mario
+                0x0000000000304828                img_mario_end
+ .rodata        0x0000000000304828       0x24 build-fx/assets/img/death.png.o
+                0x0000000000304828                img_death
+                0x000000000030484c                img_death_end
+ .rodata        0x000000000030484c       0x4c build-fx/assets/img/brick.png.o
+                0x000000000030484c                img_brick
+                0x0000000000304898                img_brick_end
+ .rodata        0x0000000000304898      0x404 build-fx/assets/img/main.png.o
+                0x0000000000304898                img_main
+                0x0000000000304c9c                img_main_end
+ .rodata        0x0000000000304c9c       0xdc build-fx/assets/img/mariosmall.png.o
+                0x0000000000304c9c                img_mariosmall
+                0x0000000000304d78                img_mariosmall_end
+ .rodata        0x0000000000304d78       0x28 build-fx/assets/img/gift.png.o
+                0x0000000000304d78                img_gift
+                0x0000000000304da0                img_gift_end
+ .rodata        0x0000000000304da0      0x404 build-fx/assets/img/error.png.o
+                0x0000000000304da0                img_error
+                0x00000000003051a4                img_error_end
+ .rodata        0x00000000003051a4       0xb8 build-fx/assets/img/tuyau.png.o
+                0x00000000003051a4                img_tuyau
+                0x000000000030525c                img_tuyau_end
+ .rodata        0x000000000030525c       0x28 build-fx/assets/img/coin.png.o
+                0x000000000030525c                img_coin
+                0x0000000000305284                img_coin_end
+ .rodata        0x0000000000305284       0x4c build-fx/assets/img/stone.png.o
+                0x0000000000305284                img_stone
+                0x00000000003052d0                img_stone_end
+ .rodata        0x00000000003052d0        0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
  .rodata.str1.4
-                0x0000000000305258        0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
- *fill*         0x000000000030525e        0x2 
+                0x00000000003052d8        0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
+ *fill*         0x00000000003052de        0x2 
  .rodata.str1.4
-                0x0000000000305260      0x11a /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o)
+                0x00000000003052e0      0x11a /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o)
                                         0x11e (size before relaxing)
- *fill*         0x000000000030537a        0x2 
- .rodata        0x000000000030537c       0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
+ *fill*         0x00000000003053fa        0x2 
+ .rodata        0x00000000003053fc       0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
  .rodata.str1.4
-                0x0000000000305394        0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
+                0x0000000000305414        0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
  .rodata.str1.4
-                0x0000000000305398       0x31 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o)
- *fill*         0x00000000003053c9        0x3 
+                0x0000000000305418       0x31 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o)
+ *fill*         0x0000000000305449        0x3 
  .rodata.str1.4
-                0x00000000003053cc        0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
- *fill*         0x00000000003053d2        0x2 
+                0x000000000030544c        0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
+ *fill*         0x0000000000305452        0x2 
  .rodata.str1.4
-                0x00000000003053d4        0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
- .rodata        0x00000000003053d8       0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
- .rodata        0x00000000003053e8      0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o)
-                0x00000000003053e8                gint_font5x7
-                0x00000000003057f0                gint_font5x7_end
- .rodata        0x00000000003057f0      0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
-                0x00000000003057f0                __clz_tab
+                0x0000000000305454        0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
+ .rodata        0x0000000000305458       0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
+ .rodata        0x0000000000305468      0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o)
+                0x0000000000305468                gint_font5x7
+                0x0000000000305870                gint_font5x7_end
+ .rodata        0x0000000000305870      0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
+                0x0000000000305870                __clz_tab
 
-.rela.dyn       0x00000000003058f0        0x0
+.rela.dyn       0x0000000000305970        0x0
  .rela.pretext.entry
-                0x00000000003058f0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
- .rela.text     0x00000000003058f0        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
+                0x0000000000305970        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
+ .rela.text     0x0000000000305970        0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
                 0x0000000008100000                . = ORIGIN (ram)
 
 .bss            0x0000000008100000      0x570
@@ -516,8 +516,8 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
  *fill*         0x0000000008100564        0xc 
                 0x0000000000000570                _sbss = SIZEOF (.bss)
 
-.data           0x0000000008100570      0x290 load address 0x00000000003058f0
-                0x00000000003058f0                _ldata = LOADADDR (.data)
+.data           0x0000000008100570      0x290 load address 0x0000000000305970
+                0x0000000000305970                _ldata = LOADADDR (.data)
                 0x0000000008100570                _rdata = .
  *(.data .data.*)
  .data          0x0000000008100570       0x50 build-fx/src/tile.o
@@ -577,28 +577,28 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
                 0x0000000008100800                . = ALIGN (0x10)
  *fill*         0x00000000081007f4        0xc 
 
-.data.4         0x0000000008100800        0x0 load address 0x0000000000305b80
+.data.4         0x0000000008100800        0x0 load address 0x0000000000305c00
  *(.data.4)
                 0x0000000008100800                . = ALIGN (0x10)
                 0x0000000000000290                _sdata = (SIZEOF (.data) + SIZEOF (.data.4))
                 0x00000000e5200000                . = ORIGIN (ilram)
 
-.ilram          0x00000000e5200000        0x0 load address 0x0000000000305b80
-                0x0000000000305b80                _lilram = LOADADDR (.ilram)
+.ilram          0x00000000e5200000        0x0 load address 0x0000000000305c00
+                0x0000000000305c00                _lilram = LOADADDR (.ilram)
                 0x00000000e5200000                _rilram = .
  *(.ilram)
                 0x00000000e5200000                . = ALIGN (0x10)
                 0x00000000e5007000                . = ORIGIN (xram)
 
-.xram           0x00000000e5007000        0x0 load address 0x0000000000305b80
-                0x0000000000305b80                _lxram = LOADADDR (.xram)
+.xram           0x00000000e5007000        0x0 load address 0x0000000000305c00
+                0x0000000000305c00                _lxram = LOADADDR (.xram)
                 0x00000000e5007000                _rxram = .
  *(.xram)
                 0x00000000e5007000                . = ALIGN (0x10)
                 0x00000000e5017000                . = ORIGIN (yram)
 
-.yram           0x00000000e5017000        0x0 load address 0x0000000000305b80
-                0x0000000000305b80                _lyram = LOADADDR (.yram)
+.yram           0x00000000e5017000        0x0 load address 0x0000000000305c00
+                0x0000000000305c00                _lyram = LOADADDR (.yram)
                 0x00000000e5017000                _ryram = .
  *(.yram)
                 0x00000000e5017000                . = ALIGN (0x10)
@@ -608,8 +608,8 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
                 0x000000008800df00                _gint_vbr = 0x8800df00
                 0x000000008800f400                . = ORIGIN (rram)
 
-.gint.data      0x000000008800f400      0x140 load address 0x0000000000305b80
-                0x0000000000305b80                _lgdata = LOADADDR (.gint.data)
+.gint.data      0x000000008800f400      0x140 load address 0x0000000000305c00
+                0x0000000000305c00                _lgdata = LOADADDR (.gint.data)
                 0x000000008800f400                _rgdata = .
  *(.gint.data .gint.data.*)
  .gint.data     0x000000008800f400        0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o)
@@ -630,7 +630,7 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
                 0x000000008800f540                . = ALIGN (0x10)
                 0x0000000000000140                _sgdata = SIZEOF (.gint.data)
 
-.gint.bss       0x000000008800f540      0x290 load address 0x0000000000305cc0
+.gint.bss       0x000000008800f540      0x290 load address 0x0000000000305d40
  *(.gint.bss .gint.bss.*)
  .gint.bss      0x000000008800f540      0x180 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
  .gint.bss      0x000000008800f6c0       0x1c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o)
diff --git a/build-fx/src/MARIOBRS.bin b/build-fx/src/MARIOBRS.bin
index 5a6aba5edac83197df29027c8cef37ea51e964e6..25200f467c35f18f869888fd8e65d1ab1586b5e3 100755
GIT binary patch
delta 1657
zcmY*ZeMnnZ6hHSFvlsLAOroaNYK$?pi|xC9Ra?`Vs4$_nF(30|gyM#4?bpak8B)q@
zojAMMD%`G&O}0X%8%$Q=vLdXAY-RX|e?-<5|LB;kYTYKo4axi?8#^!0wtC_B?m546
z?mg$;bMBk|hD_fh6Ro5-3Zj%A0}w`lcEpw(pbi>^B|uskicDU}0O>JNQVfyL0a|VW
z1sH_HW1zcMf#xp&&9fnrKpQAx8fZpbh18<XyT)G+zisyGe*MeOe<D>xdq@K`oa9p4
z5iObEQQcv3+T@Z4x*O!1U19l-d{6#CeiXOL%K@iPe=6({hjY)Q1>A2X&Lz$!&LmDJ
zP9;F!op|+1S6|iSQGMmO<F`TbA*_;%B=}z07uWtSow@q-?y~)(pVNMaRk*wU=f9u>
zs*eISx!7pNe;G#1ps56?CCbM1t%6a*lKRg=#%6h7UXpJH-<R(c+5^sEOK<X2U)<o+
zcd-NFYggiWlx_#FzInTCuu7CIbK)b>kG5V-!2K*K(23GZJ`B`_IL}rM=j%<bIfFb9
zaQgM2o70CZVXL#&S#nL&ZH<c$bw2%)A$aADzK7bflDO7p3%Grr?u3$WCe{i>poUS_
zZ`^MwZdCFGdK61wsR5enWwXZJgs^qvv4h7PSOXVO$qv+oPDQgQODNw@)s9-xR@}Im
z+GU_-jk<|>hFvm!t<Az^*)xoq``nmq+EZ!S*JYU#{GKHM-5{(3(8|~x@p~{Y%*;~5
z=FLZRan*7l$x5Y@#!amjqat%lIw2G{GBNYGDYr?@$A-JO?(++o`9!dH@*9>9h>&Gx
z4x3Y%8f_=Z3>&xA;&;WiEaaSJ@vMVFP7gO^Ur#xX=H!~HVsWwrKF?wSQ2Pjfkn;{{
zRnC_F7+Y#c&BqY|8d^gg<At#|!&vAD<`5o7Od=j2;)q4{4nhkk_aIsjUPKpSjE(I0
zC4E}yYIY&_-F@{EHa)8K6ocR<<w<-I%}Rq0!U8^sCkVVO>eXN&nwVo}t~Mq1bKlM<
z0$Jp){I7&P{kXUiH)+8cH&R|vgM>0x%uA79yR1AkS|8^djtY{#4)l<NQRlKyEHQi0
zMZ8gdqo|x{>m<d(XI%v(a|)>2j;}h3=mfgEg(Zvsc+Pez7KP;-?oUaU;*3F43tpJM
zEC~p^kgj;P*K-rz9JWTJl-oSRo2%6@YRFW$$<pt$lIY}99JeOINA|u#$P}C3_gx0X
zLg1Y#>5a)Dp)ATaWT#MG$?|BvGI?oA>!jJJ@gC|SWQC2D)!}!s>_@V~C(DP^$P{nd
z?<A($ZalsL!?gpgZs$GKRzhakP)!?|<%>0Sge1A^;Bg_NJqFZ2fjGg3yf1In+4SLa
zysR#rC{0@9Yr`-jK4(TGqTD~wstFeK@2H>=%-Vr%Q@EJo@y|C1|KuSzk6dSpqoH|q
zwhjTc#&BI$0gW`PT!m@_Ah>P}ACZVC<z9cbSzC>9s@=T3<r8gvD2o2#CJ4Uqp6z<5
zf4knK?7zi7IL0g6z9nRot+f~Q;)(ZMLWk``;ppCvx09$*PbpB@`<$mGms7IBKO5WR
Z2;M$o%fNq(<AutucNCI-KG7kO{{b(8o~i%<

delta 1566
zcmY*ZUr3u*6hHS<vzWx>i$)i%nix~HjctzFx|+J0I6<LZjftqUQryU<9UHhphm0_@
zGPZ2UlwBERlTp?(gq0DvZV2-sY(DhChq&312ce@?C(MVAiSt3m&dulF3%~E4d;Z^Z
z&i#@<vg8je(Zj~B#q?^<2!JvP*!OJB3EIMIu{9vJT#{yoG(gUXUX_Aw2SCsX2oQ(u
z6~MA#!14jW6XdIO6tFb`_>v#ckkVjT)b_HPSHtgE0=ZBA4v0tWJkvGD0K-wCW?j~?
zS}~A&i79#WJlpu6!88rnJ_Be?bCan@F-`M`>Fbbb)%#Ie^?uRyvG>~wd#7unU~Kos
z?Uc!HjPNFX{|6}}QTMt&@#$Z`=gq&REa@ZscYVOv8z0N=ta@|%#x@v-xAp3Clw95}
zpxMB?^KMq<%`fRXT>&HH{+hF_>#BIomCC8BvDy5d&ML?SRHJlnJ=dEX^W90A6X45E
z+Ghca=XlUu&47=ZuljBw)!;6mWeTv8lqx%j9tU(^$kYw<N#;&!;mvjmPnVQVEQ6n0
zzSr5vs;G_6T5ijPvi?-p{gM17CE!^D$c@7m05)tcv4DqCqNJ>|d_cXN8`LCCqdcJw
z<?Wq(6qGn_>l=zY$;YkN&BY5^It5Xgj@Yr5Gv)aeVK4ZUDYhwo-{z9rL)#E*<5+l+
zzHb$-D@7Z;yU3>$ZHdXE&oYWmdx`nnW{RzW-?Qofw3|eS{aw~0ua>hy-85<WIH>iZ
z5kibW7Yk7@!w(6ygbRc=LXZ&AN)Q?(ogIR-n<uQ2%*|~jk8}KTp!iP7`&R>#G;c}3
zK!SqI0oISwFkX?f6^B1)7M~KRSa>l;eOQRYV>zGcB_);hD9i7O<jXQ{r!{#gh=mhR
z6*eel%D+=ik>=Jp@=Tt#P@C%3Numcx`vD~|5|e|Etw9m3Xkhekuz8x#y4Dr<IG?V3
zkIF3U?s}%XM3rxz7QvGaX7vG{oT67YKo|t9TI8{+zYe&AQX;t`TKyF(B;~5UJ%dA0
z?Ws<sjMxqPz79lGo;!pG;*Mux&sqzkh0KI&KJ!cAC@CeS;?YEe?QA<^K0e_6+2Ebb
z6jG*FgCPaeJc=%*F2V0&x!jWIDyd6!x>DI=yWX3A<Iq3yEdf0iz`BIkMGs>UUQ^#f
z-{Jb-SVS~8Ok^>iSZs7Lvyb}N9H;ncz{X{<`$7R@9b9edWgTL;sfDpoG2^?g7<!*k
z@e$DfM5r&GK6>VDEpKO0?M0$R$K*KA`Fkmp8gLoH%d#ne=WF>=ptu3UG-%Emz>2{P
zpMFnq__vgJ-Gr444?}(0UZ4le-z2+22Zk3lUPJeu9V5H@RP_%DGh#kaWYIN7=>p$~
zbnr`EYnSw;-va}@vUB_#%07N>m;R6Fce%xE?@x@C@{v~@WAq|wq=Vy2^6-r9IFn9z
qdIs?9+yNh}cQdr)@2_KYc!R3Hu`iN4{fwN4XKwDVU?8wxW&Z>2G>2yZ

diff --git a/build-fx/src/MARIOBRS.elf b/build-fx/src/MARIOBRS.elf
index bd287b159d8d9563fbbfa3fb7849a9aba188d758..fe96dfc4b5446d108ab8c8e7542b18ffd747cb0c 100755
GIT binary patch
delta 5031
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

delta 4930
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
Ng4{D0vmc>`{s-iDexv{Z

diff --git a/build-fx/src/box.o b/build-fx/src/box.o
index ecec7636e8f4be49a8d81193ff57f0c7ae6cefd1..c12cbbcbc13e14b24d0351a24160656c1b8daa1c 100644
GIT binary patch
delta 248
zcmeyvK816F5)-q|MwI}@1pT%QXZ>j@!TQVex9K0#zji@b|Czs%19xVy0!P18HnYE4
z-nZOuIp4CsWqr&1#=xENEwnME$#jP=x5*lXmmQ4V3~v~#7z3LPm-l|sInnui{WFQF
zcbQ)?ykS`X<=tNf&dE89Yxx-%R2di;9T*rGGK7GP$r4PeobgHd74cc6xdoH$n56j`
z7#A=wurUHv00HBY$pK8wj4LKzVNzy202DBo{D(=I@y=ugW_2(rJ~^IQ0LUs}R%iVH
dlwUA;4zn`r1RzU)@)2fbQIMDw5W@i2TmZpkOPv4!

delta 95
zcmbQj`G<Xi5);#ujVb|*lkYGtojj3Ag^^+MJ|^kOADOBc9VX{6E3-N<Ffd3=p2Dom
uSTgwmv-srm%mQGRI*{aGQD^M{%1@YV!lKM70c5F8j$u(|jF{ZOA_4$b_!*i2

diff --git a/build-fx/src/main.o b/build-fx/src/main.o
index 92ece74aae1137ca911835c87cca630cbdf3d454..d67d6dc78089716eb9a2485677e8702485af8cac 100644
GIT binary patch
delta 25
hcmZqSZQ-3Tn~`zi96u&Mg^3?cCNZ*ZR%MK51psTz2gU#Z

delta 25
hcmZqSZQ-3Tn~`DS96zQ~gNYwaCNZ*ZR%MK51psb!2mAm4

diff --git a/build-fx/src/mario.o b/build-fx/src/mario.o
index e862c91ee4da4d331bf41215c53363f481571cd4..e174de3664331b077b0b9c5b98895a4a5d4ea8fb 100644
GIT binary patch
delta 361
zcmeyuy@h9ja_ABU1_ovZ6ClaJpuxb!z^UJMLqLC8V7vY@MG1eUexdq5nN1gX9Jo^^
zTXIA-Uf>3@76*2wE)MT7<<J+p$Z?Is5hz#B;;)wVE%O@#cg8mc&dG(0A`^RZjd}Fj
z{FNNJ88|O;2MGlWD_JXP^s;0KU*NdH>A?MzC$KT8=?a^n#sxMJ5q~uYZHQJD@y+Ut
z7L1G@lM|TiH5mlJPGi^!p%_>M85mfB>|;<qO#a&B9ZcI;vPyFcCTB2PPF~FH;qZfj
zfu9ko><<Hj0F(`)1Yv9z1_pK*n}dNt2+C&AVPFuMEYH%+#K<#w35zo86`-b;$!A!U
z8675nU{Pm`m@L7n&R8?q0ZeAFs<TdDU|>v`JcU)6^#f4tlgWEnl^IheKVTIB0IjT0
AJ^%m!

delta 304
zcmdnO^M!kYa%c(z0|PUI36Nx9&|u(V;M8xsA)r4kuw8$dqJ+Ovzi|DZ%%%%G4%{h|
zEjgkZFK`1{ivv5YI8qnu3zafm<Vcx(jl+>UyrZ7QUoGof<~IiJjBk@SvWQIV$(3gF
zS90WL;Jn0og)LAqN$CQsp@xWvgSNjK11C_4@MdR53r0qr$u&&&k}QG@46Hym>;bz3
zNC-d}XC^;k+BSI!v+?As%w8rB7#R2&p(>sL)xg*<7#P@L>^BSyf-trY1B3A7c$Q`+
zh7XgUuqd-G0P3xn%)_e8s504rRh>~{as-e}nA`v+SFozHmM}0d228%fs?2%>sP@+6
KKVY>AY$5={hDP=P

diff --git a/src/box.c b/src/box.c
index ad2e9a3..0e2765f 100644
--- a/src/box.c
+++ b/src/box.c
@@ -88,32 +88,17 @@ int box_move(box_t * b)
 
 int box_jump(box_t * b, int height)
 {
-	int sgn_vx=-sgn(b->gravity)*sgn(height);
-	if (sgn_vx)
+	int sol=0;
+	int sgn_vy=-1*sgn(height);
+	if (sgn_vy)
 	{
-		int i=sgn_vx;
-			int previous_tested_y=-545;
-			int type=CTG_EMPTY;
-			for (int j=0; j<b->h; j++)
-			{
-				int t=(b->y+j)/8;
-				if (t!=previous_tested_y)
-				{
-					previous_tested_y=t;
-					int typetemp;
-					if (sgn_vx>0)
-						typetemp=world_get_ctg(b->x+b->w+i*sgn_vx,b->y+j);
-					else
-						typetemp=world_get_ctg(b->x+i*sgn_vx,b->y+j);
-					if (typetemp==CTG_DEATH || typetemp==CTG_SOIL)
-					{
-						b->x+=(i-1)*sgn_vx;
-						b->vx=0;
-						return;
-					}
-
-				}
-			}
-		b->vx=height;
+		for (int j=0; j<b->h; j++)
+		{
+			int typetemp=world_get_ctg(b->x+j ,b->y+sgn_vy);
+			if (typetemp==CTG_DEATH || typetemp==CTG_SOIL)
+				sol=1;
+		}
+		if (sol)
+			b->vy=height;
 	}
 }
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 6607445..f49c7b2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,7 +29,7 @@ int main(void)
 	gint_panic_set(system_error);
     volatile int has_ticked = 1;
 
-    timer_setup(0, timer_delay(0, 3*10000), timer_Po_4, callback, &has_ticked);
+    timer_setup(0, timer_delay(0, 20000), timer_Po_16, callback, &has_ticked);
     timer_start(0);
 
     while(global_quit==0)
diff --git a/src/mario.c b/src/mario.c
index 84270a4..db7f919 100644
--- a/src/mario.c
+++ b/src/mario.c
@@ -21,7 +21,7 @@ pnj mario=
 void mario_draw()
 {
     if (mario.size==M_SMALL)
-        draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y)+2, &mario_small, mario.type1, mario.type2);
+        draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, mario.type1, mario.type2);
 }
 
 int test_sol_le_plus_proche(int x, int y)
@@ -51,26 +51,11 @@ void mario_move()
 {
     update_keyboard();
     int jump = keys[MK_JUMP1] || keys[MK_JUMP2];
-    mario.p.vx = keys[MK_RIGHT] - keys[MK_LEFT];
-/*
-    if (hitbox(mario.p.x, mario.p.y-1, 8, 8)==CTG_SOIL)
-    {
-        if (jump)
-        {
-            if (mario.running==1)
-                mario.vel_y=6;
-            else
-                mario.vel_y=5;
-        }
-        else
-        {
-            mario.vel_y=0;
-        }
-    }
-    else if (mario.vel_y>=-1)
-        mario.vel_y--;
-*/
+    if (jump) 
+        box_jump(&mario.p, 12);
 
-    box_move(&mario.p);
+    mario.p.vx = keys[MK_RIGHT] - keys[MK_LEFT];
+
+    box_move(&mario.p); // <-> + gravity
 }