diff --git a/SuperCbr.g1a b/SuperCbr.g1a index db763e5..58dfe61 100644 Binary files a/SuperCbr.g1a and b/SuperCbr.g1a differ diff --git a/assets-fx/img/1up.png b/assets-fx/img/1up.png index c9e0726..9ce7386 100644 Binary files a/assets-fx/img/1up.png and b/assets-fx/img/1up.png differ diff --git a/assets-fx/img/bloc.png b/assets-fx/img/bloc.png index a438992..7552ca0 100644 Binary files a/assets-fx/img/bloc.png and b/assets-fx/img/bloc.png differ diff --git a/assets-fx/img/buisson.png b/assets-fx/img/buisson.png index 19c08b0..9b8376d 100644 Binary files a/assets-fx/img/buisson.png and b/assets-fx/img/buisson.png differ diff --git a/assets-fx/img/bullet.png b/assets-fx/img/bullet.png index fc0acb8..0589fca 100644 Binary files a/assets-fx/img/bullet.png and b/assets-fx/img/bullet.png differ diff --git a/assets-fx/img/carapace_verte.png b/assets-fx/img/carapace_verte.png index adff626..b370e5a 100644 Binary files a/assets-fx/img/carapace_verte.png and b/assets-fx/img/carapace_verte.png differ diff --git a/assets-fx/img/colline.png b/assets-fx/img/colline.png index b08ad14..81ae669 100644 Binary files a/assets-fx/img/colline.png and b/assets-fx/img/colline.png differ diff --git a/assets-fx/img/error.png b/assets-fx/img/error.png index 8cfb2e4..a061bfa 100755 Binary files a/assets-fx/img/error.png and b/assets-fx/img/error.png differ diff --git a/assets-fx/img/fleur.png b/assets-fx/img/fleur.png index f273bb5..b3b8332 100644 Binary files a/assets-fx/img/fleur.png and b/assets-fx/img/fleur.png differ diff --git a/assets-fx/img/goomba.png b/assets-fx/img/goomba.png index 3273b14..f040960 100644 Binary files a/assets-fx/img/goomba.png and b/assets-fx/img/goomba.png differ diff --git a/assets-fx/img/koopa_verte.png b/assets-fx/img/koopa_verte.png index 4670032..600d014 100644 Binary files a/assets-fx/img/koopa_verte.png and b/assets-fx/img/koopa_verte.png differ diff --git a/build-fx/SuperCbr.bin b/build-fx/SuperCbr.bin index 3a96da3..75af441 100755 Binary files a/build-fx/SuperCbr.bin and b/build-fx/SuperCbr.bin differ diff --git a/build-fx/SuperCbr.elf b/build-fx/SuperCbr.elf index 83decdd..15f7e3c 100755 Binary files a/build-fx/SuperCbr.elf and b/build-fx/SuperCbr.elf differ diff --git a/build-fx/assets/img/1up.png.o b/build-fx/assets/img/1up.png.o index 4164daa..d4fc041 100644 Binary files a/build-fx/assets/img/1up.png.o and b/build-fx/assets/img/1up.png.o differ diff --git a/build-fx/assets/img/bloc.png.o b/build-fx/assets/img/bloc.png.o index 25ead2d..906e58e 100644 Binary files a/build-fx/assets/img/bloc.png.o and b/build-fx/assets/img/bloc.png.o differ diff --git a/build-fx/assets/img/buisson.png.o b/build-fx/assets/img/buisson.png.o index 5b93a75..d59e02c 100644 Binary files a/build-fx/assets/img/buisson.png.o and b/build-fx/assets/img/buisson.png.o differ diff --git a/build-fx/assets/img/bullet.png.o b/build-fx/assets/img/bullet.png.o index 58cf7e9..aceede1 100644 Binary files a/build-fx/assets/img/bullet.png.o and b/build-fx/assets/img/bullet.png.o differ diff --git a/build-fx/assets/img/carapace_verte.png.o b/build-fx/assets/img/carapace_verte.png.o index 0e0417c..5cc8bb6 100644 Binary files a/build-fx/assets/img/carapace_verte.png.o and b/build-fx/assets/img/carapace_verte.png.o differ diff --git a/build-fx/assets/img/colline.png.o b/build-fx/assets/img/colline.png.o index 2b95054..4686941 100644 Binary files a/build-fx/assets/img/colline.png.o and b/build-fx/assets/img/colline.png.o differ diff --git a/build-fx/assets/img/error.png.o b/build-fx/assets/img/error.png.o index a8fd8b5..508a63d 100644 Binary files a/build-fx/assets/img/error.png.o and b/build-fx/assets/img/error.png.o differ diff --git a/build-fx/assets/img/fleur.png.o b/build-fx/assets/img/fleur.png.o index 7c06f72..9d2b9a4 100644 Binary files a/build-fx/assets/img/fleur.png.o and b/build-fx/assets/img/fleur.png.o differ diff --git a/build-fx/assets/img/goomba.png.o b/build-fx/assets/img/goomba.png.o index 0497792..a5039d1 100644 Binary files a/build-fx/assets/img/goomba.png.o and b/build-fx/assets/img/goomba.png.o differ diff --git a/build-fx/assets/img/koopa_verte.png.o b/build-fx/assets/img/koopa_verte.png.o index 6d338a8..1687aa0 100644 Binary files a/build-fx/assets/img/koopa_verte.png.o and b/build-fx/assets/img/koopa_verte.png.o differ diff --git a/build-fx/map b/build-fx/map index 2ed5bfa..c849d0f 100644 --- a/build-fx/map +++ b/build-fx/map @@ -201,7 +201,7 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x0000000000300000 _brom = 0x300000 - 0x000000000000a3a8 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x000000000000aeac _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8d0 *(.pretext.entry) @@ -241,7 +241,7 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a *(.dtors .dtors.*) 0x0000000000300ad0 _etors = . -.text 0x0000000000300ad0 0x5290 +.text 0x0000000000300ad0 0x5388 0x0000000000300ad0 _gint_exch_tlbh_start = . *(.gint.exch_tlbh) .gint.exch_tlbh @@ -263,361 +263,363 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x0000000000300db8 _score_display .text 0x0000000000300ef8 0x40 build-fx/src/tile.c.o 0x0000000000300ef8 _draw_tile - .text 0x0000000000300f38 0x370 build-fx/src/box.c.o + .text 0x0000000000300f38 0x374 build-fx/src/box.c.o 0x0000000000300f38 _sgn 0x0000000000300f4a _check_collision 0x0000000000300fc4 _box_move - 0x0000000000301248 _box_jump - .text 0x00000000003012a8 0x544 build-fx/src/world.c.o - 0x00000000003012a8 _world_get_width - 0x00000000003012b8 _world_get - 0x000000000030131c _display_cell - 0x000000000030165c _world_get_ctg - 0x0000000000301694 _world_get_real_x0 - 0x00000000003016cc _world_get_real_y0 - 0x00000000003016e0 _world_draw - .text 0x00000000003017ec 0x40c build-fx/src/bonus.c.o - 0x00000000003017ec _lance_bullet - 0x0000000000301844 _bullet_display - 0x0000000000301998 _bonus_set - 0x00000000003019c8 _bonus_move - 0x0000000000301b34 _bonus_draw - .text 0x0000000000301bf8 0x6b4 build-fx/src/mario.c.o - 0x0000000000301c08 _mario_bigger - 0x0000000000301c24 _mario_smaller - 0x0000000000301c50 _mario_draw - 0x0000000000301dc4 _test_sol_le_plus_proche - 0x0000000000301e30 _mario_move - .text 0x00000000003022ac 0x40 build-fx/src/main.c.o - 0x00000000003022ac _callback - 0x00000000003022b4 _system_error - .text.startup 0x00000000003022ec 0x1c0 build-fx/src/main.c.o - 0x00000000003022ec _main - .text 0x00000000003024ac 0x288 build-fx/src/keyboard.c.o - 0x00000000003024ac _menu_pause - 0x0000000000302644 _update_keyboard - .text 0x0000000000302734 0x5f8 build-fx/src/ennemi.c.o - 0x0000000000302734 _display_ennemi - 0x00000000003028d0 _ennemi_check_collision - 0x000000000030292c _hurt_mario - 0x0000000000302960 _move_ennemi - 0x0000000000302cec _display_ennemi_table - .text 0x0000000000302d2c 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x0000000000303728 _kprint_opt - 0x0000000000303870 _kprint - 0x0000000000303948 _kvsprint - 0x0000000000303990 _sprintf - 0x00000000003039b8 _vsprintf - 0x00000000003039d8 _snprintf - 0x00000000003039f8 _vsnprintf - .text 0x0000000000303a10 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - 0x0000000000303a10 _memcpy - 0x0000000000303aca __memmove - 0x0000000000303ace __memcmp - 0x0000000000303ad2 _memset - .text 0x0000000000303aec 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) - .text 0x0000000000303aec 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - .text 0x0000000000303aec 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - 0x0000000000303aec _dupdate - 0x0000000000303b04 _dupdate_noint - .text 0x0000000000303b10 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - 0x0000000000303b10 _dimage - 0x0000000000303b64 _dsubimage - .text 0x0000000000303bd8 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - 0x0000000000303bd8 _dclear - .text 0x0000000000303c24 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x0000000000303dcc _pollevent - 0x0000000000303f10 _waitevent - 0x0000000000303f5c _clearevents - 0x0000000000303f7c _keydown - 0x0000000000303fa8 _keydown_all - 0x0000000000303fe4 _keydown_any - .text 0x0000000000304020 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - 0x000000000030402c _iokbd_row - 0x0000000000304114 _iokbd_scan - .text 0x0000000000304144 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - 0x0000000000304144 _getkey_opt - 0x00000000003042f0 _getkey - 0x00000000003042fc _getkey_repeat - .text 0x0000000000304338 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) - .text 0x0000000000304338 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - 0x00000000003044c8 _gint_panic - 0x00000000003044d8 _gint_panic_set - 0x00000000003044e4 _gint_exc_catch - 0x00000000003044f0 _gint_exc_skip - .text 0x00000000003044fc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) - .text 0x00000000003044fc 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - 0x00000000003045b0 _gint_install - 0x0000000000304660 _gint_unload - .text 0x0000000000304678 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) - .text 0x0000000000304678 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) - .text 0x0000000000304678 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - 0x0000000000304678 _tlb_addr - 0x000000000030468c _tlb_data - 0x00000000003046a0 _tlb_mapped_memory - 0x0000000000304774 _utlb_addr - 0x0000000000304784 _utlb_data - 0x0000000000304794 _utlb_mapped_memory - .text 0x000000000030486c 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x000000000030486c _dsize - .text 0x0000000000304908 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - 0x0000000000304908 _dprint - .text 0x0000000000304960 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x0000000000304c80 _timer_setup - 0x0000000000304d10 _timer_delay - 0x0000000000304d70 _timer_start - 0x0000000000304da4 _timer_reload - 0x0000000000304dc4 _timer_pause - 0x0000000000304df8 _timer_stop - 0x0000000000304e54 _timer_timeout - 0x0000000000304e60 _timer_address - 0x0000000000304e9c _timer_clear - .text 0x0000000000304ecc 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - 0x0000000000304ecc _sleep_us - .text 0x0000000000304f24 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x0000000000304fbc _t6k11_display - 0x0000000000305090 _t6k11_contrast - 0x00000000003050bc _t6k11_backlight - .text 0x00000000003050fc 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x0000000000305240 _clock_freq - .text 0x000000000030524c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) - .text 0x000000000030524c 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) - 0x000000000030524c _bopti_asm_mono - 0x0000000000305272 _bopti_asm_mono_alpha - .text 0x00000000003052a4 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - 0x00000000003052a4 _bopti_grid - 0x0000000000305418 _bopti_render - 0x0000000000305548 _bopti_render_clip - 0x000000000030565c _bopti_render_noclip - .text 0x00000000003056b4 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - 0x00000000003056b4 _masks - .text 0x0000000000305750 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - 0x0000000000305750 _gint_setvbr - .text 0x000000000030577c 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - 0x000000000030577c _gint_intlevel - 0x00000000003057d0 _gint_inthandler - .text 0x00000000003057f4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - .text 0x00000000003057f4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - .text 0x00000000003057f4 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - 0x00000000003057f4 ___movstr - 0x00000000003057f4 ___movmem - 0x0000000000305828 ___movmemSI64 - 0x0000000000305828 ___movstrSI64 - 0x000000000030582c ___movstrSI60 - 0x000000000030582c ___movmemSI60 - 0x0000000000305830 ___movmemSI56 - 0x0000000000305830 ___movstrSI56 - 0x0000000000305834 ___movstrSI52 - 0x0000000000305834 ___movmemSI52 - 0x0000000000305838 ___movstrSI48 - 0x0000000000305838 ___movmemSI48 - 0x000000000030583c ___movstrSI44 - 0x000000000030583c ___movmemSI44 - 0x0000000000305840 ___movstrSI40 - 0x0000000000305840 ___movmemSI40 - 0x0000000000305844 ___movstrSI36 - 0x0000000000305844 ___movmemSI36 - 0x0000000000305848 ___movmemSI32 - 0x0000000000305848 ___movstrSI32 - 0x000000000030584c ___movmemSI28 - 0x000000000030584c ___movstrSI28 - 0x0000000000305850 ___movstrSI24 - 0x0000000000305850 ___movmemSI24 - 0x0000000000305854 ___movmemSI20 - 0x0000000000305854 ___movstrSI20 - 0x0000000000305858 ___movstrSI16 - 0x0000000000305858 ___movmemSI16 - 0x000000000030585c ___movmemSI12 - 0x000000000030585c ___movstrSI12 - 0x0000000000305860 ___movmemSI8 - 0x0000000000305860 ___movstrSI8 - 0x0000000000305864 ___movmemSI4 - 0x0000000000305864 ___movstrSI4 - .text 0x000000000030586c 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - 0x000000000030586c ___udivdi3 - .text 0x0000000000305a5c 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - 0x0000000000305a5c ___umoddi3 - .text 0x0000000000305c90 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - 0x0000000000305cb2 ___udivsi3 - *fill* 0x0000000000305cfc 0x4 - .text 0x0000000000305d00 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000305d00 ___udiv_qrnnd_16 - .text 0x0000000000305d60 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x000000000030124c _box_jump + .text 0x00000000003012ac 0x598 build-fx/src/world.c.o + 0x00000000003012ac _world_get_width + 0x00000000003012bc _world_get + 0x0000000000301320 _display_cell + 0x0000000000301684 _world_get_ctg + 0x00000000003016bc _world_get_real_x0 + 0x0000000000301704 _world_get_real_y0 + 0x0000000000301718 _world_draw + 0x0000000000301824 _world_move + .text 0x0000000000301844 0x43c build-fx/src/bonus.c.o + 0x0000000000301844 _lance_bullet + 0x000000000030189c _bullet_display + 0x000000000030191c _bullet_move + 0x0000000000301a28 _bonus_set + 0x0000000000301a58 _bonus_move + 0x0000000000301bc4 _bonus_draw + .text 0x0000000000301c80 0x6dc build-fx/src/mario.c.o + 0x0000000000301c90 _mario_bigger + 0x0000000000301cac _mario_smaller + 0x0000000000301cd8 _mario_draw + 0x0000000000301e74 _test_sol_le_plus_proche + 0x0000000000301ee0 _mario_move + .text 0x000000000030235c 0x40 build-fx/src/main.c.o + 0x000000000030235c _callback + 0x0000000000302364 _system_error + .text.startup 0x000000000030239c 0x1c0 build-fx/src/main.c.o + 0x000000000030239c _main + .text 0x000000000030255c 0x284 build-fx/src/keyboard.c.o + 0x000000000030255c _menu_pause + 0x00000000003026f0 _update_keyboard + .text 0x00000000003027e0 0x644 build-fx/src/ennemi.c.o + 0x00000000003027e0 _display_ennemi + 0x000000000030297c _ennemi_check_collision + 0x00000000003029d8 _hurt_mario + 0x0000000000302a0c _move_ennemi + 0x0000000000302de4 _display_ennemi_table + .text 0x0000000000302e24 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x0000000000303820 _kprint_opt + 0x0000000000303968 _kprint + 0x0000000000303a40 _kvsprint + 0x0000000000303a88 _sprintf + 0x0000000000303ab0 _vsprintf + 0x0000000000303ad0 _snprintf + 0x0000000000303af0 _vsnprintf + .text 0x0000000000303b08 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + 0x0000000000303b08 _memcpy + 0x0000000000303bc2 __memmove + 0x0000000000303bc6 __memcmp + 0x0000000000303bca _memset + .text 0x0000000000303be4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) + .text 0x0000000000303be4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + .text 0x0000000000303be4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + 0x0000000000303be4 _dupdate + 0x0000000000303bfc _dupdate_noint + .text 0x0000000000303c08 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x0000000000303c08 _dimage + 0x0000000000303c5c _dsubimage + .text 0x0000000000303cd0 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + 0x0000000000303cd0 _dclear + .text 0x0000000000303d1c 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000303ec4 _pollevent + 0x0000000000304008 _waitevent + 0x0000000000304054 _clearevents + 0x0000000000304074 _keydown + 0x00000000003040a0 _keydown_all + 0x00000000003040dc _keydown_any + .text 0x0000000000304118 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + 0x0000000000304124 _iokbd_row + 0x000000000030420c _iokbd_scan + .text 0x000000000030423c 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + 0x000000000030423c _getkey_opt + 0x00000000003043e8 _getkey + 0x00000000003043f4 _getkey_repeat + .text 0x0000000000304430 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) + .text 0x0000000000304430 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x00000000003045c0 _gint_panic + 0x00000000003045d0 _gint_panic_set + 0x00000000003045dc _gint_exc_catch + 0x00000000003045e8 _gint_exc_skip + .text 0x00000000003045f4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) + .text 0x00000000003045f4 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + 0x00000000003046a8 _gint_install + 0x0000000000304758 _gint_unload + .text 0x0000000000304770 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) + .text 0x0000000000304770 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) + .text 0x0000000000304770 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + 0x0000000000304770 _tlb_addr + 0x0000000000304784 _tlb_data + 0x0000000000304798 _tlb_mapped_memory + 0x000000000030486c _utlb_addr + 0x000000000030487c _utlb_data + 0x000000000030488c _utlb_mapped_memory + .text 0x0000000000304964 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x0000000000304964 _dsize + .text 0x0000000000304a00 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + 0x0000000000304a00 _dprint + .text 0x0000000000304a58 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000304d78 _timer_setup + 0x0000000000304e08 _timer_delay + 0x0000000000304e68 _timer_start + 0x0000000000304e9c _timer_reload + 0x0000000000304ebc _timer_pause + 0x0000000000304ef0 _timer_stop + 0x0000000000304f4c _timer_timeout + 0x0000000000304f58 _timer_address + 0x0000000000304f94 _timer_clear + .text 0x0000000000304fc4 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + 0x0000000000304fc4 _sleep_us + .text 0x000000000030501c 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x00000000003050b4 _t6k11_display + 0x0000000000305188 _t6k11_contrast + 0x00000000003051b4 _t6k11_backlight + .text 0x00000000003051f4 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x0000000000305338 _clock_freq + .text 0x0000000000305344 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) + .text 0x0000000000305344 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) + 0x0000000000305344 _bopti_asm_mono + 0x000000000030536a _bopti_asm_mono_alpha + .text 0x000000000030539c 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x000000000030539c _bopti_grid + 0x0000000000305510 _bopti_render + 0x0000000000305640 _bopti_render_clip + 0x0000000000305754 _bopti_render_noclip + .text 0x00000000003057ac 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + 0x00000000003057ac _masks + .text 0x0000000000305848 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + 0x0000000000305848 _gint_setvbr + .text 0x0000000000305874 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + 0x0000000000305874 _gint_intlevel + 0x00000000003058c8 _gint_inthandler + .text 0x00000000003058ec 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + .text 0x00000000003058ec 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + .text 0x00000000003058ec 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + 0x00000000003058ec ___movstr + 0x00000000003058ec ___movmem + 0x0000000000305920 ___movmemSI64 + 0x0000000000305920 ___movstrSI64 + 0x0000000000305924 ___movstrSI60 + 0x0000000000305924 ___movmemSI60 + 0x0000000000305928 ___movmemSI56 + 0x0000000000305928 ___movstrSI56 + 0x000000000030592c ___movstrSI52 + 0x000000000030592c ___movmemSI52 + 0x0000000000305930 ___movstrSI48 + 0x0000000000305930 ___movmemSI48 + 0x0000000000305934 ___movstrSI44 + 0x0000000000305934 ___movmemSI44 + 0x0000000000305938 ___movstrSI40 + 0x0000000000305938 ___movmemSI40 + 0x000000000030593c ___movstrSI36 + 0x000000000030593c ___movmemSI36 + 0x0000000000305940 ___movmemSI32 + 0x0000000000305940 ___movstrSI32 + 0x0000000000305944 ___movmemSI28 + 0x0000000000305944 ___movstrSI28 + 0x0000000000305948 ___movstrSI24 + 0x0000000000305948 ___movmemSI24 + 0x000000000030594c ___movmemSI20 + 0x000000000030594c ___movstrSI20 + 0x0000000000305950 ___movstrSI16 + 0x0000000000305950 ___movmemSI16 + 0x0000000000305954 ___movmemSI12 + 0x0000000000305954 ___movstrSI12 + 0x0000000000305958 ___movmemSI8 + 0x0000000000305958 ___movstrSI8 + 0x000000000030595c ___movmemSI4 + 0x000000000030595c ___movstrSI4 + .text 0x0000000000305964 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + 0x0000000000305964 ___udivdi3 + .text 0x0000000000305b54 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + 0x0000000000305b54 ___umoddi3 + .text 0x0000000000305d88 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + 0x0000000000305daa ___udivsi3 + *fill* 0x0000000000305df4 0x4 + .text 0x0000000000305df8 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000305df8 ___udiv_qrnnd_16 + .text 0x0000000000305e58 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) *(C P) -.gint.blocks 0x0000000000305d60 0x120 +.gint.blocks 0x0000000000305e60 0x120 *(.gint.blocks) - .gint.blocks 0x0000000000305d60 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - 0x0000000000305d60 _gint_inth_7305 - 0x0000000000305d80 _gint_inth_7705 - .gint.blocks 0x0000000000305da0 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - 0x0000000000305da0 _inth_tmu - 0x0000000000305e20 _inth_etmu2 - 0x0000000000305e40 _inth_etmu_help - 0x0000000000305e60 _inth_etmux + .gint.blocks 0x0000000000305e60 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + 0x0000000000305e60 _gint_inth_7305 + 0x0000000000305e80 _gint_inth_7705 + .gint.blocks 0x0000000000305ea0 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + 0x0000000000305ea0 _inth_tmu + 0x0000000000305f20 _inth_etmu2 + 0x0000000000305f40 _inth_etmu_help + 0x0000000000305f60 _inth_etmux -.gint.drivers 0x0000000000305e80 0x90 - 0x0000000000305e80 _bdrv = . +.gint.drivers 0x0000000000305f80 0x90 + 0x0000000000305f80 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x0000000000305e80 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x0000000000305e80 _drv_cpg + 0x0000000000305f80 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x0000000000305f80 _drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x0000000000305ea4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x0000000000305ea4 _drv_tmu + 0x0000000000305fa4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000305fa4 _drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x0000000000305ec8 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x0000000000305ec8 _drv_keysc + 0x0000000000305fc8 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000305fc8 _drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x0000000000305eec 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x0000000000305eec _drv_t6k11 + 0x0000000000305fec 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x0000000000305fec _drv_t6k11 *(.gint.drivers.6) - 0x0000000000305f10 _edrv = . + 0x0000000000306010 _edrv = . -.rodata 0x0000000000305f10 0x4d68 +.rodata 0x0000000000306010 0x5774 *(.rodata.4) *(.rodata .rodata.*) - .rodata 0x0000000000305f10 0x190c build-fx/src/level.c.o + .rodata 0x0000000000306010 0x1de4 build-fx/src/level.c.o .rodata.str1.4 - 0x000000000030781c 0x1e build-fx/src/score.c.o + 0x0000000000307df4 0x1e build-fx/src/score.c.o .rodata.str1.4 - 0x000000000030783a 0x3 build-fx/src/main.c.o - *fill* 0x000000000030783a 0x2 - .rodata 0x000000000030783c 0x28 build-fx/src/keyboard.c.o - .rodata 0x0000000000307864 0x30 build-fx/src/ennemi.c.o - .rodata 0x0000000000307894 0x204 build-fx/assets/fonts/mario.png.o - 0x0000000000307894 _font_mario - 0x0000000000307a98 _font_mario_end - .rodata 0x0000000000307a98 0x20 build-fx/assets/img/bonus.png.o - 0x0000000000307a98 _img_bonus - 0x0000000000307ab8 _img_bonus_end - .rodata 0x0000000000307ab8 0x24 build-fx/assets/img/bloc.png.o - 0x0000000000307ab8 _img_bloc - 0x0000000000307adc _img_bloc_end - .rodata 0x0000000000307adc 0x404 build-fx/assets/img/ram.png.o - 0x0000000000307adc _img_ram - 0x0000000000307ee0 _img_ram_end - .rodata 0x0000000000307ee0 0x64 build-fx/assets/img/mario.png.o - 0x0000000000307ee0 _img_mario - 0x0000000000307f44 _img_mario_end - .rodata 0x0000000000307f44 0x404 build-fx/assets/img/main.png.o - 0x0000000000307f44 _img_main - 0x0000000000308348 _img_main_end - .rodata 0x0000000000308348 0x404 build-fx/assets/img/new_level.png.o - 0x0000000000308348 _img_new_level - 0x000000000030874c _img_new_level_end - .rodata 0x000000000030874c 0x4c build-fx/assets/img/brick.png.o - 0x000000000030874c _img_brick - 0x0000000000308798 _img_brick_end - .rodata 0x0000000000308798 0x84 build-fx/assets/img/menu_pause.png.o - 0x0000000000308798 _img_menu_pause - 0x000000000030881c _img_menu_pause_end - .rodata 0x000000000030881c 0x18 build-fx/assets/img/select_arrow.png.o - 0x000000000030881c _img_select_arrow - 0x0000000000308834 _img_select_arrow_end - .rodata 0x0000000000308834 0x804 build-fx/assets/img/dev.png.o - 0x0000000000308834 _img_dev - 0x0000000000309038 _img_dev_end - .rodata 0x0000000000309038 0x24 build-fx/assets/img/death.png.o - 0x0000000000309038 _img_death - 0x000000000030905c _img_death_end - .rodata 0x000000000030905c 0x404 build-fx/assets/img/time_over.png.o - 0x000000000030905c _img_time_over - 0x0000000000309460 _img_time_over_end - .rodata 0x0000000000309460 0x4c build-fx/assets/img/coin.png.o - 0x0000000000309460 _img_coin - 0x00000000003094ac _img_coin_end - .rodata 0x00000000003094ac 0x24 build-fx/assets/img/champi.png.o - 0x00000000003094ac _img_champi - 0x00000000003094d0 _img_champi_end - .rodata 0x00000000003094d0 0xdc build-fx/assets/img/mariosmall.png.o - 0x00000000003094d0 _img_mariosmall - 0x00000000003095ac _img_mariosmall_end - .rodata 0x00000000003095ac 0x28 build-fx/assets/img/gift.png.o - 0x00000000003095ac _img_gift - 0x00000000003095d4 _img_gift_end - .rodata 0x00000000003095d4 0x24 build-fx/assets/img/buisson.png.o - 0x00000000003095d4 _img_buisson - 0x00000000003095f8 _img_buisson_end - .rodata 0x00000000003095f8 0x44 build-fx/assets/img/colline.png.o - 0x00000000003095f8 _img_colline - 0x000000000030963c _img_colline_end - .rodata 0x000000000030963c 0x114 build-fx/assets/img/mariobig.png.o - 0x000000000030963c _img_mariobig - 0x0000000000309750 _img_mariobig_end - .rodata 0x0000000000309750 0x404 build-fx/assets/img/error.png.o - 0x0000000000309750 _img_error - 0x0000000000309b54 _img_error_end - .rodata 0x0000000000309b54 0x24 build-fx/assets/img/1up.png.o - 0x0000000000309b54 _img_1up - 0x0000000000309b78 _img_1up_end - .rodata 0x0000000000309b78 0xb8 build-fx/assets/img/tuyau.png.o - 0x0000000000309b78 _img_tuyau - 0x0000000000309c30 _img_tuyau_end - .rodata 0x0000000000309c30 0x14 build-fx/assets/img/bullet.png.o - 0x0000000000309c30 _img_bullet - 0x0000000000309c44 _img_bullet_end - .rodata 0x0000000000309c44 0x28 build-fx/assets/img/carapace_verte.png.o - 0x0000000000309c44 _img_carapace_verte - 0x0000000000309c6c _img_carapace_verte_end - .rodata 0x0000000000309c6c 0x44 build-fx/assets/img/nuage.png.o - 0x0000000000309c6c _img_nuage - 0x0000000000309cb0 _img_nuage_end - .rodata 0x0000000000309cb0 0x64 build-fx/assets/img/koopa_verte.png.o - 0x0000000000309cb0 _img_koopa_verte - 0x0000000000309d14 _img_koopa_verte_end - .rodata 0x0000000000309d14 0x404 build-fx/assets/img/level.png.o - 0x0000000000309d14 _img_level - 0x000000000030a118 _img_level_end - .rodata 0x000000000030a118 0x4c build-fx/assets/img/goomba.png.o - 0x000000000030a118 _img_goomba - 0x000000000030a164 _img_goomba_end - .rodata 0x000000000030a164 0x24 build-fx/assets/img/fleur.png.o - 0x000000000030a164 _img_fleur - 0x000000000030a188 _img_fleur_end - .rodata 0x000000000030a188 0x4c build-fx/assets/img/stone.png.o - 0x000000000030a188 _img_stone - 0x000000000030a1d4 _img_stone_end - .rodata 0x000000000030a1d4 0x404 build-fx/assets/img/lvl0.png.o - 0x000000000030a1d4 _img_lvl0 - 0x000000000030a5d8 _img_lvl0_end + 0x0000000000307e12 0x3 build-fx/src/main.c.o + *fill* 0x0000000000307e12 0x2 + .rodata 0x0000000000307e14 0x28 build-fx/src/keyboard.c.o + .rodata 0x0000000000307e3c 0x30 build-fx/src/ennemi.c.o + .rodata 0x0000000000307e6c 0x204 build-fx/assets/fonts/mario.png.o + 0x0000000000307e6c _font_mario + 0x0000000000308070 _font_mario_end + .rodata 0x0000000000308070 0x20 build-fx/assets/img/bonus.png.o + 0x0000000000308070 _img_bonus + 0x0000000000308090 _img_bonus_end + .rodata 0x0000000000308090 0x24 build-fx/assets/img/bloc.png.o + 0x0000000000308090 _img_bloc + 0x00000000003080b4 _img_bloc_end + .rodata 0x00000000003080b4 0x404 build-fx/assets/img/ram.png.o + 0x00000000003080b4 _img_ram + 0x00000000003084b8 _img_ram_end + .rodata 0x00000000003084b8 0x64 build-fx/assets/img/mario.png.o + 0x00000000003084b8 _img_mario + 0x000000000030851c _img_mario_end + .rodata 0x000000000030851c 0x404 build-fx/assets/img/main.png.o + 0x000000000030851c _img_main + 0x0000000000308920 _img_main_end + .rodata 0x0000000000308920 0x404 build-fx/assets/img/new_level.png.o + 0x0000000000308920 _img_new_level + 0x0000000000308d24 _img_new_level_end + .rodata 0x0000000000308d24 0x4c build-fx/assets/img/brick.png.o + 0x0000000000308d24 _img_brick + 0x0000000000308d70 _img_brick_end + .rodata 0x0000000000308d70 0x84 build-fx/assets/img/menu_pause.png.o + 0x0000000000308d70 _img_menu_pause + 0x0000000000308df4 _img_menu_pause_end + .rodata 0x0000000000308df4 0x18 build-fx/assets/img/select_arrow.png.o + 0x0000000000308df4 _img_select_arrow + 0x0000000000308e0c _img_select_arrow_end + .rodata 0x0000000000308e0c 0x804 build-fx/assets/img/dev.png.o + 0x0000000000308e0c _img_dev + 0x0000000000309610 _img_dev_end + .rodata 0x0000000000309610 0x24 build-fx/assets/img/death.png.o + 0x0000000000309610 _img_death + 0x0000000000309634 _img_death_end + .rodata 0x0000000000309634 0x404 build-fx/assets/img/time_over.png.o + 0x0000000000309634 _img_time_over + 0x0000000000309a38 _img_time_over_end + .rodata 0x0000000000309a38 0x4c build-fx/assets/img/coin.png.o + 0x0000000000309a38 _img_coin + 0x0000000000309a84 _img_coin_end + .rodata 0x0000000000309a84 0x24 build-fx/assets/img/champi.png.o + 0x0000000000309a84 _img_champi + 0x0000000000309aa8 _img_champi_end + .rodata 0x0000000000309aa8 0xdc build-fx/assets/img/mariosmall.png.o + 0x0000000000309aa8 _img_mariosmall + 0x0000000000309b84 _img_mariosmall_end + .rodata 0x0000000000309b84 0x28 build-fx/assets/img/gift.png.o + 0x0000000000309b84 _img_gift + 0x0000000000309bac _img_gift_end + .rodata 0x0000000000309bac 0x44 build-fx/assets/img/buisson.png.o + 0x0000000000309bac _img_buisson + 0x0000000000309bf0 _img_buisson_end + .rodata 0x0000000000309bf0 0x84 build-fx/assets/img/colline.png.o + 0x0000000000309bf0 _img_colline + 0x0000000000309c74 _img_colline_end + .rodata 0x0000000000309c74 0x114 build-fx/assets/img/mariobig.png.o + 0x0000000000309c74 _img_mariobig + 0x0000000000309d88 _img_mariobig_end + .rodata 0x0000000000309d88 0x804 build-fx/assets/img/error.png.o + 0x0000000000309d88 _img_error + 0x000000000030a58c _img_error_end + .rodata 0x000000000030a58c 0x44 build-fx/assets/img/1up.png.o + 0x000000000030a58c _img_1up + 0x000000000030a5d0 _img_1up_end + .rodata 0x000000000030a5d0 0xb8 build-fx/assets/img/tuyau.png.o + 0x000000000030a5d0 _img_tuyau + 0x000000000030a688 _img_tuyau_end + .rodata 0x000000000030a688 0x24 build-fx/assets/img/bullet.png.o + 0x000000000030a688 _img_bullet + 0x000000000030a6ac _img_bullet_end + .rodata 0x000000000030a6ac 0x4c build-fx/assets/img/carapace_verte.png.o + 0x000000000030a6ac _img_carapace_verte + 0x000000000030a6f8 _img_carapace_verte_end + .rodata 0x000000000030a6f8 0x44 build-fx/assets/img/nuage.png.o + 0x000000000030a6f8 _img_nuage + 0x000000000030a73c _img_nuage_end + .rodata 0x000000000030a73c 0xc4 build-fx/assets/img/koopa_verte.png.o + 0x000000000030a73c _img_koopa_verte + 0x000000000030a800 _img_koopa_verte_end + .rodata 0x000000000030a800 0x404 build-fx/assets/img/level.png.o + 0x000000000030a800 _img_level + 0x000000000030ac04 _img_level_end + .rodata 0x000000000030ac04 0x4c build-fx/assets/img/goomba.png.o + 0x000000000030ac04 _img_goomba + 0x000000000030ac50 _img_goomba_end + .rodata 0x000000000030ac50 0x44 build-fx/assets/img/fleur.png.o + 0x000000000030ac50 _img_fleur + 0x000000000030ac94 _img_fleur_end + .rodata 0x000000000030ac94 0x4c build-fx/assets/img/stone.png.o + 0x000000000030ac94 _img_stone + 0x000000000030ace0 _img_stone_end + .rodata 0x000000000030ace0 0x404 build-fx/assets/img/lvl0.png.o + 0x000000000030ace0 _img_lvl0 + 0x000000000030b0e4 _img_lvl0_end .rodata.str1.4 - 0x000000000030a5d8 0x31 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - *fill* 0x000000000030a609 0x3 - .rodata 0x000000000030a60c 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x000000000030b0e4 0x31 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + *fill* 0x000000000030b115 0x3 + .rodata 0x000000000030b118 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) .rodata.str1.4 - 0x000000000030a614 0x6 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - *fill* 0x000000000030a61a 0x2 + 0x000000000030b120 0x6 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + *fill* 0x000000000030b126 0x2 .rodata.str1.4 - 0x000000000030a61c 0x11a /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x000000000030b128 0x11a /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) 0x11e (size before relaxing) - *fill* 0x000000000030a736 0x2 - .rodata 0x000000000030a738 0x18 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + *fill* 0x000000000030b242 0x2 + .rodata 0x000000000030b244 0x18 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) .rodata.str1.4 - 0x000000000030a750 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - .rodata 0x000000000030a754 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) - 0x000000000030a754 _gint_font5x7 - 0x000000000030ab5c _gint_font5x7_end + 0x000000000030b25c 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + .rodata 0x000000000030b260 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) + 0x000000000030b260 _gint_font5x7 + 0x000000000030b668 _gint_font5x7_end .rodata.str1.4 - 0x000000000030ab5c 0x6 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - *fill* 0x000000000030ab62 0x2 + 0x000000000030b668 0x6 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + *fill* 0x000000000030b66e 0x2 .rodata.str1.4 - 0x000000000030ab64 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - .rodata 0x000000000030ab68 0x10 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - .rodata 0x000000000030ab78 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) - 0x000000000030ab78 ___clz_tab + 0x000000000030b670 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + .rodata 0x000000000030b674 0x10 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + .rodata 0x000000000030b684 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x000000000030b684 ___clz_tab -.rela.dyn 0x000000000030ac78 0x0 - .rela.text 0x000000000030ac78 0x0 build-fx/src/score.c.o +.rela.dyn 0x000000000030b784 0x0 + .rela.text 0x000000000030b784 0x0 build-fx/src/score.c.o .rela.text.startup - 0x000000000030ac78 0x0 build-fx/src/score.c.o + 0x000000000030b784 0x0 build-fx/src/score.c.o .rela.pretext.entry - 0x000000000030ac78 0x0 build-fx/src/score.c.o + 0x000000000030b784 0x0 build-fx/src/score.c.o 0x0000000008100000 . = ORIGIN (ram) .bss 0x0000000008100000 0x5c0 @@ -700,8 +702,8 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a *fill* 0x00000000081005bc 0x4 0x00000000000005c0 _sbss = SIZEOF (.bss) -.data 0x00000000081005c0 0x210 load address 0x000000000030ac78 - 0x000000000030ac78 _ldata = LOADADDR (.data) +.data 0x00000000081005c0 0x220 load address 0x000000000030b784 + 0x000000000030b784 _ldata = LOADADDR (.data) 0x00000000081005c0 _rdata = . *(.data .data.*) .data 0x00000000081005c0 0x0 build-fx/src/level.c.o @@ -725,80 +727,80 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x000000000810068c _tuyau .data 0x000000000810069c 0x0 build-fx/src/box.c.o .data 0x000000000810069c 0x0 build-fx/src/world.c.o - .data 0x000000000810069c 0x6c build-fx/src/bonus.c.o - .data 0x0000000008100708 0x50 build-fx/src/mario.c.o - 0x0000000008100708 _last_vx_sign - 0x000000000810070c _mario - 0x0000000008100738 _mario_big - 0x0000000008100748 _mario_small - .data 0x0000000008100758 0x0 build-fx/src/main.c.o - .data 0x0000000008100758 0x0 build-fx/src/keyboard.c.o - .data 0x0000000008100758 0x0 build-fx/src/ennemi.c.o - .data 0x0000000008100758 0x68 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x0000000008100758 _kprint_formatters - .data 0x00000000081007c0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - .data 0x00000000081007c0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) - .data 0x00000000081007c0 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x00000000081007c0 _topti_font - 0x00000000081007c4 _gint_default_font - .data 0x00000000081007c8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - .data 0x00000000081007c8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - .data 0x00000000081007c8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - .data 0x00000000081007c8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - .data 0x00000000081007c8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - .data 0x00000000081007c8 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + .data 0x000000000810069c 0x78 build-fx/src/bonus.c.o + .data 0x0000000008100714 0x54 build-fx/src/mario.c.o + 0x0000000008100714 _last_vx_sign + 0x0000000008100718 _mario + 0x0000000008100748 _mario_big + 0x0000000008100758 _mario_small + .data 0x0000000008100768 0x0 build-fx/src/main.c.o + .data 0x0000000008100768 0x0 build-fx/src/keyboard.c.o + .data 0x0000000008100768 0x0 build-fx/src/ennemi.c.o + .data 0x0000000008100768 0x68 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x0000000008100768 _kprint_formatters + .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) + .data 0x00000000081007d0 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x00000000081007d0 _topti_font + 0x00000000081007d4 _gint_default_font + .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + .data 0x00000000081007d8 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) *(D) - 0x00000000081007d0 . = ALIGN (0x10) + 0x00000000081007e0 . = ALIGN (0x10) -.data.4 0x00000000081007d0 0x0 load address 0x000000000030ae88 +.data.4 0x00000000081007e0 0x0 load address 0x000000000030b9a4 *(.data.4) - 0x00000000081007d0 . = ALIGN (0x10) - 0x0000000000000210 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) + 0x00000000081007e0 . = ALIGN (0x10) + 0x0000000000000220 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x00000000e5200000 . = ORIGIN (ilram) -.ilram 0x00000000e5200000 0x0 load address 0x000000000030ae88 - 0x000000000030ae88 _lilram = LOADADDR (.ilram) +.ilram 0x00000000e5200000 0x0 load address 0x000000000030b9a4 + 0x000000000030b9a4 _lilram = LOADADDR (.ilram) 0x00000000e5200000 _rilram = . *(.ilram) 0x00000000e5200000 . = ALIGN (0x10) 0x00000000e5007000 . = ORIGIN (xram) -.xram 0x00000000e5007000 0x0 load address 0x000000000030ae88 - 0x000000000030ae88 _lxram = LOADADDR (.xram) +.xram 0x00000000e5007000 0x0 load address 0x000000000030b9a4 + 0x000000000030b9a4 _lxram = LOADADDR (.xram) 0x00000000e5007000 _rxram = . *(.xram) 0x00000000e5007000 . = ALIGN (0x10) 0x00000000e5017000 . = ORIGIN (yram) -.yram 0x00000000e5017000 0x0 load address 0x000000000030ae88 - 0x000000000030ae88 _lyram = LOADADDR (.yram) +.yram 0x00000000e5017000 0x0 load address 0x000000000030b9a4 + 0x000000000030b9a4 _lyram = LOADADDR (.yram) 0x00000000e5017000 _ryram = . *(.yram) 0x00000000e5017000 . = ALIGN (0x10) @@ -808,8 +810,8 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x000000008800df00 _gint_vbr = 0x8800df00 0x000000008800f400 . = ORIGIN (rram) -.gint.data 0x000000008800f400 0x140 load address 0x000000000030ae88 - 0x000000000030ae88 _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x140 load address 0x000000000030b9a4 + 0x000000000030b9a4 _lgdata = LOADADDR (.gint.data) 0x000000008800f400 _rgdata = . *(.gint.data .gint.data.*) .gint.data 0x000000008800f400 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) @@ -830,7 +832,7 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x000000008800f540 . = ALIGN (0x10) 0x0000000000000140 _sgdata = SIZEOF (.gint.data) -.gint.bss 0x000000008800f540 0x290 load address 0x000000000030afc8 +.gint.bss 0x000000008800f540 0x290 load address 0x000000000030bae4 *(.gint.bss .gint.bss.*) .gint.bss 0x000000008800f540 0x180 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) .gint.bss 0x000000008800f6c0 0x1c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) diff --git a/build-fx/src/bonus.c.o b/build-fx/src/bonus.c.o index 7eed611..dbbab7a 100644 Binary files a/build-fx/src/bonus.c.o and b/build-fx/src/bonus.c.o differ diff --git a/build-fx/src/box.c.o b/build-fx/src/box.c.o index 943e562..f22da60 100644 Binary files a/build-fx/src/box.c.o and b/build-fx/src/box.c.o differ diff --git a/build-fx/src/ennemi.c.o b/build-fx/src/ennemi.c.o index 501a6aa..453815b 100644 Binary files a/build-fx/src/ennemi.c.o and b/build-fx/src/ennemi.c.o differ diff --git a/build-fx/src/keyboard.c.o b/build-fx/src/keyboard.c.o index 76eea8f..cf0ab26 100644 Binary files a/build-fx/src/keyboard.c.o and b/build-fx/src/keyboard.c.o differ diff --git a/build-fx/src/level.c.o b/build-fx/src/level.c.o index cf6bad1..2e6a71c 100644 Binary files a/build-fx/src/level.c.o and b/build-fx/src/level.c.o differ diff --git a/build-fx/src/main.c.o b/build-fx/src/main.c.o index 8f4a68b..e138c48 100644 Binary files a/build-fx/src/main.c.o and b/build-fx/src/main.c.o differ diff --git a/build-fx/src/mario.c.o b/build-fx/src/mario.c.o index 30be578..5493fce 100644 Binary files a/build-fx/src/mario.c.o and b/build-fx/src/mario.c.o differ diff --git a/build-fx/src/world.c.o b/build-fx/src/world.c.o index 3ee8929..835d04b 100644 Binary files a/build-fx/src/world.c.o and b/build-fx/src/world.c.o differ diff --git a/src/bonus.c b/src/bonus.c index f3629ce..3ca9611 100644 --- a/src/bonus.c +++ b/src/bonus.c @@ -27,9 +27,9 @@ static int sgn(int x) } -static bonus_t bonus ={BONUS_NONE, {0,0,8,8,0,0,1}, 0}; +static bonus_t bonus ={BONUS_NONE, {0,0,8,8,0,0,0,1}, 0}; /* Les balles ont les memes propriétés que les boulets et sont donc gérées ici */ -static bonus_t bullets[2] ={{0, {0,0,4,4,0,0,1}, 0},{0, {0,0,4,4,0,0,1}, 0}}; +static bonus_t bullets[2] ={{0, {0,0,4,4,0,0,0,1}, 0},{0, {0,0,4,4,0,0,0,1}, 0}}; void lance_bullet() { @@ -50,15 +50,24 @@ void lance_bullet() } } } + void bullet_display() +{ + for (int i=0; i<2; i++) + { + if (bullets[i].type==BULLET) + draw_tile(bullets[i].b.x-world_get_real_x0(), bullets[i].b.y-world_get_real_y0(), &bullet, (1+sgn(bullets[i].b.vy))/2, 0); + } +} + +void bullet_move() { for (int i=0; i<2; i++) { if (bullets[i].type==BULLET) { box_jump(&bullets[i].b,4); - box_move(&bullets[i].b,0); - draw_tile(bullets[i].b.x-world_get_real_x0(), bullets[i].b.y-world_get_real_y0(), &bullet, (1+sgn(bullets[i].b.vy))/2, 0); + box_move(&bullets[i].b); if (bullets[i].b.vx==0) bullets[i].type=0; if (bullets[i].b.y<0) @@ -111,7 +120,7 @@ void bonus_move() //+collision { box_jump(&bonus.b,5); } - box_move(&bonus.b,0); + box_move(&bonus.b); if (bonus.type==BONUS_CHAMPI || bonus.type==BONUS_1UP || bonus.type==BONUS_STAR) { @@ -159,7 +168,7 @@ void bonus_move() //+collision void bonus_draw() { - bonus_move(); + //bonus_move(); if (bonus.type==BONUS_NONE) return; if (bonus.type==BONUS_CHAMPI) diff --git a/src/bonus.h b/src/bonus.h index d047094..74aea6b 100644 --- a/src/bonus.h +++ b/src/bonus.h @@ -9,8 +9,10 @@ void bonus_set(int type, int x, int y); -void bonus_draw(); //&move &collide void lance_bullet(); void bullet_display(); +void bonus_draw(); +void bonus_move(); + #endif \ No newline at end of file diff --git a/src/box.c b/src/box.c index 12ffa2d..d45064e 100755 --- a/src/box.c +++ b/src/box.c @@ -67,6 +67,7 @@ static void move_x(box_t * b) static void move_y(box_t * b) { + b->last_vy=b->vy; int sgn_vy=sgn(b->vy); if (sgn_vy) { @@ -124,11 +125,12 @@ static void move_y(box_t * b) } b->y+=b->vy; } - b->vy-=b->gravity; + //if (b->vy>=-6) + b->vy-=b->gravity; } -int box_move(box_t * b, int c) +int box_move(box_t * b) { //velx move_x(b); diff --git a/src/box.h b/src/box.h index e31e7c2..8f53825 100755 --- a/src/box.h +++ b/src/box.h @@ -11,12 +11,12 @@ typedef struct int vx; int vy; - + int last_vy; int gravity; //int is_mario; } box_t; -int box_move(box_t * b, int collide); +int box_move(box_t * b); int box_jump(box_t * b, int height); // hauteur du saut #endif \ No newline at end of file diff --git a/src/ennemi.c b/src/ennemi.c index 8cf14fe..fdeced6 100644 --- a/src/ennemi.c +++ b/src/ennemi.c @@ -100,25 +100,26 @@ void move_ennemi(ennemi_t *e) } else { - e->life=DEAD; - e->p1=time_id; + t->life=DEAD; + t->p1=time_id; score_add(200); } - + } } - int sol=0; - - for (int j=0; jb.h; j++) + } + } + for (int i=0; ib.h; j++) + { + gift_t * c=world_get(e->b.x+j ,e->b.y-1); + if ((c->type==GIFT || c->type==BRICK) && (c->time_hit_id || c->state)) { - gift_t * c=world_get(e->b.x+j ,e->b.y-1); - if ((c->type==GIFT || c->type==BRICK) && (c->time_hit_id || c->state)) - { - e->life=DEAD; - e->p1=time_id; - score_add(100); - } - + e->life=DEAD; + //e->p1=time_id; + score_add(100); + break; } } } @@ -131,7 +132,7 @@ void move_ennemi(ennemi_t *e) if (time_id%2) e->b.vx=0; - box_move(&e->b,1); + box_move(&e->b); if (time_id%2) e->b.vx=old_vx; @@ -153,13 +154,13 @@ void move_ennemi(ennemi_t *e) e->type=NONE; if (ennemi_check_collision(e)) { - if (mario.p.vy<=-2) + if (mario.p.last_vy<=-2) { e->life=DEAD; e->p1=time_id; score_add(200); mario.p.vy=4; - mario.p.y=e->b.y+CARAPACE_X; + mario.p.y=e->b.y+CARAPACE_Y; } else hurt_mario(); @@ -180,7 +181,7 @@ void move_ennemi(ennemi_t *e) if (time_id%2) e->b.vx=0; - box_move(&e->b,1); + box_move(&e->b); if (time_id%2) e->b.vx=old_vx; @@ -202,7 +203,7 @@ void move_ennemi(ennemi_t *e) e->type=NONE; if (ennemi_check_collision(e)) { - if (mario.p.vy<=-2) + if (mario.p.last_vy<=-2) { e->type=CARAPACE_VERTE; e->b.h=CARAPACE_Y; @@ -217,18 +218,18 @@ void move_ennemi(ennemi_t *e) } } else - e->life=DEAD; + e->life=DEAD; } if (e->type==CARAPACE_VERTE) { if (e->life==1) { - box_move(&e->b,0); + box_move(&e->b); if (e->b.vx==0) { e->p1*=-1; - e->b.vx=e->p1; + e->b.vx=3*e->p1; } if (e->b.y<0) e->type=NONE; @@ -239,13 +240,25 @@ void move_ennemi(ennemi_t *e) { if (mario.p.x>=e->b.x) e->p1=-1; - if (mario.p.vy<=e->b.x) + if (mario.p.x<=e->b.x) e->p1=1; e->b.vx=3*e->p1; + if (mario.p.last_vy<=-2) + { + mario.p.vy=4; + mario.p.y=e->b.y+CARAPACE_Y; + } + else + { + if (mario.p.x>=e->b.x) + mario.p.x=e->b.x+e->b.w; + if (mario.p.x<=e->b.x) + mario.p.x=e->b.x-mario.p.w; + } } else { - if (mario.p.vy<=-2) + if (mario.p.last_vy<=-2) { e->p1=0; e->b.vx=0; diff --git a/src/keyboard.c b/src/keyboard.c index 025b8b9..6820046 100755 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -65,7 +65,6 @@ int menu_pause() // 1 exit, 0 continue dimage(0,0,&img_dev); dupdate(); sleep_ms(3,1000); - sleep_ms(3,1000); return 0; } else diff --git a/src/level.c b/src/level.c index 3627c96..e4d5f3a 100644 --- a/src/level.c +++ b/src/level.c @@ -172,11 +172,34 @@ void set_level(int n) {EARTH,0x11}, {EARTH,0x10}, {COLLINE,0x01}, {0,0}, {0,0}, {GIFT,0x11}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, {COLLINE,0x11}, {COLLINE,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, {COLLINE,0x21}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x01}, {NUAGE,0x00}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x21}, {NUAGE,0x20}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x01}, {EARTH,0x10}, {BUISSON,0x00}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {BUISSON,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {BUISSON,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {NUAGE,0x01}, {NUAGE,0x00}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x21}, {NUAGE,0x20}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {GIFT,0x11}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {GIFT,0x11}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x01}, {NUAGE,0x00}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, + {EARTH,0x11}, {EARTH,0x10}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, + {EARTH,0x11}, {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x21}, {NUAGE,0x20}, + {EARTH,0x11}, {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, }; lvl=&level_0; extern image_t img_lvl0; w_fond=&img_lvl0; - w_current_x=114; + w_current_x=137; w_current_y=13; mario_x_max=0; mario.p.x=25; @@ -186,17 +209,17 @@ void set_level(int n) ennemis_global_size=10; ennemi_t ennemies0[]= { - {GOOMBA,{176,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{321,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{409,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{421,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{640,80,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{656,80,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{776,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{788,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {KOOPA_VERTE,{856,16,KOOPA_X,KOOPA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{912,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{924,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1} + {GOOMBA,{176,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{321,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{409,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{421,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{640,80,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{656,80,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{776,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{788,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {KOOPA_VERTE,{856,16,KOOPA_X,KOOPA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{912,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{924,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1} }; init_ennemies(ennemies0); diff --git a/src/main.c b/src/main.c index 0fdfd1b..df8f581 100755 --- a/src/main.c +++ b/src/main.c @@ -46,10 +46,11 @@ int main(void) if (has_ticked) { has_ticked=0; - mario_move(); + //mario_move(); + + world_move(); dclear(C_WHITE); - - world_draw(mario.p.x,mario.p.y); + world_draw(mario.p.x,mario.p.y); score_display(); dupdate(); diff --git a/src/mario.c b/src/mario.c index 7671b08..ade1e7b 100755 --- a/src/mario.c +++ b/src/mario.c @@ -27,7 +27,7 @@ tileset_t mario_big={&img_mariobig, 8,16, 1}; pnj mario= { - {26,17,8,8,0,0,1}, + {26,17,8,8,0,0,0,1}, M_SMALL, M_RIGHT1, M_WALK, 0 @@ -61,23 +61,26 @@ void mario_smaller() void mario_draw() { - if (mario.size==M_SMALL) + if (mario_immunity==0 || (mario_immunity/7)%2==0) { - if (mario.p.vx*sgn(mario.p.vx)>=3) - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, 2*last_vx_sign+(id_frame/4)%2, 0); - else if (mario.p.vx*sgn(mario.p.vx)>=1) - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, 2*last_vx_sign+(id_frame/8)%2, 0); + if (mario.size==M_SMALL) + { + if (mario.p.vx*sgn(mario.p.vx)>=3) + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, 2*last_vx_sign+(id_frame/4)%2, 0); + else if (mario.p.vx*sgn(mario.p.vx)>=1) + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, 2*last_vx_sign+(id_frame/8)%2, 0); + else + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, 2*last_vx_sign, 0); + } else - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, 2*last_vx_sign, 0); - } - else - { - if (mario.p.vx*sgn(mario.p.vx)>=3) - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign+(id_frame/4)%2, mario_has_bullets); - else if (mario.p.vx*sgn(mario.p.vx)>=1) - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign+(id_frame/8)%2, mario_has_bullets); - else - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign, mario_has_bullets); + { + if (mario.p.vx*sgn(mario.p.vx)>=3) + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign+(id_frame/4)%2, mario_has_bullets); + else if (mario.p.vx*sgn(mario.p.vx)>=1) + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign+(id_frame/8)%2, mario_has_bullets); + else + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign, mario_has_bullets); + } } } @@ -87,16 +90,16 @@ int test_sol_le_plus_proche(int x, int y) int t=0; while (t==0) { - int type_sol = world_get_ctg(x, y-1); - if (type_sol==CTG_SOIL) - t=1; - if (type_sol==CTG_DEATH) - return distance+1; - type_sol = world_get_ctg(x+7, y-1); - if (type_sol==CTG_SOIL) - t=1; - if (type_sol==CTG_DEATH) - return distance+1; + int type_sol = world_get_ctg(x, y-1); + if (type_sol==CTG_SOIL) + t=1; + if (type_sol==CTG_DEATH) + return distance+1; + type_sol = world_get_ctg(x+7, y-1); + if (type_sol==CTG_SOIL) + t=1; + if (type_sol==CTG_DEATH) + return distance+1; y--; distance++; } @@ -192,7 +195,7 @@ void mario_move() if (mario.p.x+mario.p.vx + gravity + box_move(&mario.p); // <-> + gravity if (mario.p.y<0) mario_dead=1; @@ -203,57 +206,57 @@ void mario_move() coin_t* c; c=(coin_t*)world_get(mario.p.x, mario.p.y); if (c->type==COIN && c->taken==0) - {score_add_coin();c->taken=1;} + {score_add_coin();c->taken=1;} c=world_get(mario.p.x+mario.p.w-1, mario.p.y); if (c->type==COIN && c->taken==0) - {score_add_coin();c->taken=1;} + {score_add_coin();c->taken=1;} c=world_get(mario.p.x, mario.p.y+mario.p.h-1); if (c->type==COIN && c->taken==0) - {score_add_coin();c->taken=1;} + {score_add_coin();c->taken=1;} c=world_get(mario.p.x+mario.p.w-1, mario.p.y+mario.p.h-1); if (c->type==COIN && c->taken==0) - {score_add_coin();c->taken=1;} + {score_add_coin();c->taken=1;} //if ((mario.p.x+mario.p.w/2)/8==(mario.p.x+mario.p.w/2-1)/8) //{ - gift_t* t=(gift_t*)world_get((mario.p.x+mario.p.w/2),mario.p.y+mario.p.h); + gift_t* t=(gift_t*)world_get((mario.p.x+mario.p.w/2),mario.p.y+mario.p.h); - if (t->type==GIFT || t->type==BRICK) + if (t->type==GIFT || t->type==BRICK) + { + brick_t *c=(brick_t*)t; + if (c->time_hit_id==0) { - brick_t *c=(brick_t*)t; - if (c->time_hit_id==0) + if (c->content==1 && c->number) { - if (c->content==1 && c->number) - { - c->number--; - score_add_coin(); - score_add(200); - c->time_hit_id=1; - } - else if (c->content==2 && c->number) - { - c->number--; - bonus_set(BONUS_CHAMPI,((mario.p.x+mario.p.w/2)/8)*8,mario.p.y+mario.p.h+8); - c->time_hit_id=1; - } - else if (c->content==3 && c->number) - { - c->number--; - bonus_set(BONUS_1UP,((mario.p.x+mario.p.w/2)/8)*8,mario.p.y+mario.p.h+8); - c->time_hit_id=1; - } - else if (c->content==0 && mario.size==M_BIG && c->type==BRICK) - { - c->state=1; - c->time_hit_id=1; - mario.p.vy=0; - } - else if (c->type==BRICK && mario.size==M_SMALL && c->content==0) - c->time_hit_id=1; - - c->hidden=0; + c->number--; + score_add_coin(); + score_add(200); + c->time_hit_id=1; } + else if (c->content==2 && c->number) + { + c->number--; + bonus_set(BONUS_CHAMPI,((mario.p.x+mario.p.w/2)/8)*8,mario.p.y+mario.p.h+8); + c->time_hit_id=1; + } + else if (c->content==3 && c->number) + { + c->number--; + bonus_set(BONUS_1UP,((mario.p.x+mario.p.w/2)/8)*8,mario.p.y+mario.p.h+8); + c->time_hit_id=1; + } + else if (c->content==0 && mario.size==M_BIG && c->type==BRICK) + { + c->state=1; + c->time_hit_id=1; + mario.p.vy=0; + } + else if (c->type==BRICK && mario.size==M_SMALL && c->content==0) + c->time_hit_id=1; + + c->hidden=0; } + } //} diff --git a/src/mario.h b/src/mario.h index 5e70838..d03736e 100755 --- a/src/mario.h +++ b/src/mario.h @@ -17,7 +17,7 @@ typedef struct { - box_t p; + box_t p; int size; // small, big int type1; // left1 left2, right1, right2, int type2; // jump, down... diff --git a/src/tile.c b/src/tile.c index 00779c2..b7b5f82 100755 --- a/src/tile.c +++ b/src/tile.c @@ -39,6 +39,7 @@ tileset_t fleur={&img_fleur, 8, 8, 0}; extern image_t img_bullet; tileset_t bullet={&img_bullet, 4, 4, 1}; + void draw_tile(int sx, int sy, tileset_t const * const set, int x, int y) { dsubimage(sx, 64-sy-set->height, diff --git a/src/tile.h b/src/tile.h index aabf50d..71049a4 100755 --- a/src/tile.h +++ b/src/tile.h @@ -28,6 +28,7 @@ extern tileset_t life_1up; extern tileset_t bullet; +extern tileset_t bloc; void draw_tile(int sx, int sy, tileset_t const * const set, int x, int y); diff --git a/src/world.c b/src/world.c index 211c256..f1726ad 100755 --- a/src/world.c +++ b/src/world.c @@ -48,6 +48,10 @@ void display_cell(int cx, int cy, int sx, int sy, int plan) earth_t* i=(earth_t*)cell; draw_tile(sx, sy, &earth, i->x, i->y); } + if (cell->type==BLOC) + { + draw_tile(sx, sy, &bloc, 0, 0); + } if (cell->type==BLOC) { @@ -132,6 +136,7 @@ int world_get_ctg(int x, int y) case GIFT: case BRICK: case EARTH: + case BLOC: return CTG_SOIL; default: return CTG_EMPTY; @@ -151,7 +156,9 @@ static int min(const int x, const int y) int world_get_real_x0() //mario delta en 0,0 { if (mario.p.x>mario_x_max) mario_x_max=mario.p.x; - return min(max(mario_x_max-32,0),w_current_x*8-128); + if (mario_x_max-40>mario.p.x) + mario_x_max--; + return min(max(mario_x_max-40,0),w_current_x*8-128); } int world_get_real_y0() //mario delta en 0,0 @@ -197,4 +204,11 @@ void world_draw(int x, int y) mx+=8; } +} + +void world_move() +{ + bonus_move(); + bullet_move(); + mario_move(); } \ No newline at end of file diff --git a/src/world.h b/src/world.h index be3af42..f853b1e 100755 --- a/src/world.h +++ b/src/world.h @@ -34,10 +34,12 @@ typedef struct #define BLOC 3 typedef struct { - unsigned type :4; + unsigned type :4; unsigned data :28; // raw binary format } bloc_t; +#define END_LEVEL 4 + #define TUYAU 5 // X, Y, _ (XY tileset) typedef struct { @@ -80,7 +82,7 @@ typedef struct // Generic container typedef struct { - unsigned type :4; + unsigned type :4; unsigned data :28; // raw binary format } world_t; @@ -93,6 +95,7 @@ void display_cell(int cx, int cy, int sx, int sy, int plan); void world_set(world_t * w); void world_draw(int x, int y); +void world_move(); int world_get_real_x0(); int world_get_real_y0();