From ea8499c1f2ed745fef114bb3f098dfde3cd9fb01 Mon Sep 17 00:00:00 2001 From: milangames-art Date: Wed, 11 Dec 2019 16:31:18 +0100 Subject: [PATCH] change move physics engine add beautiful walk animation --- SuperCbr.g1a | Bin 47844 -> 48992 bytes assets-fx/img/goomba.png | Bin 5966 -> 6322 bytes assets-fx/img/mario.png | Bin 670 -> 0 bytes assets-fx/img/mariobig.png | Bin 756 -> 16881 bytes build-fx/SuperCbr.bin | Bin 47332 -> 48480 bytes build-fx/SuperCbr.elf | Bin 62384 -> 63572 bytes build-fx/assets/img/goomba.png.o | Bin 492 -> 492 bytes build-fx/assets/img/mariobig.png.o | Bin 696 -> 968 bytes build-fx/map | 991 +++++++++++++++-------------- build-fx/src/bonus.c.d | 4 +- build-fx/src/bonus.c.o | Bin 2924 -> 3072 bytes build-fx/src/box.c.d | 5 +- build-fx/src/box.c.o | Bin 1772 -> 1992 bytes build-fx/src/ennemi.c.o | Bin 3468 -> 4124 bytes build-fx/src/keyboard.c.o | Bin 1996 -> 2008 bytes build-fx/src/level.c.o | Bin 9800 -> 9960 bytes build-fx/src/main.c.o | Bin 2496 -> 2496 bytes build-fx/src/mario.c.o | Bin 4000 -> 3948 bytes build-fx/src/score.c.o | Bin 2084 -> 2064 bytes build-fx/src/tile.c.d | 4 +- build-fx/src/tile.c.o | Bin 1712 -> 1980 bytes build-fx/src/world.c.o | Bin 3368 -> 3368 bytes src/bonus.c | 12 +- src/box.c | 9 +- src/box.h | 16 +- src/constants.h | 9 + src/ennemi.c | 286 ++++----- src/ennemi.h | 30 +- src/keyboard.c | 15 +- src/level.c | 26 +- src/mario.c | 26 +- src/mario.h | 3 + src/score.c | 4 +- src/tile.c | 53 +- src/tile.h | 36 +- 35 files changed, 800 insertions(+), 729 deletions(-) delete mode 100755 assets-fx/img/mario.png create mode 100644 src/constants.h diff --git a/SuperCbr.g1a b/SuperCbr.g1a index 58dfe61fa09a65562c1dd784a3b0d289e9e9ab86..07fbdc75371cb9e549632905be07b61ca0f2f22d 100644 GIT binary patch delta 10716 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 aaA^RcgJXg_cyDiSDn*y&`7iuYLHr*GF=(Lx delta 9529 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 diff --git a/assets-fx/img/goomba.png b/assets-fx/img/goomba.png index f04096010945c59b550e1c19319381476d579ade..83edf84b180cac10b726f42e22d33cab927d9263 100644 GIT binary patch delta 6224 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 Ef=o3h{Qv*} diff --git a/assets-fx/img/mariobig.png b/assets-fx/img/mariobig.png index 05aa263ea217e1d6ef23bc84aa6831ae748fa268..6234d6c62df68cd7a5708e579c87ea0d0d066b69 100644 GIT binary patch literal 16881 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 delta 705 zcmV;y0zUomg8}pfe~C~|M-2)Z3IG5A4M|8uQUCw|Bme*aA_xKi006ijjYy%h9ZB5<-E_Z-|CtWfmM+(sNG#3iM`x$*x4(PuHde+?DTKhPC z05a57>IOJC1V)OKz3%bu?#|x+J=5y%2T#{>nJ>Fgjgt*PAP5ByA~wx_N;{J^Kqr3y z-bqA3R7l6|mCF{xAP7W(3b`i+5BiW@a0hC_#}XN1(FJ>Ja%4+{FTx%Y zblR-``q;0!G1rHv78;(!9d!jB2?TY~yO2kBDS;xJiO@pIS2rfVmTz%9OK4-ravv|C ztvln{mU|Lq*$Iz%9`pRGc}C@e=<~mUc><)W@NLz1Km?y=(?@8ld5XV){uCijjJR5FPV8=9$I|#PM!YAe!o~00000NkvXXu0mjf>MuR< diff --git a/build-fx/SuperCbr.bin b/build-fx/SuperCbr.bin index 75af44144f007eb95788fe8b8c43292d5cd467a3..f29ea62e2e47a15fbf8af3e996a7e3a053983f3f 100755 GIT binary patch delta 10677 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 delta 9490 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%0Dc)r3k|rsH)WCqZHV^|+ykXr_W+k4!6QXrt z`h|FU^MEk<>oX>gy3geL$;lJW>!v0jx(znT=RmMk zY3jjJ4}CHo94AyIjSjZ0Ex#;(i>h!uSdKFSEg5y6fVK~N@E>y4YoBsj|ROu16+?;$ktf;_j+&tg!ciB z#QDt=#1lc-QnUCRaNE{*-hPt!GRJ+<)Tc^%=Z~PcEUdP7E}Ly_+qX;eV_jrXBHZit z;t|$fUNhYejPMBrMtuvT*knA+9c{MhW1OU_#9iFza2Jdd4yvwBm+cN@DC>IlDY`V* zml?GCW?fxTno}G=s*J}YR5<~WBE!uqp5vtgjX#9c1uEJRQWH+8mB*ul6GC)_n4EKn z$r{r>eHFgkXb+x`_*_;)>n#JiXB^X#TkC#5BY}IGf)rk4l1vFc_4kV2?7Oe3pZHs z)!k-1x(_#d_7%QFBnaqNCx_haGZd{RQy+l#JLK;4A?7f|Du=)03`L3D8->}PuS;sC z=m2e)GBmv~b?t(W67Xl7BXT@sI#-_TvSkFh;8Skv!jBS)A-ch6+7?V9geLCbs><`@ zC#A!ZVu>;Rk`8WPIZc-uaMW5ud&AgU+Sc~^QMfJJcpYb}2y_hJL=4=Sayq%x04O3r z+4gtcF^j&9sy)gR#$0?|h);Gd#;`o%h{}#`K&aek;H-xBsHtibr~sPI8QRI!6P&^L zP}Gtep#X0o1Zk@~Jco>_1i4u5Ikh;Ah&%)*%p!;&gAm8<6oFW0t@A?|QR+`!UQ(y)V5FTG3}Rh(p5DQQgiR4jXzn2RHcFbE364nsK#PT(Ar z3z#rsOh>&C?-+6~&OyxLGVWI8{BZFFjN&P-DkU1ryrFpU$eEBl%R#0i#ZaoCKumgM zE0j1WAjUBC4TF+~RZ#LmLC%qE=sN-BMJTXmj)0g)u5lyPe+t7NIoET)TF$P1$PAxC z0qLPVFv)v@8X=XypFQmm{M*quluJOo875tN!;bz8^_%B-(o2m}hFmM$2jF_Be;MQ1 zwc=+ad>-XQs~gGE2~W%Fx5=F55g=UvQw#xQLSJ6jo8cW~Xx;&g7+|eoiuE3?DW3?h zFBVLtqwX@f`Z!lx{{&Xosruzn5R(h>cnz?(x`Rt!vzn~U<94hm$KdE19{`WN;aLiH zrAM`vCZd`^U>rUigGuUN@l>r-5@bUR*YaQ^0MF3}%V7gcJU3b%A|sB$`uyZOC~tdO z*3X?@=k{5=kPL(#&fIzsvmV9)MF1F|Ceqp%6xZKL-C7KY)+tNB5iH^&c4U1Nh_~=%|JAPYOWp3*oc> z>;MWA{t*&WasL!P$d8wlghai0+5q{qC5Ptwtq_GJ_%RHF%k1d*<>B>J*Xc%G+CG8x~IEmRk&G%`nAsc%~weMWlgFiHZ_K4=SHC zCwdRS@7Xzj90QmcnrC7x|@FU z&=9~&+uk}e25^J^t-%ujf0z;39ZsAlJSDHb92H;2esH49Fl5*baChBXh9JP8=P&O6 z6ouDUfZN*Sxp1^AoMjH$fiPArE}+IkwE(Bo49@fQy))}C_06pB!8>po{>u~h)Tg!u z#sPWzYUlz)%J znXC!yU7@D1@dAY&43nWKp!_2|FzLyMd1c2WZVW(>>!mj*>v;SWU05LPam48C2yKGq z=?`vX3SXPvB)l{E;OvX4?zA%u)))|i_Niya`>+{~ax-+{i471s?d41xaww*P@zfrV GA^sna+s7~f diff --git a/build-fx/SuperCbr.elf b/build-fx/SuperCbr.elf index 15f7e3c3a667cf41c0cdd3c4707ac1ba1be86b88..77e416ccbf4991fa6a6034e10aeed98f2287abb8 100755 GIT binary patch delta 17748 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 diff --git a/build-fx/assets/img/goomba.png.o b/build-fx/assets/img/goomba.png.o index a5039d1071e4d7a0b0c4525f5bc5137496b71e74..7a5d3aafa64bfc261b1c96683b4abe77b1ffbedb 100644 GIT binary patch delta 32 lcmaFE{DygghbTk+{sRmS3moczbY0L&hyOtO_Qu$LMgZ_o50wA_ delta 32 lcmaFE{Dygghp0{c{sT4+3moczbY0L&hyOtO|HjyUMgaTF5HSD% diff --git a/build-fx/assets/img/mariobig.png.o b/build-fx/assets/img/mariobig.png.o index 447d5a6dd95da97af49a12ee35add1d817d65162..ffaa81f05cadaf03176235e4d674448251bfb71a 100644 GIT binary patch literal 968 zcmcJO%}e7z7{=cuwV@!5;w8{x{8$zd5h)9L5JhA?d00@;TN7!iJv2hwi^5VR(0H)T z*^@^->7TIG$`*G21;v0!#l0wd@v&|oBz+(rm1Q7p)d);!iUaJrOW<#5+5yeq_XJS;*b~`7tvuW3)lZDE zZPZc;l_q-?xic(_JflVq|~=Mg}b)8(H83Sk44YYA~=eurM$=D9P~gv4ceH%w|@Eo zAZ;VZ&)xu}O~iOvk?AsX+1>*{aTpC`f&r=S5aX8O1!>e5-z(Puq}PYv43MD= J;{j=~y#PM+ToC{O diff --git a/build-fx/map b/build-fx/map index c849d0f..a839750 100644 --- a/build-fx/map +++ b/build-fx/map @@ -169,7 +169,6 @@ LOAD build-fx/assets/fonts/mario.png.o LOAD build-fx/assets/img/bonus.png.o LOAD build-fx/assets/img/bloc.png.o LOAD build-fx/assets/img/ram.png.o -LOAD build-fx/assets/img/mario.png.o LOAD build-fx/assets/img/main.png.o LOAD build-fx/assets/img/new_level.png.o LOAD build-fx/assets/img/brick.png.o @@ -201,7 +200,7 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x0000000000300000 _brom = 0x300000 - 0x000000000000aeac _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x000000000000b470 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8d0 *(.pretext.entry) @@ -241,7 +240,7 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a *(.dtors .dtors.*) 0x0000000000300ad0 _etors = . -.text 0x0000000000300ad0 0x5388 +.text 0x0000000000300ad0 0x5990 0x0000000000300ad0 _gint_exch_tlbh_start = . *(.gint.exch_tlbh) .gint.exch_tlbh @@ -249,380 +248,395 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x0000000000300ad0 _gint_exch_tlbh 0x000000000000004c _gint_exch_tlbh_size = ABSOLUTE ((. - _gint_exch_tlbh_start)) *(.text .text.*) - .text 0x0000000000300b1c 0x1e0 build-fx/src/level.c.o + .text 0x0000000000300b1c 0x444 build-fx/src/level.c.o 0x0000000000300b1c _malloc_error 0x0000000000300b54 _init_level 0x0000000000300bc8 _init_ennemies 0x0000000000300c28 _set_level - 0x0000000000300ccc _get_lvl_id - .text 0x0000000000300cfc 0x1fc build-fx/src/score.c.o - 0x0000000000300cfc _new_level - 0x0000000000300d20 _new_game - 0x0000000000300d58 _score_add_coin - 0x0000000000300d68 _score_add - 0x0000000000300db8 _score_display - .text 0x0000000000300ef8 0x40 build-fx/src/tile.c.o - 0x0000000000300ef8 _draw_tile - .text 0x0000000000300f38 0x374 build-fx/src/box.c.o - 0x0000000000300f38 _sgn - 0x0000000000300f4a _check_collision - 0x0000000000300fc4 _box_move - 0x000000000030124c _box_jump - .text 0x00000000003012ac 0x598 build-fx/src/world.c.o - 0x00000000003012ac _world_get_width - 0x00000000003012bc _world_get - 0x0000000000301320 _display_cell - 0x0000000000301684 _world_get_ctg - 0x00000000003016bc _world_get_real_x0 - 0x0000000000301704 _world_get_real_y0 - 0x0000000000301718 _world_draw - 0x0000000000301824 _world_move - .text 0x0000000000301844 0x43c build-fx/src/bonus.c.o - 0x0000000000301844 _lance_bullet - 0x000000000030189c _bullet_display - 0x000000000030191c _bullet_move - 0x0000000000301a28 _bonus_set - 0x0000000000301a58 _bonus_move - 0x0000000000301bc4 _bonus_draw - .text 0x0000000000301c80 0x6dc build-fx/src/mario.c.o - 0x0000000000301c90 _mario_bigger - 0x0000000000301cac _mario_smaller - 0x0000000000301cd8 _mario_draw - 0x0000000000301e74 _test_sol_le_plus_proche - 0x0000000000301ee0 _mario_move - .text 0x000000000030235c 0x40 build-fx/src/main.c.o - 0x000000000030235c _callback - 0x0000000000302364 _system_error - .text.startup 0x000000000030239c 0x1c0 build-fx/src/main.c.o - 0x000000000030239c _main - .text 0x000000000030255c 0x284 build-fx/src/keyboard.c.o - 0x000000000030255c _menu_pause - 0x00000000003026f0 _update_keyboard - .text 0x00000000003027e0 0x644 build-fx/src/ennemi.c.o - 0x00000000003027e0 _display_ennemi - 0x000000000030297c _ennemi_check_collision - 0x00000000003029d8 _hurt_mario - 0x0000000000302a0c _move_ennemi - 0x0000000000302de4 _display_ennemi_table - .text 0x0000000000302e24 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x0000000000303820 _kprint_opt - 0x0000000000303968 _kprint - 0x0000000000303a40 _kvsprint - 0x0000000000303a88 _sprintf - 0x0000000000303ab0 _vsprintf - 0x0000000000303ad0 _snprintf - 0x0000000000303af0 _vsnprintf - .text 0x0000000000303b08 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - 0x0000000000303b08 _memcpy - 0x0000000000303bc2 __memmove - 0x0000000000303bc6 __memcmp - 0x0000000000303bca _memset - .text 0x0000000000303be4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) - .text 0x0000000000303be4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - .text 0x0000000000303be4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - 0x0000000000303be4 _dupdate - 0x0000000000303bfc _dupdate_noint - .text 0x0000000000303c08 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - 0x0000000000303c08 _dimage - 0x0000000000303c5c _dsubimage - .text 0x0000000000303cd0 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - 0x0000000000303cd0 _dclear - .text 0x0000000000303d1c 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x0000000000303ec4 _pollevent - 0x0000000000304008 _waitevent - 0x0000000000304054 _clearevents - 0x0000000000304074 _keydown - 0x00000000003040a0 _keydown_all - 0x00000000003040dc _keydown_any - .text 0x0000000000304118 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - 0x0000000000304124 _iokbd_row - 0x000000000030420c _iokbd_scan - .text 0x000000000030423c 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - 0x000000000030423c _getkey_opt - 0x00000000003043e8 _getkey - 0x00000000003043f4 _getkey_repeat - .text 0x0000000000304430 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) - .text 0x0000000000304430 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - 0x00000000003045c0 _gint_panic - 0x00000000003045d0 _gint_panic_set - 0x00000000003045dc _gint_exc_catch - 0x00000000003045e8 _gint_exc_skip - .text 0x00000000003045f4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) - .text 0x00000000003045f4 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - 0x00000000003046a8 _gint_install - 0x0000000000304758 _gint_unload - .text 0x0000000000304770 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) - .text 0x0000000000304770 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) - .text 0x0000000000304770 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - 0x0000000000304770 _tlb_addr - 0x0000000000304784 _tlb_data - 0x0000000000304798 _tlb_mapped_memory - 0x000000000030486c _utlb_addr - 0x000000000030487c _utlb_data - 0x000000000030488c _utlb_mapped_memory - .text 0x0000000000304964 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x0000000000304964 _dsize - .text 0x0000000000304a00 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - 0x0000000000304a00 _dprint - .text 0x0000000000304a58 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x0000000000304d78 _timer_setup - 0x0000000000304e08 _timer_delay - 0x0000000000304e68 _timer_start - 0x0000000000304e9c _timer_reload - 0x0000000000304ebc _timer_pause - 0x0000000000304ef0 _timer_stop - 0x0000000000304f4c _timer_timeout - 0x0000000000304f58 _timer_address - 0x0000000000304f94 _timer_clear - .text 0x0000000000304fc4 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - 0x0000000000304fc4 _sleep_us - .text 0x000000000030501c 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x00000000003050b4 _t6k11_display - 0x0000000000305188 _t6k11_contrast - 0x00000000003051b4 _t6k11_backlight - .text 0x00000000003051f4 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x0000000000305338 _clock_freq - .text 0x0000000000305344 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) - .text 0x0000000000305344 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) - 0x0000000000305344 _bopti_asm_mono - 0x000000000030536a _bopti_asm_mono_alpha - .text 0x000000000030539c 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - 0x000000000030539c _bopti_grid - 0x0000000000305510 _bopti_render - 0x0000000000305640 _bopti_render_clip - 0x0000000000305754 _bopti_render_noclip - .text 0x00000000003057ac 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - 0x00000000003057ac _masks - .text 0x0000000000305848 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - 0x0000000000305848 _gint_setvbr - .text 0x0000000000305874 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - 0x0000000000305874 _gint_intlevel - 0x00000000003058c8 _gint_inthandler - .text 0x00000000003058ec 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - .text 0x00000000003058ec 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - .text 0x00000000003058ec 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - 0x00000000003058ec ___movstr - 0x00000000003058ec ___movmem - 0x0000000000305920 ___movmemSI64 - 0x0000000000305920 ___movstrSI64 - 0x0000000000305924 ___movstrSI60 - 0x0000000000305924 ___movmemSI60 - 0x0000000000305928 ___movmemSI56 - 0x0000000000305928 ___movstrSI56 - 0x000000000030592c ___movstrSI52 - 0x000000000030592c ___movmemSI52 - 0x0000000000305930 ___movstrSI48 - 0x0000000000305930 ___movmemSI48 - 0x0000000000305934 ___movstrSI44 - 0x0000000000305934 ___movmemSI44 - 0x0000000000305938 ___movstrSI40 - 0x0000000000305938 ___movmemSI40 - 0x000000000030593c ___movstrSI36 - 0x000000000030593c ___movmemSI36 - 0x0000000000305940 ___movmemSI32 - 0x0000000000305940 ___movstrSI32 - 0x0000000000305944 ___movmemSI28 - 0x0000000000305944 ___movstrSI28 - 0x0000000000305948 ___movstrSI24 - 0x0000000000305948 ___movmemSI24 - 0x000000000030594c ___movmemSI20 - 0x000000000030594c ___movstrSI20 - 0x0000000000305950 ___movstrSI16 - 0x0000000000305950 ___movmemSI16 - 0x0000000000305954 ___movmemSI12 - 0x0000000000305954 ___movstrSI12 - 0x0000000000305958 ___movmemSI8 - 0x0000000000305958 ___movstrSI8 - 0x000000000030595c ___movmemSI4 - 0x000000000030595c ___movstrSI4 - .text 0x0000000000305964 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - 0x0000000000305964 ___udivdi3 - .text 0x0000000000305b54 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - 0x0000000000305b54 ___umoddi3 - .text 0x0000000000305d88 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - 0x0000000000305daa ___udivsi3 - *fill* 0x0000000000305df4 0x4 - .text 0x0000000000305df8 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000305df8 ___udiv_qrnnd_16 - .text 0x0000000000305e58 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x0000000000300f30 _get_lvl_id + .text 0x0000000000300f60 0x1e8 build-fx/src/score.c.o + 0x0000000000300f60 _new_level + 0x0000000000300f84 _new_game + 0x0000000000300fbc _score_add_coin + 0x0000000000300fcc _score_add + 0x000000000030101c _score_display + .text 0x0000000000301148 0x40 build-fx/src/tile.c.o + 0x0000000000301148 _draw_tile + .text 0x0000000000301188 0x42c build-fx/src/box.c.o + 0x0000000000301188 _sgn + 0x000000000030119a _check_collision + 0x000000000030122c _box_move + 0x0000000000301550 _box_jump + .text 0x00000000003015b4 0x598 build-fx/src/world.c.o + 0x00000000003015b4 _world_get_width + 0x00000000003015c4 _world_get + 0x0000000000301628 _display_cell + 0x000000000030198c _world_get_ctg + 0x00000000003019c4 _world_get_real_x0 + 0x0000000000301a0c _world_get_real_y0 + 0x0000000000301a20 _world_draw + 0x0000000000301b2c _world_move + .text 0x0000000000301b4c 0x50c build-fx/src/bonus.c.o + 0x0000000000301b4c _lance_bullet + 0x0000000000301ba8 _bullet_display + 0x0000000000301c40 _bullet_move + 0x0000000000301dc0 _bonus_set + 0x0000000000301df0 _bonus_move + 0x0000000000301f7c _bonus_draw + .text 0x0000000000302058 0x730 build-fx/src/mario.c.o + 0x0000000000302068 _mario_bigger + 0x0000000000302084 _mario_smaller + 0x00000000003020b0 _mario_draw + 0x0000000000302260 _test_sol_le_plus_proche + 0x00000000003022cc _mario_move + .text 0x0000000000302788 0x40 build-fx/src/main.c.o + 0x0000000000302788 _callback + 0x0000000000302790 _system_error + .text.startup 0x00000000003027c8 0x1c0 build-fx/src/main.c.o + 0x00000000003027c8 _main + .text 0x0000000000302988 0x290 build-fx/src/keyboard.c.o + 0x0000000000302988 _menu_pause + 0x0000000000302b28 _update_keyboard + .text 0x0000000000302c18 0x814 build-fx/src/ennemi.c.o + 0x0000000000302c18 _display_ennemi + 0x0000000000302e60 _ennemi_check_collision + 0x0000000000302ec4 _hurt_mario + 0x0000000000302ef8 _move_ennemi + 0x00000000003033dc _display_ennemi_table + .text 0x000000000030342c 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x0000000000303e28 _kprint_opt + 0x0000000000303f70 _kprint + 0x0000000000304048 _kvsprint + 0x0000000000304090 _sprintf + 0x00000000003040b8 _vsprintf + 0x00000000003040d8 _snprintf + 0x00000000003040f8 _vsnprintf + .text 0x0000000000304110 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + 0x0000000000304110 _memcpy + 0x00000000003041ca __memmove + 0x00000000003041ce __memcmp + 0x00000000003041d2 _memset + .text 0x00000000003041ec 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) + .text 0x00000000003041ec 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + .text 0x00000000003041ec 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + 0x00000000003041ec _dupdate + 0x0000000000304204 _dupdate_noint + .text 0x0000000000304210 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x0000000000304210 _dimage + 0x0000000000304264 _dsubimage + .text 0x00000000003042d8 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + 0x00000000003042d8 _dclear + .text 0x0000000000304324 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x00000000003044cc _pollevent + 0x0000000000304610 _waitevent + 0x000000000030465c _clearevents + 0x000000000030467c _keydown + 0x00000000003046a8 _keydown_all + 0x00000000003046e4 _keydown_any + .text 0x0000000000304720 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + 0x000000000030472c _iokbd_row + 0x0000000000304814 _iokbd_scan + .text 0x0000000000304844 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + 0x0000000000304844 _getkey_opt + 0x00000000003049f0 _getkey + 0x00000000003049fc _getkey_repeat + .text 0x0000000000304a38 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) + .text 0x0000000000304a38 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x0000000000304bc8 _gint_panic + 0x0000000000304bd8 _gint_panic_set + 0x0000000000304be4 _gint_exc_catch + 0x0000000000304bf0 _gint_exc_skip + .text 0x0000000000304bfc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) + .text 0x0000000000304bfc 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + 0x0000000000304cb0 _gint_install + 0x0000000000304d60 _gint_unload + .text 0x0000000000304d78 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) + .text 0x0000000000304d78 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) + .text 0x0000000000304d78 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + 0x0000000000304d78 _tlb_addr + 0x0000000000304d8c _tlb_data + 0x0000000000304da0 _tlb_mapped_memory + 0x0000000000304e74 _utlb_addr + 0x0000000000304e84 _utlb_data + 0x0000000000304e94 _utlb_mapped_memory + .text 0x0000000000304f6c 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x0000000000304f6c _dsize + .text 0x0000000000305008 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + 0x0000000000305008 _dprint + .text 0x0000000000305060 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000305380 _timer_setup + 0x0000000000305410 _timer_delay + 0x0000000000305470 _timer_start + 0x00000000003054a4 _timer_reload + 0x00000000003054c4 _timer_pause + 0x00000000003054f8 _timer_stop + 0x0000000000305554 _timer_timeout + 0x0000000000305560 _timer_address + 0x000000000030559c _timer_clear + .text 0x00000000003055cc 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + 0x00000000003055cc _sleep_us + .text 0x0000000000305624 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x00000000003056bc _t6k11_display + 0x0000000000305790 _t6k11_contrast + 0x00000000003057bc _t6k11_backlight + .text 0x00000000003057fc 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x0000000000305940 _clock_freq + .text 0x000000000030594c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) + .text 0x000000000030594c 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) + 0x000000000030594c _bopti_asm_mono + 0x0000000000305972 _bopti_asm_mono_alpha + .text 0x00000000003059a4 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x00000000003059a4 _bopti_grid + 0x0000000000305b18 _bopti_render + 0x0000000000305c48 _bopti_render_clip + 0x0000000000305d5c _bopti_render_noclip + .text 0x0000000000305db4 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + 0x0000000000305db4 _masks + .text 0x0000000000305e50 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + 0x0000000000305e50 _gint_setvbr + .text 0x0000000000305e7c 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + 0x0000000000305e7c _gint_intlevel + 0x0000000000305ed0 _gint_inthandler + .text 0x0000000000305ef4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + .text 0x0000000000305ef4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + .text 0x0000000000305ef4 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + 0x0000000000305ef4 ___movstr + 0x0000000000305ef4 ___movmem + 0x0000000000305f28 ___movmemSI64 + 0x0000000000305f28 ___movstrSI64 + 0x0000000000305f2c ___movstrSI60 + 0x0000000000305f2c ___movmemSI60 + 0x0000000000305f30 ___movmemSI56 + 0x0000000000305f30 ___movstrSI56 + 0x0000000000305f34 ___movstrSI52 + 0x0000000000305f34 ___movmemSI52 + 0x0000000000305f38 ___movstrSI48 + 0x0000000000305f38 ___movmemSI48 + 0x0000000000305f3c ___movstrSI44 + 0x0000000000305f3c ___movmemSI44 + 0x0000000000305f40 ___movstrSI40 + 0x0000000000305f40 ___movmemSI40 + 0x0000000000305f44 ___movstrSI36 + 0x0000000000305f44 ___movmemSI36 + 0x0000000000305f48 ___movmemSI32 + 0x0000000000305f48 ___movstrSI32 + 0x0000000000305f4c ___movmemSI28 + 0x0000000000305f4c ___movstrSI28 + 0x0000000000305f50 ___movstrSI24 + 0x0000000000305f50 ___movmemSI24 + 0x0000000000305f54 ___movmemSI20 + 0x0000000000305f54 ___movstrSI20 + 0x0000000000305f58 ___movstrSI16 + 0x0000000000305f58 ___movmemSI16 + 0x0000000000305f5c ___movmemSI12 + 0x0000000000305f5c ___movstrSI12 + 0x0000000000305f60 ___movmemSI8 + 0x0000000000305f60 ___movstrSI8 + 0x0000000000305f64 ___movmemSI4 + 0x0000000000305f64 ___movstrSI4 + .text 0x0000000000305f6c 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + 0x0000000000305f6c ___udivdi3 + .text 0x000000000030615c 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + 0x000000000030615c ___umoddi3 + .text 0x0000000000306390 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + 0x00000000003063b2 ___udivsi3 + *fill* 0x00000000003063fc 0x4 + .text 0x0000000000306400 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000306400 ___udiv_qrnnd_16 + .text 0x0000000000306460 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) *(C P) -.gint.blocks 0x0000000000305e60 0x120 +.gint.blocks 0x0000000000306460 0x120 *(.gint.blocks) - .gint.blocks 0x0000000000305e60 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - 0x0000000000305e60 _gint_inth_7305 - 0x0000000000305e80 _gint_inth_7705 - .gint.blocks 0x0000000000305ea0 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - 0x0000000000305ea0 _inth_tmu - 0x0000000000305f20 _inth_etmu2 - 0x0000000000305f40 _inth_etmu_help - 0x0000000000305f60 _inth_etmux + .gint.blocks 0x0000000000306460 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + 0x0000000000306460 _gint_inth_7305 + 0x0000000000306480 _gint_inth_7705 + .gint.blocks 0x00000000003064a0 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + 0x00000000003064a0 _inth_tmu + 0x0000000000306520 _inth_etmu2 + 0x0000000000306540 _inth_etmu_help + 0x0000000000306560 _inth_etmux -.gint.drivers 0x0000000000305f80 0x90 - 0x0000000000305f80 _bdrv = . +.gint.drivers 0x0000000000306580 0x90 + 0x0000000000306580 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x0000000000305f80 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x0000000000305f80 _drv_cpg + 0x0000000000306580 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x0000000000306580 _drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x0000000000305fa4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x0000000000305fa4 _drv_tmu + 0x00000000003065a4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x00000000003065a4 _drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x0000000000305fc8 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x0000000000305fc8 _drv_keysc + 0x00000000003065c8 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x00000000003065c8 _drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x0000000000305fec 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x0000000000305fec _drv_t6k11 + 0x00000000003065ec 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x00000000003065ec _drv_t6k11 *(.gint.drivers.6) - 0x0000000000306010 _edrv = . + 0x0000000000306610 _edrv = . -.rodata 0x0000000000306010 0x5774 +.rodata 0x0000000000306610 0x5730 *(.rodata.4) *(.rodata .rodata.*) - .rodata 0x0000000000306010 0x1de4 build-fx/src/level.c.o + .rodata 0x0000000000306610 0x1bd4 build-fx/src/level.c.o .rodata.str1.4 - 0x0000000000307df4 0x1e build-fx/src/score.c.o + 0x00000000003081e4 0x1e build-fx/src/score.c.o + *fill* 0x0000000000308202 0x2 + .rodata 0x0000000000308204 0xf0 build-fx/src/tile.c.o + 0x0000000000308204 _mario_big + 0x0000000000308214 _mario_small + 0x0000000000308224 _bullet + 0x0000000000308234 _fleur + 0x0000000000308244 _life_1up + 0x0000000000308254 _champi + 0x0000000000308264 _bloc + 0x0000000000308274 _colline + 0x0000000000308284 _buisson + 0x0000000000308294 _nuage + 0x00000000003082a4 _coin + 0x00000000003082b4 _gift + 0x00000000003082c4 _earth + 0x00000000003082d4 _brick + 0x00000000003082e4 _tuyau .rodata.str1.4 - 0x0000000000307e12 0x3 build-fx/src/main.c.o - *fill* 0x0000000000307e12 0x2 - .rodata 0x0000000000307e14 0x28 build-fx/src/keyboard.c.o - .rodata 0x0000000000307e3c 0x30 build-fx/src/ennemi.c.o - .rodata 0x0000000000307e6c 0x204 build-fx/assets/fonts/mario.png.o - 0x0000000000307e6c _font_mario - 0x0000000000308070 _font_mario_end - .rodata 0x0000000000308070 0x20 build-fx/assets/img/bonus.png.o - 0x0000000000308070 _img_bonus - 0x0000000000308090 _img_bonus_end - .rodata 0x0000000000308090 0x24 build-fx/assets/img/bloc.png.o - 0x0000000000308090 _img_bloc - 0x00000000003080b4 _img_bloc_end - .rodata 0x00000000003080b4 0x404 build-fx/assets/img/ram.png.o - 0x00000000003080b4 _img_ram - 0x00000000003084b8 _img_ram_end - .rodata 0x00000000003084b8 0x64 build-fx/assets/img/mario.png.o - 0x00000000003084b8 _img_mario - 0x000000000030851c _img_mario_end - .rodata 0x000000000030851c 0x404 build-fx/assets/img/main.png.o - 0x000000000030851c _img_main - 0x0000000000308920 _img_main_end - .rodata 0x0000000000308920 0x404 build-fx/assets/img/new_level.png.o - 0x0000000000308920 _img_new_level - 0x0000000000308d24 _img_new_level_end - .rodata 0x0000000000308d24 0x4c build-fx/assets/img/brick.png.o - 0x0000000000308d24 _img_brick - 0x0000000000308d70 _img_brick_end - .rodata 0x0000000000308d70 0x84 build-fx/assets/img/menu_pause.png.o - 0x0000000000308d70 _img_menu_pause - 0x0000000000308df4 _img_menu_pause_end - .rodata 0x0000000000308df4 0x18 build-fx/assets/img/select_arrow.png.o - 0x0000000000308df4 _img_select_arrow - 0x0000000000308e0c _img_select_arrow_end - .rodata 0x0000000000308e0c 0x804 build-fx/assets/img/dev.png.o - 0x0000000000308e0c _img_dev - 0x0000000000309610 _img_dev_end - .rodata 0x0000000000309610 0x24 build-fx/assets/img/death.png.o - 0x0000000000309610 _img_death - 0x0000000000309634 _img_death_end - .rodata 0x0000000000309634 0x404 build-fx/assets/img/time_over.png.o - 0x0000000000309634 _img_time_over - 0x0000000000309a38 _img_time_over_end - .rodata 0x0000000000309a38 0x4c build-fx/assets/img/coin.png.o - 0x0000000000309a38 _img_coin - 0x0000000000309a84 _img_coin_end - .rodata 0x0000000000309a84 0x24 build-fx/assets/img/champi.png.o - 0x0000000000309a84 _img_champi - 0x0000000000309aa8 _img_champi_end - .rodata 0x0000000000309aa8 0xdc build-fx/assets/img/mariosmall.png.o - 0x0000000000309aa8 _img_mariosmall - 0x0000000000309b84 _img_mariosmall_end - .rodata 0x0000000000309b84 0x28 build-fx/assets/img/gift.png.o - 0x0000000000309b84 _img_gift - 0x0000000000309bac _img_gift_end - .rodata 0x0000000000309bac 0x44 build-fx/assets/img/buisson.png.o - 0x0000000000309bac _img_buisson - 0x0000000000309bf0 _img_buisson_end - .rodata 0x0000000000309bf0 0x84 build-fx/assets/img/colline.png.o - 0x0000000000309bf0 _img_colline - 0x0000000000309c74 _img_colline_end - .rodata 0x0000000000309c74 0x114 build-fx/assets/img/mariobig.png.o - 0x0000000000309c74 _img_mariobig - 0x0000000000309d88 _img_mariobig_end - .rodata 0x0000000000309d88 0x804 build-fx/assets/img/error.png.o - 0x0000000000309d88 _img_error - 0x000000000030a58c _img_error_end - .rodata 0x000000000030a58c 0x44 build-fx/assets/img/1up.png.o - 0x000000000030a58c _img_1up - 0x000000000030a5d0 _img_1up_end - .rodata 0x000000000030a5d0 0xb8 build-fx/assets/img/tuyau.png.o - 0x000000000030a5d0 _img_tuyau - 0x000000000030a688 _img_tuyau_end - .rodata 0x000000000030a688 0x24 build-fx/assets/img/bullet.png.o - 0x000000000030a688 _img_bullet - 0x000000000030a6ac _img_bullet_end - .rodata 0x000000000030a6ac 0x4c build-fx/assets/img/carapace_verte.png.o - 0x000000000030a6ac _img_carapace_verte - 0x000000000030a6f8 _img_carapace_verte_end - .rodata 0x000000000030a6f8 0x44 build-fx/assets/img/nuage.png.o - 0x000000000030a6f8 _img_nuage - 0x000000000030a73c _img_nuage_end - .rodata 0x000000000030a73c 0xc4 build-fx/assets/img/koopa_verte.png.o - 0x000000000030a73c _img_koopa_verte - 0x000000000030a800 _img_koopa_verte_end - .rodata 0x000000000030a800 0x404 build-fx/assets/img/level.png.o - 0x000000000030a800 _img_level - 0x000000000030ac04 _img_level_end - .rodata 0x000000000030ac04 0x4c build-fx/assets/img/goomba.png.o - 0x000000000030ac04 _img_goomba - 0x000000000030ac50 _img_goomba_end - .rodata 0x000000000030ac50 0x44 build-fx/assets/img/fleur.png.o - 0x000000000030ac50 _img_fleur - 0x000000000030ac94 _img_fleur_end - .rodata 0x000000000030ac94 0x4c build-fx/assets/img/stone.png.o - 0x000000000030ac94 _img_stone - 0x000000000030ace0 _img_stone_end - .rodata 0x000000000030ace0 0x404 build-fx/assets/img/lvl0.png.o - 0x000000000030ace0 _img_lvl0 - 0x000000000030b0e4 _img_lvl0_end + 0x00000000003082f4 0x3 build-fx/src/main.c.o + .rodata 0x00000000003082f4 0x28 build-fx/src/keyboard.c.o + .rodata 0x000000000030831c 0x60 build-fx/src/ennemi.c.o + 0x000000000030834c _ennemi_heights + 0x0000000000308364 _ennemi_widths + .rodata 0x000000000030837c 0x204 build-fx/assets/fonts/mario.png.o + 0x000000000030837c _font_mario + 0x0000000000308580 _font_mario_end + .rodata 0x0000000000308580 0x20 build-fx/assets/img/bonus.png.o + 0x0000000000308580 _img_bonus + 0x00000000003085a0 _img_bonus_end + .rodata 0x00000000003085a0 0x24 build-fx/assets/img/bloc.png.o + 0x00000000003085a0 _img_bloc + 0x00000000003085c4 _img_bloc_end + .rodata 0x00000000003085c4 0x404 build-fx/assets/img/ram.png.o + 0x00000000003085c4 _img_ram + 0x00000000003089c8 _img_ram_end + .rodata 0x00000000003089c8 0x404 build-fx/assets/img/main.png.o + 0x00000000003089c8 _img_main + 0x0000000000308dcc _img_main_end + .rodata 0x0000000000308dcc 0x404 build-fx/assets/img/new_level.png.o + 0x0000000000308dcc _img_new_level + 0x00000000003091d0 _img_new_level_end + .rodata 0x00000000003091d0 0x4c build-fx/assets/img/brick.png.o + 0x00000000003091d0 _img_brick + 0x000000000030921c _img_brick_end + .rodata 0x000000000030921c 0x84 build-fx/assets/img/menu_pause.png.o + 0x000000000030921c _img_menu_pause + 0x00000000003092a0 _img_menu_pause_end + .rodata 0x00000000003092a0 0x18 build-fx/assets/img/select_arrow.png.o + 0x00000000003092a0 _img_select_arrow + 0x00000000003092b8 _img_select_arrow_end + .rodata 0x00000000003092b8 0x804 build-fx/assets/img/dev.png.o + 0x00000000003092b8 _img_dev + 0x0000000000309abc _img_dev_end + .rodata 0x0000000000309abc 0x24 build-fx/assets/img/death.png.o + 0x0000000000309abc _img_death + 0x0000000000309ae0 _img_death_end + .rodata 0x0000000000309ae0 0x404 build-fx/assets/img/time_over.png.o + 0x0000000000309ae0 _img_time_over + 0x0000000000309ee4 _img_time_over_end + .rodata 0x0000000000309ee4 0x4c build-fx/assets/img/coin.png.o + 0x0000000000309ee4 _img_coin + 0x0000000000309f30 _img_coin_end + .rodata 0x0000000000309f30 0x24 build-fx/assets/img/champi.png.o + 0x0000000000309f30 _img_champi + 0x0000000000309f54 _img_champi_end + .rodata 0x0000000000309f54 0xdc build-fx/assets/img/mariosmall.png.o + 0x0000000000309f54 _img_mariosmall + 0x000000000030a030 _img_mariosmall_end + .rodata 0x000000000030a030 0x28 build-fx/assets/img/gift.png.o + 0x000000000030a030 _img_gift + 0x000000000030a058 _img_gift_end + .rodata 0x000000000030a058 0x44 build-fx/assets/img/buisson.png.o + 0x000000000030a058 _img_buisson + 0x000000000030a09c _img_buisson_end + .rodata 0x000000000030a09c 0x84 build-fx/assets/img/colline.png.o + 0x000000000030a09c _img_colline + 0x000000000030a120 _img_colline_end + .rodata 0x000000000030a120 0x224 build-fx/assets/img/mariobig.png.o + 0x000000000030a120 _img_mariobig + 0x000000000030a344 _img_mariobig_end + .rodata 0x000000000030a344 0x804 build-fx/assets/img/error.png.o + 0x000000000030a344 _img_error + 0x000000000030ab48 _img_error_end + .rodata 0x000000000030ab48 0x44 build-fx/assets/img/1up.png.o + 0x000000000030ab48 _img_1up + 0x000000000030ab8c _img_1up_end + .rodata 0x000000000030ab8c 0xb8 build-fx/assets/img/tuyau.png.o + 0x000000000030ab8c _img_tuyau + 0x000000000030ac44 _img_tuyau_end + .rodata 0x000000000030ac44 0x24 build-fx/assets/img/bullet.png.o + 0x000000000030ac44 _img_bullet + 0x000000000030ac68 _img_bullet_end + .rodata 0x000000000030ac68 0x4c build-fx/assets/img/carapace_verte.png.o + 0x000000000030ac68 _img_carapace_verte + 0x000000000030acb4 _img_carapace_verte_end + .rodata 0x000000000030acb4 0x44 build-fx/assets/img/nuage.png.o + 0x000000000030acb4 _img_nuage + 0x000000000030acf8 _img_nuage_end + .rodata 0x000000000030acf8 0xc4 build-fx/assets/img/koopa_verte.png.o + 0x000000000030acf8 _img_koopa_verte + 0x000000000030adbc _img_koopa_verte_end + .rodata 0x000000000030adbc 0x404 build-fx/assets/img/level.png.o + 0x000000000030adbc _img_level + 0x000000000030b1c0 _img_level_end + .rodata 0x000000000030b1c0 0x4c build-fx/assets/img/goomba.png.o + 0x000000000030b1c0 _img_goomba + 0x000000000030b20c _img_goomba_end + .rodata 0x000000000030b20c 0x44 build-fx/assets/img/fleur.png.o + 0x000000000030b20c _img_fleur + 0x000000000030b250 _img_fleur_end + .rodata 0x000000000030b250 0x4c build-fx/assets/img/stone.png.o + 0x000000000030b250 _img_stone + 0x000000000030b29c _img_stone_end + .rodata 0x000000000030b29c 0x404 build-fx/assets/img/lvl0.png.o + 0x000000000030b29c _img_lvl0 + 0x000000000030b6a0 _img_lvl0_end .rodata.str1.4 - 0x000000000030b0e4 0x31 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - *fill* 0x000000000030b115 0x3 - .rodata 0x000000000030b118 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x000000000030b6a0 0x31 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + *fill* 0x000000000030b6d1 0x3 + .rodata 0x000000000030b6d4 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) .rodata.str1.4 - 0x000000000030b120 0x6 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - *fill* 0x000000000030b126 0x2 + 0x000000000030b6dc 0x6 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + *fill* 0x000000000030b6e2 0x2 .rodata.str1.4 - 0x000000000030b128 0x11a /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x000000000030b6e4 0x11a /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) 0x11e (size before relaxing) - *fill* 0x000000000030b242 0x2 - .rodata 0x000000000030b244 0x18 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + *fill* 0x000000000030b7fe 0x2 + .rodata 0x000000000030b800 0x18 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) .rodata.str1.4 - 0x000000000030b25c 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - .rodata 0x000000000030b260 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) - 0x000000000030b260 _gint_font5x7 - 0x000000000030b668 _gint_font5x7_end + 0x000000000030b818 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + .rodata 0x000000000030b81c 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) + 0x000000000030b81c _gint_font5x7 + 0x000000000030bc24 _gint_font5x7_end .rodata.str1.4 - 0x000000000030b668 0x6 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - *fill* 0x000000000030b66e 0x2 + 0x000000000030bc24 0x6 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + *fill* 0x000000000030bc2a 0x2 .rodata.str1.4 - 0x000000000030b670 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - .rodata 0x000000000030b674 0x10 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - .rodata 0x000000000030b684 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) - 0x000000000030b684 ___clz_tab + 0x000000000030bc2c 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + .rodata 0x000000000030bc30 0x10 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + .rodata 0x000000000030bc40 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x000000000030bc40 ___clz_tab -.rela.dyn 0x000000000030b784 0x0 - .rela.text 0x000000000030b784 0x0 build-fx/src/score.c.o +.rela.dyn 0x000000000030bd40 0x0 + .rela.text 0x000000000030bd40 0x0 build-fx/src/score.c.o .rela.text.startup - 0x000000000030b784 0x0 build-fx/src/score.c.o + 0x000000000030bd40 0x0 build-fx/src/score.c.o .rela.pretext.entry - 0x000000000030b784 0x0 build-fx/src/score.c.o + 0x000000000030bd40 0x0 build-fx/src/score.c.o 0x0000000008100000 . = ORIGIN (ram) -.bss 0x0000000008100000 0x5c0 +.bss 0x0000000008100000 0x5d0 0x0000000008100000 _rbss = . *(.bss COMMON) .bss 0x0000000008100000 0x0 build-fx/src/level.c.o @@ -632,175 +646,162 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x0000000008100008 _pieces 0x000000000810000c _combo 0x0000000008100010 _score - .bss 0x0000000008100014 0x0 build-fx/src/tile.c.o - .bss 0x0000000008100014 0x0 build-fx/src/box.c.o - .bss 0x0000000008100014 0x1c build-fx/src/world.c.o - 0x0000000008100014 _death - 0x0000000008100018 _w_mario_starty - 0x000000000810001c _w_mario_startx - 0x0000000008100020 _w_current_y - 0x0000000008100024 _w_current_x - 0x0000000008100028 _w_fond - 0x000000000810002c _w_current - .bss 0x0000000008100030 0x0 build-fx/src/bonus.c.o - .bss 0x0000000008100030 0x28 build-fx/src/mario.c.o - 0x0000000008100030 _global_quit - 0x0000000008100034 _mario_immunity - 0x0000000008100038 _mario_accel - 0x000000000810003c _last_bonus - 0x0000000008100040 _mario_coins - 0x0000000008100044 _mario_dead - 0x0000000008100048 _mario_time_accel - 0x000000000810004c _mario_has_bullets - 0x0000000008100050 _mario_x_max - 0x0000000008100054 _id_frame - .bss 0x0000000008100058 0x0 build-fx/src/main.c.o - .bss 0x0000000008100058 0x18 build-fx/src/keyboard.c.o - 0x0000000008100058 _keys - .bss 0x0000000008100070 0x8 build-fx/src/ennemi.c.o - 0x0000000008100070 _ennemis_global_size - 0x0000000008100074 _ennemis_global - .bss 0x0000000008100078 0x114 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - .bss 0x000000000810018c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - .bss 0x000000000810018c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) - .bss 0x000000000810018c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - .bss 0x000000000810018c 0x400 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - .bss 0x000000000810058c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - .bss 0x000000000810058c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - .bss 0x000000000810058c 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - .bss 0x00000000081005b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - .bss 0x00000000081005b0 0xc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - .bss 0x00000000081005bc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + .bss 0x0000000008100014 0x4 build-fx/src/tile.c.o + 0x0000000008100014 _dark_theme + .bss 0x0000000008100018 0x0 build-fx/src/box.c.o + .bss 0x0000000008100018 0x1c build-fx/src/world.c.o + 0x0000000008100018 _death + 0x000000000810001c _w_mario_starty + 0x0000000008100020 _w_mario_startx + 0x0000000008100024 _w_current_y + 0x0000000008100028 _w_current_x + 0x000000000810002c _w_fond + 0x0000000008100030 _w_current + .bss 0x0000000008100034 0x0 build-fx/src/bonus.c.o + .bss 0x0000000008100034 0x2c build-fx/src/mario.c.o + 0x0000000008100034 _global_quit + 0x0000000008100038 _mario_star_mode + 0x000000000810003c _mario_immunity + 0x0000000008100040 _mario_accel + 0x0000000008100044 _last_bonus + 0x0000000008100048 _mario_coins + 0x000000000810004c _mario_dead + 0x0000000008100050 _mario_time_accel + 0x0000000008100054 _mario_has_bullets + 0x0000000008100058 _mario_x_max + 0x000000000810005c _id_frame + .bss 0x0000000008100060 0x0 build-fx/src/main.c.o + .bss 0x0000000008100060 0x18 build-fx/src/keyboard.c.o + 0x0000000008100060 _keys + .bss 0x0000000008100078 0x8 build-fx/src/ennemi.c.o + 0x0000000008100078 _ennemis_global_size + 0x000000000810007c _ennemis_global + .bss 0x0000000008100080 0x114 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + .bss 0x0000000008100194 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + .bss 0x0000000008100194 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) + .bss 0x0000000008100194 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + .bss 0x0000000008100194 0x400 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + .bss 0x0000000008100594 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + .bss 0x0000000008100594 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + .bss 0x0000000008100594 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + .bss 0x00000000081005b8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + .bss 0x00000000081005b8 0xc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + .bss 0x00000000081005c4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) *(B R) - 0x00000000081005c0 . = ALIGN (0x10) - *fill* 0x00000000081005bc 0x4 - 0x00000000000005c0 _sbss = SIZEOF (.bss) + 0x00000000081005d0 . = ALIGN (0x10) + *fill* 0x00000000081005c4 0xc + 0x00000000000005d0 _sbss = SIZEOF (.bss) -.data 0x00000000081005c0 0x220 load address 0x000000000030b784 - 0x000000000030b784 _ldata = LOADADDR (.data) - 0x00000000081005c0 _rdata = . +.data 0x00000000081005d0 0xe0 load address 0x000000000030bd40 + 0x000000000030bd40 _ldata = LOADADDR (.data) + 0x00000000081005d0 _rdata = . *(.data .data.*) - .data 0x00000000081005c0 0x0 build-fx/src/level.c.o - .data 0x00000000081005c0 0xc build-fx/src/score.c.o - 0x00000000081005c0 _end_level - 0x00000000081005c4 _combo_id - 0x00000000081005c8 _lifes - .data 0x00000000081005cc 0xd0 build-fx/src/tile.c.o - 0x00000000081005cc _bullet - 0x00000000081005dc _fleur - 0x00000000081005ec _life_1up - 0x00000000081005fc _champi - 0x000000000810060c _bloc - 0x000000000810061c _colline - 0x000000000810062c _buisson - 0x000000000810063c _nuage - 0x000000000810064c _coin - 0x000000000810065c _gift - 0x000000000810066c _earth - 0x000000000810067c _brick - 0x000000000810068c _tuyau - .data 0x000000000810069c 0x0 build-fx/src/box.c.o - .data 0x000000000810069c 0x0 build-fx/src/world.c.o - .data 0x000000000810069c 0x78 build-fx/src/bonus.c.o - .data 0x0000000008100714 0x54 build-fx/src/mario.c.o - 0x0000000008100714 _last_vx_sign - 0x0000000008100718 _mario - 0x0000000008100748 _mario_big - 0x0000000008100758 _mario_small - .data 0x0000000008100768 0x0 build-fx/src/main.c.o - .data 0x0000000008100768 0x0 build-fx/src/keyboard.c.o - .data 0x0000000008100768 0x0 build-fx/src/ennemi.c.o - .data 0x0000000008100768 0x68 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x0000000008100768 _kprint_formatters - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) - .data 0x00000000081007d0 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x00000000081007d0 _topti_font - 0x00000000081007d4 _gint_default_font - .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - .data 0x00000000081007d8 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + .data 0x00000000081005d0 0x0 build-fx/src/level.c.o + .data 0x00000000081005d0 0xc build-fx/src/score.c.o + 0x00000000081005d0 _end_level + 0x00000000081005d4 _combo_id + 0x00000000081005d8 _lifes + .data 0x00000000081005dc 0x0 build-fx/src/tile.c.o + .data 0x00000000081005dc 0x0 build-fx/src/box.c.o + .data 0x00000000081005dc 0x0 build-fx/src/world.c.o + .data 0x00000000081005dc 0x3c build-fx/src/bonus.c.o + .data 0x0000000008100618 0x20 build-fx/src/mario.c.o + 0x0000000008100618 _last_vx_sign + 0x000000000810061c _mario + .data 0x0000000008100638 0x0 build-fx/src/main.c.o + .data 0x0000000008100638 0x0 build-fx/src/keyboard.c.o + .data 0x0000000008100638 0x0 build-fx/src/ennemi.c.o + .data 0x0000000008100638 0x68 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x0000000008100638 _kprint_formatters + .data 0x00000000081006a0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + .data 0x00000000081006a0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) + .data 0x00000000081006a0 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x00000000081006a0 _topti_font + 0x00000000081006a4 _gint_default_font + .data 0x00000000081006a8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + .data 0x00000000081006a8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + .data 0x00000000081006a8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + .data 0x00000000081006a8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + .data 0x00000000081006a8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + .data 0x00000000081006a8 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + .data 0x00000000081006b0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) *(D) - 0x00000000081007e0 . = ALIGN (0x10) + 0x00000000081006b0 . = ALIGN (0x10) -.data.4 0x00000000081007e0 0x0 load address 0x000000000030b9a4 +.data.4 0x00000000081006b0 0x0 load address 0x000000000030be20 *(.data.4) - 0x00000000081007e0 . = ALIGN (0x10) - 0x0000000000000220 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) + 0x00000000081006b0 . = ALIGN (0x10) + 0x00000000000000e0 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x00000000e5200000 . = ORIGIN (ilram) -.ilram 0x00000000e5200000 0x0 load address 0x000000000030b9a4 - 0x000000000030b9a4 _lilram = LOADADDR (.ilram) +.ilram 0x00000000e5200000 0x0 load address 0x000000000030be20 + 0x000000000030be20 _lilram = LOADADDR (.ilram) 0x00000000e5200000 _rilram = . *(.ilram) 0x00000000e5200000 . = ALIGN (0x10) 0x00000000e5007000 . = ORIGIN (xram) -.xram 0x00000000e5007000 0x0 load address 0x000000000030b9a4 - 0x000000000030b9a4 _lxram = LOADADDR (.xram) +.xram 0x00000000e5007000 0x0 load address 0x000000000030be20 + 0x000000000030be20 _lxram = LOADADDR (.xram) 0x00000000e5007000 _rxram = . *(.xram) 0x00000000e5007000 . = ALIGN (0x10) 0x00000000e5017000 . = ORIGIN (yram) -.yram 0x00000000e5017000 0x0 load address 0x000000000030b9a4 - 0x000000000030b9a4 _lyram = LOADADDR (.yram) +.yram 0x00000000e5017000 0x0 load address 0x000000000030be20 + 0x000000000030be20 _lyram = LOADADDR (.yram) 0x00000000e5017000 _ryram = . *(.yram) 0x00000000e5017000 . = ALIGN (0x10) @@ -810,8 +811,8 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x000000008800df00 _gint_vbr = 0x8800df00 0x000000008800f400 . = ORIGIN (rram) -.gint.data 0x000000008800f400 0x140 load address 0x000000000030b9a4 - 0x000000000030b9a4 _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x140 load address 0x000000000030be20 + 0x000000000030be20 _lgdata = LOADADDR (.gint.data) 0x000000008800f400 _rgdata = . *(.gint.data .gint.data.*) .gint.data 0x000000008800f400 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) @@ -832,7 +833,7 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x000000008800f540 . = ALIGN (0x10) 0x0000000000000140 _sgdata = SIZEOF (.gint.data) -.gint.bss 0x000000008800f540 0x290 load address 0x000000000030bae4 +.gint.bss 0x000000008800f540 0x290 load address 0x000000000030bf60 *(.gint.bss .gint.bss.*) .gint.bss 0x000000008800f540 0x180 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) .gint.bss 0x000000008800f6c0 0x1c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) diff --git a/build-fx/src/bonus.c.d b/build-fx/src/bonus.c.d index 2a9568e..379787d 100644 --- a/build-fx/src/bonus.c.d +++ b/build-fx/src/bonus.c.d @@ -1,5 +1,5 @@ build-fx/src/bonus.c.o: src/bonus.c src/bonus.h src/box.h src/mario.h \ - src/world.h src/tile.h src/score.h src/ennemi.h + src/world.h src/tile.h src/score.h src/ennemi.h src/constants.h src/bonus.h: @@ -14,3 +14,5 @@ src/tile.h: src/score.h: src/ennemi.h: + +src/constants.h: diff --git a/build-fx/src/bonus.c.o b/build-fx/src/bonus.c.o index dbbab7a7939714eb58fa17159e8d479f66876268..a58b8c150dc5e7138396cf09769e086fa3378fd2 100644 GIT binary patch literal 3072 zcmb7EO>7(25uW8PB~rUqM2fO$TCpigl_}RHDVd5A!$v3ziQw9hgvPCU5U{%>HzXBO zKU^x33?-6iZX%jtR99}`Lk~tB_z(n8PdyaA1ub&uLF)!?nmB=eY&kA^Xo5iK!GSw( zxl2-vFMYu7n{Q^mc{B5V7GJseDrKUeJSaGUa+RXt24Wh5nuiyxU{RYR_VyQx=55C> zT0Gv>)*WiwK_54{dRiY*p7cKs2-C|RWqQi8+&1_i?6K(!>;xU%30jmZ$Ie|uS=#BfwRhgiQyq;sE!ze{r6pY|Lo#);RCLp>X_t7pUVpiQ(FsWi1soogyy5Y`l@ z*OKRBO~>c*W7fWUSKl2aEzyd-x4u{xrE_xv7Z?i+7N6Uta!!E@a>3D6%Py2Wb8|7S zZ>(>yuFKlTxPo_-0c184W{l3A*O;@##?E-|aFh!!1V;-$)p_%T7nFE;;*$2^5cP~2@nP+r2{+JrVJr~ufw*$?q*S28&+KyxW#@ z>8IVDd0Xx(`qho(+?LgOf!(B*t~wdzO30RH)U!q`^<^a+v-M#g!*tFO;Z7}_I$mUP z2UaAm_hj$vs(BZ3jxg7=&@)=srPyM$a)o$Hbgo779xbxi^*nlv^~@G}b1fp*z0lK~ z4`9E2LKbUpTw&C<@_HTDU+Bjy)pqhnJ5yj)*8|wa${vDxbep=~+2&DQy46(RRC}4* za@|SvcMpo5Y06_C?lkVfdDMn!C7XV`ht5;$39zoGgshWUe|PCB{f%~Ky*0aZvIdtS zxjX*bpZ{#wL;74CT6}^v9A06RY=YkKk`907eF^XHIIZ+Y>5WdJAvadKrFJ}mdmX)& zem1(MRd!J09ML#OsyK(MIERqqEOShS5~oq)G!jm{v<_G1Tu~d4!<9JX+!|eYW}W4_ zss)Ceyim0U;8{A0rOIz`VBoadJ2>>qF852m9$#QT-9Y8{h=Hfy8cH(L``&2{qpC6x zkgUGfHC_xv?Bu;Ad*{%xZq|%u1WmeP%wCFr)Ns%ZKdHf|5Rc(^L-!x3vHz+DCu;D) z8k|9lIa5n|yyY5up$7l127gq8|6GIr0$?I*1oZeDh(E;j-qZ2@8vlRQ;2-v53VY0u zt-D|1Q%3*vMpDii|6}`bcyeM!_Cavu@UJJO86*)8zI$d$@7V~RQsX{c!lP`+zXoV9ux`L!T^NDUzuP^KCKo zzpvzJx><=&UI$|>244juPlf|HsB@X7N)C*p${){^kq^^aiO;wz>oOexP9qN9_rr#a z@3hO1u@B`Oun*-N@ctRSW&T^~8}p>nH}X`p>T%3i%kzeewHz(UK6yTs5yRk9+b6nzL~+BkxLB8M~t zmXDG4N0bSV@QID^I(4kSrREUgGx!<9h<6edSgZD?;$&Vh9Q0Z52XrGQa-gKw{P3wL z4`MSuQ&|h<-=G@z1nTi4>yUMu@FVZHo*PO~zl45WMAC<`t_^XOU&9#U(}okyn&1Bb Db)z|& literal 2924 zcmb7EUu;uV82@hXWovgUa=U-s7`PUQ4#m#xsQqkmW@ z#L*VXnq{d3qKUp3iM)=)L=*AJ2;sqpm5@0V6Ia+q#0O2x;sXS~b9+zQ)jjA*&b`0i zcYfzP-}#+;&*WHRh9C8+RDhdneK$|gm4BPh3Y{**r>&=#Q{e32D zVOuoyj)oP+9Qr|jA~bl~AdPDcp*t0BGb)%BcIC;kg&k(=+dA)q5EXU{t-xb0U4C5z zwu`n8ZP#pH+HTqA7iw+Gr;@$qvwin!CLjM&<4X)(o?@n}5Aw(2?%V%C9kwwrpVFoK5=bYPSxD^;oI?p*<%3J#rhYgNBDQ@7x?j24~TGtXA zsB-!p&J;gz!Qn@3c}omW2TbM%-i*GRx0q*do@EZ8->&%Bd-lrojYXKf@rZ7F-S-_` zrlQX>#iYwjuMG9zo6SO&Gnum>xCFP*Bs2q$XGqVlk9fCm=*M2$wPW#K^Xp_S+;vC! zH1lZ^beT7nVF|kV2QZXq)Xqew*lBid-`#y({L%(|zuJX*DUsEje%jWY5)>cHTq%<= z9h5dNGRA6So#H9C44FN-Jel_XxW}M4Wym{~%sXXJoe~Zw6sIclPF+x(+UcrvG@w)V zmRQP4&N#hsipw<8Dl^-z?CQpvGG_9`aW0LuXN=3Zhb72t$ud`(Oy*3TI;u(Qu`)re ztm;ZFiQlP~%%>T%p|_cSb&4y>38a|WDClM#v&P=1g7u+wqL4T{~wwB6RV`66BwduV%Kc!2H%-TKp$2lf6s}bG3@H z29-5ylvSv#&MP&j)GJCoD)mHpG?z1((V>#hDajv3_qfhJ@^!BR$lXGEaVxre^5Org z)8Y)$i(4+={+^zWM$7&~Z?!hITOC$=v7&(UYjg1Q&qA17fW>#B!ZB26NJx!;sgXWR zM8?VgLC)2pa&=f4+<;`08aQgm<=;vL>OfNocOpNE{k*F0DH$Iq;l2`HQ^F(27jS94 znlD~5eyN0iQo=tk;a`{Vo0$6n#_VeTIRH%+#{4S3SEB!|gg;r!8T6PvkFjrZ^BL-& zY9wPU(Lc9_yMv?Au+;;i0zmXjqaImwNBw>|0%AZ4`GO=Ej)-SsV%Rr4ib`cr^!mbM zerW>4@nFdB6^G@B7?LHw7_Ga2r3#9_E7IHs(9`($0MAg2 zXTFi*y8zFsm_a?w&!AqQanu_qMtvp4_?^=H41PCNH2y0xE%%GI6FWC&9f6=3&nc@w&t)kJQ0XUZm@sIc;GIbKx!gUrU!2eTeoAF6-m%>16#A(+NlX;|GGKOab%_>*# zQVu-@^e^9NKJ-Gl*QxGdUXcT;AJB%BVDyVLj_B~J$Tu=ZyCxq6?lFe{Kwgeri=C{y i2|KyJ)in`8+3%=pB}i>_T>*KKPInu52NmI4(ftEaWAx1c diff --git a/build-fx/src/box.c.d b/build-fx/src/box.c.d index 489ee92..eccc596 100644 --- a/build-fx/src/box.c.d +++ b/build-fx/src/box.c.d @@ -1,7 +1,10 @@ -build-fx/src/box.c.o: src/box.c src/box.h src/world.h src/ennemi.h +build-fx/src/box.c.o: src/box.c src/box.h src/world.h src/ennemi.h \ + src/score.h src/box.h: src/world.h: src/ennemi.h: + +src/score.h: diff --git a/build-fx/src/box.c.o b/build-fx/src/box.c.o index f22da6055981ae7914e0d66ee27f81758b124551..5a22568831a780ca9c6c0a43d8edd30e78846c49 100644 GIT binary patch literal 1992 zcma)7O-vg{6n?Y2*brMSziM$*2@E0*GG1d$F$6^z5(q5~Qfbr+lI`^_*x;YkHYrV! z0Cmkz!E%*W#tT$ zuW#=zi!sIOkeuGvp9&#bXX$j;^*|adr=`a3T1tIPXV);gn&Ox#Kp#^h9a|3S65TlM z`sdUui>FuYYt|izN&?+_tNC5q$0@a;#5Vlr-njvrGuCjvD$ekdxH+P=`XaJaZP!>= z7f@U`@)7r4NOnv5zbU+43YuzXwxpNEPasWk(c^4t;^5wK~M7$ zH;EUgwHmY8>|x)sd>*aZBi3Cdf?UY;3C;d$&!j!PoXI}Dox6U zb&dv|**GhuU?w@u3^oKZ{){g(o*Bz{GvrM&tb;D`&^$baxX;B+QWuLTLG#ii5|i)) zrL&!gt6X$c;%H}u+4$}DtaOD*JlKJ4D)CTE;)*FDHN(z%de{|yDEFTHQo(Kw>bo@F zp_=0O@o{>v;qf)2v-~Ws^dH~SSiiyhf*o`jiBYH4{8j9c@y6nP=ckFkX6ApV9zf#X zoqS0G^!4;~)EN5CUpQIQZnBun1W9}*fHu0axR}E?7b`;odgGt;P3}8VN1m87aU$59PbB1KHf1Z zL>%tOXihOU;lG$mWEG$|e}-!SB??BL0I2f#GXPBR2$*6)>I_$Vcujfb!Mpb=ZX yQwOuakYh;UPHK|mNb)0PN8UkYO^l%E9sCFoq_li~Wtbn*sp>KB$cylp)%^#~WaCW$ literal 1772 zcma)6Uu;@c7(eG;I;b?JWs-C_BBNcqHWXU^tSypdgSob@+6)SN(1dY;0PO`_VHOF| z_$L!m2#Je(@QK7kjhgUgeb}QKAABem*<#d4U1HTVi+_0*p0Mlq#&sykHSQo z#?gdx$aT&*3!I~;btd3wWFCi!HkxvMo})Y$Yh+t@%FNYi$U+dqb;C`=dxlR8Ul?vj z9fqI2J-MR2C|^CVkrgJxks=C5WJtRL=5 zCy!Z|pSD>wMdG5e^x4`-fpAw!5=+)uwdk&~mi!W&To&hWX*+|RHM^3>KT5IAYK-9+ zfx8?hNo4WXfV<+X26!*;BeTR7K`|S6N_z;wJ=jDq_LAI^@4>|#uCwZ{aC za%n=uqdolhg(!AP+XH>@kf`RrMzIfxdeDiYm@}H*Pe2t%*U4I~dYWZQ(wqAUNVzLde#yDr9N%Hi^OfJtFjO+HJg=Ek>3X9X%MRiAiE zQogs3zQN@`Ts5dJh~awJVYnG^wR&+!VYt1bJu8p6G_vCGI=M1-a4+|(f!8dbJ|j1O z4F7=kaT;HGedhhbpSmw|zm$I-e*1g!S5*FcA9eZ$EjS!j&8dZF-4mL5y-`0cUVwvh z``$_r`+GM;9=Oxoh33AFfFbEvJlF@eRPZSjt@r`3K}Bi7Rtq>9Y$?V=wjJy|LPS>J zFCW66gPk4&-xVIG;wil!c@v=+^7_L;|GL*7r|C!{5(h^x77Ior32%swQ$E_8h@^vu zoyZF-c%$(b0ojai&;f5KnDqLSp%$=qE&776KfGx&@vO3N%z}>Ll{+HpbMSNtItjnm z*69w1g!Kf!KJijC>7$T7k=$s_VNu%%(ms7Mm`Wmjz?bwPJ(Wlxy+0m}24hL_K>pvX z0UDRn5rGc*lHE&)HGCX!PCwh?N&bR)6$Tf_#d8=}%Q3+gdV%}^>~0bMAL+m;gYjRy z8Q^d+(=b5z^`NwE;V^L!Z7(8kfxZKS>o+b(EaRv$L}#ao@LrpYqd$JU8k+ukj&V`G>Hks(C7qz)G3UWc97J8q5&0CrD&Q4-nq|y ziR&_HSG9e9=bU@K@4e~#qx&8sWCYq+1bPtY3dU9rFo}9Z4HKeKo#k2Ih~>wYUsztY z{MqtX%g6hhggx`0+3K@{?3U;Hja0gZ-^h~(Z&<}B1;MjWwgLV4Cds0*)6Ncq@His-!i!# zTo0@tU7uL@uOr&G{&4X%#Kw%e%ol6u3L`9x(G#SLF(6+Ql!_$=rx2bPLhmv z>Ia>L^wkr;5|RdeJjuk8MAnd$^xQTS5)aa0RzW=_w zrGUMjw{(F|lbz;%3qHxTKK}stY!`iskxr2BH17g$zLGa1_O^;F8qcl#4tJsyG3-8{ z`z})Anhb+(u$)(3x2$J1)`t{zqsCFA9a*>c>+%h)jidFM+Ep}DT>Yw5KSPMwU+$$W zni*oc2C^^UdZmcm_nBDECoI^+A^9I)YRr$7X3OC5c)a;-!XuvgK1D|ECiw=hsz1Y#UU3jMGF{rH*W-2`2MP}tr@>EtXhS0@_i(g->7b}Xl9HX~6n~3e!_MPg~K|$vv8S0`f^@La5I-A-nXxvaQ zj^r1EBfC|-?`7n0N_8Gp-;v#}tombuPco{`eI9bU*f-Sc%_u%bpsVW{a;bWUdPn7E zLCcYNUitLoOt%r0d7|>o=eKiJh{yFP&laPHmGCYBFGGyDleM z<4LqV_epH=qbc+0apHLK#L+cQtaTr*bgtnU;)A~2hkUAVlZk-up{4Jz`ld$g7w#u*&JbIK z^JPLxe9vS#E^(=Sqv!O=ky6jIU4@&~9nU<0`;EJO_K(o*9a6W?z6!SjX;PnP5t7S# zL*w|uTe5i4XkKnSwZqt^)8y55nCiYtGquip`5s2qMdhwH8~LP9wX@xqwI;Gxo8!4#e9vmJPn)Vc(O_tVQ;I}C zGvKE#_g4H^UU|DOdt2#s#4QkOui9*e<=IbA=?%ZKgMI1i?*gz+l|Rzo4;W*wl^EZ-l^Dx0Px=LN!;WN+ zLZc%iy9}n$C%kqsFBZ7u*cn@AMaR$&F;I*BJf zW(a+w3b$6_!4j73(Ukl@UL}933U6GeW&43D`Fs^#tinqO$@Tz`EBpI3;1>Y*l=1JY z^xv$)m#gpxRrqtTw*sYFE8F|`?Q(*y!cu)|>c#pJZB_DKz_{*`{Lw1;0fZE90PjG_ zAK?MI6Fxey2mK+YfyVikuzPaS9rSm&ki#GJI=rD!(8-qQqoL3g>zHiGgC35)Oey=YY*}yY?F6xUwFJQ^;L5MD&MVSGPwnX0# zZIfsdLR%!d9igof4gI}KqTzoX8~QsDQcHYW1^+^YowqCKO9*Kt{dW**km$c5bhkub zgCks~$$xFeO#TO<`Z6Dnr%s{)G)gpu&~}MdBczw;hRqn{P=|ZUd^yxX+AD`T+$-@R zUumx#@|9{Lha5F!9mR{AI*L~|bri2{>QE4yTpIPs6*t2LnV$Y6b!m2qu9^? zy$qm#w+|S2kE|pR?J*@<{Fd~rfG}+nxo8W_7P=ok*d~5gunfmH3?FO{W&khh z0(`+$x3REH`jmZQ83i*SgPw`+CVrQ&Jqed{01m2q8@3CWDlcpcFStG{-@mOer)U%l I%1hMyFEyc*^#A|> literal 3468 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 delta 692 zcmXw#L1+^}6o&uFns$?IO*hp-AnNWWwgth}YE&?y35W>|<{$+RJtS>}Xj-)x!Gn@Y zN=Zp!+iny=QKTRuLWF<_g5brAUe;=~;GxtiF?dnS(nCRK*UTIq-^}~p`+w%M=bdLR zPzVFyaFAA@A8xqRY4x`HNPVupQS0jWFK3dAFsM~!fVN{yqpMkB%+SN#f?HClZ=!Yv<;3v1gYUW=s` zD?@Q>AwPpA=<8LR2&KHlmk(7={qJhW#<@zgrF>=WSqP^&`Nw`q^;z>Rd2M$wI`{ilDph6cG^L9tdeh#mDK^mU-!$3;ia))blW}eN1qk4iPU0&Pxf9k z$IUS_XI?PRn-H>Q^-q&<@ciW(n8p<53EMFun$KF}@D8F`fiO##4Zo@@d<+ z1az~;EU>M`4r;){Ij8{(P@mGiOo3`u1AP*M(nKj{< zO&1b2w%xpU*c{=LvoEl2^BFG5>3oA&<0ofR+Nf{3maattat$oncdWZq6`59zWeydC zmx9-V-v>8J|Bgywhdw*V%TfRQ0&{U3Ea(1OQECK?g7c)S5f4v7lUpYRS|f2KiEx%wlpGRMsw{KWu=cs%QjPd| zGD~F=qSGYq>z$0AbSpA)myx@yUTJU!b&Jp|$Xz9I=bRi>%7w_rYZ!G7X_e$%nd0Os z{i-{rmUnKVWjRVhg&4h#=scneB)=J>s(QNZ%M1n&poIWWR_W;sa;FHLN3&OvEt5*y z4YWU_e2rGls0n{;XWS2Ca+D^}&P3sL5EzKR8u?mEPH5bpzdEGq0JsTWxamn6JkGd7LTzvu0Uth z;|a7cqJ5Dk_EHNy?p|uXaG*Pr@ChuSfT27GA1$CC-#fs~WPOP*y< zZ(VT=)O8!F+_pI!rA~*2Gggup-KF+}y>)6+?LUTpicmXlc~;-uNbU2@;kQP8xmvcC zsWs9Ycuena;WJo+8=WiMM`&abgw-lz>0JHC^)bV8W^Gw~+56wNcWkyV1Ezc0c2Hl?*IS* delta 1031 zcmb7CKWGzC82{e8CR}@0le@&6X;RF++?_#(c5ra3X+>M9#Ib{ma!4zJi(?_hIz+43 z_(H58;!wrGA<)Iq(J@cj!7aoL4&5rHLqWe6eGnvte?j=O5Xuzn5HDh;d5xZ?uN1vG2FB{?dd79H- zXrU$ysc4SfUFTWiRhxRX<&tSm$?W~=bcxNJ5$U3_JXfe}yz}DANnPDe^Nky zJzc}|n}`7$pqu~n+8Oep>gUz_4s zbwcqPfTj2rKvr?A^pxW70LB&H25<=ct(bi5N%o1G{!>a?e9LE1_Dhz7lDPGBBhhGX9J$uA&1?M6rDqFk~u&BF_ROgL=rM!pO*DOL=H~k-xgd_Z^u6C+ovV2a>Hdq?h6=FL2eTQ~q#yaulT delta 23 ecmX>gd_Z^u6C+osV2aR1dq-{t&dofGTQ~qwSq32h diff --git a/build-fx/src/mario.c.o b/build-fx/src/mario.c.o index 5493fcecabd9367b1e6187e83f25b8f2f1d34df7..6e08994f94e67f28b07973ecc0ccf77ea0d2f04f 100644 GIT binary patch literal 3948 zcmb7FZ){W76~FI26Wg&v5{HNovf=jvBqnKWlcZ6Ap?HDPu&985!v5*KXTOJIu;avb zAStZG!f`xV?$eUBV;?#NkP7W4xdW~HvQPU^W!i`F3}TeRMjYCqZJIJ^idv1%JNNlr zCo%1$UFq8Ach2vgbMCq4-gj~T;7b%uq0*qx4v<$V)*Apbs7qtCA~Q1WtIsfxsjV-& zDg`65AhT-7Q;%zEoAYS0UZs(R<$$G+oN)m?HreVXx8*80n_A(uajgoKr+@=1S9qB2 zOgi6kzT^DB`JwZk`rSjEXk!~PRTrP-zU_ViRl1t`*gn>S+>Ne=dFqGM+-t~u|JcK0 ziDZD0nA=DDEZ@I`eiDekaR2rZs`29^dHTT-#UstSTNKt)-v`lpO;hn9X3!!r>R_Jn z+rDwm-N-uJ7d)(o{o~8*gr_#cm*&3NZA#aa`PiK| zuK37*k$vQ8U(4{{bmp>u?z!M@dDN-2KbJ$Bml173T_18){*G~5wJchSSuEl#cH=DM zOTOFz)4i=dP0pR&tp_dA>_x+&?V;u1@|oq+%YkKN8Cp))u8pg1@G^^ElzbcA)@;tR zXDvs(>CO4;dM@0n>S@Zp;pA}rX9l*;;{UH2lWY2-cwT{{&Ua29b$)QBAD>#N-}&he zj1TJ$al_a4UY;n(vrz3@DJrvmh)FT&%GW7j@zD0+<+b@gMH=tU@HJrmWAEh@llfa~ zD)UHK%swSOvbr~%pQ_(G#0fULDP!<5sok0L5$LDf$v>SGxlszb?1Tq*Pf%(d0y8tRTfjYgf~NB~}PAiR6wO3LRkP zUbmaDN7r0#m(p{JDQ4&6)E>4Mdd(noju!s%j6FX}%`-|LXFKu)`rRSmdaX12g*z!q zX*ORs`yn6G&W#!7V7)Nw`o&~2Obe(S8xlsYnt{aodgY^n6+`3{- zQIG+RJ5P#p;$An zz&tZrSbT;%T`_YusMTz*N&1=4KWLdu3YIoHk$mtr-0t{6OYdMWlQBF-kflY6w^Fw+ z-~A~*m#KIk+*+AY-@i~Sc3G$5vBH2wW^&USds=5F*RrSLUM4XmTf5tfXP>*EvCr%5*S?&cNMJth zjWLK3E98c?Rm1wKQ28pK76Vr8@x~?VK5D?y)qaXrrJTeDU`siybO=>sJD|<_vQMPccx~E@$sVDk>dCET6wkiGQ ziA#4lAquy~+8pStNoUk8f)A>&#lG1=3(b?$*(q@b^#5)dPk*k~X|_81=In%nMoVaZ zsZid(1e5j7)`k8l9sZ#elT*FfNM{yMO)hl!JI zvK8%3AmepSwMBo;AltDHFxI~avmH;JzaM10Lt;M;@=0*@zHS!*YeTCDLa{PDtz*0% z=l^DzeGYIdOyd8&GW)N~@NW^KaXvvk{>NqZzk(fdF#JZhFPGV$t;JMT8Qxrmw*l5_ zR;&-z1K0{v&zIU)#(xEH!z%lC%ItC(9xKC>WjL*467Mo#d`<+v3o)5~$N6Xgr-4`Uu|QBpd_dw)MZ^$D#oV-* z1VEyQkIAq!8V>S7nI8#`Mfs6P*f#_VRwDaiz$>l~h0lWNj64Cm7#oqqn2dopEJh@p z#jsD-cZqm!c$_~y78)T-V}X#&i$0$mBpMxHV$p9gh9ryNtP~z<>kCIUZ~LMSO9>&+n5*u*Ak?xRY+qKBlcA~3&=nmhf~$g)?U^Vy0Y2K;Q)Ik@#3hzx-EG{Bp%iRj^elD!+?Zjk&9 z8xU$F9Jr$-t^w}%W}@G^vagE!aP@V41=NRdDxR#=p#p01HNt_Kkhm34ldls!>}!iI z8zFx?ks&vh$dCi6r_qiOSJZbzCqgmNi#npQNb!G&ND(y_@hbE+T?iRnx{UvD(ec14$N&HU literal 4000 zcmb7He{2)i9e;Nh$99}wIE^qNZG9I)Y{FtYBn=EiV-W`F0wjgB(9zwU?ZYwHabjN} z(Xv4dTRnM}r$8q(F)6@CCsfHDNKk3h)Rk(=e*6&|#7avm?9dKv)09b5v}$zT_ubu# zos>@6lfJ&s=llJ>@Avz@@7=xRTq10%uT%;$cG-$k96xegaolkH)^RuU(mqZ!vzDakruM zzA@Wv@|{Mn4ZYj?_S_z-;iEly`hz|9_NKP`PPpn!rQCqEMA(~rn` zC_M*`Pcy&V#|dVuAz9{O;#-r^2%Mel&5v)2+$aSn>V_Miz#D=&P9=2x594%#&Roa3 z{`~vbtcLs7QitR8z&vZo6~u=A`8b_AnAaUT1GSzt>gk3Y-M)J6YLfcI_=(}p72Gp1 ze;{}7jXqO{WpL^!q z^J8`koTxHk(`ez(kJ)dHQnO5|oih(Sgwxz&d_%xJVuagqD#g+bMnBY0*1kGPzfiyB zP0P6ib+HE-XVxKOI*~`ot2rwDv;O)0-`&)by5^?7|5iF}X%^WJ#{cWiKK z=c*)~r!oS|4V+;u2`YP#GvE6roZVRVRgq@x*;ifGl;J3oIgEEkxRhJ4uK5GCfgXtY zl&^x%{)*4c==pWUr^?$$haJ=t?0Hdg2We~7$I@!zKTZ(Z(x zAok*Eafch_P{%WaQ$4I0>)hCD>S#PdXI$BKHUP6)0!-HF^{%(2xF-9woeKy}@!FIe zw+h~T&1_Awjtk^!A~oC^ysk`>wbgC1)0yUT^*EC_oo#{+G_kFAvp79n$=dDaFTNLO z0nIMJjy&mI{4yQ9qs*7t77(f#(Ts1w(+W~kP!$WPP{3dKX`1Cy>*7vrtv@NQbueaK^U{>Hb>Q?v%1%GmDDHQo2dJ}Ji0x!^|LUyV^fG+s z^qrN*4b9LM+>7*tIGwU`HZ4}`6Jyc;J68H$^O{8U%kkT_LKNO1Q&V75ZK6C=C3vCt zRo1n3+R~is#VD$uN{0m1M;G zgJBPJXml(9L}`d(B+2m9rPf12aU8l6@~i7oI6Y|)>B^F#h|pym*&BK~*aQ$z6kaO)6!AC4!%58(4k@FRrG1plpA1GRuq zou;P`BUGW(?ov(p=Su5LFie6--K6`;9nucYPcLQ$yNSNF<1F} z2yvPZ{uZ_n+=Gx!#ck1vkSuyoTU3sy&mn>$Qc!G@rEwXxDG(05h}t~SC~EVDLm_Dx zI`V%EEBNA^_-?@i>M6gkLglwi!}vRjakt7%4`JFJz6(;ZzNZA6ywr1KWs{-1&NZ sW?=7?95^?Qhik_7u(k$3r~+!BO8bIi;Q`lLsbAF`@aM5X8;ak50rN{ZR{#J2 diff --git a/build-fx/src/score.c.o b/build-fx/src/score.c.o index 561ef50890380529a3add9438b04b34d1ccd8bc0..b5ffc1df53a4aa188b1abe0058b68ff5180078ba 100644 GIT binary patch delta 485 zcmZ1?FhO8~GGoI;6;;Lw6TLRpoB1o!RJZ13U ze!_6e@RCvDq9i3ljYk}YY8MT910FG?38`gt`lNims*9qY4W#~}CQw|ngvFCPP3R#5 z&@3UiSw;zq3K+GRPO#rn>Sjt@RQO*@h%M!F+M=rplY1Ct%_Xl%If4w3yaA*cIIl_q zjbpwl0Vc&jRj zcwyp4ki<_gFmM9Joj^7-oK^(@u!N4E^W8Yz5kc6?HOm<+K%=lvR y6*gtY1CxKSsWZwjGUJqqDyob+6TLRpTly>Aw5!RJZ13U ze!_6e@k7ZeWx(m%b+B z2r^9i29RdpyebVen)#{}n3MpK7bO%Y)eHEmWq-^1midi=JLB8>ZHh{h8`2<8($whs{%%uQS%KVPN26geYL#z`!5^V{c(#5QVXKFfg#f*n1cl zxM1u93=9G=_7MgKei-`%lKL|Y47@P$3rOO37#KK#;!Yr|86O}?JYirEgK2odz#tA| zzhPjIfU!R?Fi67KKPKz2O=kQv`2d?TF( diff --git a/build-fx/src/tile.c.d b/build-fx/src/tile.c.d index a80010d..b6d00c3 100644 --- a/build-fx/src/tile.c.d +++ b/build-fx/src/tile.c.d @@ -1,3 +1,5 @@ -build-fx/src/tile.c.o: src/tile.c src/tile.h +build-fx/src/tile.c.o: src/tile.c src/tile.h src/constants.h src/tile.h: + +src/constants.h: diff --git a/build-fx/src/tile.c.o b/build-fx/src/tile.c.o index b2b8cd1acc81428eab9dbffaaff9ab9b5e7478d2..edd3429659df14e65c1f7800e65f2c1fa82710b8 100644 GIT binary patch literal 1980 zcmchYO-K}B7{{OWvs7ZUh%m`TLNsL5vZRREu<{aVSrByComoeBaAtRz57bLaL5B|E zp+iSIbPb6vL4nYrQ((|Np-XfKJ0u-~`akpTGfwZ#OAo&D{(sN^{hZnNb@|G*tC@xj zC6S?%(5XaA6S$E^;}-qYPHjUEztUu{eRtYi-o9xSPv0m-`JR#C?&+P8!JY@1u}s%c zCoS~!wsw7NI@5oteb!pePWDlId588V^APQW&Z5X%%v^+dUM|AoBNfO0VtxL-^Thc0 z`CR|R_1govbH*uSSa$GlE#qR-e}1H`#@%-ir@{E!4FJEVB*4uHK!96O@%!S)cdGFY zDO4W;`gonQ2UY(8%^w5v_Y(iI=HCJ5QvNN?p8@mMrGHWL=fQat@gvQ@51vZ-_cZ@8 zxR~-EY5r4iE#*Ja{O916l>bcgUxHUt{tL~23tmh4uQmTYcs=F6)BF$Mjgdd9$t^`BZS7S-UV2)l@POrLyVO9F?@(D%QeNm8!1mRImgFD{_LM zT2WAm;-#rZPCYs2%wjUz^uw}h6@=BKx9^nZRW^*4%m_O){rN&zwmrN4E-v6$B~y1Lv)VlfaqcTJVob;Iz>+r9Tr_AIwHD8bX4>TQJ3gdqHfV^IC`SjafC!~5cP`Q zBsw8_i>Oa&BUti6(;_1XeN~r5`L=5sp}iQAF=K`%8CDRG5oi6X%9N^}XIDbnOXSd) z=WeNY8bzJ2Yp&!TI#$M-?<%g9}16$D=H3sHL~YHxZF40PUhl{qR&Ee zp9W4Mc)aacsfV;10kY1kbTg0r3WaOFJK5v)T}0vWhEWii89Z=(Cc&N*nUhnCSi%Yf l|G(qAm&eQ2S@r;I{DrpMUqUpFXtGzx<~MjuNF&s7yT3PyzQX_j literal 1712 zcmcgs&1(};5T8v`V~k?jB4Vp%?V-dEwuxH55R6oHY`jbF;Iz)biY;XXn+M+GVZ6 zC)mGoT|D&PKe9A5xPvH+96tj?GCW|BcnCS)Rc%!4ALE>&0FyB2Hv4Ncv_0W845Z!MF!-lJN$>DaKm>6O6Y3&M@8qC^6mzI47{?uXh670L>3Pv9=j` zmZNKdwHAOD!DT(rK{I?GG}G;LtZo1YF%^@kC%v0wG%;%gVxw6{Hi1sKhK`oKfsdo; zIds}j8u5!U=UG7C<~uqY*PFtCT<;$859m~n_Hw-{VwxFoJ%#dQwL)rxI}4-WWDgb>mJ7_SjGHI0%-{e3Ri*~{ delta 23 fcmZ1>wL)rxI}4-GWDgb>mW#{*f}1C>%-{e3RI3Ko diff --git a/src/bonus.c b/src/bonus.c index 3ca9611..f4ce50f 100644 --- a/src/bonus.c +++ b/src/bonus.c @@ -5,6 +5,7 @@ #include "tile.h" #include "score.h" #include "ennemi.h" +#include "constants.h" #include #define BONUS_FLEUR 4 // interne, généré depuis champi @@ -27,9 +28,13 @@ static int sgn(int x) } -static bonus_t bonus ={BONUS_NONE, {0,0,8,8,0,0,0,1}, 0}; +static bonus_t bonus ={BONUS_NONE, {0,0,TILE_W,TILE_H,0,0,0,1}, 0}; /* Les balles ont les memes propriétés que les boulets et sont donc gérées ici */ -static bonus_t bullets[2] ={{0, {0,0,4,4,0,0,0,1}, 0},{0, {0,0,4,4,0,0,0,1}, 0}}; +static bonus_t bullets[2] = +{ + {0, {0,0,TILE_W/2,TILE_H/2,0,0,0,1}, 0}, + {0, {0,0,TILE_W/2,TILE_H/2,0,0,0,1}, 0} +}; void lance_bullet() { @@ -83,9 +88,10 @@ void bullet_move() bool y_collide= (bullets[i].b.y<=t->b.y && t->b.yb.y+t->b.h-1 && t->b.y+t->b.htype=NONE; + t->life=DEAD; bullets[i].type=0; score_add(100); + break; } } } diff --git a/src/box.c b/src/box.c index d45064e..fdb60d3 100755 --- a/src/box.c +++ b/src/box.c @@ -1,6 +1,7 @@ #include "box.h" #include "world.h" #include "ennemi.h" +#include "score.h" int sgn(int x) { @@ -33,9 +34,13 @@ int check_collision(box_t *b) static void move_x(box_t * b) { int sgn_vx=sgn(b->vx); + + int t_vx=((sgn_vx*b->vx+time_id%2)/2)*sgn_vx; + sgn_vx=sgn(t_vx); + if (sgn_vx) { - for (int i=sgn_vx; i<=sgn_vx*b->vx; i++) + for (int i=sgn_vx; i<=sgn_vx*t_vx; i++) { int previous_tested_y=-545; int type=CTG_EMPTY; @@ -60,7 +65,7 @@ static void move_x(box_t * b) } } } - b->x+=b->vx; + b->x+=t_vx; } } diff --git a/src/box.h b/src/box.h index 8f53825..2835a6f 100755 --- a/src/box.h +++ b/src/box.h @@ -3,16 +3,16 @@ typedef struct { - int x; - int y; + int x :16; + int y :16; - int w; - int h; + unsigned w :8; + unsigned h :8; - int vx; - int vy; - int last_vy; - int gravity; + int vx :8; + int vy :8; + int last_vy :8; + int gravity :2; //int is_mario; } box_t; diff --git a/src/constants.h b/src/constants.h new file mode 100644 index 0000000..d2cec99 --- /dev/null +++ b/src/constants.h @@ -0,0 +1,9 @@ +#define TILE_W 8 +#define TILE_H 8 + +#define SCREEN_W 128 +#define SCREEN_H 64 + +#include +extern bool dark_theme_enable; +extern bool is_in_water; \ No newline at end of file diff --git a/src/ennemi.c b/src/ennemi.c index fdeced6..43f9873 100644 --- a/src/ennemi.c +++ b/src/ennemi.c @@ -7,16 +7,33 @@ #include +const int ennemi_widths [NOMBRE_ENNEMIS] = {0, 8, 8, 8, 8 , 8}; +const int ennemi_heights[NOMBRE_ENNEMIS] = {0, 8, 12, 9, 12, 9}; + void display_ennemi(ennemi_t * e) { - if (e->life==DEAD) + if (e->life==0) + { + if (e->p1==0) + { + e->b.vx*=-1; + e->b.vy=5; + } + e->p1++; + e->b.vy--; + e->b.y+=e->b.vy; + e->b.x+=e->b.vx; + if (e->p1==30) + e->type=NONE; + } + if (e->type==NONE) return; if (e->b.x<=world_get_real_x0(0)-e->b.w || e->b.x>=world_get_real_x0(0)+127) return; else e->discovered=1; - if (e->type==GOOMBA) + if (e->type==GOOMBA_ID) { extern image_t img_goomba; tileset_t goomba={&img_goomba, GOOMBA_X, GOOMBA_Y, 1}; @@ -25,7 +42,7 @@ void display_ennemi(ennemi_t * e) if (e->life==0) draw_tile(e->b.x-world_get_real_x0(0), e->b.y-world_get_real_y0(mario.p.y), &goomba, 0, 0); } - if (e->type==KOOPA_VERTE) + if (e->type==KOOPA_V_ID) { extern image_t img_koopa_verte; tileset_t koopa_verte={&img_koopa_verte, KOOPA_X, KOOPA_Y, 1}; @@ -42,24 +59,16 @@ void display_ennemi(ennemi_t * e) } bool ennemi_check_collision(ennemi_t *e) -{ - bool x_collide= (mario.p.x<=e->b.x && e->b.xb.x+e->b.w-1 && e->b.x+e->b.wb.y && e->b.yb.y+e->b.h-1 && e->b.y+e->b.hb.x && e->b.x<=mario.p.x+mario.p.w-1) || (mario.p.x<=e->b.x+e->b.w-1 && e->b.x+e->b.w-1<=mario.p.x+mario.p.w-1); + bool y_collide= (mario.p.y<=e->b.y && e->b.y<=mario.p.y+mario.p.h-1) || (mario.p.y<=e->b.y+e->b.h-1 && e->b.y+e->b.h-1<=mario.p.y+mario.p.h-1); return (x_collide&&y_collide); - } void hurt_mario() -{ - if (mario.size==M_SMALL && mario_immunity==0) - { - mario_dead=1; - end_level=0; - } +{ if (mario.size==M_SMALL && mario_immunity==0) + {mario_dead=1;end_level=0;} else - { mario_smaller(); - } } void move_ennemi(ennemi_t *e) @@ -72,10 +81,19 @@ void move_ennemi(ennemi_t *e) if (e->discovered==0) return; if (e->life==DEAD) - e->type=NONE; + return; + // e->type=NONE; if (e->type==NONE) return; - + + bool e_hit_mario=ennemi_check_collision(e); + if (e_hit_mario&&mario_star_mode) + { + e->life=DEAD; + e->p1=0; + score_add(200); + } + for (int i=0; ib.x<=e->b.x+e->b.vx && e->b.x+e->b.vxb.x+t->b.w) || (t->b.x<=e->b.x+e->b.w-1+e->b.vx && e->b.x+e->b.w+e->b.vxb.x+t->b.w); bool y_collide= (t->b.y<=e->b.y+e->b.vy && e->b.y+e->b.vyb.y+t->b.h) || (t->b.y<=e->b.y+e->b.h-1+e->b.vy && e->b.y+e->b.h+e->b.vyb.y+t->b.h); - if (x_collide&&y_collide) + if (x_collide&&y_collide && t->life!=DEAD) { if (e->type!=CARAPACE_VERTE && e->type!=CARAPACE_ROUGE) { @@ -96,12 +114,12 @@ void move_ennemi(ennemi_t *e) if (t->type==CARAPACE_VERTE || t->type==CARAPACE_ROUGE) { e->p1*=-1; - e->b.vx=3*e->p1; + e->b.vx=6*e->p1; } else { t->life=DEAD; - t->p1=time_id; + t->p1=0; score_add(200); } @@ -117,99 +135,135 @@ void move_ennemi(ennemi_t *e) if ((c->type==GIFT || c->type==BRICK) && (c->time_hit_id || c->state)) { e->life=DEAD; - //e->p1=time_id; + e->p1=0; score_add(100); break; } } } - if (e->type==GOOMBA) + if (e->type==GOOMBA_ID) { - if (e->life==1) + box_move(&e->b); + + if (e->b.vx==0) { - int old_vx=e->b.vx; - if (time_id%2) - e->b.vx=0; - - box_move(&e->b); - - if (time_id%2) - e->b.vx=old_vx; - - if (e->b.vx==0) + if (e->p1==0) { - if (e->p1==0) - { - e->b.vx=-1; - e->p1=-1; - } - else - { - e->p1*=-1; - e->b.vx=e->p1; - } + e->b.vx=-1; + e->p1=-1; } - if (e->b.y<0) - e->type=NONE; - if (ennemi_check_collision(e)) + else { + e->p1*=-1; + e->b.vx=e->p1; + } + } + if (e->b.y<0) + e->type=NONE; + if (e_hit_mario) + { + if (mario.p.last_vy<=-2) + { + e->life=DEAD; + e->p1=0; + score_add(200); + mario.p.vy=4; + mario.p.y=e->b.y+CARAPACE_Y; + } + else + hurt_mario(); + } + } + + if (e->type==KOOPA_V_ID) + { + box_move(&e->b); + if (e->b.vx==0) + { + if (e->p1==0) + { + e->b.vx=-1; + e->p1=-1; + } + else + { + e->p1*=-1; + e->b.vx=e->p1; + } + } + if (e->b.y<0) + e->type=NONE; + if (e_hit_mario) + { + if (mario.p.last_vy<=-2) + { + e->type=CARAPACE_VERTE; + e->b.h=CARAPACE_Y; + e->p1=2; + e->b.vx=0; + score_add(200); + mario.p.vy=4; + mario.p.y=e->b.y+CARAPACE_Y+1; + } + else + hurt_mario(); + } + } + if (e->type==CARAPACE_VERTE) + { + box_move(&e->b); + + if (e->b.vx==0) + { + if (e->p1<2) + { + e->p1*=-1; + e->b.vx=6*e->p1; + } + } + if (e->b.y<0) + e->type=NONE; + if (e->p1>=2) + { + e->p1++; + if (e->p1==80) + { + e->type=KOOPA_V_ID; + e->b.h=KOOPA_Y; + e->p1=0; + e->b.vx=0; + } + } + + if (e_hit_mario) + { + if (e->p1==0 || e->p1>=2) + { + if (mario.p.x>=e->b.x) + e->p1=-1; + if (mario.p.x<=e->b.x) + e->p1=1; + e->b.vx=6*e->p1; if (mario.p.last_vy<=-2) - { - e->life=DEAD; - e->p1=time_id; - score_add(200); + { mario.p.vy=4; mario.p.y=e->b.y+CARAPACE_Y; } else - hurt_mario(); - } - } - else - { - if (e->p1>=time_id+10 || e->p1life=DEAD; - } - } - - if (e->type==KOOPA_VERTE) - { - if (e->life==1) - { - int old_vx=e->b.vx; - if (time_id%2) - e->b.vx=0; - - box_move(&e->b); - - if (time_id%2) - e->b.vx=old_vx; - - if (e->b.vx==0) - { - if (e->p1==0) { - e->b.vx=-1; - e->p1=-1; - } - else - { - e->p1*=-1; - e->b.vx=e->p1; + if (mario.p.x>=e->b.x) + mario.p.x=e->b.x+e->b.w; + if (mario.p.x<=e->b.x) + mario.p.x=e->b.x-mario.p.w; } } - if (e->b.y<0) - e->type=NONE; - if (ennemi_check_collision(e)) + else { if (mario.p.last_vy<=-2) { - e->type=CARAPACE_VERTE; - e->b.h=CARAPACE_Y; e->p1=0; e->b.vx=0; - score_add(200); mario.p.vy=4; mario.p.y=e->b.y+CARAPACE_Y+1; } @@ -217,61 +271,8 @@ void move_ennemi(ennemi_t *e) hurt_mario(); } } - else - e->life=DEAD; } - if (e->type==CARAPACE_VERTE) - { - if (e->life==1) - { - box_move(&e->b); - if (e->b.vx==0) - { - e->p1*=-1; - e->b.vx=3*e->p1; - } - if (e->b.y<0) - e->type=NONE; - - if (ennemi_check_collision(e)) - { - if (e->p1==0) - { - if (mario.p.x>=e->b.x) - e->p1=-1; - if (mario.p.x<=e->b.x) - e->p1=1; - e->b.vx=3*e->p1; - if (mario.p.last_vy<=-2) - { - mario.p.vy=4; - mario.p.y=e->b.y+CARAPACE_Y; - } - else - { - if (mario.p.x>=e->b.x) - mario.p.x=e->b.x+e->b.w; - if (mario.p.x<=e->b.x) - mario.p.x=e->b.x-mario.p.w; - } - } - else - { - if (mario.p.last_vy<=-2) - { - e->p1=0; - e->b.vx=0; - mario.p.vy=4; - mario.p.y=e->b.y+CARAPACE_Y+1; - } - else - hurt_mario(); - } - } - } - } - display_ennemi(e); } @@ -284,5 +285,6 @@ void display_ennemi_table() for (int i=0; i=3) - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign+(id_frame/4)%2, mario_has_bullets); + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 4*last_vx_sign+(id_frame/4)%2, mario_has_bullets); else if (mario.p.vx*sgn(mario.p.vx)>=1) - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign+(id_frame/8)%2, mario_has_bullets); + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 4*last_vx_sign+(id_frame/8)%2, mario_has_bullets); else - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign, mario_has_bullets); + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 3*last_vx_sign, mario_has_bullets); } } } @@ -152,13 +149,19 @@ void mario_move() { if (keys[MK_RUN] && (c1==CTG_SOIL || c2==CTG_SOIL)) { - if(mario.p.vx*sgn(mario.p.vx)<=4) + if(mario.p.vx*sgn(mario.p.vx)<=8) mario.p.vx+=vx; } else { - if (mario.p.vx*vx<2) + if (mario.p.vx*vx<4) mario.p.vx+=vx; + + } + if (keys[MK_RUN]==0) + { + if (mario.p.vx*vx>4) + mario.p.vx-=vx; } } } @@ -193,7 +196,10 @@ void mario_move() last_vx_sign=0; if (mario.p.x+mario.p.vx + gravity diff --git a/src/mario.h b/src/mario.h index d03736e..6a7e2d2 100755 --- a/src/mario.h +++ b/src/mario.h @@ -46,4 +46,7 @@ extern int id_frame; extern int mario_immunity; extern int mario_has_bullets; extern int last_vx_sign; + +extern int mario_star_mode; + #endif \ No newline at end of file diff --git a/src/score.c b/src/score.c index e48ee18..d71a151 100644 --- a/src/score.c +++ b/src/score.c @@ -33,7 +33,7 @@ void new_game() void new_level() { end_level=-1; - time_left=300; + time_left=400; time_id=0; } @@ -79,7 +79,7 @@ void score_display() dtext(50,0,str, C_BLACK, C_WHITE); time_id++; - if (time_id%10==0) + if (time_id%8==0) time_left--; sprintf(str, "TIME : %d", time_left); diff --git a/src/tile.c b/src/tile.c index b7b5f82..d14c92b 100755 --- a/src/tile.c +++ b/src/tile.c @@ -1,50 +1,67 @@ #include "tile.h" +#include "constants.h" #include +int dark_theme=0; extern image_t img_tuyau; -tileset_t tuyau={&img_tuyau, 8, 8, 1}; +const tileset_t tuyau={&img_tuyau, TILE_W, TILE_H, 1}; extern image_t img_brick; -tileset_t brick={&img_brick, 8, 8, 1}; +const tileset_t brick={&img_brick, TILE_W, TILE_H, 1}; extern image_t img_stone; -tileset_t earth={&img_stone, 8, 8, 1}; +const tileset_t earth={&img_stone, TILE_W, TILE_H, 1}; extern image_t img_gift; -tileset_t gift={&img_gift, 8, 8, 1}; +const tileset_t gift={&img_gift, TILE_W, TILE_H, 1}; extern image_t img_coin; -tileset_t coin={&img_coin, 8, 8, 1}; +const tileset_t coin={&img_coin, TILE_W, TILE_H, 1}; extern image_t img_nuage; -tileset_t nuage={&img_nuage, 8, 8, 0}; +const tileset_t nuage={&img_nuage, TILE_W, TILE_H, 0}; extern image_t img_buisson; -tileset_t buisson={&img_buisson, 8, 8, 0}; +const tileset_t buisson={&img_buisson, TILE_W, TILE_H, 0}; extern image_t img_colline; -tileset_t colline={&img_colline, 8, 8, 0}; +const tileset_t colline={&img_colline, TILE_W, TILE_H, 0}; extern image_t img_bloc; -tileset_t bloc={&img_bloc, 8, 8, 0}; +const tileset_t bloc={&img_bloc, TILE_W, TILE_H, 0}; extern image_t img_champi; -tileset_t champi={&img_champi, 8, 8, 0}; +const tileset_t champi={&img_champi, TILE_W, TILE_H, 0}; extern image_t img_1up; -tileset_t life_1up={&img_1up, 8, 8, 0}; +const tileset_t life_1up={&img_1up, TILE_W, TILE_H, 0}; extern image_t img_fleur; -tileset_t fleur={&img_fleur, 8, 8, 0}; +const tileset_t fleur={&img_fleur, TILE_W, TILE_H, 0}; extern image_t img_bullet; -tileset_t bullet={&img_bullet, 4, 4, 1}; +const tileset_t bullet={&img_bullet, TILE_W/2, TILE_H/2, 1}; + + +extern image_t img_mariosmall; +const tileset_t mario_small={&img_mariosmall, TILE_W, TILE_H, 1}; + +extern image_t img_mariobig; +const tileset_t mario_big={&img_mariobig, TILE_W, 2*TILE_H, 1}; void draw_tile(int sx, int sy, tileset_t const * const set, int x, int y) { - dsubimage(sx, 64-sy-set->height, - set->sheet, - x*(set->width+set->padding), y*(set->height+set->padding), - set->width,set->height, - DIMAGE_NONE); +// if (dark_theme==0) + dsubimage(sx, 64-sy-set->height, + set->sheet, + x*(set->width+set->padding), y*(set->height+set->padding), + set->width,set->height, + DIMAGE_NONE); +/* else + dsubimage(sx, 64-sy-set->height, + set->sheet_dark, + x*(set->width+set->padding), y*(set->height+set->padding), + set->width,set->height, + DIMAGE_NONE); +*/ } \ No newline at end of file diff --git a/src/tile.h b/src/tile.h index 71049a4..e6fe2c5 100755 --- a/src/tile.h +++ b/src/tile.h @@ -1,8 +1,10 @@ -#ifndef TILE_H -#define TILE_H +#ifndef _TILE_H +#define _TILE_H #include +extern int dark_theme; + typedef struct { image_t * sheet; @@ -11,24 +13,26 @@ typedef struct int padding; } tileset_t; -extern tileset_t tuyau; -extern tileset_t brick; -extern tileset_t earth; -extern tileset_t gift; -extern tileset_t coin; -extern tileset_t bloc; +extern const tileset_t tuyau; +extern const tileset_t brick; +extern const tileset_t earth; +extern const tileset_t gift; +extern const tileset_t coin; +extern const tileset_t bloc; +extern const tileset_t nuage; +extern const tileset_t buisson; +extern const tileset_t colline; -extern tileset_t nuage; -extern tileset_t buisson; -extern tileset_t colline; +extern const tileset_t champi; +extern const tileset_t fleur; +extern const tileset_t life_1up; -extern tileset_t champi; -extern tileset_t fleur; -extern tileset_t life_1up; +extern const tileset_t bullet; -extern tileset_t bullet; +extern const tileset_t bloc; -extern tileset_t bloc; +extern const tileset_t mario_small; +extern const tileset_t mario_big; void draw_tile(int sx, int sy, tileset_t const * const set, int x, int y);