From 87bf7a6d18205e0fae2e8d080c12af19bbc1b82f Mon Sep 17 00:00:00 2001 From: milangames-art Date: Thu, 21 Nov 2019 19:30:23 +0100 Subject: [PATCH] box system --- MARIOBRS.g1a | Bin 23328 -> 23744 bytes build-fx/map | 602 +++++++++++++++++++------------------- build-fx/src/MARIOBRS.bin | Bin 22816 -> 23232 bytes build-fx/src/main.d | 4 +- build-fx/src/main.o | Bin 1668 -> 1668 bytes build-fx/src/tile.o | Bin 1132 -> 1132 bytes build-fx/src/world.o | Bin 1848 -> 2044 bytes src/main.c | 4 +- src/tile.c | 2 +- src/world.c | 46 +-- 10 files changed, 339 insertions(+), 319 deletions(-) diff --git a/MARIOBRS.g1a b/MARIOBRS.g1a index 86b68d016002e237af290db3b2b882543d481602..2044f53d2ecbd7319c4515961f7a2e7be851a267 100644 GIT binary patch delta 2357 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 diff --git a/build-fx/map b/build-fx/map index 634f09d..d386a5e 100644 --- a/build-fx/map +++ b/build-fx/map @@ -78,10 +78,12 @@ Archive member included to satisfy reference by file (symbol) Discarded input sections .comment 0x0000000000000000 0x12 build-fx/src/tile.o + .comment 0x0000000000000000 0x12 build-fx/src/box.o .comment 0x0000000000000000 0x12 build-fx/src/world.o .comment 0x0000000000000000 0x12 build-fx/src/mario.o .comment 0x0000000000000000 0x12 build-fx/src/main.o .comment 0x0000000000000000 0x12 build-fx/src/keyboard.o + .comment 0x0000000000000000 0x12 build-fx/src/sprite.o .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) @@ -124,10 +126,12 @@ yram 0x00000000e5017000 0x0000000000002000 xrw Linker script and memory map LOAD build-fx/src/tile.o +LOAD build-fx/src/box.o LOAD build-fx/src/world.o LOAD build-fx/src/mario.o LOAD build-fx/src/main.o LOAD build-fx/src/keyboard.o +LOAD build-fx/src/sprite.o LOAD build-fx/assets/img/level.png.o LOAD build-fx/assets/img/mario.png.o LOAD build-fx/assets/img/death.png.o @@ -142,7 +146,7 @@ LOAD build-fx/assets/img/stone.png.o LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x0000000000300000 _brom = 0x300000 - 0x0000000000004f50 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x0000000000005020 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8d0 *(.pretext.entry) @@ -182,7 +186,7 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *(.dtors .dtors.*) 0x0000000000300ad0 _etors = . -.text 0x0000000000300ad0 0x35f0 +.text 0x0000000000300ad0 0x36c0 0x0000000000300ad0 _gint_exch_tlbh_start = . *(.gint.exch_tlbh) .gint.exch_tlbh @@ -192,270 +196,277 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *(.text .text.*) .text 0x0000000000300b1c 0x40 build-fx/src/tile.o 0x0000000000300b1c draw_tile - .text 0x0000000000300b5c 0x1fc build-fx/src/world.o - 0x0000000000300b5c world_get - 0x0000000000300ba4 display_cell - 0x0000000000300c7c world_get_ctg - 0x0000000000300cbc world_get_real_x0 - 0x0000000000300cca world_get_real_y0 - 0x0000000000300cd8 world_draw - .text 0x0000000000300d58 0x1e4 build-fx/src/mario.o - 0x0000000000300d58 mario_draw - 0x0000000000300db0 test_sol_le_plus_proche - 0x0000000000300e1c mario_move - .text 0x0000000000300f3c 0x40 build-fx/src/main.o - 0x0000000000300f3c callback - 0x0000000000300f44 system_error - .text.startup 0x0000000000300f7c 0xb0 build-fx/src/main.o - 0x0000000000300f7c main - .text 0x000000000030102c 0xbc build-fx/src/keyboard.o - 0x000000000030102c update_keyboard - .text 0x00000000003010e8 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) - 0x00000000003010e8 dupdate - 0x0000000000301100 dupdate_noint - .text 0x000000000030110c 0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - 0x000000000030110c dimage - 0x0000000000301160 dsubimage - .text 0x00000000003011d4 0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - 0x00000000003011d4 dclear - .text 0x0000000000301220 0x3fc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - 0x00000000003013c8 pollevent - 0x000000000030150c waitevent - 0x0000000000301558 clearevents - 0x0000000000301578 keydown - 0x00000000003015a4 keydown_all - 0x00000000003015e0 keydown_any - .text 0x000000000030161c 0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) - 0x0000000000301628 iokbd_row - 0x0000000000301710 iokbd_scan - .text 0x0000000000301740 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) - 0x0000000000301740 getkey_opt - 0x00000000003018ec getkey - 0x00000000003018f8 getkey_repeat - .text 0x0000000000301934 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .text 0x0000000000301934 0x1c4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) - 0x0000000000301ac4 gint_panic - 0x0000000000301ad4 gint_panic_set - 0x0000000000301ae0 gint_exc_catch - 0x0000000000301aec gint_exc_skip - .text 0x0000000000301af8 0x17c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - 0x0000000000301bac gint_install - 0x0000000000301c5c gint_unload - .text 0x0000000000301c74 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .text 0x0000000000301c74 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) - .text 0x0000000000301c74 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - 0x0000000000301c74 tlb_addr - 0x0000000000301c88 tlb_data - 0x0000000000301c9c tlb_mapped_memory - 0x0000000000301d70 utlb_addr - 0x0000000000301d80 utlb_data - 0x0000000000301d90 utlb_mapped_memory - .text 0x0000000000301e68 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - 0x0000000000301e68 dsize - .text 0x0000000000301f04 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) - 0x0000000000301f04 dprint - .text 0x0000000000301f5c 0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - 0x000000000030227c timer_setup - 0x000000000030230c timer_delay - 0x000000000030236c timer_start - 0x00000000003023a0 timer_reload - 0x00000000003023c0 timer_pause - 0x00000000003023f4 timer_stop - 0x0000000000302450 timer_timeout - 0x000000000030245c timer_address - 0x0000000000302498 timer_clear - .text 0x00000000003024c8 0xce4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - 0x0000000000302ec4 kprint_opt - 0x000000000030300c kprint - 0x00000000003030e4 kvsprint - 0x000000000030312c sprintf - 0x0000000000303154 vsprintf - 0x0000000000303174 snprintf - 0x0000000000303194 vsnprintf - .text 0x00000000003031ac 0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - 0x00000000003031ac memcpy - 0x0000000000303266 _memmove - 0x000000000030326a _memcmp - 0x000000000030326e memset - .text 0x0000000000303288 0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - 0x0000000000303320 t6k11_display - 0x00000000003033f4 t6k11_contrast - 0x0000000000303420 t6k11_backlight - .text 0x0000000000303460 0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x00000000003035a4 clock_freq - .text 0x00000000003035b0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) - .text 0x00000000003035b0 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - 0x00000000003035b0 bopti_asm_mono - 0x00000000003035d6 bopti_asm_mono_alpha - .text 0x0000000000303608 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .text 0x0000000000303608 0x410 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - 0x0000000000303608 bopti_grid - 0x000000000030377c bopti_render - 0x00000000003038ac bopti_render_clip - 0x00000000003039c0 bopti_render_noclip - .text 0x0000000000303a18 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - 0x0000000000303a18 masks - .text 0x0000000000303ab4 0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - 0x0000000000303ab4 gint_setvbr - .text 0x0000000000303ae0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .text 0x0000000000303ae0 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - 0x0000000000303ae0 gint_intlevel - 0x0000000000303b34 gint_inthandler - .text 0x0000000000303b58 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .text 0x0000000000303b58 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .text 0x0000000000303b58 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .text 0x0000000000303b58 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - 0x0000000000303b58 __movstr - 0x0000000000303b58 __movmem - 0x0000000000303b8c __movmemSI64 - 0x0000000000303b8c __movstrSI64 - 0x0000000000303b90 __movstrSI60 - 0x0000000000303b90 __movmemSI60 - 0x0000000000303b94 __movmemSI56 - 0x0000000000303b94 __movstrSI56 - 0x0000000000303b98 __movstrSI52 - 0x0000000000303b98 __movmemSI52 - 0x0000000000303b9c __movstrSI48 - 0x0000000000303b9c __movmemSI48 - 0x0000000000303ba0 __movstrSI44 - 0x0000000000303ba0 __movmemSI44 - 0x0000000000303ba4 __movstrSI40 - 0x0000000000303ba4 __movmemSI40 - 0x0000000000303ba8 __movstrSI36 - 0x0000000000303ba8 __movmemSI36 - 0x0000000000303bac __movmemSI32 - 0x0000000000303bac __movstrSI32 - 0x0000000000303bb0 __movmemSI28 - 0x0000000000303bb0 __movstrSI28 - 0x0000000000303bb4 __movstrSI24 - 0x0000000000303bb4 __movmemSI24 - 0x0000000000303bb8 __movmemSI20 - 0x0000000000303bb8 __movstrSI20 - 0x0000000000303bbc __movstrSI16 - 0x0000000000303bbc __movmemSI16 - 0x0000000000303bc0 __movmemSI12 - 0x0000000000303bc0 __movstrSI12 - 0x0000000000303bc4 __movmemSI8 - 0x0000000000303bc4 __movstrSI8 - 0x0000000000303bc8 __movmemSI4 - 0x0000000000303bc8 __movstrSI4 - .text 0x0000000000303bd0 0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - 0x0000000000303bd0 __udivdi3 - .text 0x0000000000303dc0 0x234 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) - 0x0000000000303dc0 __umoddi3 - .text 0x0000000000303ff4 0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - 0x0000000000304016 __udivsi3 - .text 0x0000000000304060 0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000304060 __udiv_qrnnd_16 - .text 0x00000000003040c0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + .text 0x0000000000300b5c 0x140 build-fx/src/box.o + 0x0000000000300b5c sgn + 0x0000000000300b6e box_move + .text 0x0000000000300c9c 0x200 build-fx/src/world.o + 0x0000000000300c9c world_get + 0x0000000000300ce4 display_cell + 0x0000000000300dbc world_get_ctg + 0x0000000000300dfc world_get_real_x0 + 0x0000000000300e0a world_get_real_y0 + 0x0000000000300e18 world_draw + .text 0x0000000000300e9c 0xf0 build-fx/src/mario.o + 0x0000000000300e9c mario_draw + 0x0000000000300ef4 test_sol_le_plus_proche + 0x0000000000300f60 mario_move + .text 0x0000000000300f8c 0x40 build-fx/src/main.o + 0x0000000000300f8c callback + 0x0000000000300f94 system_error + .text.startup 0x0000000000300fcc 0xb0 build-fx/src/main.o + 0x0000000000300fcc main + .text 0x000000000030107c 0xbc build-fx/src/keyboard.o + 0x000000000030107c update_keyboard + .text 0x0000000000301138 0x7c build-fx/src/sprite.o + 0x0000000000301138 hitbox + .text 0x00000000003011b4 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) + 0x00000000003011b4 dupdate + 0x00000000003011cc dupdate_noint + .text 0x00000000003011d8 0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + 0x00000000003011d8 dimage + 0x000000000030122c dsubimage + .text 0x00000000003012a0 0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + 0x00000000003012a0 dclear + .text 0x00000000003012ec 0x3fc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + 0x0000000000301494 pollevent + 0x00000000003015d8 waitevent + 0x0000000000301624 clearevents + 0x0000000000301644 keydown + 0x0000000000301670 keydown_all + 0x00000000003016ac keydown_any + .text 0x00000000003016e8 0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + 0x00000000003016f4 iokbd_row + 0x00000000003017dc iokbd_scan + .text 0x000000000030180c 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + 0x000000000030180c getkey_opt + 0x00000000003019b8 getkey + 0x00000000003019c4 getkey_repeat + .text 0x0000000000301a00 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .text 0x0000000000301a00 0x1c4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) + 0x0000000000301b90 gint_panic + 0x0000000000301ba0 gint_panic_set + 0x0000000000301bac gint_exc_catch + 0x0000000000301bb8 gint_exc_skip + .text 0x0000000000301bc4 0x17c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + 0x0000000000301c78 gint_install + 0x0000000000301d28 gint_unload + .text 0x0000000000301d40 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .text 0x0000000000301d40 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) + .text 0x0000000000301d40 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + 0x0000000000301d40 tlb_addr + 0x0000000000301d54 tlb_data + 0x0000000000301d68 tlb_mapped_memory + 0x0000000000301e3c utlb_addr + 0x0000000000301e4c utlb_data + 0x0000000000301e5c utlb_mapped_memory + .text 0x0000000000301f34 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x0000000000301f34 dsize + .text 0x0000000000301fd0 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) + 0x0000000000301fd0 dprint + .text 0x0000000000302028 0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x0000000000302348 timer_setup + 0x00000000003023d8 timer_delay + 0x0000000000302438 timer_start + 0x000000000030246c timer_reload + 0x000000000030248c timer_pause + 0x00000000003024c0 timer_stop + 0x000000000030251c timer_timeout + 0x0000000000302528 timer_address + 0x0000000000302564 timer_clear + .text 0x0000000000302594 0xce4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + 0x0000000000302f90 kprint_opt + 0x00000000003030d8 kprint + 0x00000000003031b0 kvsprint + 0x00000000003031f8 sprintf + 0x0000000000303220 vsprintf + 0x0000000000303240 snprintf + 0x0000000000303260 vsnprintf + .text 0x0000000000303278 0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + 0x0000000000303278 memcpy + 0x0000000000303332 _memmove + 0x0000000000303336 _memcmp + 0x000000000030333a memset + .text 0x0000000000303354 0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x00000000003033ec t6k11_display + 0x00000000003034c0 t6k11_contrast + 0x00000000003034ec t6k11_backlight + .text 0x000000000030352c 0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x0000000000303670 clock_freq + .text 0x000000000030367c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) + .text 0x000000000030367c 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + 0x000000000030367c bopti_asm_mono + 0x00000000003036a2 bopti_asm_mono_alpha + .text 0x00000000003036d4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .text 0x00000000003036d4 0x410 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + 0x00000000003036d4 bopti_grid + 0x0000000000303848 bopti_render + 0x0000000000303978 bopti_render_clip + 0x0000000000303a8c bopti_render_noclip + .text 0x0000000000303ae4 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + 0x0000000000303ae4 masks + .text 0x0000000000303b80 0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + 0x0000000000303b80 gint_setvbr + .text 0x0000000000303bac 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .text 0x0000000000303bac 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + 0x0000000000303bac gint_intlevel + 0x0000000000303c00 gint_inthandler + .text 0x0000000000303c24 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .text 0x0000000000303c24 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .text 0x0000000000303c24 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .text 0x0000000000303c24 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + 0x0000000000303c24 __movstr + 0x0000000000303c24 __movmem + 0x0000000000303c58 __movmemSI64 + 0x0000000000303c58 __movstrSI64 + 0x0000000000303c5c __movstrSI60 + 0x0000000000303c5c __movmemSI60 + 0x0000000000303c60 __movmemSI56 + 0x0000000000303c60 __movstrSI56 + 0x0000000000303c64 __movstrSI52 + 0x0000000000303c64 __movmemSI52 + 0x0000000000303c68 __movstrSI48 + 0x0000000000303c68 __movmemSI48 + 0x0000000000303c6c __movstrSI44 + 0x0000000000303c6c __movmemSI44 + 0x0000000000303c70 __movstrSI40 + 0x0000000000303c70 __movmemSI40 + 0x0000000000303c74 __movstrSI36 + 0x0000000000303c74 __movmemSI36 + 0x0000000000303c78 __movmemSI32 + 0x0000000000303c78 __movstrSI32 + 0x0000000000303c7c __movmemSI28 + 0x0000000000303c7c __movstrSI28 + 0x0000000000303c80 __movstrSI24 + 0x0000000000303c80 __movmemSI24 + 0x0000000000303c84 __movmemSI20 + 0x0000000000303c84 __movstrSI20 + 0x0000000000303c88 __movstrSI16 + 0x0000000000303c88 __movmemSI16 + 0x0000000000303c8c __movmemSI12 + 0x0000000000303c8c __movstrSI12 + 0x0000000000303c90 __movmemSI8 + 0x0000000000303c90 __movstrSI8 + 0x0000000000303c94 __movmemSI4 + 0x0000000000303c94 __movstrSI4 + .text 0x0000000000303c9c 0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + 0x0000000000303c9c __udivdi3 + .text 0x0000000000303e8c 0x234 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) + 0x0000000000303e8c __umoddi3 + .text 0x00000000003040c0 0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + 0x00000000003040e2 __udivsi3 + *fill* 0x000000000030412c 0x4 + .text 0x0000000000304130 0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000304130 __udiv_qrnnd_16 + .text 0x0000000000304190 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) *(C P) -.gint.blocks 0x00000000003040c0 0x120 +.gint.blocks 0x0000000000304190 0x120 *(.gint.blocks) - .gint.blocks 0x00000000003040c0 0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - 0x00000000003040c0 gint_inth_7305 - 0x00000000003040e0 gint_inth_7705 - .gint.blocks 0x0000000000304100 0xe0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - 0x0000000000304100 inth_tmu - 0x0000000000304180 inth_etmu2 - 0x00000000003041a0 inth_etmu_help - 0x00000000003041c0 inth_etmux + .gint.blocks 0x0000000000304190 0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + 0x0000000000304190 gint_inth_7305 + 0x00000000003041b0 gint_inth_7705 + .gint.blocks 0x00000000003041d0 0xe0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + 0x00000000003041d0 inth_tmu + 0x0000000000304250 inth_etmu2 + 0x0000000000304270 inth_etmu_help + 0x0000000000304290 inth_etmux -.gint.drivers 0x00000000003041e0 0x90 - 0x00000000003041e0 _bdrv = . +.gint.drivers 0x00000000003042b0 0x90 + 0x00000000003042b0 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x00000000003041e0 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x00000000003041e0 drv_cpg + 0x00000000003042b0 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x00000000003042b0 drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x0000000000304204 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - 0x0000000000304204 drv_tmu + 0x00000000003042d4 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x00000000003042d4 drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x0000000000304228 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - 0x0000000000304228 drv_keysc + 0x00000000003042f8 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + 0x00000000003042f8 drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x000000000030424c 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - 0x000000000030424c drv_t6k11 + 0x000000000030431c 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x000000000030431c drv_t6k11 *(.gint.drivers.6) - 0x0000000000304270 _edrv = . + 0x0000000000304340 _edrv = . -.rodata 0x0000000000304270 0x15b0 +.rodata 0x0000000000304340 0x15b0 *(.rodata.4) *(.rodata .rodata.*) - .rodata 0x0000000000304270 0x404 build-fx/assets/img/level.png.o - 0x0000000000304270 img_level - 0x0000000000304674 img_level_end - .rodata 0x0000000000304674 0x64 build-fx/assets/img/mario.png.o - 0x0000000000304674 img_mario - 0x00000000003046d8 img_mario_end - .rodata 0x00000000003046d8 0x24 build-fx/assets/img/death.png.o - 0x00000000003046d8 img_death - 0x00000000003046fc img_death_end - .rodata 0x00000000003046fc 0x4c build-fx/assets/img/brick.png.o - 0x00000000003046fc img_brick - 0x0000000000304748 img_brick_end - .rodata 0x0000000000304748 0x404 build-fx/assets/img/main.png.o - 0x0000000000304748 img_main - 0x0000000000304b4c img_main_end - .rodata 0x0000000000304b4c 0xdc build-fx/assets/img/mariosmall.png.o - 0x0000000000304b4c img_mariosmall - 0x0000000000304c28 img_mariosmall_end - .rodata 0x0000000000304c28 0x28 build-fx/assets/img/gift.png.o - 0x0000000000304c28 img_gift - 0x0000000000304c50 img_gift_end - .rodata 0x0000000000304c50 0x404 build-fx/assets/img/error.png.o - 0x0000000000304c50 img_error - 0x0000000000305054 img_error_end - .rodata 0x0000000000305054 0xb8 build-fx/assets/img/tuyau.png.o - 0x0000000000305054 img_tuyau - 0x000000000030510c img_tuyau_end - .rodata 0x000000000030510c 0x28 build-fx/assets/img/coin.png.o - 0x000000000030510c img_coin - 0x0000000000305134 img_coin_end - .rodata 0x0000000000305134 0x4c build-fx/assets/img/stone.png.o - 0x0000000000305134 img_stone - 0x0000000000305180 img_stone_end - .rodata 0x0000000000305180 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + .rodata 0x0000000000304340 0x404 build-fx/assets/img/level.png.o + 0x0000000000304340 img_level + 0x0000000000304744 img_level_end + .rodata 0x0000000000304744 0x64 build-fx/assets/img/mario.png.o + 0x0000000000304744 img_mario + 0x00000000003047a8 img_mario_end + .rodata 0x00000000003047a8 0x24 build-fx/assets/img/death.png.o + 0x00000000003047a8 img_death + 0x00000000003047cc img_death_end + .rodata 0x00000000003047cc 0x4c build-fx/assets/img/brick.png.o + 0x00000000003047cc img_brick + 0x0000000000304818 img_brick_end + .rodata 0x0000000000304818 0x404 build-fx/assets/img/main.png.o + 0x0000000000304818 img_main + 0x0000000000304c1c img_main_end + .rodata 0x0000000000304c1c 0xdc build-fx/assets/img/mariosmall.png.o + 0x0000000000304c1c img_mariosmall + 0x0000000000304cf8 img_mariosmall_end + .rodata 0x0000000000304cf8 0x28 build-fx/assets/img/gift.png.o + 0x0000000000304cf8 img_gift + 0x0000000000304d20 img_gift_end + .rodata 0x0000000000304d20 0x404 build-fx/assets/img/error.png.o + 0x0000000000304d20 img_error + 0x0000000000305124 img_error_end + .rodata 0x0000000000305124 0xb8 build-fx/assets/img/tuyau.png.o + 0x0000000000305124 img_tuyau + 0x00000000003051dc img_tuyau_end + .rodata 0x00000000003051dc 0x28 build-fx/assets/img/coin.png.o + 0x00000000003051dc img_coin + 0x0000000000305204 img_coin_end + .rodata 0x0000000000305204 0x4c build-fx/assets/img/stone.png.o + 0x0000000000305204 img_stone + 0x0000000000305250 img_stone_end + .rodata 0x0000000000305250 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) .rodata.str1.4 - 0x0000000000305188 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - *fill* 0x000000000030518e 0x2 + 0x0000000000305258 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + *fill* 0x000000000030525e 0x2 .rodata.str1.4 - 0x0000000000305190 0x11a /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) + 0x0000000000305260 0x11a /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) 0x11e (size before relaxing) - *fill* 0x00000000003052aa 0x2 - .rodata 0x00000000003052ac 0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + *fill* 0x000000000030537a 0x2 + .rodata 0x000000000030537c 0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) .rodata.str1.4 - 0x00000000003052c4 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x0000000000305394 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) .rodata.str1.4 - 0x00000000003052c8 0x31 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - *fill* 0x00000000003052f9 0x3 + 0x0000000000305398 0x31 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + *fill* 0x00000000003053c9 0x3 .rodata.str1.4 - 0x00000000003052fc 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - *fill* 0x0000000000305302 0x2 + 0x00000000003053cc 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + *fill* 0x00000000003053d2 0x2 .rodata.str1.4 - 0x0000000000305304 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - .rodata 0x0000000000305308 0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - .rodata 0x0000000000305318 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) - 0x0000000000305318 gint_font5x7 - 0x0000000000305720 gint_font5x7_end - .rodata 0x0000000000305720 0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) - 0x0000000000305720 __clz_tab + 0x00000000003053d4 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + .rodata 0x00000000003053d8 0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + .rodata 0x00000000003053e8 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) + 0x00000000003053e8 gint_font5x7 + 0x00000000003057f0 gint_font5x7_end + .rodata 0x00000000003057f0 0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + 0x00000000003057f0 __clz_tab -.rela.dyn 0x0000000000305820 0x0 +.rela.dyn 0x00000000003058f0 0x0 .rela.pretext.entry - 0x0000000000305820 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .rela.text 0x0000000000305820 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + 0x00000000003058f0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .rela.text 0x00000000003058f0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) 0x0000000008100000 . = ORIGIN (ram) .bss 0x0000000008100000 0x570 0x0000000008100000 _rbss = . *(.bss COMMON) .bss 0x0000000008100000 0x0 build-fx/src/tile.o + .bss 0x0000000008100000 0x0 build-fx/src/box.o .bss 0x0000000008100000 0x0 build-fx/src/world.o .bss 0x0000000008100000 0x8 build-fx/src/mario.o 0x0000000008100000 global_quit @@ -463,6 +474,7 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a .bss 0x0000000008100008 0x0 build-fx/src/main.o .bss 0x0000000008100008 0x18 build-fx/src/keyboard.o 0x0000000008100008 keys + .bss 0x0000000008100020 0x0 build-fx/src/sprite.o .bss 0x0000000008100020 0x400 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) .bss 0x0000000008100420 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) .bss 0x0000000008100420 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) @@ -504,8 +516,8 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *fill* 0x0000000008100564 0xc 0x0000000000000570 _sbss = SIZEOF (.bss) -.data 0x0000000008100570 0x1c0 load address 0x0000000000305820 - 0x0000000000305820 _ldata = LOADADDR (.data) +.data 0x0000000008100570 0x290 load address 0x00000000003058f0 + 0x00000000003058f0 _ldata = LOADADDR (.data) 0x0000000008100570 _rdata = . *(.data .data.*) .data 0x0000000008100570 0x50 build-fx/src/tile.o @@ -514,77 +526,79 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x0000000008100590 earth 0x00000000081005a0 brick 0x00000000081005b0 tuyau - .data 0x00000000081005c0 0xc0 build-fx/src/world.o - .data 0x0000000008100680 0x30 build-fx/src/mario.o - 0x0000000008100680 mario - 0x00000000081006a0 mario_small - .data 0x00000000081006b0 0x0 build-fx/src/main.o - .data 0x00000000081006b0 0x0 build-fx/src/keyboard.o - .data 0x00000000081006b0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) - .data 0x00000000081006b0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - .data 0x00000000081006b0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - .data 0x00000000081006b0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - .data 0x00000000081006b0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) - .data 0x00000000081006b0 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) - .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) - .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) - .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) - .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - .data 0x00000000081006b8 0x68 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - 0x00000000081006b8 kprint_formatters - .data 0x0000000008100720 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - .data 0x0000000008100720 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - .data 0x0000000008100720 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - .data 0x0000000008100720 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) - .data 0x0000000008100720 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - .data 0x0000000008100720 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - 0x0000000008100720 topti_font - 0x0000000008100724 gint_default_font - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + .data 0x00000000081005c0 0x0 build-fx/src/box.o + .data 0x00000000081005c0 0x180 build-fx/src/world.o + .data 0x0000000008100740 0x3c build-fx/src/mario.o + 0x0000000008100740 mario + 0x000000000810076c mario_small + .data 0x000000000810077c 0x0 build-fx/src/main.o + .data 0x000000000810077c 0x0 build-fx/src/keyboard.o + .data 0x000000000810077c 0x0 build-fx/src/sprite.o + .data 0x000000000810077c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) + .data 0x000000000810077c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + .data 0x000000000810077c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + .data 0x000000000810077c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + .data 0x000000000810077c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + .data 0x000000000810077c 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + .data 0x0000000008100784 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .data 0x0000000008100784 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) + .data 0x0000000008100784 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + .data 0x0000000008100784 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .data 0x0000000008100784 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) + .data 0x0000000008100784 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + .data 0x0000000008100784 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .data 0x0000000008100784 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) + .data 0x0000000008100784 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + .data 0x0000000008100784 0x68 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + 0x0000000008100784 kprint_formatters + .data 0x00000000081007ec 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + .data 0x00000000081007ec 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + .data 0x00000000081007ec 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + .data 0x00000000081007ec 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) + .data 0x00000000081007ec 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + .data 0x00000000081007ec 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x00000000081007ec topti_font + 0x00000000081007f0 gint_default_font + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + .data 0x00000000081007f4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) *(D) - 0x0000000008100730 . = ALIGN (0x10) - *fill* 0x0000000008100728 0x8 + 0x0000000008100800 . = ALIGN (0x10) + *fill* 0x00000000081007f4 0xc -.data.4 0x0000000008100730 0x0 load address 0x00000000003059e0 +.data.4 0x0000000008100800 0x0 load address 0x0000000000305b80 *(.data.4) - 0x0000000008100730 . = ALIGN (0x10) - 0x00000000000001c0 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) + 0x0000000008100800 . = ALIGN (0x10) + 0x0000000000000290 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x00000000e5200000 . = ORIGIN (ilram) -.ilram 0x00000000e5200000 0x0 load address 0x00000000003059e0 - 0x00000000003059e0 _lilram = LOADADDR (.ilram) +.ilram 0x00000000e5200000 0x0 load address 0x0000000000305b80 + 0x0000000000305b80 _lilram = LOADADDR (.ilram) 0x00000000e5200000 _rilram = . *(.ilram) 0x00000000e5200000 . = ALIGN (0x10) 0x00000000e5007000 . = ORIGIN (xram) -.xram 0x00000000e5007000 0x0 load address 0x00000000003059e0 - 0x00000000003059e0 _lxram = LOADADDR (.xram) +.xram 0x00000000e5007000 0x0 load address 0x0000000000305b80 + 0x0000000000305b80 _lxram = LOADADDR (.xram) 0x00000000e5007000 _rxram = . *(.xram) 0x00000000e5007000 . = ALIGN (0x10) 0x00000000e5017000 . = ORIGIN (yram) -.yram 0x00000000e5017000 0x0 load address 0x00000000003059e0 - 0x00000000003059e0 _lyram = LOADADDR (.yram) +.yram 0x00000000e5017000 0x0 load address 0x0000000000305b80 + 0x0000000000305b80 _lyram = LOADADDR (.yram) 0x00000000e5017000 _ryram = . *(.yram) 0x00000000e5017000 . = ALIGN (0x10) @@ -594,8 +608,8 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x000000008800df00 _gint_vbr = 0x8800df00 0x000000008800f400 . = ORIGIN (rram) -.gint.data 0x000000008800f400 0x140 load address 0x00000000003059e0 - 0x00000000003059e0 _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x140 load address 0x0000000000305b80 + 0x0000000000305b80 _lgdata = LOADADDR (.gint.data) 0x000000008800f400 _rgdata = . *(.gint.data .gint.data.*) .gint.data 0x000000008800f400 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) @@ -616,7 +630,7 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x000000008800f540 . = ALIGN (0x10) 0x0000000000000140 _sgdata = SIZEOF (.gint.data) -.gint.bss 0x000000008800f540 0x290 load address 0x0000000000305b20 +.gint.bss 0x000000008800f540 0x290 load address 0x0000000000305cc0 *(.gint.bss .gint.bss.*) .gint.bss 0x000000008800f540 0x180 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) .gint.bss 0x000000008800f6c0 0x1c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) diff --git a/build-fx/src/MARIOBRS.bin b/build-fx/src/MARIOBRS.bin index 661b4e8005b6b69bfc2bba931db9d3a5b32cf812..5a6aba5edac83197df29027c8cef37ea51e964e6 100755 GIT binary patch delta 2321 zcmZWqdrX_x6~Fg0eqn9g)PDI8?XdG%LT|eM;q!FFkSy z-{C|oj>y!~hjfL@lh_6jarX;qQ3}Qp!IYp7V>>1C0>9R5Y8XxM*43v4@xtZ;MhYb7 zFLc%MSNLoEm;5*UU4Hf6FP+B2ik5nVY}DK>ny*Dtg}z7RJ}0lh`kEI;Z9gOWyQ?Lw z!>`o!(t@0C$URhQYgCj@FK-yC0ywDe7;hgsyP53& znA2O#`PxO4o;q9TP_&$fAg^|d?(IiXrT(PIbzZ(tq(4wGVy7=(t@sx@gIk9WychiE zB07tw{!u;FK4h^?E#+(97+OSR(jwgotz6rP1bPa@0bLRC#PexBf-;ExRc1Mw-D|!~YhHG+zv)<)1c5jVhq)VOjsQgKyatx7!6NqT$s4vmODaYt^VugQw0rf35 zXhzTjG*|HNoKXNb-aKNJ9UJGh?{l* zG^99Qlr%jnaT*=aA>WGcNSbqw8fV0o{M1x?p)(K35mEO;|H|U#iXLi9D$<(5EEkBp zY5@8LA{p0de^TqOG(PRDhB=y5@Ay?QerlNY-F*{a22=v-0Zjm3 zyd*9!?0EuUcGG|r(3$9s^zS8Xgw=-VM8?_I9G76yg%NRtAj)+_iu+&;HnOP}Knu{? z%K%6xsUCpFxDh}O#ueDW zV7(LqfWvhXAFH*OfIk98lW>mS0XBI_ZIfU&6k|y_T+ud0eL1U~=_A@`JPqX#ZW=*T z0~NB3eQw%=wIxKm#LUoFz5XV>)7_Zwk?xw-Tc1SxIIk% z+}(2>r0NsEq|i`s@tJ)*R6J}fWTfyb9psC+!))u$(+D@rFJrF6N|i-l>G(^rw8Cka zhxj(>Il5AG5YJIFZ{#c?+Qjc+q?b49Eg`3ICV{;TyW*Yyu<^kD84$6Agh{>ty!z-I zsbM7D@+}Y{V!0@SSVDhUE>40X+h8EM=MX8sBTSZSF<03@!xbJNLV9Hl=8F4-wyL)| z`9r7)LBzf!gsTg8Eb01zlOm{y;H{Bh_7=Kc@^E{7H2hMo{0=J>B4uVeXwN7iZfHY8 zJ|a2Zm>m8!1L(h*AZr24$7ICS7N;pPM6?mGOUowiTX9)Q%a$DmyT3pk&H*Nb6Ly_S zQr-_Y__GjjekyS=SF$a@V{d%2d+kcty*|j?@7UjLqCQVK=2&nV@+59?GafJP_2ke~ z9>XpS+Kqlac+l+d0&MKVTa??Pkc`Gm;J2g2dHc40AH2_ecH-S1lffL@Erb;*n1G8H iU4O11`<}*lrg--4;@uCR-Vd0H&b5|vdL*dZ)cAilq=47} delta 2010 zcmZVF^xg+;A3Q$V(v~U}3ayBM^im4)HR;=oLuEqwhLH^>GQTGqBt*$z(y%(k zl3ZrY<_|K6TNW~ik1Ztg2XX!&3qL?NM;tSSffC0LT?p$BGIlNx5VD(`cRueu=bm%! zd86Os-aB}x9Jf{Zc(vjJLUSJD_R2F<<{rC)I{R+xFU%1YchkmBq}lB6 z_oWXsNXLZwhZp&oyzEHt((%79@iT2XkyoG7A*-QU=(lxFsckpvF57O$8VlpR5p63~ z9TOo=p`K>()$R!as6N-_Z2m-_P20>(^7Zr)FA5c(v;`K%pI$z-jD(ZRyjt0gNXT7) zpAivE!1vOnkkf4;t+r0v4cqNW(e^`OoG7562YFM@s@S@?i9Cok?rlq%+bNWGc(6Bq z_TRd`*dJq!R|1PZ_24c%qnuF~4X#d6@6C-hR=a<9WSh#|>0fsloB7g?qe7F)!+A9` zsLai{W*)fU8RT*|;=#X+I#*|^#oIP3>IeU5Ts0aF>%ES>H%mJnTbfj5?jwTZmWR6v zj?3Ils%F(XAK>aRex7AA(!%&N%Nuv=nmw!s=lV70ecs2-tDDXrZaQBD=i_V6SDEuG zPrwuJxMe*el)1stZ)NVm@zM?ygorvBI*XSR7CHn8Yo*shQ?!;PR%=8Gioj$65#u5q z53Q)ul}1czSlTAlTfX6p9-OVayhjbK_zNQ82NAKr?l@?_@LZtJuC*`GfX=eCULEMB z&`SCAFcWPJ`_3LQhKRm}nX;HB1D>g$I_tHQoR~C^P>=^L!OKW9Phv3%B4@EL(5dhv z!LD{$l{r9@)eT`AY}P0uAnH{&aF!*?Yu*Vn`sI+ca8JuwsYw%qv0CcUeulY-F>2Pu zF?3MZ!0B7)fG(S%1>G}jq7(WYoFIi5uH(drF50B{f>AFeV4Fub~oRuOTSC-6LS zCe6hl66vJ(BQuoBVPHv(50yYIa z$Olv7PXNd!$sUGM`KdW-r;?FT4#^pHmBVH_zN?%|?UAg}-*SmL4miXCXTzo?B99z# z6le%B+XwRAb~crW*e?0acC1YAMAp!g#ziyv=5d=k$P08*@wB8% zy1ubrb|t%Ab2*ZH&j86G#V?rY)@Y>eeTOh-KToGp?io^`GR!OO?k_d;~r2VM}7@A9c07x3KUk`wzrTh#F4mCnf?jlmc zBa*>OE&H{Y+Yiq#vmB5#mw5nlsRNQV`&}-`3{a z>0?OoiY&9sI{0V7KB%!B8p}Q{<%))IWjeHP`Xi~b=u4#-0_OZWU>F_=+j*B`JAa5B zzs0_&lsYOh6ah$qIQl_F6r(Uly%mjCFl3995fT8K*J&A%qXqOuWpqP4q$weJn~E_^ sMw0XYFW)y>)c^nh diff --git a/build-fx/src/main.d b/build-fx/src/main.d index 3e79012..6059d62 100644 --- a/build-fx/src/main.d +++ b/build-fx/src/main.d @@ -1,5 +1,7 @@ -build-fx/src/main.o: src/main.c src/world.h src/mario.h +build-fx/src/main.o: src/main.c src/world.h src/mario.h src/box.h src/world.h: src/mario.h: + +src/box.h: diff --git a/build-fx/src/main.o b/build-fx/src/main.o index 2ffe1b9891dfe35980255dcd8197b4669619bfe2..92ece74aae1137ca911835c87cca630cbdf3d454 100644 GIT binary patch delta 27 jcmZqSZQ-48nprSKXyQ2;rc#56A5A7PvTjyojAsP^fs+We delta 27 jcmZqSZQ-48npq@7c;Y!3CUt>{A5A7PvTjyojAsP^dpig_ diff --git a/build-fx/src/tile.o b/build-fx/src/tile.o index 00460902d55f941ad0ccde28f154209de376584c..600c85f33072b560ea6909190640e5190fb2639b 100644 GIT binary patch delta 12 TcmaFE@rGl9JEOx!4;2;wAd>_l delta 12 TcmaFE@rGl9JEQ$Z4;2;wAdUnf diff --git a/build-fx/src/world.o b/build-fx/src/world.o index d0516dfd68027c8571c993f830cb1be1a85bc823..51ca4fee65c3c2bb75ed237d14cbac0886a12223 100644 GIT binary patch delta 282 zcmdnN_lJLik_6in1_lOZ1`{C3z@Wjv$-t59T+IF`ZKKsh#?&tl7%Com2zD~OV3?!z zlKrx%Cg)rB?AbOmbUQ71vTi3$PF$SVY_zA)!|qP%V|k(U#qx@#YxIp$l%2WLHV1yH z;t2X^CD8vd`BOEA^?~kZ^*sJ+dEaus<$TNjmh~<38v}R7H-?VMI!t5{F7#^}Ka#lRd7WNSA zWvu@3g5eFjPG{2Lq96AJGnwTTEhVBp=1xv-w%ucVBGp*mD1EW%nzYS++$ooB;|zQU%=$TIl{n>woj u&=jB=b|ogJ50gFE)j(7MyE;&I29U!NGWh_zni%U8peidQ`+&AFFaQ8O-Aye3 diff --git a/src/main.c b/src/main.c index aa5013a..6607445 100644 --- a/src/main.c +++ b/src/main.c @@ -29,7 +29,7 @@ int main(void) gint_panic_set(system_error); volatile int has_ticked = 1; - timer_setup(0, timer_delay(0, 10000), timer_Po_4, callback, &has_ticked); + timer_setup(0, timer_delay(0, 3*10000), timer_Po_4, callback, &has_ticked); timer_start(0); while(global_quit==0) @@ -38,7 +38,7 @@ int main(void) dclear(C_WHITE); - world_draw(mario.x,mario.y); + world_draw(mario.p.x,mario.p.y); //ennemies_draw(); mario_draw(); //ingame_draw(); diff --git a/src/tile.c b/src/tile.c index 7a50457..c6f70cc 100644 --- a/src/tile.c +++ b/src/tile.c @@ -20,7 +20,7 @@ tileset_t coin={&img_coin, 8, 8, 1}; void draw_tile(int sx, int sy, tileset_t const * const set, int x, int y) { - dsubimage(sx, 63-sy-set->height, + dsubimage(sx, 64-sy-set->height, set->sheet, x*(set->width+set->padding), y*(set->height+set->padding), set->width,set->height, diff --git a/src/world.c b/src/world.c index ad8df84..1add6f4 100644 --- a/src/world.c +++ b/src/world.c @@ -7,15 +7,21 @@ static world_t tuyau_sample[]= { {EARTH,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, - {EARTH,1,0,0}, {TUYAU, 0, 3, 0}, {TUYAU, 0, 3, 0}, {TUYAU, 0, 2, 0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, - {EARTH,1,0,0}, {TUYAU, 1, 3, 0}, {TUYAU, 1, 3, 0}, {TUYAU, 1, 2, 0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, + {EARTH,1,0,0}, {TUYAU, 0, 3, 0}, {TUYAU, 0, 2, 0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, + {EARTH,1,0,0}, {TUYAU, 1, 3, 0}, {TUYAU, 1, 2, 0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {EARTH,1,1,0}, {EARTH,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {BRICK,0,0,0}, {0,0,0,0}, {0,0,0,0}, {EARTH,1,1,0}, {EARTH,1,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {GIFT,0,0,0}, {COIN,0,0,0}, {COIN,0,0,0}, - {EARTH,2,1,0}, {EARTH,2,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {BRICK,0,0,0}, {0,0,0,0}, {0,0,0,0} + {EARTH,2,1,0}, {EARTH,2,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {BRICK,0,0,0}, {0,0,0,0}, {0,0,0,0}, + {EARTH,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, + {EARTH,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, + {EARTH,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, + {EARTH,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, + {EARTH,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, + {EARTH,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0} }; static world_t * current = tuyau_sample; -static int current_x=6; +static int current_x=12; static int current_y=8; world_t* world_get(int x, int y) @@ -92,32 +98,30 @@ static int max(const int x, const int y) int world_get_real_x0(int x) //mario delta en 0,0 {return max(x-63,0);} -int world_get_real_y0(int x) //mario delta en 0,0 -{return max(x-31,0);} +int world_get_real_y0(int y) //mario delta en 0,0 +{return max(y-31,0);} void world_draw(int x, int y) { - int s_left = world_get_real_x0(x)%8-8; - int s_top = world_get_real_y0(y)%8-8; + int mx0=world_get_real_x0(x); + int my0=world_get_real_y0(y); + int sx0=mx0%8; + int sy0=my0%8; + //int mx, my; - int tx, ty, rx, ry; - - tx=s_left; - rx=world_get_real_x0(x)-8; - while (tx<128) + int mx=mx0; + for (int i=0; i<=16; i++) { - ry=world_get_real_y0(y)-8; - ty=s_top; - while (ty<64) + int my=my0; + for (int j=0; j<=8; j++) { - display_cell(rx,ry, tx, ty); - ty+=8; - ry+=8; + display_cell(mx, my, 8*i-sx0, 8*j-sy0); + my+=8; } - tx+=8; - rx+=8; + mx+=8; + } } \ No newline at end of file