diff --git a/BitmapWs.g1a b/BitmapWs.g1a index a7f49f8..06b1015 100644 Binary files a/BitmapWs.g1a and b/BitmapWs.g1a differ diff --git a/assets-fx/img/water.png b/assets-fx/img/water.png new file mode 100644 index 0000000..233fd87 Binary files /dev/null and b/assets-fx/img/water.png differ diff --git a/build-fx/assets/img/water.png.o b/build-fx/assets/img/water.png.o new file mode 100644 index 0000000..9629af3 Binary files /dev/null and b/build-fx/assets/img/water.png.o differ diff --git a/build-fx/map b/build-fx/map index ed54f71..bf1eefb 100644 --- a/build-fx/map +++ b/build-fx/map @@ -70,7 +70,7 @@ Archive member included to satisfy reference by file (symbol) Allocating common symbols Common symbol size file -map 0x258 build-fx/src/map.o +map 0xc00 build-fx/src/map.o Discarded input sections @@ -115,12 +115,13 @@ LOAD build-fx/src/item.o LOAD build-fx/src/main.o LOAD build-fx/src/map.o LOAD build-fx/assets/img/brouillard.png.o +LOAD build-fx/assets/img/water.png.o LOAD build-fx/assets/img/houses.png.o LOAD build-fx/assets/img/wall.png.o LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x0000000000300000 _brom = 0x300000 - 0x0000000000002b9c _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x0000000000002dd0 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8a8 *(.pretext.entry) @@ -160,219 +161,224 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *(.dtors .dtors.*) 0x0000000000300aa8 _etors = . -.text 0x0000000000300aa8 0x20d8 +.text 0x0000000000300aa8 0x2208 *(.text .text.*) - .text 0x0000000000300aa8 0x1c8 build-fx/src/item.o + .text 0x0000000000300aa8 0x28c build-fx/src/item.o 0x0000000000300aa8 get_item_type 0x0000000000300ac4 display_item_etendu 0x0000000000300b60 display_brouillard - 0x0000000000300bf0 display_item - 0x0000000000300c64 display_case - .text 0x0000000000300c70 0x0 build-fx/src/main.o - .text.startup 0x0000000000300c70 0x58 build-fx/src/main.o - 0x0000000000300c70 main - .text 0x0000000000300cc8 0x188 build-fx/src/map.o - 0x0000000000300cc8 create_map - 0x0000000000300d50 get_item - 0x0000000000300d78 get_visibility - 0x0000000000300da8 set_item - 0x0000000000300de0 display - .text 0x0000000000300e50 0x1c8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) - 0x0000000000300e50 getkey_opt - 0x0000000000300fd0 getkey - 0x0000000000300fdc getkey_repeat - .text 0x0000000000301018 0x2c8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - 0x00000000003011bc pollevent - 0x00000000003012a8 waitevent - .text 0x00000000003012e0 0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - 0x00000000003012e0 dclear - .text 0x000000000030132c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) - .text 0x000000000030132c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .text 0x000000000030132c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .text 0x000000000030132c 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) - 0x000000000030132c dupdate - 0x0000000000301344 dupdate_noint - .text 0x0000000000301350 0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - 0x0000000000301350 dimage - 0x00000000003013a4 dsubimage - .text 0x0000000000301418 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - 0x0000000000301418 dsize - .text 0x00000000003014b4 0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - 0x00000000003017d4 timer_setup - 0x0000000000301864 timer_delay - 0x00000000003018c4 timer_start - 0x00000000003018f8 timer_reload - 0x0000000000301918 timer_pause - 0x000000000030194c timer_stop - 0x00000000003019a8 timer_timeout - 0x00000000003019b4 timer_address - 0x00000000003019f0 timer_clear - .text 0x0000000000301a20 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - 0x0000000000301a20 gint_intlevel - 0x0000000000301a74 gint_inthandler - .text 0x0000000000301a98 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .text 0x0000000000301a98 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .text 0x0000000000301a98 0x170 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - 0x0000000000301b4c gint_install - 0x0000000000301bf0 gint_unload - .text 0x0000000000301c08 0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - 0x0000000000301ca0 t6k11_display - 0x0000000000301d74 t6k11_contrast - 0x0000000000301da0 t6k11_backlight - .text 0x0000000000301de0 0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - 0x0000000000301de0 memcpy - 0x0000000000301e9a _memmove - 0x0000000000301e9e _memcmp - 0x0000000000301ea2 memset - .text 0x0000000000301ebc 0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) - 0x0000000000301ec8 iokbd_row - 0x0000000000301fb0 iokbd_scan - .text 0x0000000000301fe0 0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x0000000000302124 clock_freq - .text 0x0000000000302130 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - 0x0000000000302130 bopti_asm_mono - 0x0000000000302156 bopti_asm_mono_alpha - .text 0x0000000000302188 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - 0x0000000000302188 bopti_grid - 0x00000000003022fc bopti_render - 0x0000000000302424 bopti_render_clip - 0x0000000000302538 bopti_render_noclip - .text 0x0000000000302590 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - 0x0000000000302590 masks - .text 0x000000000030262c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .text 0x000000000030262c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) - .text 0x000000000030262c 0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - 0x000000000030262c gint_setvbr - .text 0x0000000000302658 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - 0x0000000000302658 tlb_addr - 0x000000000030266c tlb_data - 0x0000000000302680 tlb_mapped_memory - 0x0000000000302754 utlb_addr - 0x0000000000302764 utlb_data - 0x0000000000302774 utlb_mapped_memory - .text 0x000000000030284c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .text 0x000000000030284c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .text 0x000000000030284c 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - 0x000000000030284c __movstr - 0x000000000030284c __movmem - 0x0000000000302880 __movmemSI64 - 0x0000000000302880 __movstrSI64 - 0x0000000000302884 __movstrSI60 - 0x0000000000302884 __movmemSI60 - 0x0000000000302888 __movmemSI56 - 0x0000000000302888 __movstrSI56 - 0x000000000030288c __movstrSI52 - 0x000000000030288c __movmemSI52 - 0x0000000000302890 __movstrSI48 - 0x0000000000302890 __movmemSI48 - 0x0000000000302894 __movstrSI44 - 0x0000000000302894 __movmemSI44 - 0x0000000000302898 __movstrSI40 - 0x0000000000302898 __movmemSI40 - 0x000000000030289c __movstrSI36 - 0x000000000030289c __movmemSI36 - 0x00000000003028a0 __movmemSI32 - 0x00000000003028a0 __movstrSI32 - 0x00000000003028a4 __movmemSI28 - 0x00000000003028a4 __movstrSI28 - 0x00000000003028a8 __movstrSI24 - 0x00000000003028a8 __movmemSI24 - 0x00000000003028ac __movmemSI20 - 0x00000000003028ac __movstrSI20 - 0x00000000003028b0 __movstrSI16 - 0x00000000003028b0 __movmemSI16 - 0x00000000003028b4 __movmemSI12 - 0x00000000003028b4 __movstrSI12 - 0x00000000003028b8 __movmemSI8 - 0x00000000003028b8 __movstrSI8 - 0x00000000003028bc __movmemSI4 - 0x00000000003028bc __movstrSI4 - .text 0x00000000003028c4 0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - 0x00000000003028c4 __udivdi3 - .text 0x0000000000302ab4 0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - 0x0000000000302ad6 __udivsi3 - .text 0x0000000000302b20 0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000302b20 __udiv_qrnnd_16 - .text 0x0000000000302b80 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + 0x0000000000300bfc display_water + 0x0000000000300c8c display_case + .text 0x0000000000300d34 0x0 build-fx/src/main.o + .text.startup 0x0000000000300d34 0x58 build-fx/src/main.o + 0x0000000000300d34 main + .text 0x0000000000300d8c 0x1e8 build-fx/src/map.o + 0x0000000000300d8c create_map + 0x0000000000300e44 get_item + 0x0000000000300e70 get_visibility + 0x0000000000300e9c get_terrain + 0x0000000000300ec8 set_item + 0x0000000000300f04 display + .text 0x0000000000300f74 0x1c8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + 0x0000000000300f74 getkey_opt + 0x00000000003010f4 getkey + 0x0000000000301100 getkey_repeat + .text 0x000000000030113c 0x2c8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + 0x00000000003012e0 pollevent + 0x00000000003013cc waitevent + .text 0x0000000000301404 0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + 0x0000000000301404 dclear + .text 0x0000000000301450 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) + .text 0x0000000000301450 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .text 0x0000000000301450 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .text 0x0000000000301450 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) + 0x0000000000301450 dupdate + 0x0000000000301468 dupdate_noint + .text 0x0000000000301474 0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + 0x0000000000301474 dimage + 0x00000000003014c8 dsubimage + .text 0x000000000030153c 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x000000000030153c dsize + .text 0x00000000003015d8 0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x00000000003018f8 timer_setup + 0x0000000000301988 timer_delay + 0x00000000003019e8 timer_start + 0x0000000000301a1c timer_reload + 0x0000000000301a3c timer_pause + 0x0000000000301a70 timer_stop + 0x0000000000301acc timer_timeout + 0x0000000000301ad8 timer_address + 0x0000000000301b14 timer_clear + .text 0x0000000000301b44 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + 0x0000000000301b44 gint_intlevel + 0x0000000000301b98 gint_inthandler + .text 0x0000000000301bbc 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .text 0x0000000000301bbc 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .text 0x0000000000301bbc 0x170 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + 0x0000000000301c70 gint_install + 0x0000000000301d14 gint_unload + .text 0x0000000000301d2c 0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x0000000000301dc4 t6k11_display + 0x0000000000301e98 t6k11_contrast + 0x0000000000301ec4 t6k11_backlight + .text 0x0000000000301f04 0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + 0x0000000000301f04 memcpy + 0x0000000000301fbe _memmove + 0x0000000000301fc2 _memcmp + 0x0000000000301fc6 memset + .text 0x0000000000301fe0 0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + 0x0000000000301fec iokbd_row + 0x00000000003020d4 iokbd_scan + .text 0x0000000000302104 0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x0000000000302248 clock_freq + .text 0x0000000000302254 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + 0x0000000000302254 bopti_asm_mono + 0x000000000030227a bopti_asm_mono_alpha + .text 0x00000000003022ac 0x410 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + 0x00000000003022ac bopti_grid + 0x0000000000302420 bopti_render + 0x0000000000302550 bopti_render_clip + 0x0000000000302664 bopti_render_noclip + .text 0x00000000003026bc 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + 0x00000000003026bc masks + .text 0x0000000000302758 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .text 0x0000000000302758 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) + .text 0x0000000000302758 0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + 0x0000000000302758 gint_setvbr + .text 0x0000000000302784 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + 0x0000000000302784 tlb_addr + 0x0000000000302798 tlb_data + 0x00000000003027ac tlb_mapped_memory + 0x0000000000302880 utlb_addr + 0x0000000000302890 utlb_data + 0x00000000003028a0 utlb_mapped_memory + .text 0x0000000000302978 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .text 0x0000000000302978 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .text 0x0000000000302978 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + 0x0000000000302978 __movstr + 0x0000000000302978 __movmem + 0x00000000003029ac __movmemSI64 + 0x00000000003029ac __movstrSI64 + 0x00000000003029b0 __movstrSI60 + 0x00000000003029b0 __movmemSI60 + 0x00000000003029b4 __movmemSI56 + 0x00000000003029b4 __movstrSI56 + 0x00000000003029b8 __movstrSI52 + 0x00000000003029b8 __movmemSI52 + 0x00000000003029bc __movstrSI48 + 0x00000000003029bc __movmemSI48 + 0x00000000003029c0 __movstrSI44 + 0x00000000003029c0 __movmemSI44 + 0x00000000003029c4 __movstrSI40 + 0x00000000003029c4 __movmemSI40 + 0x00000000003029c8 __movstrSI36 + 0x00000000003029c8 __movmemSI36 + 0x00000000003029cc __movmemSI32 + 0x00000000003029cc __movstrSI32 + 0x00000000003029d0 __movmemSI28 + 0x00000000003029d0 __movstrSI28 + 0x00000000003029d4 __movstrSI24 + 0x00000000003029d4 __movmemSI24 + 0x00000000003029d8 __movmemSI20 + 0x00000000003029d8 __movstrSI20 + 0x00000000003029dc __movstrSI16 + 0x00000000003029dc __movmemSI16 + 0x00000000003029e0 __movmemSI12 + 0x00000000003029e0 __movstrSI12 + 0x00000000003029e4 __movmemSI8 + 0x00000000003029e4 __movstrSI8 + 0x00000000003029e8 __movmemSI4 + 0x00000000003029e8 __movstrSI4 + .text 0x00000000003029f0 0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + 0x00000000003029f0 __udivdi3 + .text 0x0000000000302be0 0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + 0x0000000000302c02 __udivsi3 + *fill* 0x0000000000302c4c 0x4 + .text 0x0000000000302c50 0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000302c50 __udiv_qrnnd_16 + .text 0x0000000000302cb0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) *(C P) -.gint.blocks 0x0000000000302b80 0x140 +.gint.blocks 0x0000000000302cb0 0x140 *(.gint.blocks) - .gint.blocks 0x0000000000302b80 0xe0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - 0x0000000000302b80 inth_tmu - 0x0000000000302c00 inth_etmu2 - 0x0000000000302c20 inth_etmu_help - 0x0000000000302c40 inth_etmux - .gint.blocks 0x0000000000302c60 0x20 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) - 0x0000000000302c60 exch_entry_7705 - 0x0000000000302c60 exch_entry_7305 - .gint.blocks 0x0000000000302c80 0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - 0x0000000000302c80 inth_entry_7305 - 0x0000000000302ca0 inth_entry_7705 + .gint.blocks 0x0000000000302cb0 0xe0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + 0x0000000000302cb0 inth_tmu + 0x0000000000302d30 inth_etmu2 + 0x0000000000302d50 inth_etmu_help + 0x0000000000302d70 inth_etmux + .gint.blocks 0x0000000000302d90 0x20 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) + 0x0000000000302d90 exch_entry_7705 + 0x0000000000302d90 exch_entry_7305 + .gint.blocks 0x0000000000302db0 0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + 0x0000000000302db0 inth_entry_7305 + 0x0000000000302dd0 inth_entry_7705 -.gint.drivers 0x0000000000302cc0 0x90 - 0x0000000000302cc0 _bdrv = . +.gint.drivers 0x0000000000302df0 0x90 + 0x0000000000302df0 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x0000000000302cc0 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x0000000000302cc0 drv_cpg + 0x0000000000302df0 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x0000000000302df0 drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x0000000000302ce4 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - 0x0000000000302ce4 drv_tmu + 0x0000000000302e14 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x0000000000302e14 drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x0000000000302d08 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - 0x0000000000302d08 drv_keysc + 0x0000000000302e38 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + 0x0000000000302e38 drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x0000000000302d2c 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - 0x0000000000302d2c drv_t6k11 + 0x0000000000302e5c 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x0000000000302e5c drv_t6k11 *(.gint.drivers.6) - 0x0000000000302d50 _edrv = . + 0x0000000000302e80 _edrv = . -.rodata 0x0000000000302d50 0x6f4 +.rodata 0x0000000000302e80 0x7f8 *(.rodata .rodata.*) .rodata.str1.4 - 0x0000000000302d50 0x15 build-fx/src/main.o - *fill* 0x0000000000302d65 0x3 - .rodata 0x0000000000302d68 0x84 build-fx/assets/img/brouillard.png.o - 0x0000000000302d68 img_brouillard - 0x0000000000302dec img_brouillard_end - .rodata 0x0000000000302dec 0x84 build-fx/assets/img/houses.png.o - 0x0000000000302dec img_houses - 0x0000000000302e70 img_houses_end - .rodata 0x0000000000302e70 0x84 build-fx/assets/img/wall.png.o - 0x0000000000302e70 img_wall - 0x0000000000302ef4 img_wall_end + 0x0000000000302e80 0x15 build-fx/src/main.o + *fill* 0x0000000000302e95 0x3 + .rodata 0x0000000000302e98 0x104 build-fx/assets/img/brouillard.png.o + 0x0000000000302e98 img_brouillard + 0x0000000000302f9c img_brouillard_end + .rodata 0x0000000000302f9c 0x84 build-fx/assets/img/water.png.o + 0x0000000000302f9c img_water + 0x0000000000303020 img_water_end + .rodata 0x0000000000303020 0x84 build-fx/assets/img/houses.png.o + 0x0000000000303020 img_houses + 0x00000000003030a4 img_houses_end + .rodata 0x00000000003030a4 0x84 build-fx/assets/img/wall.png.o + 0x00000000003030a4 img_wall + 0x0000000000303128 img_wall_end .rodata.str1.4 - 0x0000000000302ef4 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - *fill* 0x0000000000302efa 0x2 - .rodata 0x0000000000302efc 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - .rodata 0x0000000000302f04 0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x0000000000303128 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + *fill* 0x000000000030312e 0x2 + .rodata 0x0000000000303130 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + .rodata 0x0000000000303138 0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) .rodata.str1.4 - 0x0000000000302f1c 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x0000000000303150 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) .rodata.str1.4 - 0x0000000000302f20 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - *fill* 0x0000000000302f26 0x2 - .rodata 0x0000000000302f28 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) - 0x0000000000302f28 gint_font5x7 - 0x0000000000303330 gint_font5x7_end + 0x0000000000303154 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + *fill* 0x000000000030315a 0x2 + .rodata 0x000000000030315c 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) + 0x000000000030315c gint_font5x7 + 0x0000000000303564 gint_font5x7_end .rodata.str1.4 - 0x0000000000303330 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - .rodata 0x0000000000303334 0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - .rodata 0x0000000000303344 0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) - 0x0000000000303344 __clz_tab + 0x0000000000303564 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + .rodata 0x0000000000303568 0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + .rodata 0x0000000000303578 0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + 0x0000000000303578 __clz_tab -.rela.dyn 0x0000000000303444 0x0 - .rela.text 0x0000000000303444 0x0 build-fx/src/map.o +.rela.dyn 0x0000000000303678 0x0 + .rela.text 0x0000000000303678 0x0 build-fx/src/map.o .rela.pretext.entry - 0x0000000000303444 0x0 build-fx/src/map.o + 0x0000000000303678 0x0 build-fx/src/map.o 0x0000000008100000 . = ORIGIN (ram) -.bss 0x0000000008100000 0x690 +.bss 0x0000000008100000 0x1040 0x0000000008100000 _rbss = . *(.bss COMMON) .bss 0x0000000008100000 0x0 build-fx/src/item.o @@ -380,97 +386,98 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a .bss 0x0000000008100000 0x8 build-fx/src/map.o 0x0000000008100000 dy 0x0000000008100004 dx - COMMON 0x0000000008100008 0x258 build-fx/src/map.o + COMMON 0x0000000008100008 0xc00 build-fx/src/map.o 0x0000000008100008 map - .bss 0x0000000008100260 0xc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) - .bss 0x000000000810026c 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - .bss 0x0000000008100290 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - .bss 0x0000000008100290 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) - .bss 0x0000000008100290 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .bss 0x0000000008100290 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .bss 0x0000000008100290 0x400 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - .bss 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + .bss 0x0000000008100c08 0xc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + .bss 0x0000000008100c14 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + .bss 0x0000000008100c38 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + .bss 0x0000000008100c38 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) + .bss 0x0000000008100c38 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .bss 0x0000000008100c38 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .bss 0x0000000008100c38 0x400 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + .bss 0x0000000008101038 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) *(B R) - 0x0000000008100690 . = ALIGN (0x10) - 0x0000000000000690 _sbss = SIZEOF (.bss) + 0x0000000008101040 . = ALIGN (0x10) + *fill* 0x0000000008101038 0x8 + 0x0000000000001040 _sbss = SIZEOF (.bss) -.data 0x0000000008100690 0x10 load address 0x0000000000303444 - 0x0000000000303444 _ldata = LOADADDR (.data) - 0x0000000008100690 _rdata = . +.data 0x0000000008101040 0x10 load address 0x0000000000303678 + 0x0000000000303678 _ldata = LOADADDR (.data) + 0x0000000008101040 _rdata = . *(.data .data.*) - .data 0x0000000008100690 0x0 build-fx/src/item.o - .data 0x0000000008100690 0x0 build-fx/src/main.o - .data 0x0000000008100690 0x0 build-fx/src/map.o - .data 0x0000000008100690 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .data 0x0000000008100698 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - 0x0000000008100698 topti_font - 0x000000000810069c gint_default_font - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - .data 0x00000000081006a0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + .data 0x0000000008101040 0x0 build-fx/src/item.o + .data 0x0000000008101040 0x0 build-fx/src/main.o + .data 0x0000000008101040 0x0 build-fx/src/map.o + .data 0x0000000008101040 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + .data 0x0000000008101048 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + .data 0x0000000008101048 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + .data 0x0000000008101048 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) + .data 0x0000000008101048 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .data 0x0000000008101048 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x0000000008101048 topti_font + 0x000000000810104c gint_default_font + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + .data 0x0000000008101050 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) *(D) - 0x00000000081006a0 . = ALIGN (0x10) + 0x0000000008101050 . = ALIGN (0x10) -.data.4 0x00000000081006a0 0x0 load address 0x0000000000303454 +.data.4 0x0000000008101050 0x0 load address 0x0000000000303688 *(.data.4) - 0x00000000081006a0 . = ALIGN (0x10) + 0x0000000008101050 . = ALIGN (0x10) 0x0000000000000010 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x000000008800df00 _gint_vbr = 0x8800df00 0x000000008800f400 . = ORIGIN (rram) -.gint.data 0x000000008800f400 0x130 load address 0x0000000000303454 - 0x0000000000303454 _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x130 load address 0x0000000000303688 + 0x0000000000303688 _lgdata = LOADADDR (.gint.data) 0x000000008800f400 _rgdata = . *(.gint.data .gint.data.*) .gint.data 0x000000008800f400 0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) @@ -488,7 +495,7 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x000000008800f530 . = ALIGN (0x10) 0x0000000000000130 _sgdata = SIZEOF (.gint.data) -.gint.bss 0x000000008800f530 0x210 load address 0x0000000000303584 +.gint.bss 0x000000008800f530 0x210 load address 0x00000000003037b8 *(.gint.bss .gint.bss.*) .gint.bss 0x000000008800f530 0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) .gint.bss 0x000000008800f630 0x88 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) diff --git a/build-fx/src/BitmapWs.bin b/build-fx/src/BitmapWs.bin index b16a539..8ae0461 100755 Binary files a/build-fx/src/BitmapWs.bin and b/build-fx/src/BitmapWs.bin differ diff --git a/build-fx/src/BitmapWs.elf b/build-fx/src/BitmapWs.elf index f3a9574..2f04ee2 100755 Binary files a/build-fx/src/BitmapWs.elf and b/build-fx/src/BitmapWs.elf differ diff --git a/build-fx/src/item.o b/build-fx/src/item.o index 2cb3364..033e3f0 100644 Binary files a/build-fx/src/item.o and b/build-fx/src/item.o differ diff --git a/build-fx/src/map.o b/build-fx/src/map.o index fdc71f7..c23973a 100644 Binary files a/build-fx/src/map.o and b/build-fx/src/map.o differ diff --git a/src/item.c b/src/item.c index d6b2ad5..3a68f05 100644 --- a/src/item.c +++ b/src/item.c @@ -28,31 +28,45 @@ void display_item_etendu(image_t* res,int mx, int my, int sx, int sy) void display_brouillard(int mx, int my, int sx, int sy) { - unsigned char val=0x00; // on n'utilise que les 4 premiers bits 0<=val<=15 mais on multiplie nativement par 8 - val|=get_visibility(mx-1,my)<<3; - val|=get_visibility(mx+1,my)<<4; - val|=get_visibility(mx,my-1)<<5; - val|=get_visibility(mx,my+1)<<6; - dsubimage(sx,sy,&img_brouillard,val,0,8,8,0); + char val=0x00; // on n'utilise que les 4 premiers bits 0<=val<=15 mais on multiplie nativement par 8 + val|=(!get_visibility(mx-1,my))<<3; + val|=(!get_visibility(mx+1,my))<<4; + val|=(!get_visibility(mx,my-1))<<5; + val|=(!get_visibility(mx,my+1))<<6; + dsubimage(sx,sy, &img_brouillard, val, 0, 8, 8, DIMAGE_NONE); } -void display_item(int mx, int my, int sx, int sy) +void display_water(int mx, int my, int sx, int sy) { - int type=get_item_type(mx,my); - if (type==WALL) - display_item_etendu(&img_wall,mx,my,sx,sy); - if (type==HOUSE) - display_item_etendu(&img_houses,mx,my,sx,sy); + char val=0x00; // on n'utilise que les 4 premiers bits 0<=val<=15 mais on multiplie nativement par 8 + val|=(WATER==get_terrain(mx-1,my))<<3; + val|=(WATER==get_terrain(mx+1,my))<<4; + val|=(WATER==get_terrain(mx,my-1))<<5; + val|=(WATER==get_terrain(mx,my+1))<<6; + + dsubimage(sx,sy, &img_water, val, 0, 8, 8, DIMAGE_NONE); - if (type==EMPTY) - display_item_etendu(&img_brouillard,mx,my,sx,sy); } + void display_case(int mx, int my, int sx, int sy) { - display_item(mx,my,sx,sy); - //display_brouillard(mx,my,sx,sy); + int type=get_item_type(mx,my); + switch (type) + { + case WALL: + display_item_etendu(&img_wall,mx,my,sx,sy); + return; + case HOUSE: + display_item_etendu(&img_houses,mx,my,sx,sy); + return; + default: + if (get_terrain(mx,my)==WATER) + display_water(mx,my,sx,sy); + if (!get_visibility(mx,my)) + display_brouillard(mx,my,sx,sy); + } } \ No newline at end of file diff --git a/src/item.h b/src/item.h index 394a197..aa6ba4d 100644 --- a/src/item.h +++ b/src/item.h @@ -12,6 +12,7 @@ extern image_t img_houses; extern image_t img_wall; extern image_t img_brouillard; +extern image_t img_water; diff --git a/src/map.c b/src/map.c index bc98fee..d77313c 100644 --- a/src/map.c +++ b/src/map.c @@ -3,8 +3,8 @@ #include -#define DIM_X 5 -#define DIM_Y 5 +#define DIM_X 16 +#define DIM_Y 8 // la map correspond à un système par couches successives : @@ -22,7 +22,7 @@ void create_map() for (int y=0;y=DIM_X||y<0||y>DIM_Y) - return true; - return 1-map[y][x].explored; + if (x<0||x>=DIM_X||y<0||y>=DIM_Y) + return false; + return map[y][x].explored; +} +int get_terrain(int x,int y) +{ + if (x<0||x>=DIM_X||y<0||y>=DIM_Y) + return WATER; + return map[y][x].terrain; } - void set_item(int x, int y, generic_item const * const item) { diff --git a/src/map.h b/src/map.h index 210cbcf..07b431e 100644 --- a/src/map.h +++ b/src/map.h @@ -7,17 +7,13 @@ extern const int dim_y; #include #include "item.h" -typedef enum -{ - EARTH = 0, - WATER = 1, - MOUNTAIN = 2 - -} map_terrain; +#define EARTH 0 +#define WATER 1 +#define MOUNTAIN 2 struct generic_map // map à l'échelle d'un point { - map_terrain terrain; + int terrain; bool explored; // brouillard de guerre generic_item item; }; @@ -29,6 +25,7 @@ void create_map(); // hidden true, shown false bool get_visibility(int x, int y); +int get_terrain(int x,int y); generic_item* get_item(int x, int y); void set_item(int x, int y, generic_item const * const item);