diff --git a/SuperCbr.g1a b/SuperCbr.g1a index 5c29fb7..bb4af59 100644 Binary files a/SuperCbr.g1a and b/SuperCbr.g1a differ diff --git a/build-fx/SuperCbr.bin b/build-fx/SuperCbr.bin index 5a7a425..630f759 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 d5da427..4e21ee2 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 9863ced..a510e77 100644 --- a/build-fx/map +++ b/build-fx/map @@ -236,7 +236,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 - 0x0000000000010884 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x0000000000010994 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8d0 *(.pretext.entry) @@ -276,7 +276,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 0x86b8 +.text 0x0000000000300ad0 0x87c8 0x0000000000300ad0 _gint_exch_tlbh_start = . *(.gint.exch_tlbh) .gint.exch_tlbh @@ -284,495 +284,497 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x0000000000300ad0 _gint_exch_tlbh 0x000000000000004c _gint_exch_tlbh_size = ABSOLUTE ((. - _gint_exch_tlbh_start)) *(.text .text.*) - .text 0x0000000000300b1c 0x5e0 build-fx/src/levelchanger.c.o + .text 0x0000000000300b1c 0x63c build-fx/src/levelchanger.c.o 0x0000000000300b1c _callback 0x0000000000300b24 _play_level 0x0000000000300d2c _launch_ui - .text 0x00000000003010fc 0x2028 build-fx/src/level.c.o - 0x00000000003010fc _malloc_error - 0x0000000000301134 _init_level - 0x00000000003011b8 _init_ennemies - 0x0000000000301228 _set_level - 0x0000000000303104 _get_lvl_id - .text 0x0000000000303124 0xd8 build-fx/src/config.c.o - 0x0000000000303124 _configmenu - .text 0x00000000003031fc 0x250 build-fx/src/score.c.o - 0x00000000003031fc _new_level - 0x000000000030321c _new_game - 0x0000000000303270 _get_score - 0x000000000030327c _score_reset - 0x000000000030329c _score_add_coin - 0x00000000003032ac _score_add - 0x00000000003032fc _score_display - 0x0000000000303440 _get_time_spent - .text 0x000000000030344c 0x114 build-fx/src/tuyau.c.o - 0x000000000030344c _set_teleporteurs - 0x0000000000303484 _teleport_active - .text 0x0000000000303560 0x40 build-fx/src/tile.c.o - 0x0000000000303560 _draw_tile - .text 0x00000000003035a0 0x318 build-fx/src/plateforme.c.o - 0x00000000003035a0 _reset_plateforme - 0x00000000003035ae _move_plateforme - 0x000000000030376c _display_plateformes - 0x000000000030380c _move_plateformes - 0x0000000000303864 _plateforme_check_collide - .text 0x00000000003038b8 0x4ac build-fx/src/box.c.o - 0x00000000003038b8 _sgn - 0x00000000003038ca _check_collision - 0x000000000030395c _box_move - 0x0000000000303ce0 _box_jump - .text 0x0000000000303d64 0x620 build-fx/src/world.c.o - 0x0000000000303d64 _world_get_width - 0x0000000000303d74 _world_get - 0x0000000000303dd8 _display_cell - 0x00000000003040e4 _world_get_ctg - 0x0000000000304138 _reset_camera - 0x0000000000304154 _world_get_real_x0 - 0x000000000030417c _reload_camera - 0x00000000003041a4 _world_get_real_y0 - 0x00000000003041b8 _world_draw - 0x00000000003042d4 _world_move - .text 0x0000000000304384 0x56c build-fx/src/bonus.c.o - 0x0000000000304384 _bonus_set - 0x00000000003043b4 _bonus_move - 0x0000000000304568 _bonus_draw - 0x000000000030467c _lance_bullet - 0x00000000003046d8 _bullet_display - 0x0000000000304770 _bullet_move - .text 0x00000000003048f0 0x178 build-fx/src/save.c.o - 0x00000000003048f0 _load_save - 0x00000000003048f4 _flash_save - 0x00000000003048f8 _get_highscore - 0x0000000000304948 _set_highscore - 0x00000000003049a4 _get_best_time - 0x00000000003049f4 _set_best_time - 0x0000000000304a5c _get_progress_status - .text 0x0000000000304a68 0x7d0 build-fx/src/mario.c.o - 0x0000000000304a78 _mario_bigger - 0x0000000000304a94 _mario_smaller - 0x0000000000304ac0 _mario_draw - 0x0000000000304c7c _test_sol_le_plus_proche - 0x0000000000304ce8 _mario_move - .text 0x0000000000305238 0x0 build-fx/src/main.c.o - .text.startup 0x0000000000305238 0x24 build-fx/src/main.c.o - 0x0000000000305238 _main - .text 0x000000000030525c 0x2c0 build-fx/src/keyboard.c.o - 0x000000000030525c _keyboard_clear - 0x000000000030527c _getkey_custom - 0x00000000003052cc _menu_pause - 0x0000000000305424 _update_keyboard - .text 0x000000000030551c 0x7b0 build-fx/src/ennemi.c.o - 0x000000000030551c _display_ennemi - 0x0000000000305764 _ennemi_check_collision - 0x00000000003057c8 _hurt_mario - 0x00000000003057fc _move_ennemi - 0x0000000000305c8c _display_ennemi_table - .text 0x0000000000305ccc 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x00000000003066c8 _kprint_opt - 0x0000000000306810 _kprint - 0x00000000003068e8 _kvsprint - 0x0000000000306930 _sprintf - 0x0000000000306958 _vsprintf - 0x0000000000306978 _snprintf - 0x0000000000306998 _vsnprintf - .text 0x00000000003069b0 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - 0x00000000003069b0 _memcpy - 0x0000000000306a6a __memmove - 0x0000000000306a6e __memcmp - 0x0000000000306a72 _memset - .text 0x0000000000306a8c 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 0x0000000000306a8c 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 0x0000000000306a8c 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) - 0x0000000000306a8c _drect - .text 0x0000000000306ba8 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - 0x0000000000306ba8 _dupdate - 0x0000000000306bc0 _dupdate_noint - .text 0x0000000000306bcc 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - 0x0000000000306bcc _masks - .text 0x0000000000306c68 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - 0x0000000000306c68 _dimage - 0x0000000000306cbc _dsubimage - .text 0x0000000000306d30 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - 0x0000000000306d30 _dclear - .text 0x0000000000306d7c 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x0000000000306f24 _pollevent - 0x0000000000307068 _waitevent - 0x00000000003070b4 _clearevents - 0x00000000003070d4 _keydown - 0x0000000000307100 _keydown_all - 0x000000000030713c _keydown_any - .text 0x0000000000307178 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - 0x0000000000307184 _iokbd_row - 0x000000000030726c _iokbd_scan - .text 0x000000000030729c 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - 0x000000000030729c _getkey_opt - 0x0000000000307448 _getkey - 0x0000000000307454 _getkey_repeat - .text 0x0000000000307490 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 0x0000000000307490 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - 0x0000000000307620 _gint_panic - 0x0000000000307630 _gint_panic_set - 0x000000000030763c _gint_exc_catch - 0x0000000000307648 _gint_exc_skip - .text 0x0000000000307654 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 0x0000000000307654 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - 0x0000000000307708 _gint_install - 0x00000000003077b8 _gint_unload - .text 0x00000000003077d0 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 0x00000000003077d0 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 0x00000000003077d0 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - 0x00000000003077d0 _tlb_addr - 0x00000000003077e4 _tlb_data - 0x00000000003077f8 _tlb_mapped_memory - 0x00000000003078cc _utlb_addr - 0x00000000003078dc _utlb_data - 0x00000000003078ec _utlb_mapped_memory - .text 0x00000000003079c4 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x00000000003079c4 _dsize - .text 0x0000000000307a60 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - 0x0000000000307a60 _dprint - .text 0x0000000000307ab8 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x0000000000307dd8 _timer_setup - 0x0000000000307e68 _timer_delay - 0x0000000000307ec8 _timer_start - 0x0000000000307efc _timer_reload - 0x0000000000307f1c _timer_pause - 0x0000000000307f50 _timer_stop - 0x0000000000307fac _timer_timeout - 0x0000000000307fb8 _timer_address - 0x0000000000307ff4 _timer_clear - .text 0x0000000000308024 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - 0x0000000000308024 _sleep_us - .text 0x000000000030807c 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x0000000000308114 _t6k11_display - 0x00000000003081e8 _t6k11_contrast - 0x0000000000308214 _t6k11_backlight - .text 0x0000000000308254 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x0000000000308398 _clock_freq - .text 0x00000000003083a4 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 0x00000000003083a4 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) - 0x00000000003083a4 _bopti_asm_mono - 0x00000000003083ca _bopti_asm_mono_alpha - .text 0x00000000003083fc 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - 0x00000000003083fc _bopti_grid - 0x0000000000308570 _bopti_render - 0x00000000003086a0 _bopti_render_clip - 0x00000000003087b4 _bopti_render_noclip - .text 0x000000000030880c 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - 0x000000000030880c _gint_setvbr - .text 0x0000000000308838 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - 0x0000000000308838 _gint_intlevel - 0x000000000030888c _gint_inthandler - .text 0x00000000003088b0 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 0x00000000003088b0 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 0x00000000003088b0 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) - 0x0000000000308990 _ll_set_size - 0x00000000003089a4 _ll_set_state - 0x00000000003089c4 _ll_get_state - 0x00000000003089d4 _ll_clear - 0x0000000000308a20 _ll_send - 0x0000000000308a94 _ll_sendp - 0x0000000000308ae0 _ll_display_custom - 0x0000000000308b4c _ll_display - 0x0000000000308b60 _ll_pause - 0x0000000000308bb8 _ll_panic - 0x0000000000308bf4 _ll_set_panic - 0x0000000000308c04 _ll_set_level - 0x0000000000308c10 _ll_get_level - .text 0x0000000000308c1c 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - 0x0000000000308c1c ___movstr - 0x0000000000308c1c ___movmem - 0x0000000000308c50 ___movmemSI64 - 0x0000000000308c50 ___movstrSI64 - 0x0000000000308c54 ___movstrSI60 - 0x0000000000308c54 ___movmemSI60 - 0x0000000000308c58 ___movmemSI56 - 0x0000000000308c58 ___movstrSI56 - 0x0000000000308c5c ___movstrSI52 - 0x0000000000308c5c ___movmemSI52 - 0x0000000000308c60 ___movstrSI48 - 0x0000000000308c60 ___movmemSI48 - 0x0000000000308c64 ___movstrSI44 - 0x0000000000308c64 ___movmemSI44 - 0x0000000000308c68 ___movstrSI40 - 0x0000000000308c68 ___movmemSI40 - 0x0000000000308c6c ___movstrSI36 - 0x0000000000308c6c ___movmemSI36 - 0x0000000000308c70 ___movmemSI32 - 0x0000000000308c70 ___movstrSI32 - 0x0000000000308c74 ___movmemSI28 - 0x0000000000308c74 ___movstrSI28 - 0x0000000000308c78 ___movstrSI24 - 0x0000000000308c78 ___movmemSI24 - 0x0000000000308c7c ___movmemSI20 - 0x0000000000308c7c ___movstrSI20 - 0x0000000000308c80 ___movstrSI16 - 0x0000000000308c80 ___movmemSI16 - 0x0000000000308c84 ___movmemSI12 - 0x0000000000308c84 ___movstrSI12 - 0x0000000000308c88 ___movmemSI8 - 0x0000000000308c88 ___movstrSI8 - 0x0000000000308c8c ___movmemSI4 - 0x0000000000308c8c ___movstrSI4 - .text 0x0000000000308c94 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - 0x0000000000308c94 ___udivdi3 - .text 0x0000000000308e84 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - 0x0000000000308e84 ___umoddi3 - .text 0x00000000003090b8 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - 0x00000000003090da ___udivsi3 - *fill* 0x0000000000309124 0x4 - .text 0x0000000000309128 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000309128 ___udiv_qrnnd_16 - .text 0x0000000000309188 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + .text 0x0000000000301158 0x2028 build-fx/src/level.c.o + 0x0000000000301158 _malloc_error + 0x0000000000301190 _init_level + 0x0000000000301214 _init_ennemies + 0x0000000000301284 _set_level + 0x0000000000303160 _get_lvl_id + .text 0x0000000000303180 0xd8 build-fx/src/config.c.o + 0x0000000000303180 _configmenu + .text 0x0000000000303258 0x25c build-fx/src/score.c.o + 0x0000000000303258 _new_level + 0x0000000000303278 _new_game + 0x00000000003032cc _get_score + 0x00000000003032d8 _get_coins + 0x00000000003032e4 _score_reset + 0x0000000000303304 _score_add_coin + 0x0000000000303314 _score_add + 0x0000000000303364 _score_display + 0x00000000003034a8 _get_time_spent + .text 0x00000000003034b4 0x114 build-fx/src/tuyau.c.o + 0x00000000003034b4 _set_teleporteurs + 0x00000000003034ec _teleport_active + .text 0x00000000003035c8 0x40 build-fx/src/tile.c.o + 0x00000000003035c8 _draw_tile + .text 0x0000000000303608 0x318 build-fx/src/plateforme.c.o + 0x0000000000303608 _reset_plateforme + 0x0000000000303616 _move_plateforme + 0x00000000003037d4 _display_plateformes + 0x0000000000303874 _move_plateformes + 0x00000000003038cc _plateforme_check_collide + .text 0x0000000000303920 0x4ac build-fx/src/box.c.o + 0x0000000000303920 _sgn + 0x0000000000303932 _check_collision + 0x00000000003039c4 _box_move + 0x0000000000303d48 _box_jump + .text 0x0000000000303dcc 0x620 build-fx/src/world.c.o + 0x0000000000303dcc _world_get_width + 0x0000000000303ddc _world_get + 0x0000000000303e40 _display_cell + 0x000000000030414c _world_get_ctg + 0x00000000003041a0 _reset_camera + 0x00000000003041bc _world_get_real_x0 + 0x00000000003041e4 _reload_camera + 0x000000000030420c _world_get_real_y0 + 0x0000000000304220 _world_draw + 0x000000000030433c _world_move + .text 0x00000000003043ec 0x56c build-fx/src/bonus.c.o + 0x00000000003043ec _bonus_set + 0x000000000030441c _bonus_move + 0x00000000003045d0 _bonus_draw + 0x00000000003046e4 _lance_bullet + 0x0000000000304740 _bullet_display + 0x00000000003047d8 _bullet_move + .text 0x0000000000304958 0x224 build-fx/src/save.c.o + 0x0000000000304958 _load_save + 0x000000000030495c _flash_save + 0x0000000000304960 _get_highscore + 0x00000000003049b0 _set_highscore + 0x0000000000304a0c _get_highcoins + 0x0000000000304a5c _set_highcoins + 0x0000000000304ab8 _get_best_time + 0x0000000000304b08 _set_best_time + 0x0000000000304b70 _get_progress_status + .text 0x0000000000304b7c 0x7d0 build-fx/src/mario.c.o + 0x0000000000304b8c _mario_bigger + 0x0000000000304ba8 _mario_smaller + 0x0000000000304bd4 _mario_draw + 0x0000000000304d90 _test_sol_le_plus_proche + 0x0000000000304dfc _mario_move + .text 0x000000000030534c 0x0 build-fx/src/main.c.o + .text.startup 0x000000000030534c 0x24 build-fx/src/main.c.o + 0x000000000030534c _main + .text 0x0000000000305370 0x2c0 build-fx/src/keyboard.c.o + 0x0000000000305370 _keyboard_clear + 0x0000000000305390 _getkey_custom + 0x00000000003053e0 _menu_pause + 0x0000000000305538 _update_keyboard + .text 0x0000000000305630 0x7b0 build-fx/src/ennemi.c.o + 0x0000000000305630 _display_ennemi + 0x0000000000305878 _ennemi_check_collision + 0x00000000003058dc _hurt_mario + 0x0000000000305910 _move_ennemi + 0x0000000000305da0 _display_ennemi_table + .text 0x0000000000305de0 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x00000000003067dc _kprint_opt + 0x0000000000306924 _kprint + 0x00000000003069fc _kvsprint + 0x0000000000306a44 _sprintf + 0x0000000000306a6c _vsprintf + 0x0000000000306a8c _snprintf + 0x0000000000306aac _vsnprintf + .text 0x0000000000306ac4 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + 0x0000000000306ac4 _memcpy + 0x0000000000306b7e __memmove + 0x0000000000306b82 __memcmp + 0x0000000000306b86 _memset + .text 0x0000000000306ba0 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 0x0000000000306ba0 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 0x0000000000306ba0 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) + 0x0000000000306ba0 _drect + .text 0x0000000000306cbc 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + 0x0000000000306cbc _dupdate + 0x0000000000306cd4 _dupdate_noint + .text 0x0000000000306ce0 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + 0x0000000000306ce0 _masks + .text 0x0000000000306d7c 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x0000000000306d7c _dimage + 0x0000000000306dd0 _dsubimage + .text 0x0000000000306e44 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + 0x0000000000306e44 _dclear + .text 0x0000000000306e90 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000307038 _pollevent + 0x000000000030717c _waitevent + 0x00000000003071c8 _clearevents + 0x00000000003071e8 _keydown + 0x0000000000307214 _keydown_all + 0x0000000000307250 _keydown_any + .text 0x000000000030728c 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + 0x0000000000307298 _iokbd_row + 0x0000000000307380 _iokbd_scan + .text 0x00000000003073b0 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + 0x00000000003073b0 _getkey_opt + 0x000000000030755c _getkey + 0x0000000000307568 _getkey_repeat + .text 0x00000000003075a4 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 0x00000000003075a4 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x0000000000307734 _gint_panic + 0x0000000000307744 _gint_panic_set + 0x0000000000307750 _gint_exc_catch + 0x000000000030775c _gint_exc_skip + .text 0x0000000000307768 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 0x0000000000307768 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + 0x000000000030781c _gint_install + 0x00000000003078cc _gint_unload + .text 0x00000000003078e4 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 0x00000000003078e4 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 0x00000000003078e4 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + 0x00000000003078e4 _tlb_addr + 0x00000000003078f8 _tlb_data + 0x000000000030790c _tlb_mapped_memory + 0x00000000003079e0 _utlb_addr + 0x00000000003079f0 _utlb_data + 0x0000000000307a00 _utlb_mapped_memory + .text 0x0000000000307ad8 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x0000000000307ad8 _dsize + .text 0x0000000000307b74 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + 0x0000000000307b74 _dprint + .text 0x0000000000307bcc 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000307eec _timer_setup + 0x0000000000307f7c _timer_delay + 0x0000000000307fdc _timer_start + 0x0000000000308010 _timer_reload + 0x0000000000308030 _timer_pause + 0x0000000000308064 _timer_stop + 0x00000000003080c0 _timer_timeout + 0x00000000003080cc _timer_address + 0x0000000000308108 _timer_clear + .text 0x0000000000308138 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + 0x0000000000308138 _sleep_us + .text 0x0000000000308190 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x0000000000308228 _t6k11_display + 0x00000000003082fc _t6k11_contrast + 0x0000000000308328 _t6k11_backlight + .text 0x0000000000308368 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x00000000003084ac _clock_freq + .text 0x00000000003084b8 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 0x00000000003084b8 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) + 0x00000000003084b8 _bopti_asm_mono + 0x00000000003084de _bopti_asm_mono_alpha + .text 0x0000000000308510 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x0000000000308510 _bopti_grid + 0x0000000000308684 _bopti_render + 0x00000000003087b4 _bopti_render_clip + 0x00000000003088c8 _bopti_render_noclip + .text 0x0000000000308920 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + 0x0000000000308920 _gint_setvbr + .text 0x000000000030894c 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + 0x000000000030894c _gint_intlevel + 0x00000000003089a0 _gint_inthandler + .text 0x00000000003089c4 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 0x00000000003089c4 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 0x00000000003089c4 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) + 0x0000000000308aa4 _ll_set_size + 0x0000000000308ab8 _ll_set_state + 0x0000000000308ad8 _ll_get_state + 0x0000000000308ae8 _ll_clear + 0x0000000000308b34 _ll_send + 0x0000000000308ba8 _ll_sendp + 0x0000000000308bf4 _ll_display_custom + 0x0000000000308c60 _ll_display + 0x0000000000308c74 _ll_pause + 0x0000000000308ccc _ll_panic + 0x0000000000308d08 _ll_set_panic + 0x0000000000308d18 _ll_set_level + 0x0000000000308d24 _ll_get_level + .text 0x0000000000308d30 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + 0x0000000000308d30 ___movstr + 0x0000000000308d30 ___movmem + 0x0000000000308d64 ___movmemSI64 + 0x0000000000308d64 ___movstrSI64 + 0x0000000000308d68 ___movstrSI60 + 0x0000000000308d68 ___movmemSI60 + 0x0000000000308d6c ___movmemSI56 + 0x0000000000308d6c ___movstrSI56 + 0x0000000000308d70 ___movstrSI52 + 0x0000000000308d70 ___movmemSI52 + 0x0000000000308d74 ___movstrSI48 + 0x0000000000308d74 ___movmemSI48 + 0x0000000000308d78 ___movstrSI44 + 0x0000000000308d78 ___movmemSI44 + 0x0000000000308d7c ___movstrSI40 + 0x0000000000308d7c ___movmemSI40 + 0x0000000000308d80 ___movstrSI36 + 0x0000000000308d80 ___movmemSI36 + 0x0000000000308d84 ___movmemSI32 + 0x0000000000308d84 ___movstrSI32 + 0x0000000000308d88 ___movmemSI28 + 0x0000000000308d88 ___movstrSI28 + 0x0000000000308d8c ___movstrSI24 + 0x0000000000308d8c ___movmemSI24 + 0x0000000000308d90 ___movmemSI20 + 0x0000000000308d90 ___movstrSI20 + 0x0000000000308d94 ___movstrSI16 + 0x0000000000308d94 ___movmemSI16 + 0x0000000000308d98 ___movmemSI12 + 0x0000000000308d98 ___movstrSI12 + 0x0000000000308d9c ___movmemSI8 + 0x0000000000308d9c ___movstrSI8 + 0x0000000000308da0 ___movmemSI4 + 0x0000000000308da0 ___movstrSI4 + .text 0x0000000000308da8 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + 0x0000000000308da8 ___udivdi3 + .text 0x0000000000308f98 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + 0x0000000000308f98 ___umoddi3 + .text 0x00000000003091cc 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + 0x00000000003091ee ___udivsi3 + .text 0x0000000000309238 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000309238 ___udiv_qrnnd_16 + .text 0x0000000000309298 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 0x0000000000309190 0x120 +.gint.blocks 0x00000000003092a0 0x120 *(.gint.blocks) - .gint.blocks 0x0000000000309190 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - 0x0000000000309190 _gint_inth_7305 - 0x00000000003091b0 _gint_inth_7705 - .gint.blocks 0x00000000003091d0 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - 0x00000000003091d0 _inth_tmu - 0x0000000000309250 _inth_etmu2 - 0x0000000000309270 _inth_etmu_help - 0x0000000000309290 _inth_etmux + .gint.blocks 0x00000000003092a0 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + 0x00000000003092a0 _gint_inth_7305 + 0x00000000003092c0 _gint_inth_7705 + .gint.blocks 0x00000000003092e0 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + 0x00000000003092e0 _inth_tmu + 0x0000000000309360 _inth_etmu2 + 0x0000000000309380 _inth_etmu_help + 0x00000000003093a0 _inth_etmux -.gint.drivers 0x00000000003092b0 0x90 - 0x00000000003092b0 _bdrv = . +.gint.drivers 0x00000000003093c0 0x90 + 0x00000000003093c0 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x00000000003092b0 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x00000000003092b0 _drv_cpg + 0x00000000003093c0 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x00000000003093c0 _drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x00000000003092d4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x00000000003092d4 _drv_tmu + 0x00000000003093e4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x00000000003093e4 _drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x00000000003092f8 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x00000000003092f8 _drv_keysc + 0x0000000000309408 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000309408 _drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x000000000030931c 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x000000000030931c _drv_t6k11 + 0x000000000030942c 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x000000000030942c _drv_t6k11 *(.gint.drivers.6) - 0x0000000000309340 _edrv = . + 0x0000000000309450 _edrv = . -.rodata 0x0000000000309340 0x7e1c +.rodata 0x0000000000309450 0x7e1c *(.rodata.4) *(.rodata .rodata.*) .rodata.str1.4 - 0x0000000000309340 0xe build-fx/src/levelchanger.c.o + 0x0000000000309450 0xe build-fx/src/levelchanger.c.o 0x12 (size before relaxing) - *fill* 0x000000000030934e 0x2 - .rodata 0x0000000000309350 0x2e28 build-fx/src/level.c.o + *fill* 0x000000000030945e 0x2 + .rodata 0x0000000000309460 0x2e28 build-fx/src/level.c.o .rodata.str1.4 - 0x000000000030c178 0x6 build-fx/src/level.c.o - *fill* 0x000000000030c17e 0x2 + 0x000000000030c288 0x6 build-fx/src/level.c.o + *fill* 0x000000000030c28e 0x2 .rodata.str1.4 - 0x000000000030c180 0x22 build-fx/src/config.c.o - *fill* 0x000000000030c1a2 0x2 + 0x000000000030c290 0x22 build-fx/src/config.c.o + *fill* 0x000000000030c2b2 0x2 .rodata.str1.4 - 0x000000000030c1a4 0x1a build-fx/src/score.c.o + 0x000000000030c2b4 0x1a build-fx/src/score.c.o 0x1e (size before relaxing) - *fill* 0x000000000030c1be 0x2 - .rodata 0x000000000030c1c0 0x130 build-fx/src/tile.c.o - 0x000000000030c1c0 _tplateforme - 0x000000000030c1d0 _mario_big - 0x000000000030c1e0 _mario_small - 0x000000000030c1f0 _bullet - 0x000000000030c200 _fleur - 0x000000000030c210 _mario_starman - 0x000000000030c220 _life_1up - 0x000000000030c230 _champi - 0x000000000030c240 _bloc - 0x000000000030c250 _end_level - 0x000000000030c260 _castle - 0x000000000030c270 _colline - 0x000000000030c280 _buisson - 0x000000000030c290 _nuage - 0x000000000030c2a0 _coin - 0x000000000030c2b0 _gift - 0x000000000030c2c0 _earth - 0x000000000030c2d0 _brick - 0x000000000030c2e0 _tuyau + *fill* 0x000000000030c2ce 0x2 + .rodata 0x000000000030c2d0 0x130 build-fx/src/tile.c.o + 0x000000000030c2d0 _tplateforme + 0x000000000030c2e0 _mario_big + 0x000000000030c2f0 _mario_small + 0x000000000030c300 _bullet + 0x000000000030c310 _fleur + 0x000000000030c320 _mario_starman + 0x000000000030c330 _life_1up + 0x000000000030c340 _champi + 0x000000000030c350 _bloc + 0x000000000030c360 _end_level + 0x000000000030c370 _castle + 0x000000000030c380 _colline + 0x000000000030c390 _buisson + 0x000000000030c3a0 _nuage + 0x000000000030c3b0 _coin + 0x000000000030c3c0 _gift + 0x000000000030c3d0 _earth + 0x000000000030c3e0 _brick + 0x000000000030c3f0 _tuyau .rodata.str1.4 - 0x000000000030c2f0 0x63 build-fx/src/world.c.o - *fill* 0x000000000030c353 0x1 - .rodata 0x000000000030c354 0x28 build-fx/src/keyboard.c.o - .rodata 0x000000000030c37c 0x60 build-fx/src/ennemi.c.o - 0x000000000030c3ac _ennemi_heights - 0x000000000030c3c4 _ennemi_widths - .rodata 0x000000000030c3dc 0x204 build-fx/assets/fonts/mario.png.o - 0x000000000030c3dc _font_mario - 0x000000000030c5e0 _font_mario_end - .rodata 0x000000000030c5e0 0x20 build-fx/assets/img/bonus.png.o - 0x000000000030c5e0 _img_bonus - 0x000000000030c600 _img_bonus_end - .rodata 0x000000000030c600 0x24 build-fx/assets/img/bloc.png.o - 0x000000000030c600 _img_bloc - 0x000000000030c624 _img_bloc_end - .rodata 0x000000000030c624 0x404 build-fx/assets/img/ram.png.o - 0x000000000030c624 _img_ram - 0x000000000030ca28 _img_ram_end - .rodata 0x000000000030ca28 0x58 build-fx/assets/img/w5.png.o - 0x000000000030ca28 _img_w5 - 0x000000000030ca80 _img_w5_end - .rodata 0x000000000030ca80 0x404 build-fx/assets/img/options.png.o - 0x000000000030ca80 _img_options - 0x000000000030ce84 _img_options_end - .rodata 0x000000000030ce84 0x44 build-fx/assets/img/fleur.png.o - 0x000000000030ce84 _img_fleur - 0x000000000030cec8 _img_fleur_end - .rodata 0x000000000030cec8 0x58 build-fx/assets/img/w2.png.o - 0x000000000030cec8 _img_w2 - 0x000000000030cf20 _img_w2_end - .rodata 0x000000000030cf20 0x404 build-fx/assets/img/main.png.o - 0x000000000030cf20 _img_main - 0x000000000030d324 _img_main_end - .rodata 0x000000000030d324 0x64 build-fx/assets/img/flag.png.o - 0x000000000030d324 _img_flag - 0x000000000030d388 _img_flag_end - .rodata 0x000000000030d388 0x404 build-fx/assets/img/new_level.png.o - 0x000000000030d388 _img_new_level - 0x000000000030d78c _img_new_level_end - .rodata 0x000000000030d78c 0x4c build-fx/assets/img/brick.png.o - 0x000000000030d78c _img_brick - 0x000000000030d7d8 _img_brick_end - .rodata 0x000000000030d7d8 0xbc build-fx/assets/img/menu_pause.png.o - 0x000000000030d7d8 _img_menu_pause - 0x000000000030d894 _img_menu_pause_end - .rodata 0x000000000030d894 0x18 build-fx/assets/img/select_arrow.png.o - 0x000000000030d894 _img_select_arrow - 0x000000000030d8ac _img_select_arrow_end - .rodata 0x000000000030d8ac 0x804 build-fx/assets/img/dev.png.o - 0x000000000030d8ac _img_dev - 0x000000000030e0b0 _img_dev_end - .rodata 0x000000000030e0b0 0x24 build-fx/assets/img/death.png.o - 0x000000000030e0b0 _img_death - 0x000000000030e0d4 _img_death_end - .rodata 0x000000000030e0d4 0x404 build-fx/assets/img/mainmenu.png.o - 0x000000000030e0d4 _img_mainmenu - 0x000000000030e4d8 _img_mainmenu_end - .rodata 0x000000000030e4d8 0x58 build-fx/assets/img/w3.png.o - 0x000000000030e4d8 _img_w3 - 0x000000000030e530 _img_w3_end - .rodata 0x000000000030e530 0x404 build-fx/assets/img/time_over.png.o - 0x000000000030e530 _img_time_over - 0x000000000030e934 _img_time_over_end - .rodata 0x000000000030e934 0x4c build-fx/assets/img/coin.png.o - 0x000000000030e934 _img_coin - 0x000000000030e980 _img_coin_end - .rodata 0x000000000030e980 0x24 build-fx/assets/img/champi.png.o - 0x000000000030e980 _img_champi - 0x000000000030e9a4 _img_champi_end - .rodata 0x000000000030e9a4 0xdc build-fx/assets/img/mariosmall.png.o - 0x000000000030e9a4 _img_mariosmall - 0x000000000030ea80 _img_mariosmall_end - .rodata 0x000000000030ea80 0x404 build-fx/assets/img/levelchanger.png.o - 0x000000000030ea80 _img_levelchanger - 0x000000000030ee84 _img_levelchanger_end - .rodata 0x000000000030ee84 0x28 build-fx/assets/img/gift.png.o - 0x000000000030ee84 _img_gift - 0x000000000030eeac _img_gift_end - .rodata 0x000000000030eeac 0x44 build-fx/assets/img/buisson.png.o - 0x000000000030eeac _img_buisson - 0x000000000030eef0 _img_buisson_end - .rodata 0x000000000030eef0 0x84 build-fx/assets/img/colline.png.o - 0x000000000030eef0 _img_colline - 0x000000000030ef74 _img_colline_end - .rodata 0x000000000030ef74 0x24 build-fx/assets/img/star.png.o - 0x000000000030ef74 _img_star - 0x000000000030ef98 _img_star_end - .rodata 0x000000000030ef98 0x224 build-fx/assets/img/mariobig.png.o - 0x000000000030ef98 _img_mariobig - 0x000000000030f1bc _img_mariobig_end - .rodata 0x000000000030f1bc 0x804 build-fx/assets/img/error.png.o - 0x000000000030f1bc _img_error - 0x000000000030f9c0 _img_error_end - .rodata 0x000000000030f9c0 0x44 build-fx/assets/img/1up.png.o - 0x000000000030f9c0 _img_1up - 0x000000000030fa04 _img_1up_end - .rodata 0x000000000030fa04 0xb8 build-fx/assets/img/tuyau.png.o - 0x000000000030fa04 _img_tuyau - 0x000000000030fabc _img_tuyau_end - .rodata 0x000000000030fabc 0x24 build-fx/assets/img/bullet.png.o - 0x000000000030fabc _img_bullet - 0x000000000030fae0 _img_bullet_end - .rodata 0x000000000030fae0 0x4c build-fx/assets/img/carapace_verte.png.o - 0x000000000030fae0 _img_carapace_verte - 0x000000000030fb2c _img_carapace_verte_end - .rodata 0x000000000030fb2c 0x44 build-fx/assets/img/nuage.png.o - 0x000000000030fb2c _img_nuage - 0x000000000030fb70 _img_nuage_end - .rodata 0x000000000030fb70 0x10 build-fx/assets/img/plateforme.png.o - 0x000000000030fb70 _img_plateforme - 0x000000000030fb80 _img_plateforme_end - .rodata 0x000000000030fb80 0xc4 build-fx/assets/img/koopa_verte.png.o - 0x000000000030fb80 _img_koopa_verte - 0x000000000030fc44 _img_koopa_verte_end - .rodata 0x000000000030fc44 0x404 build-fx/assets/img/game_over.png.o - 0x000000000030fc44 _img_game_over - 0x0000000000310048 _img_game_over_end - .rodata 0x0000000000310048 0x404 build-fx/assets/img/level.png.o - 0x0000000000310048 _img_level - 0x000000000031044c _img_level_end - .rodata 0x000000000031044c 0xe4 build-fx/assets/img/castle.png.o - 0x000000000031044c _img_castle - 0x0000000000310530 _img_castle_end - .rodata 0x0000000000310530 0x4c build-fx/assets/img/goomba.png.o - 0x0000000000310530 _img_goomba - 0x000000000031057c _img_goomba_end - .rodata 0x000000000031057c 0x4c build-fx/assets/img/stone.png.o - 0x000000000031057c _img_stone - 0x00000000003105c8 _img_stone_end - .rodata 0x00000000003105c8 0x24 build-fx/assets/img/tickbox.png.o - 0x00000000003105c8 _img_tickbox - 0x00000000003105ec _img_tickbox_end - .rodata 0x00000000003105ec 0x58 build-fx/assets/img/w4.png.o - 0x00000000003105ec _img_w4 - 0x0000000000310644 _img_w4_end - .rodata 0x0000000000310644 0x58 build-fx/assets/img/w1.png.o - 0x0000000000310644 _img_w1 - 0x000000000031069c _img_w1_end - .rodata 0x000000000031069c 0x404 build-fx/assets/img/lvl0.png.o - 0x000000000031069c _img_lvl0 - 0x0000000000310aa0 _img_lvl0_end + 0x000000000030c400 0x63 build-fx/src/world.c.o + *fill* 0x000000000030c463 0x1 + .rodata 0x000000000030c464 0x28 build-fx/src/keyboard.c.o + .rodata 0x000000000030c48c 0x60 build-fx/src/ennemi.c.o + 0x000000000030c4bc _ennemi_heights + 0x000000000030c4d4 _ennemi_widths + .rodata 0x000000000030c4ec 0x204 build-fx/assets/fonts/mario.png.o + 0x000000000030c4ec _font_mario + 0x000000000030c6f0 _font_mario_end + .rodata 0x000000000030c6f0 0x20 build-fx/assets/img/bonus.png.o + 0x000000000030c6f0 _img_bonus + 0x000000000030c710 _img_bonus_end + .rodata 0x000000000030c710 0x24 build-fx/assets/img/bloc.png.o + 0x000000000030c710 _img_bloc + 0x000000000030c734 _img_bloc_end + .rodata 0x000000000030c734 0x404 build-fx/assets/img/ram.png.o + 0x000000000030c734 _img_ram + 0x000000000030cb38 _img_ram_end + .rodata 0x000000000030cb38 0x58 build-fx/assets/img/w5.png.o + 0x000000000030cb38 _img_w5 + 0x000000000030cb90 _img_w5_end + .rodata 0x000000000030cb90 0x404 build-fx/assets/img/options.png.o + 0x000000000030cb90 _img_options + 0x000000000030cf94 _img_options_end + .rodata 0x000000000030cf94 0x44 build-fx/assets/img/fleur.png.o + 0x000000000030cf94 _img_fleur + 0x000000000030cfd8 _img_fleur_end + .rodata 0x000000000030cfd8 0x58 build-fx/assets/img/w2.png.o + 0x000000000030cfd8 _img_w2 + 0x000000000030d030 _img_w2_end + .rodata 0x000000000030d030 0x404 build-fx/assets/img/main.png.o + 0x000000000030d030 _img_main + 0x000000000030d434 _img_main_end + .rodata 0x000000000030d434 0x64 build-fx/assets/img/flag.png.o + 0x000000000030d434 _img_flag + 0x000000000030d498 _img_flag_end + .rodata 0x000000000030d498 0x404 build-fx/assets/img/new_level.png.o + 0x000000000030d498 _img_new_level + 0x000000000030d89c _img_new_level_end + .rodata 0x000000000030d89c 0x4c build-fx/assets/img/brick.png.o + 0x000000000030d89c _img_brick + 0x000000000030d8e8 _img_brick_end + .rodata 0x000000000030d8e8 0xbc build-fx/assets/img/menu_pause.png.o + 0x000000000030d8e8 _img_menu_pause + 0x000000000030d9a4 _img_menu_pause_end + .rodata 0x000000000030d9a4 0x18 build-fx/assets/img/select_arrow.png.o + 0x000000000030d9a4 _img_select_arrow + 0x000000000030d9bc _img_select_arrow_end + .rodata 0x000000000030d9bc 0x804 build-fx/assets/img/dev.png.o + 0x000000000030d9bc _img_dev + 0x000000000030e1c0 _img_dev_end + .rodata 0x000000000030e1c0 0x24 build-fx/assets/img/death.png.o + 0x000000000030e1c0 _img_death + 0x000000000030e1e4 _img_death_end + .rodata 0x000000000030e1e4 0x404 build-fx/assets/img/mainmenu.png.o + 0x000000000030e1e4 _img_mainmenu + 0x000000000030e5e8 _img_mainmenu_end + .rodata 0x000000000030e5e8 0x58 build-fx/assets/img/w3.png.o + 0x000000000030e5e8 _img_w3 + 0x000000000030e640 _img_w3_end + .rodata 0x000000000030e640 0x404 build-fx/assets/img/time_over.png.o + 0x000000000030e640 _img_time_over + 0x000000000030ea44 _img_time_over_end + .rodata 0x000000000030ea44 0x4c build-fx/assets/img/coin.png.o + 0x000000000030ea44 _img_coin + 0x000000000030ea90 _img_coin_end + .rodata 0x000000000030ea90 0x24 build-fx/assets/img/champi.png.o + 0x000000000030ea90 _img_champi + 0x000000000030eab4 _img_champi_end + .rodata 0x000000000030eab4 0xdc build-fx/assets/img/mariosmall.png.o + 0x000000000030eab4 _img_mariosmall + 0x000000000030eb90 _img_mariosmall_end + .rodata 0x000000000030eb90 0x404 build-fx/assets/img/levelchanger.png.o + 0x000000000030eb90 _img_levelchanger + 0x000000000030ef94 _img_levelchanger_end + .rodata 0x000000000030ef94 0x28 build-fx/assets/img/gift.png.o + 0x000000000030ef94 _img_gift + 0x000000000030efbc _img_gift_end + .rodata 0x000000000030efbc 0x44 build-fx/assets/img/buisson.png.o + 0x000000000030efbc _img_buisson + 0x000000000030f000 _img_buisson_end + .rodata 0x000000000030f000 0x84 build-fx/assets/img/colline.png.o + 0x000000000030f000 _img_colline + 0x000000000030f084 _img_colline_end + .rodata 0x000000000030f084 0x24 build-fx/assets/img/star.png.o + 0x000000000030f084 _img_star + 0x000000000030f0a8 _img_star_end + .rodata 0x000000000030f0a8 0x224 build-fx/assets/img/mariobig.png.o + 0x000000000030f0a8 _img_mariobig + 0x000000000030f2cc _img_mariobig_end + .rodata 0x000000000030f2cc 0x804 build-fx/assets/img/error.png.o + 0x000000000030f2cc _img_error + 0x000000000030fad0 _img_error_end + .rodata 0x000000000030fad0 0x44 build-fx/assets/img/1up.png.o + 0x000000000030fad0 _img_1up + 0x000000000030fb14 _img_1up_end + .rodata 0x000000000030fb14 0xb8 build-fx/assets/img/tuyau.png.o + 0x000000000030fb14 _img_tuyau + 0x000000000030fbcc _img_tuyau_end + .rodata 0x000000000030fbcc 0x24 build-fx/assets/img/bullet.png.o + 0x000000000030fbcc _img_bullet + 0x000000000030fbf0 _img_bullet_end + .rodata 0x000000000030fbf0 0x4c build-fx/assets/img/carapace_verte.png.o + 0x000000000030fbf0 _img_carapace_verte + 0x000000000030fc3c _img_carapace_verte_end + .rodata 0x000000000030fc3c 0x44 build-fx/assets/img/nuage.png.o + 0x000000000030fc3c _img_nuage + 0x000000000030fc80 _img_nuage_end + .rodata 0x000000000030fc80 0x10 build-fx/assets/img/plateforme.png.o + 0x000000000030fc80 _img_plateforme + 0x000000000030fc90 _img_plateforme_end + .rodata 0x000000000030fc90 0xc4 build-fx/assets/img/koopa_verte.png.o + 0x000000000030fc90 _img_koopa_verte + 0x000000000030fd54 _img_koopa_verte_end + .rodata 0x000000000030fd54 0x404 build-fx/assets/img/game_over.png.o + 0x000000000030fd54 _img_game_over + 0x0000000000310158 _img_game_over_end + .rodata 0x0000000000310158 0x404 build-fx/assets/img/level.png.o + 0x0000000000310158 _img_level + 0x000000000031055c _img_level_end + .rodata 0x000000000031055c 0xe4 build-fx/assets/img/castle.png.o + 0x000000000031055c _img_castle + 0x0000000000310640 _img_castle_end + .rodata 0x0000000000310640 0x4c build-fx/assets/img/goomba.png.o + 0x0000000000310640 _img_goomba + 0x000000000031068c _img_goomba_end + .rodata 0x000000000031068c 0x4c build-fx/assets/img/stone.png.o + 0x000000000031068c _img_stone + 0x00000000003106d8 _img_stone_end + .rodata 0x00000000003106d8 0x24 build-fx/assets/img/tickbox.png.o + 0x00000000003106d8 _img_tickbox + 0x00000000003106fc _img_tickbox_end + .rodata 0x00000000003106fc 0x58 build-fx/assets/img/w4.png.o + 0x00000000003106fc _img_w4 + 0x0000000000310754 _img_w4_end + .rodata 0x0000000000310754 0x58 build-fx/assets/img/w1.png.o + 0x0000000000310754 _img_w1 + 0x00000000003107ac _img_w1_end + .rodata 0x00000000003107ac 0x404 build-fx/assets/img/lvl0.png.o + 0x00000000003107ac _img_lvl0 + 0x0000000000310bb0 _img_lvl0_end .rodata.str1.4 - 0x0000000000310aa0 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* 0x0000000000310ad1 0x3 - .rodata 0x0000000000310ad4 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x0000000000310bb0 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* 0x0000000000310be1 0x3 + .rodata 0x0000000000310be4 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 - 0x0000000000310adc 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* 0x0000000000310ae2 0x2 + 0x0000000000310bec 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* 0x0000000000310bf2 0x2 .rodata.str1.4 - 0x0000000000310ae4 0x11a /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x0000000000310bf4 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* 0x0000000000310bfe 0x2 - .rodata 0x0000000000310c00 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* 0x0000000000310d0e 0x2 + .rodata 0x0000000000310d10 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 - 0x0000000000310c18 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 0x0000000000310c1c 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) - 0x0000000000310c1c _gint_font5x7 - 0x0000000000311024 _gint_font5x7_end + 0x0000000000310d28 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 0x0000000000310d2c 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) + 0x0000000000310d2c _gint_font5x7 + 0x0000000000311134 _gint_font5x7_end .rodata.str1.4 - 0x0000000000311024 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* 0x000000000031102a 0x2 + 0x0000000000311134 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* 0x000000000031113a 0x2 .rodata.str1.4 - 0x000000000031102c 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 0x0000000000311030 0x10 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x000000000031113c 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 0x0000000000311140 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.str1.4 - 0x0000000000311040 0x1b /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) - *fill* 0x000000000031105b 0x1 - .rodata 0x000000000031105c 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) - 0x000000000031105c ___clz_tab + 0x0000000000311150 0x1b /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) + *fill* 0x000000000031116b 0x1 + .rodata 0x000000000031116c 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x000000000031116c ___clz_tab -.rela.dyn 0x000000000031115c 0x0 - .rela.text 0x000000000031115c 0x0 build-fx/src/levelchanger.c.o +.rela.dyn 0x000000000031126c 0x0 + .rela.text 0x000000000031126c 0x0 build-fx/src/levelchanger.c.o .rela.pretext.entry - 0x000000000031115c 0x0 build-fx/src/levelchanger.c.o + 0x000000000031126c 0x0 build-fx/src/levelchanger.c.o 0x0000000008100000 . = ORIGIN (ram) .bss 0x0000000008100000 0x930 @@ -870,8 +872,8 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a *fill* 0x0000000008100928 0x8 0x0000000000000930 _sbss = SIZEOF (.bss) -.data 0x0000000008100930 0x160 load address 0x000000000031115c - 0x000000000031115c _ldata = LOADADDR (.data) +.data 0x0000000008100930 0x160 load address 0x000000000031126c + 0x000000000031126c _ldata = LOADADDR (.data) 0x0000000008100930 _rdata = . *(.data .data.*) .data 0x0000000008100930 0x0 build-fx/src/levelchanger.c.o @@ -939,28 +941,28 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a *(D) 0x0000000008100a90 . = ALIGN (0x10) -.data.4 0x0000000008100a90 0x0 load address 0x00000000003112bc +.data.4 0x0000000008100a90 0x0 load address 0x00000000003113cc *(.data.4) 0x0000000008100a90 . = ALIGN (0x10) 0x0000000000000160 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x00000000e5200000 . = ORIGIN (ilram) -.ilram 0x00000000e5200000 0x0 load address 0x00000000003112bc - 0x00000000003112bc _lilram = LOADADDR (.ilram) +.ilram 0x00000000e5200000 0x0 load address 0x00000000003113cc + 0x00000000003113cc _lilram = LOADADDR (.ilram) 0x00000000e5200000 _rilram = . *(.ilram) 0x00000000e5200000 . = ALIGN (0x10) 0x00000000e5007000 . = ORIGIN (xram) -.xram 0x00000000e5007000 0x0 load address 0x00000000003112bc - 0x00000000003112bc _lxram = LOADADDR (.xram) +.xram 0x00000000e5007000 0x0 load address 0x00000000003113cc + 0x00000000003113cc _lxram = LOADADDR (.xram) 0x00000000e5007000 _rxram = . *(.xram) 0x00000000e5007000 . = ALIGN (0x10) 0x00000000e5017000 . = ORIGIN (yram) -.yram 0x00000000e5017000 0x0 load address 0x00000000003112bc - 0x00000000003112bc _lyram = LOADADDR (.yram) +.yram 0x00000000e5017000 0x0 load address 0x00000000003113cc + 0x00000000003113cc _lyram = LOADADDR (.yram) 0x00000000e5017000 _ryram = . *(.yram) 0x00000000e5017000 . = ALIGN (0x10) @@ -970,8 +972,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 0x00000000003112bc - 0x00000000003112bc _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x140 load address 0x00000000003113cc + 0x00000000003113cc _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) @@ -992,7 +994,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 0x00000000003113fc +.gint.bss 0x000000008800f540 0x290 load address 0x000000000031150c *(.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/levelchanger.c.o b/build-fx/src/levelchanger.c.o index 2176ff2..ecac208 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 fe16314..38cc7c5 100644 Binary files a/build-fx/src/save.c.o and b/build-fx/src/save.c.o differ diff --git a/build-fx/src/score.c.o b/build-fx/src/score.c.o index 5b716cd..18dce68 100644 Binary files a/build-fx/src/score.c.o and b/build-fx/src/score.c.o differ diff --git a/build-fx/src/tuyau.c.o b/build-fx/src/tuyau.c.o index 6db7c56..9ca6954 100644 Binary files a/build-fx/src/tuyau.c.o and b/build-fx/src/tuyau.c.o differ diff --git a/include/save.h b/include/save.h index a74d9a0..8c979dd 100644 --- a/include/save.h +++ b/include/save.h @@ -13,6 +13,10 @@ void set_highscore(int world, int level, int score); int get_best_time(int world, int level); void set_best_time(int world, int level, int score); +int get_highcoins(int world, int level); +void set_highcoins(int world, int level, int coins); + + int get_progress_status(); #endif \ No newline at end of file diff --git a/include/score.h b/include/score.h index de6dee6..787fe11 100644 --- a/include/score.h +++ b/include/score.h @@ -7,6 +7,7 @@ extern int finish_level; // si ==-1, continue, si 0==retry, si ==1 ou + next extern int time_id; int get_score(); +int get_coins(); void score_reset(); void score_add(int); void score_display(); diff --git a/src/levelchanger.c b/src/levelchanger.c index 1adfbba..a59398b 100644 --- a/src/levelchanger.c +++ b/src/levelchanger.c @@ -59,6 +59,13 @@ static void levelchanger(int w) i++; dtext(99-6*i, 45, str, C_BLACK, C_WHITE); + sprintf(str, "%d", get_highcoins(w,choice)); + i=0; + while (str[i]) + i++; + dtext(90-6*i, 37, str, C_BLACK, C_WHITE); + + dupdate(); @@ -102,18 +109,21 @@ static void levelchanger(int w) } else { - dienretry: - new_game(); - mario_smaller(); - mario_immunity=0; - int s=play_level(w, choice); - if (s==1) + while (1) { - set_best_time(w, choice, get_time_spent()); + new_game(); + mario_smaller(); + mario_immunity=0; + int s=play_level(w, choice); + if (s==1) + { + set_best_time(w, choice, get_time_spent()); + } + set_highscore(w, choice, get_score()); + set_highcoins(w, choice, get_coins()); + if (s) + break; } - set_highscore(w, choice, get_score()); - if (s==0) - goto dienretry; } } diff --git a/src/save.c b/src/save.c index d52666a..74aa4dd 100644 --- a/src/save.c +++ b/src/save.c @@ -30,6 +30,19 @@ void set_highscore(int world, int level, int score) level_scores[world%NB_MONDES][level%WORLD_RUN_ENTRY]=score; } + +int get_highcoins(int world, int level) +{ + return level_coins[world%NB_MONDES][level%WORLD_RUN_ENTRY]; +} + +void set_highcoins(int world, int level, int coins) +{ + if (coins>level_coins[world%NB_MONDES][level%WORLD_RUN_ENTRY]) + level_coins[world%NB_MONDES][level%WORLD_RUN_ENTRY]=coins; +} + + int get_best_time(int world, int level) { return level_times[world%NB_MONDES][level%WORLD_RUN_ENTRY]; diff --git a/src/score.c b/src/score.c index 945f5bb..2aa780f 100644 --- a/src/score.c +++ b/src/score.c @@ -45,6 +45,12 @@ int get_score() return score; } +int get_coins() +{ + return pieces; +} + + void score_reset() { score=0; diff --git a/src/tuyau.c b/src/tuyau.c index 733a8e3..7f3d12a 100644 --- a/src/tuyau.c +++ b/src/tuyau.c @@ -36,9 +36,8 @@ void teleport_active() if (!keys[t.key]) continue; } - mario.p.x=t.tx*8; - mario.p.y=t.ty*8; - mario.p.vx=mario.p.vy=0; + mario.p.x=t.tx*8; mario.p.y=t.ty*8; + mario.p.vx=0; mario.p.vy=0; } } } \ No newline at end of file