diff --git a/SuperCbr.g1a b/SuperCbr.g1a index 18a9f82..1fffa7b 100644 Binary files a/SuperCbr.g1a and b/SuperCbr.g1a differ diff --git a/build-fx/SuperCbr.bin b/build-fx/SuperCbr.bin index 2f94efe..1237e7e 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 d1d2816..485321a 100755 Binary files a/build-fx/SuperCbr.elf and b/build-fx/SuperCbr.elf differ diff --git a/build-fx/map b/build-fx/map index 617ad8a..79dcb1b 100644 --- a/build-fx/map +++ b/build-fx/map @@ -234,7 +234,7 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-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 - 0x0000000000010690 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x0000000000010698 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8d0 *(.pretext.entry) @@ -274,7 +274,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 0x84d8 +.text 0x0000000000300ad0 0x84e0 0x0000000000300ad0 _gint_exch_tlbh_start = . *(.gint.exch_tlbh) .gint.exch_tlbh @@ -334,191 +334,190 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x00000000003044a8 _lance_bullet 0x0000000000304504 _bullet_display 0x000000000030459c _bullet_move - .text 0x000000000030471c 0x16c build-fx/src/save.c.o + .text 0x000000000030471c 0x178 build-fx/src/save.c.o 0x000000000030471c _load_save 0x0000000000304720 _flash_save 0x0000000000304724 _get_highscore 0x0000000000304774 _set_highscore - 0x00000000003047c4 _get_best_time - 0x0000000000304814 _set_best_time - 0x000000000030487c _get_progress_status - .text 0x0000000000304888 0x7d0 build-fx/src/mario.c.o - 0x0000000000304898 _mario_bigger - 0x00000000003048b4 _mario_smaller - 0x00000000003048e0 _mario_draw - 0x0000000000304a9c _test_sol_le_plus_proche - 0x0000000000304b08 _mario_move - .text 0x0000000000305058 0x0 build-fx/src/main.c.o - .text.startup 0x0000000000305058 0x24 build-fx/src/main.c.o - 0x0000000000305058 _main - .text 0x000000000030507c 0x2c0 build-fx/src/keyboard.c.o - 0x000000000030507c _keyboard_clear - 0x000000000030509c _getkey_custom - 0x00000000003050ec _menu_pause - 0x0000000000305244 _update_keyboard - .text 0x000000000030533c 0x7b0 build-fx/src/ennemi.c.o - 0x000000000030533c _display_ennemi - 0x0000000000305584 _ennemi_check_collision - 0x00000000003055e8 _hurt_mario - 0x000000000030561c _move_ennemi - 0x0000000000305aac _display_ennemi_table - .text 0x0000000000305aec 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x00000000003064e8 _kprint_opt - 0x0000000000306630 _kprint - 0x0000000000306708 _kvsprint - 0x0000000000306750 _sprintf - 0x0000000000306778 _vsprintf - 0x0000000000306798 _snprintf - 0x00000000003067b8 _vsnprintf - .text 0x00000000003067d0 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - 0x00000000003067d0 _memcpy - 0x000000000030688a __memmove - 0x000000000030688e __memcmp - 0x0000000000306892 _memset - .text 0x00000000003068ac 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 0x00000000003068ac 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 0x00000000003068ac 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) - 0x00000000003068ac _drect - .text 0x00000000003069c8 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - 0x00000000003069c8 _dupdate - 0x00000000003069e0 _dupdate_noint - .text 0x00000000003069ec 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - 0x00000000003069ec _masks - .text 0x0000000000306a88 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - 0x0000000000306a88 _dimage - 0x0000000000306adc _dsubimage - .text 0x0000000000306b50 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - 0x0000000000306b50 _dclear - .text 0x0000000000306b9c 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x0000000000306d44 _pollevent - 0x0000000000306e88 _waitevent - 0x0000000000306ed4 _clearevents - 0x0000000000306ef4 _keydown - 0x0000000000306f20 _keydown_all - 0x0000000000306f5c _keydown_any - .text 0x0000000000306f98 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - 0x0000000000306fa4 _iokbd_row - 0x000000000030708c _iokbd_scan - .text 0x00000000003070bc 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - 0x00000000003070bc _getkey_opt - 0x0000000000307268 _getkey - 0x0000000000307274 _getkey_repeat - .text 0x00000000003072b0 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 0x00000000003072b0 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - 0x0000000000307440 _gint_panic - 0x0000000000307450 _gint_panic_set - 0x000000000030745c _gint_exc_catch - 0x0000000000307468 _gint_exc_skip - .text 0x0000000000307474 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 0x0000000000307474 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - 0x0000000000307528 _gint_install - 0x00000000003075d8 _gint_unload - .text 0x00000000003075f0 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 0x00000000003075f0 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 0x00000000003075f0 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - 0x00000000003075f0 _tlb_addr - 0x0000000000307604 _tlb_data - 0x0000000000307618 _tlb_mapped_memory - 0x00000000003076ec _utlb_addr - 0x00000000003076fc _utlb_data - 0x000000000030770c _utlb_mapped_memory - .text 0x00000000003077e4 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x00000000003077e4 _dsize - .text 0x0000000000307880 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - 0x0000000000307880 _dprint - .text 0x00000000003078d8 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x0000000000307bf8 _timer_setup - 0x0000000000307c88 _timer_delay - 0x0000000000307ce8 _timer_start - 0x0000000000307d1c _timer_reload - 0x0000000000307d3c _timer_pause - 0x0000000000307d70 _timer_stop - 0x0000000000307dcc _timer_timeout - 0x0000000000307dd8 _timer_address - 0x0000000000307e14 _timer_clear - .text 0x0000000000307e44 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - 0x0000000000307e44 _sleep_us - .text 0x0000000000307e9c 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x0000000000307f34 _t6k11_display - 0x0000000000308008 _t6k11_contrast - 0x0000000000308034 _t6k11_backlight - .text 0x0000000000308074 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x00000000003081b8 _clock_freq - .text 0x00000000003081c4 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 0x00000000003081c4 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) - 0x00000000003081c4 _bopti_asm_mono - 0x00000000003081ea _bopti_asm_mono_alpha - .text 0x000000000030821c 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - 0x000000000030821c _bopti_grid - 0x0000000000308390 _bopti_render - 0x00000000003084c0 _bopti_render_clip - 0x00000000003085d4 _bopti_render_noclip - .text 0x000000000030862c 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - 0x000000000030862c _gint_setvbr - .text 0x0000000000308658 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - 0x0000000000308658 _gint_intlevel - 0x00000000003086ac _gint_inthandler - .text 0x00000000003086d0 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 0x00000000003086d0 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 0x00000000003086d0 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) - 0x00000000003087b0 _ll_set_size - 0x00000000003087c4 _ll_set_state - 0x00000000003087e4 _ll_get_state - 0x00000000003087f4 _ll_clear - 0x0000000000308840 _ll_send - 0x00000000003088b4 _ll_sendp - 0x0000000000308900 _ll_display_custom - 0x000000000030896c _ll_display - 0x0000000000308980 _ll_pause - 0x00000000003089d8 _ll_panic - 0x0000000000308a14 _ll_set_panic - 0x0000000000308a24 _ll_set_level - 0x0000000000308a30 _ll_get_level - .text 0x0000000000308a3c 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - 0x0000000000308a3c ___movstr - 0x0000000000308a3c ___movmem - 0x0000000000308a70 ___movmemSI64 - 0x0000000000308a70 ___movstrSI64 - 0x0000000000308a74 ___movstrSI60 - 0x0000000000308a74 ___movmemSI60 - 0x0000000000308a78 ___movmemSI56 - 0x0000000000308a78 ___movstrSI56 - 0x0000000000308a7c ___movstrSI52 - 0x0000000000308a7c ___movmemSI52 - 0x0000000000308a80 ___movstrSI48 - 0x0000000000308a80 ___movmemSI48 - 0x0000000000308a84 ___movstrSI44 - 0x0000000000308a84 ___movmemSI44 - 0x0000000000308a88 ___movstrSI40 - 0x0000000000308a88 ___movmemSI40 - 0x0000000000308a8c ___movstrSI36 - 0x0000000000308a8c ___movmemSI36 - 0x0000000000308a90 ___movmemSI32 - 0x0000000000308a90 ___movstrSI32 - 0x0000000000308a94 ___movmemSI28 - 0x0000000000308a94 ___movstrSI28 - 0x0000000000308a98 ___movstrSI24 - 0x0000000000308a98 ___movmemSI24 - 0x0000000000308a9c ___movmemSI20 - 0x0000000000308a9c ___movstrSI20 - 0x0000000000308aa0 ___movstrSI16 - 0x0000000000308aa0 ___movmemSI16 - 0x0000000000308aa4 ___movmemSI12 - 0x0000000000308aa4 ___movstrSI12 - 0x0000000000308aa8 ___movmemSI8 - 0x0000000000308aa8 ___movstrSI8 - 0x0000000000308aac ___movmemSI4 - 0x0000000000308aac ___movstrSI4 - .text 0x0000000000308ab4 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - 0x0000000000308ab4 ___udivdi3 - .text 0x0000000000308ca4 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - 0x0000000000308ca4 ___umoddi3 - .text 0x0000000000308ed8 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - 0x0000000000308efa ___udivsi3 - *fill* 0x0000000000308f44 0x4 - .text 0x0000000000308f48 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000308f48 ___udiv_qrnnd_16 - .text 0x0000000000308fa8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x00000000003047d0 _get_best_time + 0x0000000000304820 _set_best_time + 0x0000000000304888 _get_progress_status + .text 0x0000000000304894 0x7d0 build-fx/src/mario.c.o + 0x00000000003048a4 _mario_bigger + 0x00000000003048c0 _mario_smaller + 0x00000000003048ec _mario_draw + 0x0000000000304aa8 _test_sol_le_plus_proche + 0x0000000000304b14 _mario_move + .text 0x0000000000305064 0x0 build-fx/src/main.c.o + .text.startup 0x0000000000305064 0x24 build-fx/src/main.c.o + 0x0000000000305064 _main + .text 0x0000000000305088 0x2c0 build-fx/src/keyboard.c.o + 0x0000000000305088 _keyboard_clear + 0x00000000003050a8 _getkey_custom + 0x00000000003050f8 _menu_pause + 0x0000000000305250 _update_keyboard + .text 0x0000000000305348 0x7b0 build-fx/src/ennemi.c.o + 0x0000000000305348 _display_ennemi + 0x0000000000305590 _ennemi_check_collision + 0x00000000003055f4 _hurt_mario + 0x0000000000305628 _move_ennemi + 0x0000000000305ab8 _display_ennemi_table + .text 0x0000000000305af8 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x00000000003064f4 _kprint_opt + 0x000000000030663c _kprint + 0x0000000000306714 _kvsprint + 0x000000000030675c _sprintf + 0x0000000000306784 _vsprintf + 0x00000000003067a4 _snprintf + 0x00000000003067c4 _vsnprintf + .text 0x00000000003067dc 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + 0x00000000003067dc _memcpy + 0x0000000000306896 __memmove + 0x000000000030689a __memcmp + 0x000000000030689e _memset + .text 0x00000000003068b8 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 0x00000000003068b8 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 0x00000000003068b8 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) + 0x00000000003068b8 _drect + .text 0x00000000003069d4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + 0x00000000003069d4 _dupdate + 0x00000000003069ec _dupdate_noint + .text 0x00000000003069f8 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + 0x00000000003069f8 _masks + .text 0x0000000000306a94 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x0000000000306a94 _dimage + 0x0000000000306ae8 _dsubimage + .text 0x0000000000306b5c 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + 0x0000000000306b5c _dclear + .text 0x0000000000306ba8 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000306d50 _pollevent + 0x0000000000306e94 _waitevent + 0x0000000000306ee0 _clearevents + 0x0000000000306f00 _keydown + 0x0000000000306f2c _keydown_all + 0x0000000000306f68 _keydown_any + .text 0x0000000000306fa4 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + 0x0000000000306fb0 _iokbd_row + 0x0000000000307098 _iokbd_scan + .text 0x00000000003070c8 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + 0x00000000003070c8 _getkey_opt + 0x0000000000307274 _getkey + 0x0000000000307280 _getkey_repeat + .text 0x00000000003072bc 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 0x00000000003072bc 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x000000000030744c _gint_panic + 0x000000000030745c _gint_panic_set + 0x0000000000307468 _gint_exc_catch + 0x0000000000307474 _gint_exc_skip + .text 0x0000000000307480 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 0x0000000000307480 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + 0x0000000000307534 _gint_install + 0x00000000003075e4 _gint_unload + .text 0x00000000003075fc 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 0x00000000003075fc 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 0x00000000003075fc 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + 0x00000000003075fc _tlb_addr + 0x0000000000307610 _tlb_data + 0x0000000000307624 _tlb_mapped_memory + 0x00000000003076f8 _utlb_addr + 0x0000000000307708 _utlb_data + 0x0000000000307718 _utlb_mapped_memory + .text 0x00000000003077f0 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x00000000003077f0 _dsize + .text 0x000000000030788c 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + 0x000000000030788c _dprint + .text 0x00000000003078e4 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000307c04 _timer_setup + 0x0000000000307c94 _timer_delay + 0x0000000000307cf4 _timer_start + 0x0000000000307d28 _timer_reload + 0x0000000000307d48 _timer_pause + 0x0000000000307d7c _timer_stop + 0x0000000000307dd8 _timer_timeout + 0x0000000000307de4 _timer_address + 0x0000000000307e20 _timer_clear + .text 0x0000000000307e50 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + 0x0000000000307e50 _sleep_us + .text 0x0000000000307ea8 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x0000000000307f40 _t6k11_display + 0x0000000000308014 _t6k11_contrast + 0x0000000000308040 _t6k11_backlight + .text 0x0000000000308080 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x00000000003081c4 _clock_freq + .text 0x00000000003081d0 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 0x00000000003081d0 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) + 0x00000000003081d0 _bopti_asm_mono + 0x00000000003081f6 _bopti_asm_mono_alpha + .text 0x0000000000308228 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x0000000000308228 _bopti_grid + 0x000000000030839c _bopti_render + 0x00000000003084cc _bopti_render_clip + 0x00000000003085e0 _bopti_render_noclip + .text 0x0000000000308638 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + 0x0000000000308638 _gint_setvbr + .text 0x0000000000308664 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + 0x0000000000308664 _gint_intlevel + 0x00000000003086b8 _gint_inthandler + .text 0x00000000003086dc 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 0x00000000003086dc 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 0x00000000003086dc 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) + 0x00000000003087bc _ll_set_size + 0x00000000003087d0 _ll_set_state + 0x00000000003087f0 _ll_get_state + 0x0000000000308800 _ll_clear + 0x000000000030884c _ll_send + 0x00000000003088c0 _ll_sendp + 0x000000000030890c _ll_display_custom + 0x0000000000308978 _ll_display + 0x000000000030898c _ll_pause + 0x00000000003089e4 _ll_panic + 0x0000000000308a20 _ll_set_panic + 0x0000000000308a30 _ll_set_level + 0x0000000000308a3c _ll_get_level + .text 0x0000000000308a48 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + 0x0000000000308a48 ___movstr + 0x0000000000308a48 ___movmem + 0x0000000000308a7c ___movmemSI64 + 0x0000000000308a7c ___movstrSI64 + 0x0000000000308a80 ___movstrSI60 + 0x0000000000308a80 ___movmemSI60 + 0x0000000000308a84 ___movmemSI56 + 0x0000000000308a84 ___movstrSI56 + 0x0000000000308a88 ___movstrSI52 + 0x0000000000308a88 ___movmemSI52 + 0x0000000000308a8c ___movstrSI48 + 0x0000000000308a8c ___movmemSI48 + 0x0000000000308a90 ___movstrSI44 + 0x0000000000308a90 ___movmemSI44 + 0x0000000000308a94 ___movstrSI40 + 0x0000000000308a94 ___movmemSI40 + 0x0000000000308a98 ___movstrSI36 + 0x0000000000308a98 ___movmemSI36 + 0x0000000000308a9c ___movmemSI32 + 0x0000000000308a9c ___movstrSI32 + 0x0000000000308aa0 ___movmemSI28 + 0x0000000000308aa0 ___movstrSI28 + 0x0000000000308aa4 ___movstrSI24 + 0x0000000000308aa4 ___movmemSI24 + 0x0000000000308aa8 ___movmemSI20 + 0x0000000000308aa8 ___movstrSI20 + 0x0000000000308aac ___movstrSI16 + 0x0000000000308aac ___movmemSI16 + 0x0000000000308ab0 ___movmemSI12 + 0x0000000000308ab0 ___movstrSI12 + 0x0000000000308ab4 ___movmemSI8 + 0x0000000000308ab4 ___movstrSI8 + 0x0000000000308ab8 ___movmemSI4 + 0x0000000000308ab8 ___movstrSI4 + .text 0x0000000000308ac0 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + 0x0000000000308ac0 ___udivdi3 + .text 0x0000000000308cb0 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + 0x0000000000308cb0 ___umoddi3 + .text 0x0000000000308ee4 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + 0x0000000000308f06 ___udivsi3 + .text 0x0000000000308f50 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000308f50 ___udiv_qrnnd_16 + .text 0x0000000000308fb0 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 0x0000000000308fb0 0x120 diff --git a/build-fx/src/levelchanger.c.o b/build-fx/src/levelchanger.c.o index 0987c62..e534521 100644 Binary files a/build-fx/src/levelchanger.c.o and b/build-fx/src/levelchanger.c.o differ diff --git a/build-fx/src/save.c.o b/build-fx/src/save.c.o index 7261fa9..fe16314 100644 Binary files a/build-fx/src/save.c.o and b/build-fx/src/save.c.o differ diff --git a/src/levelchanger.c b/src/levelchanger.c index b19e27c..eee2ae3 100644 --- a/src/levelchanger.c +++ b/src/levelchanger.c @@ -99,8 +99,11 @@ static void levelchanger(int w) mario_smaller(); mario_immunity=0; int s=play_level(w, choice); - if (s) + if (s==1) + { + set_best_time(w, choice, get_time_spent()); + } } } diff --git a/src/save.c b/src/save.c index e15442c..60a4003 100644 --- a/src/save.c +++ b/src/save.c @@ -27,7 +27,8 @@ int get_highscore(int world, int level) void set_highscore(int world, int level, int score) { - level_scores[world%NB_MONDES][level%WORLD_RUN_ENTRY]=score; + if (score>level_scores[world%NB_MONDES][level%WORLD_RUN_ENTRY]) + level_scores[world%NB_MONDES][level%WORLD_RUN_ENTRY]=score; } int get_best_time(int world, int level)