diff --git a/Sources/Plague.g1a b/Sources/Plague.g1a index 40dbfc2..fbb3482 100644 Binary files a/Sources/Plague.g1a and b/Sources/Plague.g1a differ diff --git a/Sources/build-fx/map b/Sources/build-fx/map index 431c8aa..b7aaa59 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 - 0x0000000000005f44 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x0000000000005fec _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x888 *(.pretext.entry) @@ -232,250 +232,251 @@ 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 0x3258 +.text 0x0000000000300a88 0x3300 *(.text .text.*) - .text 0x0000000000300a88 0x180 build-fx/src/main.o - 0x0000000000300a88 _display - 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 + .text 0x0000000000300a88 0x1e0 build-fx/src/main.o + 0x0000000000300a88 _display_barre + 0x0000000000300b08 _display_menu + 0x0000000000300c0c _display_info + 0x0000000000300c48 _floor + .text.startup 0x0000000000300c68 0x118 build-fx/src/main.o + 0x0000000000300c68 _main + .text 0x0000000000300d80 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 0x0000000000300d80 0x1f4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(mmu.c.o) + 0x0000000000300d80 _tlb_addr + 0x0000000000300d94 _tlb_data + 0x0000000000300da8 _tlb_mapped_memory + 0x0000000000300e7c _utlb_addr + 0x0000000000300e8c _utlb_data + 0x0000000000300e9c _utlb_mapped_memory + .text 0x0000000000300f74 0x54 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dimage.c.o) + 0x0000000000300f74 _dimage + 0x0000000000300fa8 _dsubimage + .text 0x0000000000300fc8 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 0x0000000000300fc8 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dupdate.c.o) + 0x0000000000300fc8 _dupdate + 0x0000000000300fe0 _dupdate_noint + .text 0x0000000000300fec 0x4c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dclear.c.o) + 0x0000000000300fec _dclear + .text 0x0000000000301038 0x3ac /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(bopti.c.o) + 0x0000000000301038 _bopti_grid + 0x000000000030118e _bopti_render + 0x0000000000301294 _bopti_render_clip + 0x000000000030139c _bopti_render_noclip + .text 0x00000000003013e4 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 0x00000000003013e4 0x218 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(getkey.c.o) + 0x00000000003015a8 _getkey + 0x00000000003015b4 _getkey_opt + 0x00000000003015c0 _getkey_repeat + .text 0x00000000003015fc 0x9c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(topti.c.o) + 0x00000000003015fc _dsize + .text 0x0000000000301698 0x124 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dline.c.o) + 0x0000000000301698 _dline + .text 0x00000000003017bc 0xbf4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(stdio.c.o) + 0x00000000003020e8 _kprint_opt + 0x0000000000302212 _kprint + 0x00000000003022ec _kvsprint + 0x0000000000302330 _sprintf + 0x0000000000302358 _vsprintf + 0x0000000000302378 _snprintf + 0x0000000000302398 _vsnprintf + .text 0x00000000003023b0 0x1dc /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(t6k11.c.o) + 0x0000000000302448 _t6k11_display + 0x0000000000302520 _t6k11_contrast + 0x000000000030254c _t6k11_backlight + .text 0x000000000030258c 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 0x000000000030258c 0x170 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(setup.c.o) + 0x0000000000302640 _gint_install + 0x00000000003026e4 _gint_unload + .text 0x00000000003026fc 0x2c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(vbr.s.o) + 0x00000000003026fc _gint_setvbr + .text 0x0000000000302728 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 0x0000000000302728 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 0x0000000000302728 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 0x0000000000302728 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) + 0x0000000000302728 _bopti_asm_mono + 0x000000000030274e _bopti_asm_mono_alpha + 0x0000000000302780 _bopti_asm_gray + 0x0000000000302784 _bopti_asm_gray_alpha + .text 0x0000000000302788 0x13c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dline.c.o) + 0x0000000000302788 _dhline + 0x0000000000302840 _dvline + .text 0x00000000003028c4 0x54 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(dpixel.c.o) + 0x00000000003028c4 _dpixel + .text 0x0000000000302918 0x8c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(masks.c.o) + 0x0000000000302918 _masks + .text 0x00000000003029a4 0x2d4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(keysc.c.o) + 0x0000000000302b6c _pollevent + 0x0000000000302c40 _waitevent + .text 0x0000000000302c78 0x124 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(iokbd.c.o) + 0x0000000000302c84 _iokbd_row + 0x0000000000302d6c _iokbd_scan + .text 0x0000000000302d9c 0xd6 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(memory.c.o) + 0x0000000000302d9c _memcpy + 0x0000000000302e50 __memmove + 0x0000000000302e54 __memcmp + 0x0000000000302e58 _memset + *fill* 0x0000000000302e72 0x2 + .text 0x0000000000302e74 0x574 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(tmu.c.o) + 0x0000000000303198 _timer_setup + 0x000000000030322c _timer_delay + 0x000000000030328c _timer_start + 0x00000000003032c0 _timer_reload + 0x00000000003032e0 _timer_pause + 0x0000000000303314 _timer_stop + 0x0000000000303370 _timer_timeout + 0x000000000030337c _timer_address + 0x00000000003033b8 _timer_clear + .text 0x00000000003033e8 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 0x00000000003033e8 0x74 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(gint.c.o) + 0x00000000003033e8 _gint_intlevel + 0x0000000000303438 _gint_inthandler + .text 0x000000000030345c 0x150 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(cpg.c.o) + 0x00000000003035a0 _clock_freq + .text 0x00000000003035ac 0x78 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_movmem.o) + 0x00000000003035ac ___movmem + 0x00000000003035ac ___movstr + 0x00000000003035e0 ___movmemSI64 + 0x00000000003035e0 ___movstrSI64 + 0x00000000003035e4 ___movmemSI60 + 0x00000000003035e4 ___movstrSI60 + 0x00000000003035e8 ___movstrSI56 + 0x00000000003035e8 ___movmemSI56 + 0x00000000003035ec ___movmemSI52 + 0x00000000003035ec ___movstrSI52 + 0x00000000003035f0 ___movstrSI48 + 0x00000000003035f0 ___movmemSI48 + 0x00000000003035f4 ___movmemSI44 + 0x00000000003035f4 ___movstrSI44 + 0x00000000003035f8 ___movstrSI40 + 0x00000000003035f8 ___movmemSI40 + 0x00000000003035fc ___movstrSI36 + 0x00000000003035fc ___movmemSI36 + 0x0000000000303600 ___movstrSI32 + 0x0000000000303600 ___movmemSI32 + 0x0000000000303604 ___movmemSI28 + 0x0000000000303604 ___movstrSI28 + 0x0000000000303608 ___movmemSI24 + 0x0000000000303608 ___movstrSI24 + 0x000000000030360c ___movmemSI20 + 0x000000000030360c ___movstrSI20 + 0x0000000000303610 ___movstrSI16 + 0x0000000000303610 ___movmemSI16 + 0x0000000000303614 ___movmemSI12 + 0x0000000000303614 ___movstrSI12 + 0x0000000000303618 ___movstrSI8 + 0x0000000000303618 ___movmemSI8 + 0x000000000030361c ___movstrSI4 + 0x000000000030361c ___movmemSI4 + .text 0x0000000000303624 0x1ec /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_udivdi3.o) + 0x0000000000303624 ___udivdi3 + .text 0x0000000000303810 0x98 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_si_to_df.o) + 0x0000000000303810 ___floatsidf + .text 0x00000000003038a8 0x94 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_df_to_si.o) + 0x00000000003038a8 ___fixdfsi + .text 0x000000000030393c 0x6c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_udivsi3.o) + 0x000000000030395e ___udivsi3 + .text 0x00000000003039a8 0x60 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_udiv_qrnnd_16.o) + 0x00000000003039a8 ___udiv_qrnnd_16 + .text 0x0000000000303a08 0x0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_clz.o) + .text 0x0000000000303a08 0x58 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_clzsi2.o) + 0x0000000000303a08 ___clzsi2 + .text 0x0000000000303a60 0x25c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_pack_df.o) + 0x0000000000303a60 ___pack_d + .text 0x0000000000303cbc 0xcc /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_unpack_df.o) + 0x0000000000303cbc ___unpack_d *(C P) -.gint.blocks 0x0000000000303ce0 0x140 +.gint.blocks 0x0000000000303d90 0x140 *(.gint.blocks) - .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.blocks 0x0000000000303d90 0x20 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(exch.S.o) + 0x0000000000303d90 _exch_entry_7705 + 0x0000000000303d90 _exch_entry_7305 + .gint.blocks 0x0000000000303db0 0x40 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(inth.S.o) + 0x0000000000303db0 _inth_entry_7305 + 0x0000000000303dd0 _inth_entry_7705 + .gint.blocks 0x0000000000303df0 0xe0 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(inth.s.o) + 0x0000000000303df0 _inth_tmu + 0x0000000000303e70 _inth_etmu2 + 0x0000000000303e90 _inth_etmu_help + 0x0000000000303eb0 _inth_etmux -.gint.drivers 0x0000000000303e20 0x90 - 0x0000000000303e20 _bdrv = . +.gint.drivers 0x0000000000303ed0 0x90 + 0x0000000000303ed0 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 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 + 0x0000000000303ed0 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(cpg.c.o) + 0x0000000000303ed0 _drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 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 + 0x0000000000303ef4 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(tmu.c.o) + 0x0000000000303ef4 _drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 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 + 0x0000000000303f18 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(keysc.c.o) + 0x0000000000303f18 _drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 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 + 0x0000000000303f3c 0x24 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(t6k11.c.o) + 0x0000000000303f3c _drv_t6k11 *(.gint.drivers.6) - 0x0000000000303eb0 _edrv = . + 0x0000000000303f60 _edrv = . -.rodata 0x0000000000303eb0 0x291c +.rodata 0x0000000000303f60 0x291c *(.rodata .rodata.*) .rodata.str1.4 - 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) + 0x0000000000303f60 0x11 build-fx/src/main.o + *fill* 0x0000000000303f71 0x3 + .rodata 0x0000000000303f74 0x188 build-fx/assets/fonts/plague.png.o + 0x0000000000303f74 _font_plague + 0x00000000003040fc _font_plague_end + .rodata 0x00000000003040fc 0x6c build-fx/assets/img/avions.png.o + 0x00000000003040fc _img_avions + 0x0000000000304168 _img_avions_end + .rodata 0x0000000000304168 0x180 build-fx/assets/img/capa.png.o + 0x0000000000304168 _img_capa + 0x00000000003042e8 _img_capa_end + .rodata 0x00000000003042e8 0x1444 build-fx/assets/img/fonds.png.o + 0x00000000003042e8 _img_fonds + 0x000000000030572c _img_fonds_end + .rodata 0x000000000030572c 0x120 build-fx/assets/img/pieces.png.o + 0x000000000030572c _img_pieces + 0x000000000030584c _img_pieces_end + .rodata 0x000000000030584c 0x380 build-fx/assets/img/symp.png.o + 0x000000000030584c _img_symp + 0x0000000000305bcc _img_symp_end + .rodata 0x0000000000305bcc 0x404 build-fx/assets/img/titre.png.o + 0x0000000000305bcc _img_titre + 0x0000000000305fd0 _img_titre_end + .rodata 0x0000000000305fd0 0x340 build-fx/assets/img/trans.png.o + 0x0000000000305fd0 _img_trans + 0x0000000000306310 _img_trans_end + .rodata 0x0000000000306310 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 - 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 + 0x0000000000306328 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* 0x0000000000306359 0x3 .rodata.str1.4 - 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 + 0x000000000030635c 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* 0x0000000000306362 0x2 + .rodata 0x0000000000306364 0x408 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-fx.a(font5x7.png.o) + 0x0000000000306364 _gint_font5x7 + 0x000000000030676c _gint_font5x7_end .rodata.str1.4 - 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 + 0x000000000030676c 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* 0x0000000000306772 0x2 .rodata.str1.4 - 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) + 0x0000000000306774 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 - 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 + 0x0000000000306778 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 0x000000000030677c 0x100 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_clz.o) + 0x000000000030677c ___clz_tab -.rela.dyn 0x00000000003067cc 0x0 - .rela.text 0x00000000003067cc 0x0 build-fx/src/main.o +.rela.dyn 0x000000000030687c 0x0 + .rela.text 0x000000000030687c 0x0 build-fx/src/main.o .rela.pretext.entry - 0x00000000003067cc 0x0 build-fx/src/main.o + 0x000000000030687c 0x0 build-fx/src/main.o 0x0000000008100000 . = ORIGIN (ram) .bss 0x0000000008100000 0x550 @@ -527,8 +528,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 0x00000000003067cc - 0x00000000003067cc _ldata = LOADADDR (.data) +.data 0x0000000008100550 0x90 load address 0x000000000030687c + 0x000000000030687c _ldata = LOADADDR (.data) 0x0000000008100550 _rdata = . *(.data .data.*) .data 0x0000000008100550 0x0 build-fx/src/main.o @@ -580,15 +581,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 0x000000000030685c +.data.4 0x00000000081005e0 0x0 load address 0x000000000030690c *(.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 0x000000000030685c - 0x000000000030685c _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x130 load address 0x000000000030690c + 0x000000000030690c _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) @@ -607,7 +608,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 0x000000000030698c +.gint.bss 0x000000008800f530 0x210 load address 0x0000000000306a3c *(.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 8d55355..fcd5b89 100755 Binary files a/Sources/build-fx/src/Plague.bin and b/Sources/build-fx/src/Plague.bin differ diff --git a/Sources/build-fx/src/Plague.elf b/Sources/build-fx/src/Plague.elf index 26ff1a9..7199fd3 100755 Binary files a/Sources/build-fx/src/Plague.elf and b/Sources/build-fx/src/Plague.elf differ diff --git a/Sources/build-fx/src/main.o b/Sources/build-fx/src/main.o index 338a9cc..180efcc 100644 Binary files a/Sources/build-fx/src/main.o and b/Sources/build-fx/src/main.o differ diff --git a/Sources/src/main.c b/Sources/src/main.c index 8f10ea3..143c35f 100755 --- a/Sources/src/main.c +++ b/Sources/src/main.c @@ -1,10 +1,9 @@ /* Nom : Plague Version : - dev- - Dernière modification : 26 Juillet 2019 + Dernière modification : 27 Juillet 2019 Liste des choses à faire : - - Optimiser 'Display' en limitant le nombre d'arguments */ #include @@ -12,14 +11,19 @@ #include +//display_barre : affiche les infos de la barre en dessous du monde +void display_barre(const int *adn, const int *recherche); +//display_menu : affiche les données sur l'écran menu du jeu à partir duquel on peut modifier la maladie +void display_menu(const int *adn, const int *contagion, const int *severite, const int *letalite); -//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, const int *contagion, const int *severite, const int *letalite); +//display_info : affiche les infos sur la maladie selectionnée +void display_info(void); //floor : renvoie la partie entière d'une variable double floor(double x); + int main(void) { extern const font_t font_plague;//déclaration de la police custom @@ -37,7 +41,7 @@ int main(void) dfont(&font_plague);//On change la police pour la police custom 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 + int recherche = 25, adn = 0, contagion = 0, severite = 0, letalite = 0;//variables pour la maladie dclear(C_WHITE); dimage(0, 0, &img_titre); @@ -47,18 +51,37 @@ int main(void) while (fin == 0) { - display(&img_fonds, &fond, &recherche, &adn, &contagion, &severite, &letalite); + dclear(C_WHITE); + dsubimage(0, 0, &img_fonds, 0, 64 * (fond - 1) + (fond - 1), 128, 64, 0); + + switch (fond)// affichage supplémentaires dépendant des fonds. + { + case 2: + display_barre(&adn, &recherche);// monde avec la barre en dessous + break; + case 3: + display_menu(&adn, &contagion, &severite, &letalite);//Menu de modification de la maladie + break; + case 4: + display_info();//Menu info + break; + } + + dupdate(); key = getkey().key; + switch (key) { - case KEY_LEFT: - if(fond > 1) fond -= 1; + case KEY_OPTN: + if (fond == 1) fond = 2; + else if (fond == 2) fond = 1; break; - case KEY_RIGHT: - if (fond < 5) fond += 1; + case KEY_VARS: + fond = 3; break; case KEY_EXIT: - fin = 1; + if (fond != 1) fond = 1; + else fin = 1; break; } @@ -67,50 +90,48 @@ int main(void) } -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) +void display_barre(const int *adn, const int *recherche) { + //recherche (jauge = 74 pxl) donc : 74 * (recherche / 100) pour le pourcentage int variable; char string[100]; - dclear(C_WHITE); - dsubimage(0, 0, &(*img_fonds), 0, 64 * (*fond - 1) + (*fond - 1), 128, 64, 0); - - switch (*fond) // affichage supplémentaires dépendant des fonds. - { - case 2:// monde avec la barre en dessous - //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); - dtext(73, 33, "0123", C_BLACK, C_NONE); - break; - - } - dupdate(); + 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); } + +void display_menu(const int *adn, const int *contagion, const int *severite, const int *letalite) +{ + // toutes les jauges font 68 pxl de long. + int variable; + char string[100]; + sprintf(string, "%d", *adn); + dtext(102, 37, string, C_BLACK, C_NONE); + + variable = 68 * *contagion / 25; + dline(57, 48, 57 + variable, 48, C_BLACK); + dline(57, 49, 57 + variable, 49, C_BLACK); + + variable = 68 * *severite / 20; + dline(57, 54, 57 + variable, 54, C_BLACK); + dline(57, 55, 57 + variable, 55, C_BLACK); + + variable = 68 * *letalite / 25; + dline(57, 60, 57 + variable, 60, C_BLACK); + dline(57, 61, 57 + variable, 61, C_BLACK); +} + + +void display_info(void) +{ + dtext(46, 25, "TOUX", C_BLACK, C_NONE); + dtext(73, 33, "0123", C_BLACK, C_NONE); +} + + double floor(double x) { return (int)x;