From 3d8bb4d2127ce6bda0aad2dd3cacae334a992c75 Mon Sep 17 00:00:00 2001 From: Shadow Date: Fri, 26 Jul 2019 20:25:41 +0200 Subject: [PATCH] Commencement du code --- Sources/Plague.g1a | Bin 26892 -> 27020 bytes Sources/build-fx/map | 447 ++++++++++++++++---------------- Sources/build-fx/src/Plague.bin | Bin 26380 -> 26508 bytes Sources/build-fx/src/Plague.elf | Bin 36304 -> 36432 bytes Sources/build-fx/src/main.o | Bin 1932 -> 2056 bytes Sources/src/main.c | 36 ++- 6 files changed, 253 insertions(+), 230 deletions(-) diff --git a/Sources/Plague.g1a b/Sources/Plague.g1a index c786241e9ea808d5aa40eb754de951e780253e23..40dbfc2c3837bb9a21159cdc609e6c5f9275be7d 100644 GIT binary patch delta 1635 zcmYjRZ%k8H6hHU1xc;M*_Em}kkG9elslMA5rOv{Nl1<1WI2U6wvtjKjD#_N!9C0Ki zbDAbA6L`iLvk!z1?jH%xXBLyWge+$B16f*!1UHkl+OA}p&8&==jLFXH1NFW9?z!ij zd(Zuyd(XXzTO{!_F@HJn-Q;lm;*f6nFZ{hvmY2^T|8~UeQF^Jz|8>U~ge1fTa)!Lt zb07{2fZs6C!_z85Nf$s#m&zcS4($YZs|_eX9R6tps#^kD`Uq&0rFrmt(qoGCYdW-%Q+bvj#pO&L+N@^sM^Mj| z<`w*Cu5wntOPk$X>|1Ab*l(Y_25LwkXju@bereBx(;QISNAixZ`5dVEA^NINzlyk? zEa|ibk$zZ_R7$eb0oY3OoAAV%VqyLaf1baTa&_8fT)63XGlVl`DmgX-oH?W6)@E3) zB2&g$Qr0;wCUHrt5k&X?i<9%o64;Io8+pxRSvAUsq3ipV|dG^=n^5h-PgqqUh9GZ!e$y=NW zPD_kcQeEAUGiQ;#{wB~jFjFa8sn&M*#r--bL*|7+{rVCt#`1Y#OkYv@X^ONq$Vrz~ zi8u5Y8NI7lDs3$3{Wv`#_Ljdu$UULY_zJlvUN?S5)aO(NC6?`mF`<{O(VP595?l#k z@{1SP0#V-u>cnDqS;TW|?M(Ru&=d=g%xgE9z3;HNgl~6-l+V5n5Dt9D-)i% zUSF?es?oe@HP%xX-j{wvLL8`mXJxh=u()J#xl!&bGo~CGlg2&IL!9FNB%0a)P&fLK z*EQ>I#u^b+HXCCL3T|7CBwm%ZcWrAWEpFS**jZuD)*=aueHMlI$j*@xyw)wX0$X?T zP| z<~=DbKjl469*K>C+k;_}EyrH@9iem7y=@4 rV(A0A?wP*okZiR2@v8b%()CH8oXkuz(#p1?PqMFm#lHB{;TG~g`wh_~ delta 1541 zcmYjRZ%k8H6hHU9;#yv*rP39|w(ttA2=Z=e2USYbIIJcRw@yx;pmynGte(*!PA(6~w;95&`nZzO?nHf8e7Pk9x-uZXW zx##@ud9Uvm()Tkles$;jv6wjAuU&nC&-g#9t2Z)@14gIHS?_XxyZ=iOtj-|;YJdKTc^$n-<>`z{M7k=fW^M0$L%Wo~5 z+tfB5xn%vkYc;fGPl2;WFr*=|Jp}BWjI`2AZ+^pqb@n3Q{G>TJ&B_v%AL3J=-=-}ul546a`g zt_nAVTZ!@@KV6QPEX@|zjcwZ zUj+ku9~ZI;GdT(kh&X!p;Pn)<5-! z4GAVtodVFT%@nnjB}kw;+o^6;_HQ0$bdE*EhjVre=w`jVQ1}KR5oyuzE{VvVEng5# zv0AS}7%M8Ig(8d2a4$~$xfF(ba*;7ZG_61#IDw84S#Pp2g*b$7UdMzOn70k6X-H}= zdA?!Yrg#*q?BDt+G2&*^@m#=vu6QZOn9;m*J=cZ{hj;~ONGq?HKgvaC6RsVZJ+8<4 zwGmMWA#5S-{|k}5Wq*-;>m<+`^kZRe{vcEKOuEeTO!<^_o3|+JKF@D0p9=DERrIy+ zv7c+tL{+&7q3BlG4l?|Zbj0RU*mc_sGP$$DO7gJSrco(YdEp%|-ijAtsp%GB4nJ1B z0$MqZAcjTwUHN$X5OnOr+pFwLFmd)F>#q(Ql#6=Rm)kokx7dAzaV*L)$3?<8|CEZV zPU?z=fYLKStF%C!VY#Q1;6sw1MQE2kL$;J#s!}oDPFiUgWE!taeV#6f>>4KrT(YZl(=XF$9pFxt-ZWv#vhyr%Q3WJ9kp2#jd<4tx*ZYN-ZL;@w9-&b z*2IgsFoNCTHSiNikL5c)TUFGJQ-Ea0!|ZmXV@M}(yBf)#3qzl21!&3ChQ2N+Hfru! cS2s8h($ diff --git a/Sources/build-fx/map b/Sources/build-fx/map index 44650d2..431c8aa 100644 --- a/Sources/build-fx/map +++ b/Sources/build-fx/map @@ -193,7 +193,7 @@ LOAD build-fx/assets/img/trans.png.o LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a 0x0000000000300000 _brom = 0x300000 - 0x0000000000005ec4 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x0000000000005f44 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x888 *(.pretext.entry) @@ -232,249 +232,250 @@ LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a *(.dtors .dtors.*) 0x0000000000300a88 _etors = . -.text 0x0000000000300a88 0x31d8 +.text 0x0000000000300a88 0x3258 *(.text .text.*) - .text 0x0000000000300a88 0x120 build-fx/src/main.o + .text 0x0000000000300a88 0x180 build-fx/src/main.o 0x0000000000300a88 _display - 0x0000000000300b88 _floor - .text.startup 0x0000000000300ba8 0xb0 build-fx/src/main.o - 0x0000000000300ba8 _main - .text 0x0000000000300c58 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(start.c.o) - .text 0x0000000000300c58 0x1f4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(mmu.c.o) - 0x0000000000300c58 _tlb_addr - 0x0000000000300c6c _tlb_data - 0x0000000000300c80 _tlb_mapped_memory - 0x0000000000300d54 _utlb_addr - 0x0000000000300d64 _utlb_data - 0x0000000000300d74 _utlb_mapped_memory - .text 0x0000000000300e4c 0x54 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dimage.c.o) - 0x0000000000300e4c _dimage - 0x0000000000300e80 _dsubimage - .text 0x0000000000300ea0 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(topti.c.o) - .text 0x0000000000300ea0 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dupdate.c.o) - 0x0000000000300ea0 _dupdate - 0x0000000000300eb8 _dupdate_noint - .text 0x0000000000300ec4 0x4c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dclear.c.o) - 0x0000000000300ec4 _dclear - .text 0x0000000000300f10 0x3ac /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(bopti.c.o) - 0x0000000000300f10 _bopti_grid - 0x0000000000301066 _bopti_render - 0x000000000030116c _bopti_render_clip - 0x0000000000301274 _bopti_render_noclip - .text 0x00000000003012bc 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(topti-asm.s.o) - .text 0x00000000003012bc 0x218 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(getkey.c.o) - 0x0000000000301480 _getkey - 0x000000000030148c _getkey_opt - 0x0000000000301498 _getkey_repeat - .text 0x00000000003014d4 0x9c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(topti.c.o) - 0x00000000003014d4 _dsize - .text 0x0000000000301570 0x124 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dline.c.o) - 0x0000000000301570 _dline - .text 0x0000000000301694 0xbf4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(stdio.c.o) - 0x0000000000301fc0 _kprint_opt - 0x00000000003020ea _kprint - 0x00000000003021c4 _kvsprint - 0x0000000000302208 _sprintf - 0x0000000000302230 _vsprintf - 0x0000000000302250 _snprintf - 0x0000000000302270 _vsnprintf - .text 0x0000000000302288 0x1dc /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(t6k11.c.o) - 0x0000000000302320 _t6k11_display - 0x00000000003023f8 _t6k11_contrast - 0x0000000000302424 _t6k11_backlight - .text 0x0000000000302464 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(hardware.c.o) - .text 0x0000000000302464 0x170 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(setup.c.o) - 0x0000000000302518 _gint_install - 0x00000000003025bc _gint_unload - .text 0x00000000003025d4 0x2c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(vbr.s.o) - 0x00000000003025d4 _gint_setvbr - .text 0x0000000000302600 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(exch.S.o) - .text 0x0000000000302600 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(inth.S.o) - .text 0x0000000000302600 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(syscalls.S.o) - .text 0x0000000000302600 0x60 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(bopti-asm.s.o) - 0x0000000000302600 _bopti_asm_mono - 0x0000000000302626 _bopti_asm_mono_alpha - 0x0000000000302658 _bopti_asm_gray - 0x000000000030265c _bopti_asm_gray_alpha - .text 0x0000000000302660 0x13c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dline.c.o) - 0x0000000000302660 _dhline - 0x0000000000302718 _dvline - .text 0x000000000030279c 0x54 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dpixel.c.o) - 0x000000000030279c _dpixel - .text 0x00000000003027f0 0x8c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(masks.c.o) - 0x00000000003027f0 _masks - .text 0x000000000030287c 0x2d4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(keysc.c.o) - 0x0000000000302a44 _pollevent - 0x0000000000302b18 _waitevent - .text 0x0000000000302b50 0x124 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(iokbd.c.o) - 0x0000000000302b5c _iokbd_row - 0x0000000000302c44 _iokbd_scan - .text 0x0000000000302c74 0xd6 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(memory.c.o) - 0x0000000000302c74 _memcpy - 0x0000000000302d28 __memmove - 0x0000000000302d2c __memcmp - 0x0000000000302d30 _memset - *fill* 0x0000000000302d4a 0x2 - .text 0x0000000000302d4c 0x574 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(tmu.c.o) - 0x0000000000303070 _timer_setup - 0x0000000000303104 _timer_delay - 0x0000000000303164 _timer_start - 0x0000000000303198 _timer_reload - 0x00000000003031b8 _timer_pause - 0x00000000003031ec _timer_stop - 0x0000000000303248 _timer_timeout - 0x0000000000303254 _timer_address - 0x0000000000303290 _timer_clear - .text 0x00000000003032c0 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(inth.s.o) - .text 0x00000000003032c0 0x74 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(gint.c.o) - 0x00000000003032c0 _gint_intlevel - 0x0000000000303310 _gint_inthandler - .text 0x0000000000303334 0x150 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(cpg.c.o) - 0x0000000000303478 _clock_freq - .text 0x0000000000303484 0x78 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_movmem.o) - 0x0000000000303484 ___movmem - 0x0000000000303484 ___movstr - 0x00000000003034b8 ___movmemSI64 - 0x00000000003034b8 ___movstrSI64 - 0x00000000003034bc ___movmemSI60 - 0x00000000003034bc ___movstrSI60 - 0x00000000003034c0 ___movstrSI56 - 0x00000000003034c0 ___movmemSI56 - 0x00000000003034c4 ___movmemSI52 - 0x00000000003034c4 ___movstrSI52 - 0x00000000003034c8 ___movstrSI48 - 0x00000000003034c8 ___movmemSI48 - 0x00000000003034cc ___movmemSI44 - 0x00000000003034cc ___movstrSI44 - 0x00000000003034d0 ___movstrSI40 - 0x00000000003034d0 ___movmemSI40 - 0x00000000003034d4 ___movstrSI36 - 0x00000000003034d4 ___movmemSI36 - 0x00000000003034d8 ___movstrSI32 - 0x00000000003034d8 ___movmemSI32 - 0x00000000003034dc ___movmemSI28 - 0x00000000003034dc ___movstrSI28 - 0x00000000003034e0 ___movmemSI24 - 0x00000000003034e0 ___movstrSI24 - 0x00000000003034e4 ___movmemSI20 - 0x00000000003034e4 ___movstrSI20 - 0x00000000003034e8 ___movstrSI16 - 0x00000000003034e8 ___movmemSI16 - 0x00000000003034ec ___movmemSI12 - 0x00000000003034ec ___movstrSI12 - 0x00000000003034f0 ___movstrSI8 - 0x00000000003034f0 ___movmemSI8 - 0x00000000003034f4 ___movstrSI4 - 0x00000000003034f4 ___movmemSI4 - .text 0x00000000003034fc 0x1ec /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_udivdi3.o) - 0x00000000003034fc ___udivdi3 - .text 0x00000000003036e8 0x98 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_si_to_df.o) - 0x00000000003036e8 ___floatsidf - .text 0x0000000000303780 0x94 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_df_to_si.o) - 0x0000000000303780 ___fixdfsi - .text 0x0000000000303814 0x6c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_udivsi3.o) - 0x0000000000303836 ___udivsi3 - .text 0x0000000000303880 0x60 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000303880 ___udiv_qrnnd_16 - .text 0x00000000003038e0 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_clz.o) - .text 0x00000000003038e0 0x58 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_clzsi2.o) - 0x00000000003038e0 ___clzsi2 - .text 0x0000000000303938 0x25c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_pack_df.o) - 0x0000000000303938 ___pack_d - .text 0x0000000000303b94 0xcc /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_unpack_df.o) - 0x0000000000303b94 ___unpack_d + 0x0000000000300be8 _floor + .text.startup 0x0000000000300c08 0xcc build-fx/src/main.o + 0x0000000000300c08 _main + .text 0x0000000000300cd4 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(start.c.o) + .text 0x0000000000300cd4 0x1f4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(mmu.c.o) + 0x0000000000300cd4 _tlb_addr + 0x0000000000300ce8 _tlb_data + 0x0000000000300cfc _tlb_mapped_memory + 0x0000000000300dd0 _utlb_addr + 0x0000000000300de0 _utlb_data + 0x0000000000300df0 _utlb_mapped_memory + .text 0x0000000000300ec8 0x54 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dimage.c.o) + 0x0000000000300ec8 _dimage + 0x0000000000300efc _dsubimage + .text 0x0000000000300f1c 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(topti.c.o) + .text 0x0000000000300f1c 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dupdate.c.o) + 0x0000000000300f1c _dupdate + 0x0000000000300f34 _dupdate_noint + .text 0x0000000000300f40 0x4c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dclear.c.o) + 0x0000000000300f40 _dclear + .text 0x0000000000300f8c 0x3ac /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(bopti.c.o) + 0x0000000000300f8c _bopti_grid + 0x00000000003010e2 _bopti_render + 0x00000000003011e8 _bopti_render_clip + 0x00000000003012f0 _bopti_render_noclip + .text 0x0000000000301338 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(topti-asm.s.o) + .text 0x0000000000301338 0x218 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(getkey.c.o) + 0x00000000003014fc _getkey + 0x0000000000301508 _getkey_opt + 0x0000000000301514 _getkey_repeat + .text 0x0000000000301550 0x9c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(topti.c.o) + 0x0000000000301550 _dsize + .text 0x00000000003015ec 0x124 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dline.c.o) + 0x00000000003015ec _dline + .text 0x0000000000301710 0xbf4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(stdio.c.o) + 0x000000000030203c _kprint_opt + 0x0000000000302166 _kprint + 0x0000000000302240 _kvsprint + 0x0000000000302284 _sprintf + 0x00000000003022ac _vsprintf + 0x00000000003022cc _snprintf + 0x00000000003022ec _vsnprintf + .text 0x0000000000302304 0x1dc /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(t6k11.c.o) + 0x000000000030239c _t6k11_display + 0x0000000000302474 _t6k11_contrast + 0x00000000003024a0 _t6k11_backlight + .text 0x00000000003024e0 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(hardware.c.o) + .text 0x00000000003024e0 0x170 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(setup.c.o) + 0x0000000000302594 _gint_install + 0x0000000000302638 _gint_unload + .text 0x0000000000302650 0x2c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(vbr.s.o) + 0x0000000000302650 _gint_setvbr + .text 0x000000000030267c 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(exch.S.o) + .text 0x000000000030267c 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(inth.S.o) + .text 0x000000000030267c 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(syscalls.S.o) + .text 0x000000000030267c 0x60 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(bopti-asm.s.o) + 0x000000000030267c _bopti_asm_mono + 0x00000000003026a2 _bopti_asm_mono_alpha + 0x00000000003026d4 _bopti_asm_gray + 0x00000000003026d8 _bopti_asm_gray_alpha + .text 0x00000000003026dc 0x13c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dline.c.o) + 0x00000000003026dc _dhline + 0x0000000000302794 _dvline + .text 0x0000000000302818 0x54 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dpixel.c.o) + 0x0000000000302818 _dpixel + .text 0x000000000030286c 0x8c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(masks.c.o) + 0x000000000030286c _masks + .text 0x00000000003028f8 0x2d4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(keysc.c.o) + 0x0000000000302ac0 _pollevent + 0x0000000000302b94 _waitevent + .text 0x0000000000302bcc 0x124 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(iokbd.c.o) + 0x0000000000302bd8 _iokbd_row + 0x0000000000302cc0 _iokbd_scan + .text 0x0000000000302cf0 0xd6 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(memory.c.o) + 0x0000000000302cf0 _memcpy + 0x0000000000302da4 __memmove + 0x0000000000302da8 __memcmp + 0x0000000000302dac _memset + *fill* 0x0000000000302dc6 0x2 + .text 0x0000000000302dc8 0x574 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(tmu.c.o) + 0x00000000003030ec _timer_setup + 0x0000000000303180 _timer_delay + 0x00000000003031e0 _timer_start + 0x0000000000303214 _timer_reload + 0x0000000000303234 _timer_pause + 0x0000000000303268 _timer_stop + 0x00000000003032c4 _timer_timeout + 0x00000000003032d0 _timer_address + 0x000000000030330c _timer_clear + .text 0x000000000030333c 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(inth.s.o) + .text 0x000000000030333c 0x74 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(gint.c.o) + 0x000000000030333c _gint_intlevel + 0x000000000030338c _gint_inthandler + .text 0x00000000003033b0 0x150 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(cpg.c.o) + 0x00000000003034f4 _clock_freq + .text 0x0000000000303500 0x78 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_movmem.o) + 0x0000000000303500 ___movmem + 0x0000000000303500 ___movstr + 0x0000000000303534 ___movmemSI64 + 0x0000000000303534 ___movstrSI64 + 0x0000000000303538 ___movmemSI60 + 0x0000000000303538 ___movstrSI60 + 0x000000000030353c ___movstrSI56 + 0x000000000030353c ___movmemSI56 + 0x0000000000303540 ___movmemSI52 + 0x0000000000303540 ___movstrSI52 + 0x0000000000303544 ___movstrSI48 + 0x0000000000303544 ___movmemSI48 + 0x0000000000303548 ___movmemSI44 + 0x0000000000303548 ___movstrSI44 + 0x000000000030354c ___movstrSI40 + 0x000000000030354c ___movmemSI40 + 0x0000000000303550 ___movstrSI36 + 0x0000000000303550 ___movmemSI36 + 0x0000000000303554 ___movstrSI32 + 0x0000000000303554 ___movmemSI32 + 0x0000000000303558 ___movmemSI28 + 0x0000000000303558 ___movstrSI28 + 0x000000000030355c ___movmemSI24 + 0x000000000030355c ___movstrSI24 + 0x0000000000303560 ___movmemSI20 + 0x0000000000303560 ___movstrSI20 + 0x0000000000303564 ___movstrSI16 + 0x0000000000303564 ___movmemSI16 + 0x0000000000303568 ___movmemSI12 + 0x0000000000303568 ___movstrSI12 + 0x000000000030356c ___movstrSI8 + 0x000000000030356c ___movmemSI8 + 0x0000000000303570 ___movstrSI4 + 0x0000000000303570 ___movmemSI4 + .text 0x0000000000303578 0x1ec /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_udivdi3.o) + 0x0000000000303578 ___udivdi3 + .text 0x0000000000303764 0x98 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_si_to_df.o) + 0x0000000000303764 ___floatsidf + .text 0x00000000003037fc 0x94 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_df_to_si.o) + 0x00000000003037fc ___fixdfsi + .text 0x0000000000303890 0x6c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_udivsi3.o) + 0x00000000003038b2 ___udivsi3 + *fill* 0x00000000003038fc 0x4 + .text 0x0000000000303900 0x60 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000303900 ___udiv_qrnnd_16 + .text 0x0000000000303960 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_clz.o) + .text 0x0000000000303960 0x58 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_clzsi2.o) + 0x0000000000303960 ___clzsi2 + .text 0x00000000003039b8 0x25c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_pack_df.o) + 0x00000000003039b8 ___pack_d + .text 0x0000000000303c14 0xcc /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_unpack_df.o) + 0x0000000000303c14 ___unpack_d *(C P) -.gint.blocks 0x0000000000303c60 0x140 +.gint.blocks 0x0000000000303ce0 0x140 *(.gint.blocks) - .gint.blocks 0x0000000000303c60 0x20 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(exch.S.o) - 0x0000000000303c60 _exch_entry_7705 - 0x0000000000303c60 _exch_entry_7305 - .gint.blocks 0x0000000000303c80 0x40 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(inth.S.o) - 0x0000000000303c80 _inth_entry_7305 - 0x0000000000303ca0 _inth_entry_7705 - .gint.blocks 0x0000000000303cc0 0xe0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(inth.s.o) - 0x0000000000303cc0 _inth_tmu - 0x0000000000303d40 _inth_etmu2 - 0x0000000000303d60 _inth_etmu_help - 0x0000000000303d80 _inth_etmux + .gint.blocks 0x0000000000303ce0 0x20 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(exch.S.o) + 0x0000000000303ce0 _exch_entry_7705 + 0x0000000000303ce0 _exch_entry_7305 + .gint.blocks 0x0000000000303d00 0x40 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(inth.S.o) + 0x0000000000303d00 _inth_entry_7305 + 0x0000000000303d20 _inth_entry_7705 + .gint.blocks 0x0000000000303d40 0xe0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(inth.s.o) + 0x0000000000303d40 _inth_tmu + 0x0000000000303dc0 _inth_etmu2 + 0x0000000000303de0 _inth_etmu_help + 0x0000000000303e00 _inth_etmux -.gint.drivers 0x0000000000303da0 0x90 - 0x0000000000303da0 _bdrv = . +.gint.drivers 0x0000000000303e20 0x90 + 0x0000000000303e20 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x0000000000303da0 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(cpg.c.o) - 0x0000000000303da0 _drv_cpg + 0x0000000000303e20 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(cpg.c.o) + 0x0000000000303e20 _drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x0000000000303dc4 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(tmu.c.o) - 0x0000000000303dc4 _drv_tmu + 0x0000000000303e44 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(tmu.c.o) + 0x0000000000303e44 _drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x0000000000303de8 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(keysc.c.o) - 0x0000000000303de8 _drv_keysc + 0x0000000000303e68 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(keysc.c.o) + 0x0000000000303e68 _drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x0000000000303e0c 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(t6k11.c.o) - 0x0000000000303e0c _drv_t6k11 + 0x0000000000303e8c 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(t6k11.c.o) + 0x0000000000303e8c _drv_t6k11 *(.gint.drivers.6) - 0x0000000000303e30 _edrv = . + 0x0000000000303eb0 _edrv = . -.rodata 0x0000000000303e30 0x291c +.rodata 0x0000000000303eb0 0x291c *(.rodata .rodata.*) .rodata.str1.4 - 0x0000000000303e30 0x11 build-fx/src/main.o - *fill* 0x0000000000303e41 0x3 - .rodata 0x0000000000303e44 0x188 build-fx/assets/fonts/plague.png.o - 0x0000000000303e44 _font_plague - 0x0000000000303fcc _font_plague_end - .rodata 0x0000000000303fcc 0x6c build-fx/assets/img/avions.png.o - 0x0000000000303fcc _img_avions - 0x0000000000304038 _img_avions_end - .rodata 0x0000000000304038 0x180 build-fx/assets/img/capa.png.o - 0x0000000000304038 _img_capa - 0x00000000003041b8 _img_capa_end - .rodata 0x00000000003041b8 0x1444 build-fx/assets/img/fonds.png.o - 0x00000000003041b8 _img_fonds - 0x00000000003055fc _img_fonds_end - .rodata 0x00000000003055fc 0x120 build-fx/assets/img/pieces.png.o - 0x00000000003055fc _img_pieces - 0x000000000030571c _img_pieces_end - .rodata 0x000000000030571c 0x380 build-fx/assets/img/symp.png.o - 0x000000000030571c _img_symp - 0x0000000000305a9c _img_symp_end - .rodata 0x0000000000305a9c 0x404 build-fx/assets/img/titre.png.o - 0x0000000000305a9c _img_titre - 0x0000000000305ea0 _img_titre_end - .rodata 0x0000000000305ea0 0x340 build-fx/assets/img/trans.png.o - 0x0000000000305ea0 _img_trans - 0x00000000003061e0 _img_trans_end - .rodata 0x00000000003061e0 0x18 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(topti.c.o) + 0x0000000000303eb0 0x11 build-fx/src/main.o + *fill* 0x0000000000303ec1 0x3 + .rodata 0x0000000000303ec4 0x188 build-fx/assets/fonts/plague.png.o + 0x0000000000303ec4 _font_plague + 0x000000000030404c _font_plague_end + .rodata 0x000000000030404c 0x6c build-fx/assets/img/avions.png.o + 0x000000000030404c _img_avions + 0x00000000003040b8 _img_avions_end + .rodata 0x00000000003040b8 0x180 build-fx/assets/img/capa.png.o + 0x00000000003040b8 _img_capa + 0x0000000000304238 _img_capa_end + .rodata 0x0000000000304238 0x1444 build-fx/assets/img/fonds.png.o + 0x0000000000304238 _img_fonds + 0x000000000030567c _img_fonds_end + .rodata 0x000000000030567c 0x120 build-fx/assets/img/pieces.png.o + 0x000000000030567c _img_pieces + 0x000000000030579c _img_pieces_end + .rodata 0x000000000030579c 0x380 build-fx/assets/img/symp.png.o + 0x000000000030579c _img_symp + 0x0000000000305b1c _img_symp_end + .rodata 0x0000000000305b1c 0x404 build-fx/assets/img/titre.png.o + 0x0000000000305b1c _img_titre + 0x0000000000305f20 _img_titre_end + .rodata 0x0000000000305f20 0x340 build-fx/assets/img/trans.png.o + 0x0000000000305f20 _img_trans + 0x0000000000306260 _img_trans_end + .rodata 0x0000000000306260 0x18 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(topti.c.o) .rodata.str1.4 - 0x00000000003061f8 0x31 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(stdio.c.o) - *fill* 0x0000000000306229 0x3 + 0x0000000000306278 0x31 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(stdio.c.o) + *fill* 0x00000000003062a9 0x3 .rodata.str1.4 - 0x000000000030622c 0x6 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(t6k11.c.o) - *fill* 0x0000000000306232 0x2 - .rodata 0x0000000000306234 0x408 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(font5x7.png.o) - 0x0000000000306234 _gint_font5x7 - 0x000000000030663c _gint_font5x7_end + 0x00000000003062ac 0x6 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(t6k11.c.o) + *fill* 0x00000000003062b2 0x2 + .rodata 0x00000000003062b4 0x408 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(font5x7.png.o) + 0x00000000003062b4 _gint_font5x7 + 0x00000000003066bc _gint_font5x7_end .rodata.str1.4 - 0x000000000030663c 0x6 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(keysc.c.o) - *fill* 0x0000000000306642 0x2 + 0x00000000003066bc 0x6 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(keysc.c.o) + *fill* 0x00000000003066c2 0x2 .rodata.str1.4 - 0x0000000000306644 0x4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(tmu.c.o) + 0x00000000003066c4 0x4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(tmu.c.o) .rodata.str1.4 - 0x0000000000306648 0x4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(cpg.c.o) - .rodata 0x000000000030664c 0x100 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_clz.o) - 0x000000000030664c ___clz_tab + 0x00000000003066c8 0x4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(cpg.c.o) + .rodata 0x00000000003066cc 0x100 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_clz.o) + 0x00000000003066cc ___clz_tab -.rela.dyn 0x000000000030674c 0x0 - .rela.text 0x000000000030674c 0x0 build-fx/src/main.o +.rela.dyn 0x00000000003067cc 0x0 + .rela.text 0x00000000003067cc 0x0 build-fx/src/main.o .rela.pretext.entry - 0x000000000030674c 0x0 build-fx/src/main.o + 0x00000000003067cc 0x0 build-fx/src/main.o 0x0000000008100000 . = ORIGIN (ram) .bss 0x0000000008100000 0x550 @@ -526,8 +527,8 @@ LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a *fill* 0x0000000008100544 0xc 0x0000000000000550 _sbss = SIZEOF (.bss) -.data 0x0000000008100550 0x90 load address 0x000000000030674c - 0x000000000030674c _ldata = LOADADDR (.data) +.data 0x0000000008100550 0x90 load address 0x00000000003067cc + 0x00000000003067cc _ldata = LOADADDR (.data) 0x0000000008100550 _rdata = . *(.data .data.*) .data 0x0000000008100550 0x0 build-fx/src/main.o @@ -579,15 +580,15 @@ LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a 0x00000000081005e0 . = ALIGN (0x10) *fill* 0x00000000081005d8 0x8 -.data.4 0x00000000081005e0 0x0 load address 0x00000000003067dc +.data.4 0x00000000081005e0 0x0 load address 0x000000000030685c *(.data.4) 0x00000000081005e0 . = ALIGN (0x10) 0x0000000000000090 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x000000008800df00 _gint_vbr = 0x8800df00 0x000000008800f400 . = ORIGIN (rram) -.gint.data 0x000000008800f400 0x130 load address 0x00000000003067dc - 0x00000000003067dc _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x130 load address 0x000000000030685c + 0x000000000030685c _lgdata = LOADADDR (.gint.data) 0x000000008800f400 _rgdata = . *(.gint.data .gint.data.*) .gint.data 0x000000008800f400 0x4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dupdate.c.o) @@ -606,7 +607,7 @@ LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a *fill* 0x000000008800f52c 0x4 0x0000000000000130 _sgdata = SIZEOF (.gint.data) -.gint.bss 0x000000008800f530 0x210 load address 0x000000000030690c +.gint.bss 0x000000008800f530 0x210 load address 0x000000000030698c *(.gint.bss .gint.bss.*) .gint.bss 0x000000008800f530 0x1 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(t6k11.c.o) *fill* 0x000000008800f531 0x3 diff --git a/Sources/build-fx/src/Plague.bin b/Sources/build-fx/src/Plague.bin index 4003dd83e433b11cc9eb744a954579af74828202..8d55355b1fd3c359b471182fa4046b3896f3ab0d 100755 GIT binary patch delta 1599 zcmYjRZ%k8H6hHU1u)e+mrF{q}@cKvFqUgKWB6Sp2lx$)a!MPZdnGI{Ls3cn>bHtI9 z&ABvLnS@7-G5bLH;Fin;<1>pN{6H47`GL50L4upfT5VS{&0P!-lv5)EL)bGHBA}S7*t%zO>~a&`_TmE_HFSMUc-Q+bLhlg8bd_eew?{ zPNsGZ9PV*+3b8~cC|ROG=}fv*s*EUyrt*-3=(CV@M_F@|Y)QS=DP-Z;RG$*pjkf-w zi|a>2aqgTuvpe+tgMYZ{l%HFh^lz;v#?CPx5-newRHA}Ch)a6C;Urx*#LzYaJJdTt^Zmr*~QCfuNFZ->rA>(c# zawadz%c<-K`Vkl%a`{)JSzcp ze5UPq={G>D9-*%e^=pV5$&wyN5b1|?Nj;N2F2FyFZ^aX9jfLgU<@55Tl&8lr=fO?C zmm!ihQ!9xXkg769X-!6ysxuW*P0GH2hmwVqJqPo4ZFCnU@E7G>_&-#L+VHrRrOKm) z=<-}$q;RAlTRsv`nY)D#kvi~wrueB*3!NP0s}$+nq!nFJr`|MOPq%vS>D7X5PB)F2o>Q^sV3WUE0)Q!#VsZl3HCs%nHXtfy=)*z5iji}sO^YFQ~ zj(M0>y;=P+sbZ7oR{~zR-mVq6dNgld&Gp=c_hkr?P>0vOzY?t_EG}7GZoK~6Dl9oP z$>zPxL!GJrlNfCQpiSsUUe~2PoIRo#Y!1#5RGMrJOuVUSAK2C~EpFSxIYni`*1<%L zeIAAS*e;P0yw)8yMRcBiy&X>@kY-uqkj7Ua2S8oDxMk@${Kj5|1a9$DpzUZ6q*Gi{ zcSjf86t)1*eA?U%b?Th6gK(Y!Row6?;kNcG7hLa_SBXIBBcP3VsLg3r@2()^vLbq9 zGNX2R1VUz%-o`wcRs0*<$bve!F{azhR>Q3AL6mXrP3k}vPw*CavG(@#2)!lHF;LX^$ za?y-GB)c?*He|D9xM-x28=7pyeegWRxGIT;E^9WYz9_K}ERq6s`Va@yrhv0Cb`8%S z;TlFvA?6SZINg8>l4~NMIJx>Gh3UEyV?P*tNGCBb=Iu#npeTTan1Mb1q8{GHT&T&8WeHfwJ z;I_C}e{j=j)b=}#xzWt-dEdD4>;5;MW2dw2m7F#Kk+L|r*ckNAcZ~;_iR^%U!jX_g zid`%y{R3`m-|n^Dk9V)`0^7Um`C;?@KmK8K5j}G}tgq3NEEn&aI%V4ehu`2$J}z{! z1DZ`ar}ZTxx`b>)H>io9iYZ;}Q0=xX!TZMJe5|&O2}fu%43i z_sS&<&LFK7^(1}C&lH35Huj^WWa&}`1}Ac9XhIPfxczq&{AX2e>mf|tFP{;+?RKpH z&D=9ii<;bSoA|At%>Bw~WkYaFDoSC(s#}5PNu6Pb(iN-QfnJ)CItA)l6xXtB4Cxd0 zRYm1E54n92Swi#N>D5LUS4A8^c`#G7*c2hIid3iSkm$_5$Ea;Pk`L$XBG4R-xRvu3 zAwFS8^B(buj@)mEvOuAcBa9^_!j{&c)-HvKGo3=aB<3AU5@i=q8&05YM%3gNGr2f~ zZ{NX$7?^PasBT(l)x9{fo{&6}Rdg17PV#ZH?ovA7KUcVrW%OvSI?Q$C!Xe%R>QRY% zMW3XjQwa}_OdU6(|27{{@E~j+)&C0-dBa~M%eV}*68%_MovDK{Z3{O|7RJ0H%$f`m zTQymZn^)YHu-w1Ted=U;l74x5LMXcB<_^X(Eu1&ENbHVz9hul?F_H`{wmBqB77xG6 z zvbb~7FRRkvX_%E?Mjl8#9nGUCF95As#-h7M@o_;SC_BZO>PC_=1hj5nc)~qr?2E!O z9hQ#g?KjAP_|Se%ro`!UVC{|uK~;Z&af}My`Y)Ae!9^WWVXuCQX}Ti>8~O#(I8WNe zg~pdMDaCBl1*T?liZ524k@fYE34eBlDHJBct&T2)vh;$jZE0CP&F!bs6 ofEKPC>4$=3qxz9U^@!7=^FWP9D$s(}14XhQt^--@@U@VC0kE)|#{d8T diff --git a/Sources/build-fx/src/Plague.elf b/Sources/build-fx/src/Plague.elf index 841de2c2ea97c35cd5b73164937f1718d9078c03..26ff1a9eab540ca5858d72925a714950439e077b 100755 GIT binary patch delta 5005 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 N7;p$9@gUDc{|Crje3<|M delta 4912 zcmY*deNbH06+iFovR`k(WhH^c@UhE=kAS=jY{@n(xJ0JL3>BgnGnz>WA`nFr5=@vF zyIX^HYax<6Cc`N0Y}MM-Iup&NHq*(ps2Q7?<`3v#hO}uV3W13ki;|>tN}K-fdv|et z%;UY^Ip>~xzV5mA?bwJs_L@AHFZCYvibVU zq<-A>_&B>pjovyX++TNarcYURo@zgw`$qTe);l+*mY1sTSsE{zp*m%nI#0D6 zj>-e6QS(4x)-;}9r;t6|(^$}T>#18$-r9AGl+IhNA70t~`G4fh@oahZSawCW!X z_1S8mYL3W$@;uouDHl^`R!x_I`@*bAePPCP(Q$Hq`hH?*2u>P;k`~+Y#f!Pbyfz~! z76fC(9=s!HwZZUMN~1RfWo@Q0Gk-P~5dPzjt;gW1IrSy=xcb((r_np%K}>F3kyQ7U zRk`U$zcZPW>mJX!l*6Mio-;!ijkoMqi+Kz-;hwmwW1)TFfNj6|e&vY;PHAyQ_Yb7A z*nlnC^U6P`D7?klSda+Q&aXd{$_rna?!JBUGt~`bE-xJTd$)A*Z>rnWOD}SxY&I=3?A|nr!^3JbcB0KtnN&FLMfD`E^R6Gu42?fde^vV)^#=1<{p>pN@j@cM(O3} zjZ1YUhNo$^H68oh~43e&$+CU)UM5^-zT-l1MXi*_AHyrj4=9q+T5Kv zY3{RQQb?$9pN(f^EJ*eiVuh%{!jZUZWxkw_B3wBHg&3H!hFIpXR-g67GIb5-aB4iX z>N#lzgfkx%1HNI6tybi0knc|DT4te$7m2kxhY^}~@ zL*l{QFC|CrD6vxTVVK|ZfSh+t>+^VJ&pGXcCx<`Id%UYX=Ni3Z=J1lbH>7kdgw3Kt z7}#d-1G0BmYxdUi$B_3T9`UaHTqy;{*2J_y-@)$%k(D6AQrZ)xDJ)i`fUTWC5Zj{k zDPO$(2s-=-M!4L#JZAdD6e?+R^F-b37qYQ<)7n}|E}V}K7Q7(I<=3^0q8(`&!^GGg zV#Q8kNU063OHEE|ys-^Am`I4~dZWm^Q*5D|fQKNO# zMDTu^Sj8xeZi%3|;FjS-HL}yc2r*g zwg;*-XVq3Y5YgJIerg8=7Yj^ji&e+u>LIOveYYkBPDu^%(}Ax|T*ZmtR=HyESWUit z6PG1c=|B3xs!G<5^1d5N%ldRO8eEia4T1(c$_x@~59%+h2oWecbo7H2xvaI+AbF!= zm;~>T2Jac%m*el$6c&g5r~=#tn5>`x_cq+yA#TGR62rjDTqL&Y+%itQa2m@#lz_`m zc2_g8++|2C>%0y)J#p#pM?WfyM>;l3a@Cx6p|e_wXtrG&WyGjqSFRM$x^}&7sUE_J z3vj5CFKt{VeZ#;D@8|}W`BU%m28Ia7!IpU2lYfw8_gT%?b;P@pYx)?n*l#2h36>U7 zt-#OeB|p*iOc=frjS2E~Vf&K6|2E+(=ZnZE@D@}iPmUQ**r8x6&!u+b>BjUnP=iA1Wvr%{ z*8I##4^Pe-LB(V!5279en^XBh(R{mK;R|B7Dm7@+yH!swB%)#jwCe?ya0eR7`ZWKZ zvT$$|V*D~ABZm?D3q+4yd=B`yzLuowgT5D;Y{E}S;GOd512=eUmRDOK^W57x>d=q z4Rs$0`_F*0(Jk}ZGC!s7NFcb7AmCnNC0T$0w_bZ@gbRBwQIXfc=sq~85KRhxEK%AR zk5V?j#Y-7{u8+_DJ7SNl5t!@$6KTKL>n-O~^a&Mn#O}F}B!ardW=ND}@Kaez~^!D)r) zw1~hZRLwkazrd&>|0wVVVbGVr+##`4txNhbifFYVZws4^j|tr)e1F&+#Maegz=RN3 z!4DR|BA+%d@O9wrf?r1LVMHJi5nByB3?|`5tZgT-NP!LKIR6FUGQ+^ItrIzF5d)B8 z8=6PnHQ>LB2_gs=Gx)p!ZG5$H1JVoyw&Pg3kl_aCe1yDW5Ri%Sry$QGmPU6hc#UEmFLFLU@XfKPxWXy2$GQ4EY4u{Y^Q6$5hvP?L`4B>BDIlQ!L3 z7RG51TcY8&{Y~TJG7%U1JH%Y=aKR$@zlYt^kY6e6IFC;Yt~FuCB$_l&yy%to&qe1D ziL_sb87xWuCf1U_4}|?f;cZMX3M@*|f!!C!EnG$*9ogXXwI|x9qXb8XQ5d++Fwn6c z&A17C(PkZW#PSz`O9g+6{>=jd^dU};A8dj}ywrpTjt)$41JGg^+ZQH?;@E*MR#8ik~@&@F1A0sbAljtK3tkUEz>-Y;%Mm_kjgx93wvv1dw z<15Hdg6$QSAylPYUev6j5R*dz&HP+rxCLbHkeNu?fsgzyzzoAI1xqJ+DJc692#6-8 zRi6L$rl|Y`^7CMerJ!J=a`KEM^u^E|N`XatRep^h8KgWAgdYlO2A`VC%|Q7O-6;$B zO<@p@B|E2pxxq+@@+to)0NiZ&sa(^)R`_nl!%PbLy}L*AA5uLLNaYz+XDQ*!3bud z3hHYaqf_WV4~giedJtW1V1r?BYBA(b0KY4+T92r41&IMz5y`zb_4_a&sTHL@CN>vt zFd~%tI9g+K-2B6eG`W0I3-ssWBb92Hw!PnLsfnR=#I(Nt{FD}=>K5&t{s-jFh_=*U xh|{ufpb+1c4fs!5kN!TQ|35cSAnzK{uH*51zm{>NVCBpIgM9~ZCobff=>Pt$U~2#X diff --git a/Sources/build-fx/src/main.o b/Sources/build-fx/src/main.o index d16773e5fd633b136d28b3aae339eae68d619857..338a9ccda3f99b055f957fb38263336a77a3ca66 100644 GIT binary patch delta 939 zcmYk4Ur19?9LIm>-febwXWsqMrKq>9@D4JswxW@PTnVWNGwPv-pl!|N)Wqr476c1~ z80b=VqKBTshwvdVWP}erL`3%Bg9{ZcAG~?TBzg!g>?P9fACt4zE)}5y}-Q!&DlEV1dxI6ESOysc(+oj+e|^ER}f zvnj@qMQ#_<-9(d(s__UVO}o(Yw9gthcCnF(yiH7#a@H#dNNE{dfnf zG!@ygZX(<{zX%LW0fRZjV~)~c5w#^;e&?!-bZkpTyj8B|Z8GqcvXQTnZM7 z8>FKOWF0wJca&(8SYTd=9b^uwv6H0Nd%XFc8rxf~ji|kZAZ)4MNg8941Kn4ba*5>Bt_s(Sn7>S#0*AC4v&L@@#X$zZqQw^htQx-quxb4MPy~DgIHtuv15}o{Y4qWJDHwvLQE7x&9MDgq z$M~oI6xza^K|mSYOxdyDz!3@*{iH$All`!aGX^K658w?FewHp1&>VJ^HBdSa?kN*0 Nmq`k_>;F+K_ZPO&`Q88k delta 834 zcmZ9KUr19?9LK+B_il6EEw^hnwYKGqO~Je~Ekq5r3d&wqZyn5p@%M*C>c1rV`4$lWCR6v_ve!IaK7jB{hi<8{JwCa=2+R3 zQ`Ei$z@SA@pbkcG!oAQ*;h_xSdEcP$y8nXkZs4-y*@WNe)^v)hho(O;I-9nr5V09|waN@w*1H{n=~TzAU&X4f|Ibl|qO}8tqJ?CIZyoX_hTQa4pw1>;hn^~z$=bza>u`fN#e7> z>zHAT!$8BDLv&j6lz_G{r|XZYBby6w{6BxH=;!GiGojq^u!nWMw{G+XBJ?6#P4BV+ z5zByq6#G_zQkB;LPUQ{2sPcC}tMV3LQh6KLqw=p^J%9c&sRZ^Fd&mL6N+1?qjsa%% z@)TfEc^cqVeza@QCqRi>p8?8Mo&)x({9;!CWzbUu15krXdH~(RCc #include #include + + + //display : affiche l'écran de la calculatrice avec les données en rapport avec l'écran -void display(const image_t *img_fonds, const int *fond, const int *recherche, const int *adn); +void display(const image_t *img_fonds, const int *fond, const int *recherche, const int *adn, const int *contagion, const int *severite, const int *letalite); //floor : renvoie la partie entière d'une variable double floor(double x); @@ -30,8 +36,8 @@ int main(void) dfont(&font_plague);//On change la police pour la police custom - int fond = 1, fin = 0, key = 0;//variables diverses - int recherche = 25, adn = 888;//variables pour la maladie + int fond = 1, fin = 0, key = 0;//variables diverses pour le jeu + int recherche = 25, adn = 0, contagion = 10, severite = 20, letalite = 15;//variables pour la maladie dclear(C_WHITE); dimage(0, 0, &img_titre); @@ -41,7 +47,7 @@ int main(void) while (fin == 0) { - display(&img_fonds, &fond, &recherche, &adn); + display(&img_fonds, &fond, &recherche, &adn, &contagion, &severite, &letalite); key = getkey().key; switch (key) { @@ -61,7 +67,7 @@ int main(void) } -void display(const image_t *img_fonds, const int *fond, const int *recherche, const int *adn) +void display(const image_t *img_fonds, const int *fond, const int *recherche, const int *adn, const int *contagion, const int *severite, const int *letalite) { int variable; char string[100]; @@ -71,14 +77,30 @@ void display(const image_t *img_fonds, const int *fond, const int *recherche, co switch (*fond) // affichage supplémentaires dépendant des fonds. { case 2:// monde avec la barre en dessous - //recherche (max = 74 pxl) en % => 74 * (recherche / 100) - variable = 74 * *recherche/100; + //recherche (jauge = 74 pxl) donc : 74 * (recherche / 100) pour le pourcentage + variable = 74 * *recherche / 100; sprintf(string, "%d", *adn); dtext(9, 58, string, C_BLACK, C_NONE); dline(51, 60, 51 + variable, 60, C_BLACK); dline(51, 59, 51 + variable, 59, C_BLACK); break; case 3://Menu de modification de la maladie + // toutes les jauges = 68 pxl. + sprintf(string, "%d", *adn); + dtext(100, 30, string, C_BLACK, C_NONE); + + variable = 68 * *contagion / 25; + dline(10, 20, 10 + variable, 20, C_BLACK); + dline(10, 19, 10 + variable, 20, C_BLACK); + + /*variable = 68 * *severite / 20; + dline(10, 20, 10 + variable, 20, C_BLACK); + dline(10, 19, 10 + variable, 20, C_BLACK); + + variable = 68 * *letalite / 25; + dline(10, 20, 10 + variable, 20, C_BLACK); + dline(10, 19, 10 + variable, 20, C_BLACK);*/ + break; case 4://Menu info dtext(46, 25, "TOUX", C_BLACK, C_NONE);