diff --git a/SuperCbr.g1a b/SuperCbr.g1a index cd5164a..12900c8 100644 Binary files a/SuperCbr.g1a and b/SuperCbr.g1a differ diff --git a/build-fx/SuperCbr.bin b/build-fx/SuperCbr.bin index b2b7552..bf5b20a 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 91a5a28..307f710 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 8ba9f10..2bc87a1 100644 --- a/build-fx/map +++ b/build-fx/map @@ -307,229 +307,228 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x000000000030332c _score_add 0x000000000030337c _score_display 0x00000000003034c0 _get_time_spent - .text 0x00000000003034cc 0x13c build-fx/src/tuyau.c.o + .text 0x00000000003034cc 0x17c build-fx/src/tuyau.c.o 0x00000000003034cc _set_teleporteurs 0x0000000000303504 _teleport_active - .text 0x0000000000303608 0x40 build-fx/src/tile.c.o - 0x0000000000303608 _draw_tile - .text 0x0000000000303648 0x324 build-fx/src/plateforme.c.o - 0x0000000000303648 _reset_plateforme - 0x0000000000303656 _move_plateforme - 0x0000000000303820 _display_plateformes - 0x00000000003038c0 _move_plateformes - 0x0000000000303918 _plateforme_check_collide - .text 0x000000000030396c 0x4ac build-fx/src/box.c.o - 0x000000000030396c _sgn - 0x000000000030397e _check_collision - 0x0000000000303a10 _box_move - 0x0000000000303d94 _box_jump - .text 0x0000000000303e18 0x620 build-fx/src/world.c.o - 0x0000000000303e18 _world_get_width - 0x0000000000303e28 _world_get - 0x0000000000303e8c _display_cell - 0x0000000000304198 _world_get_ctg - 0x00000000003041ec _reset_camera - 0x0000000000304208 _world_get_real_x0 - 0x0000000000304230 _reload_camera - 0x0000000000304258 _world_get_real_y0 - 0x000000000030426c _world_draw - 0x0000000000304388 _world_move - .text 0x0000000000304438 0x70 build-fx/src/framerate.c.o - 0x0000000000304438 _callback - 0x0000000000304440 _init_refresh - 0x0000000000304480 _quit_refresh - 0x000000000030448c _wait_next_frame - .text 0x00000000003044a8 0x56c build-fx/src/bonus.c.o - 0x00000000003044a8 _bonus_set - 0x00000000003044d8 _bonus_move - 0x000000000030468c _bonus_draw - 0x00000000003047a0 _lance_bullet - 0x00000000003047fc _bullet_display - 0x0000000000304894 _bullet_move - .text 0x0000000000304a14 0x224 build-fx/src/save.c.o - 0x0000000000304a14 _load_save - 0x0000000000304a18 _flash_save - 0x0000000000304a1c _get_highscore - 0x0000000000304a6c _set_highscore - 0x0000000000304ac8 _get_highcoins - 0x0000000000304b18 _set_highcoins - 0x0000000000304b74 _get_best_time - 0x0000000000304bc4 _set_best_time - 0x0000000000304c2c _get_progress_status - .text 0x0000000000304c38 0x7d0 build-fx/src/mario.c.o - 0x0000000000304c48 _mario_bigger - 0x0000000000304c64 _mario_smaller - 0x0000000000304c90 _mario_draw - 0x0000000000304e4c _test_sol_le_plus_proche - 0x0000000000304eb8 _mario_move - .text 0x0000000000305408 0x0 build-fx/src/main.c.o - .text.startup 0x0000000000305408 0x24 build-fx/src/main.c.o - 0x0000000000305408 _main - .text 0x000000000030542c 0x2c0 build-fx/src/keyboard.c.o - 0x000000000030542c _keyboard_clear - 0x000000000030544c _getkey_custom - 0x000000000030549c _menu_pause - 0x00000000003055f4 _update_keyboard - .text 0x00000000003056ec 0x7b0 build-fx/src/ennemi.c.o - 0x00000000003056ec _display_ennemi - 0x0000000000305934 _ennemi_check_collision - 0x0000000000305998 _hurt_mario - 0x00000000003059cc _move_ennemi - 0x0000000000305e5c _display_ennemi_table - .text 0x0000000000305e9c 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x0000000000306898 _kprint_opt - 0x00000000003069e0 _kprint - 0x0000000000306ab8 _kvsprint - 0x0000000000306b00 _sprintf - 0x0000000000306b28 _vsprintf - 0x0000000000306b48 _snprintf - 0x0000000000306b68 _vsnprintf - .text 0x0000000000306b80 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - 0x0000000000306b80 _memcpy - 0x0000000000306c3a __memmove - 0x0000000000306c3e __memcmp - 0x0000000000306c42 _memset - .text 0x0000000000306c5c 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 0x0000000000306c5c 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 0x0000000000306c5c 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) - 0x0000000000306c5c _drect - .text 0x0000000000306d78 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - 0x0000000000306d78 _dupdate - 0x0000000000306d90 _dupdate_noint - .text 0x0000000000306d9c 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - 0x0000000000306d9c _masks - .text 0x0000000000306e38 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - 0x0000000000306e38 _dimage - 0x0000000000306e8c _dsubimage - .text 0x0000000000306f00 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - 0x0000000000306f00 _dclear - .text 0x0000000000306f4c 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x00000000003070f4 _pollevent - 0x0000000000307238 _waitevent - 0x0000000000307284 _clearevents - 0x00000000003072a4 _keydown - 0x00000000003072d0 _keydown_all - 0x000000000030730c _keydown_any - .text 0x0000000000307348 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - 0x0000000000307354 _iokbd_row - 0x000000000030743c _iokbd_scan - .text 0x000000000030746c 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - 0x000000000030746c _getkey_opt - 0x0000000000307618 _getkey - 0x0000000000307624 _getkey_repeat - .text 0x0000000000307660 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 0x0000000000307660 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - 0x00000000003077f0 _gint_panic - 0x0000000000307800 _gint_panic_set - 0x000000000030780c _gint_exc_catch - 0x0000000000307818 _gint_exc_skip - .text 0x0000000000307824 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 0x0000000000307824 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - 0x00000000003078d8 _gint_install - 0x0000000000307988 _gint_unload - .text 0x00000000003079a0 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 0x00000000003079a0 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 0x00000000003079a0 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - 0x00000000003079a0 _tlb_addr - 0x00000000003079b4 _tlb_data - 0x00000000003079c8 _tlb_mapped_memory - 0x0000000000307a9c _utlb_addr - 0x0000000000307aac _utlb_data - 0x0000000000307abc _utlb_mapped_memory - .text 0x0000000000307b94 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x0000000000307b94 _dsize - .text 0x0000000000307c30 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - 0x0000000000307c30 _dprint - .text 0x0000000000307c88 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x0000000000307fa8 _timer_setup - 0x0000000000308038 _timer_delay - 0x0000000000308098 _timer_start - 0x00000000003080cc _timer_reload - 0x00000000003080ec _timer_pause - 0x0000000000308120 _timer_stop - 0x000000000030817c _timer_timeout - 0x0000000000308188 _timer_address - 0x00000000003081c4 _timer_clear - .text 0x00000000003081f4 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - 0x00000000003081f4 _sleep_us - .text 0x000000000030824c 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x00000000003082e4 _t6k11_display - 0x00000000003083b8 _t6k11_contrast - 0x00000000003083e4 _t6k11_backlight - .text 0x0000000000308424 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x0000000000308568 _clock_freq - .text 0x0000000000308574 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 0x0000000000308574 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) - 0x0000000000308574 _bopti_asm_mono - 0x000000000030859a _bopti_asm_mono_alpha - .text 0x00000000003085cc 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - 0x00000000003085cc _bopti_grid - 0x0000000000308740 _bopti_render - 0x0000000000308870 _bopti_render_clip - 0x0000000000308984 _bopti_render_noclip - .text 0x00000000003089dc 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - 0x00000000003089dc _gint_setvbr - .text 0x0000000000308a08 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - 0x0000000000308a08 _gint_intlevel - 0x0000000000308a5c _gint_inthandler - .text 0x0000000000308a80 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 0x0000000000308a80 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 0x0000000000308a80 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) - 0x0000000000308b60 _ll_set_size - 0x0000000000308b74 _ll_set_state - 0x0000000000308b94 _ll_get_state - 0x0000000000308ba4 _ll_clear - 0x0000000000308bf0 _ll_send - 0x0000000000308c64 _ll_sendp - 0x0000000000308cb0 _ll_display_custom - 0x0000000000308d1c _ll_display - 0x0000000000308d30 _ll_pause - 0x0000000000308d88 _ll_panic - 0x0000000000308dc4 _ll_set_panic - 0x0000000000308dd4 _ll_set_level - 0x0000000000308de0 _ll_get_level - .text 0x0000000000308dec 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - 0x0000000000308dec ___movstr - 0x0000000000308dec ___movmem - 0x0000000000308e20 ___movmemSI64 - 0x0000000000308e20 ___movstrSI64 - 0x0000000000308e24 ___movstrSI60 - 0x0000000000308e24 ___movmemSI60 - 0x0000000000308e28 ___movmemSI56 - 0x0000000000308e28 ___movstrSI56 - 0x0000000000308e2c ___movstrSI52 - 0x0000000000308e2c ___movmemSI52 - 0x0000000000308e30 ___movstrSI48 - 0x0000000000308e30 ___movmemSI48 - 0x0000000000308e34 ___movstrSI44 - 0x0000000000308e34 ___movmemSI44 - 0x0000000000308e38 ___movstrSI40 - 0x0000000000308e38 ___movmemSI40 - 0x0000000000308e3c ___movstrSI36 - 0x0000000000308e3c ___movmemSI36 - 0x0000000000308e40 ___movmemSI32 - 0x0000000000308e40 ___movstrSI32 - 0x0000000000308e44 ___movmemSI28 - 0x0000000000308e44 ___movstrSI28 - 0x0000000000308e48 ___movstrSI24 - 0x0000000000308e48 ___movmemSI24 - 0x0000000000308e4c ___movmemSI20 - 0x0000000000308e4c ___movstrSI20 - 0x0000000000308e50 ___movstrSI16 - 0x0000000000308e50 ___movmemSI16 - 0x0000000000308e54 ___movmemSI12 - 0x0000000000308e54 ___movstrSI12 - 0x0000000000308e58 ___movmemSI8 - 0x0000000000308e58 ___movstrSI8 - 0x0000000000308e5c ___movmemSI4 - 0x0000000000308e5c ___movstrSI4 - .text 0x0000000000308e64 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - 0x0000000000308e64 ___udivdi3 - .text 0x0000000000309054 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - 0x0000000000309054 ___umoddi3 - .text 0x0000000000309288 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - 0x00000000003092aa ___udivsi3 - *fill* 0x00000000003092f4 0x4 + .text 0x0000000000303648 0x40 build-fx/src/tile.c.o + 0x0000000000303648 _draw_tile + .text 0x0000000000303688 0x324 build-fx/src/plateforme.c.o + 0x0000000000303688 _reset_plateforme + 0x0000000000303696 _move_plateforme + 0x0000000000303860 _display_plateformes + 0x0000000000303900 _move_plateformes + 0x0000000000303958 _plateforme_check_collide + .text 0x00000000003039ac 0x470 build-fx/src/box.c.o + 0x00000000003039ac _sgn + 0x00000000003039be _check_collision + 0x0000000000303a50 _box_move + 0x0000000000303d98 _box_jump + .text 0x0000000000303e1c 0x620 build-fx/src/world.c.o + 0x0000000000303e1c _world_get_width + 0x0000000000303e2c _world_get + 0x0000000000303e90 _display_cell + 0x000000000030419c _world_get_ctg + 0x00000000003041f0 _reset_camera + 0x000000000030420c _world_get_real_x0 + 0x0000000000304234 _reload_camera + 0x000000000030425c _world_get_real_y0 + 0x0000000000304270 _world_draw + 0x000000000030438c _world_move + .text 0x000000000030443c 0x70 build-fx/src/framerate.c.o + 0x000000000030443c _callback + 0x0000000000304444 _init_refresh + 0x0000000000304484 _quit_refresh + 0x0000000000304490 _wait_next_frame + .text 0x00000000003044ac 0x56c build-fx/src/bonus.c.o + 0x00000000003044ac _bonus_set + 0x00000000003044dc _bonus_move + 0x0000000000304690 _bonus_draw + 0x00000000003047a4 _lance_bullet + 0x0000000000304800 _bullet_display + 0x0000000000304898 _bullet_move + .text 0x0000000000304a18 0x224 build-fx/src/save.c.o + 0x0000000000304a18 _load_save + 0x0000000000304a1c _flash_save + 0x0000000000304a20 _get_highscore + 0x0000000000304a70 _set_highscore + 0x0000000000304acc _get_highcoins + 0x0000000000304b1c _set_highcoins + 0x0000000000304b78 _get_best_time + 0x0000000000304bc8 _set_best_time + 0x0000000000304c30 _get_progress_status + .text 0x0000000000304c3c 0x7d0 build-fx/src/mario.c.o + 0x0000000000304c4c _mario_bigger + 0x0000000000304c68 _mario_smaller + 0x0000000000304c94 _mario_draw + 0x0000000000304e50 _test_sol_le_plus_proche + 0x0000000000304ebc _mario_move + .text 0x000000000030540c 0x0 build-fx/src/main.c.o + .text.startup 0x000000000030540c 0x24 build-fx/src/main.c.o + 0x000000000030540c _main + .text 0x0000000000305430 0x2c0 build-fx/src/keyboard.c.o + 0x0000000000305430 _keyboard_clear + 0x0000000000305450 _getkey_custom + 0x00000000003054a0 _menu_pause + 0x00000000003055f8 _update_keyboard + .text 0x00000000003056f0 0x7b0 build-fx/src/ennemi.c.o + 0x00000000003056f0 _display_ennemi + 0x0000000000305938 _ennemi_check_collision + 0x000000000030599c _hurt_mario + 0x00000000003059d0 _move_ennemi + 0x0000000000305e60 _display_ennemi_table + .text 0x0000000000305ea0 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x000000000030689c _kprint_opt + 0x00000000003069e4 _kprint + 0x0000000000306abc _kvsprint + 0x0000000000306b04 _sprintf + 0x0000000000306b2c _vsprintf + 0x0000000000306b4c _snprintf + 0x0000000000306b6c _vsnprintf + .text 0x0000000000306b84 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + 0x0000000000306b84 _memcpy + 0x0000000000306c3e __memmove + 0x0000000000306c42 __memcmp + 0x0000000000306c46 _memset + .text 0x0000000000306c60 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 0x0000000000306c60 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 0x0000000000306c60 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) + 0x0000000000306c60 _drect + .text 0x0000000000306d7c 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + 0x0000000000306d7c _dupdate + 0x0000000000306d94 _dupdate_noint + .text 0x0000000000306da0 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + 0x0000000000306da0 _masks + .text 0x0000000000306e3c 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x0000000000306e3c _dimage + 0x0000000000306e90 _dsubimage + .text 0x0000000000306f04 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + 0x0000000000306f04 _dclear + .text 0x0000000000306f50 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x00000000003070f8 _pollevent + 0x000000000030723c _waitevent + 0x0000000000307288 _clearevents + 0x00000000003072a8 _keydown + 0x00000000003072d4 _keydown_all + 0x0000000000307310 _keydown_any + .text 0x000000000030734c 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + 0x0000000000307358 _iokbd_row + 0x0000000000307440 _iokbd_scan + .text 0x0000000000307470 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + 0x0000000000307470 _getkey_opt + 0x000000000030761c _getkey + 0x0000000000307628 _getkey_repeat + .text 0x0000000000307664 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 0x0000000000307664 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x00000000003077f4 _gint_panic + 0x0000000000307804 _gint_panic_set + 0x0000000000307810 _gint_exc_catch + 0x000000000030781c _gint_exc_skip + .text 0x0000000000307828 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 0x0000000000307828 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + 0x00000000003078dc _gint_install + 0x000000000030798c _gint_unload + .text 0x00000000003079a4 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 0x00000000003079a4 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 0x00000000003079a4 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + 0x00000000003079a4 _tlb_addr + 0x00000000003079b8 _tlb_data + 0x00000000003079cc _tlb_mapped_memory + 0x0000000000307aa0 _utlb_addr + 0x0000000000307ab0 _utlb_data + 0x0000000000307ac0 _utlb_mapped_memory + .text 0x0000000000307b98 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x0000000000307b98 _dsize + .text 0x0000000000307c34 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + 0x0000000000307c34 _dprint + .text 0x0000000000307c8c 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000307fac _timer_setup + 0x000000000030803c _timer_delay + 0x000000000030809c _timer_start + 0x00000000003080d0 _timer_reload + 0x00000000003080f0 _timer_pause + 0x0000000000308124 _timer_stop + 0x0000000000308180 _timer_timeout + 0x000000000030818c _timer_address + 0x00000000003081c8 _timer_clear + .text 0x00000000003081f8 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + 0x00000000003081f8 _sleep_us + .text 0x0000000000308250 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x00000000003082e8 _t6k11_display + 0x00000000003083bc _t6k11_contrast + 0x00000000003083e8 _t6k11_backlight + .text 0x0000000000308428 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x000000000030856c _clock_freq + .text 0x0000000000308578 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 0x0000000000308578 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) + 0x0000000000308578 _bopti_asm_mono + 0x000000000030859e _bopti_asm_mono_alpha + .text 0x00000000003085d0 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x00000000003085d0 _bopti_grid + 0x0000000000308744 _bopti_render + 0x0000000000308874 _bopti_render_clip + 0x0000000000308988 _bopti_render_noclip + .text 0x00000000003089e0 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + 0x00000000003089e0 _gint_setvbr + .text 0x0000000000308a0c 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + 0x0000000000308a0c _gint_intlevel + 0x0000000000308a60 _gint_inthandler + .text 0x0000000000308a84 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 0x0000000000308a84 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 0x0000000000308a84 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) + 0x0000000000308b64 _ll_set_size + 0x0000000000308b78 _ll_set_state + 0x0000000000308b98 _ll_get_state + 0x0000000000308ba8 _ll_clear + 0x0000000000308bf4 _ll_send + 0x0000000000308c68 _ll_sendp + 0x0000000000308cb4 _ll_display_custom + 0x0000000000308d20 _ll_display + 0x0000000000308d34 _ll_pause + 0x0000000000308d8c _ll_panic + 0x0000000000308dc8 _ll_set_panic + 0x0000000000308dd8 _ll_set_level + 0x0000000000308de4 _ll_get_level + .text 0x0000000000308df0 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + 0x0000000000308df0 ___movstr + 0x0000000000308df0 ___movmem + 0x0000000000308e24 ___movmemSI64 + 0x0000000000308e24 ___movstrSI64 + 0x0000000000308e28 ___movstrSI60 + 0x0000000000308e28 ___movmemSI60 + 0x0000000000308e2c ___movmemSI56 + 0x0000000000308e2c ___movstrSI56 + 0x0000000000308e30 ___movstrSI52 + 0x0000000000308e30 ___movmemSI52 + 0x0000000000308e34 ___movstrSI48 + 0x0000000000308e34 ___movmemSI48 + 0x0000000000308e38 ___movstrSI44 + 0x0000000000308e38 ___movmemSI44 + 0x0000000000308e3c ___movstrSI40 + 0x0000000000308e3c ___movmemSI40 + 0x0000000000308e40 ___movstrSI36 + 0x0000000000308e40 ___movmemSI36 + 0x0000000000308e44 ___movmemSI32 + 0x0000000000308e44 ___movstrSI32 + 0x0000000000308e48 ___movmemSI28 + 0x0000000000308e48 ___movstrSI28 + 0x0000000000308e4c ___movstrSI24 + 0x0000000000308e4c ___movmemSI24 + 0x0000000000308e50 ___movmemSI20 + 0x0000000000308e50 ___movstrSI20 + 0x0000000000308e54 ___movstrSI16 + 0x0000000000308e54 ___movmemSI16 + 0x0000000000308e58 ___movmemSI12 + 0x0000000000308e58 ___movstrSI12 + 0x0000000000308e5c ___movmemSI8 + 0x0000000000308e5c ___movstrSI8 + 0x0000000000308e60 ___movmemSI4 + 0x0000000000308e60 ___movstrSI4 + .text 0x0000000000308e68 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + 0x0000000000308e68 ___udivdi3 + .text 0x0000000000309058 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + 0x0000000000309058 ___umoddi3 + .text 0x000000000030928c 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + 0x00000000003092ae ___udivsi3 .text 0x00000000003092f8 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) 0x00000000003092f8 ___udiv_qrnnd_16 .text 0x0000000000309358 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) diff --git a/build-fx/src/box.c.o b/build-fx/src/box.c.o index 4a8afe4..9482d00 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/tuyau.c.o b/build-fx/src/tuyau.c.o index 3bab243..5924e39 100644 Binary files a/build-fx/src/tuyau.c.o and b/build-fx/src/tuyau.c.o differ diff --git a/src/box.c b/src/box.c index af3759b..5291c15 100755 --- a/src/box.c +++ b/src/box.c @@ -54,8 +54,8 @@ static void move_x(box_t * b) for (int j=0; jh; j++) { int t=(b->y+j)/8; - if (t!=previous_tested_y) - { + //if (t!=previous_tested_y) + //{ previous_tested_y=t; int typetemp; if (sgn_vx>0) @@ -69,7 +69,7 @@ static void move_x(box_t * b) return; } - } + //} } } b->x+=t_vx; @@ -84,7 +84,7 @@ static void move_y(box_t * b) int coef=1;//1; if (world_get_ctg(b->x, b->y)==CTG_WATER || world_get_ctg(b->x+b->w-1, b->y)==CTG_WATER) - coef=2; + coef=2;// 0.5 if (frame_id%coef) return; @@ -96,8 +96,8 @@ static void move_y(box_t * b) for (int j=0; jw; j++) { int t=(b->x+j)/8; - if (t!=previous_tested_x) - { + //if (t!=previous_tested_x) + //{ previous_tested_x=t; int typetemp; if (sgn_vy>0) @@ -136,7 +136,7 @@ static void move_y(box_t * b) return; } } - } + //} } } b->y+=b->vy; diff --git a/src/tuyau.c b/src/tuyau.c index bf92c82..aa0d9c2 100644 --- a/src/tuyau.c +++ b/src/tuyau.c @@ -44,15 +44,28 @@ void teleport_active() { while (mario.p.y+mario.p.h>=8*t.y) { - wait_next_frame(); // 10 fps - wait_next_frame(); dclear(C_WHITE); world_draw(0,0); dupdate(); + wait_next_frame(); // 10 fps + wait_next_frame(); mario.p.y--; } } + if (t.key==MK_RIGHT) + { + while (mario.p.x-mario.p.w<=8*t.x) + { + dclear(C_WHITE); + world_draw(0,0); + dupdate(); + wait_next_frame(); // 10 fps + wait_next_frame(); + mario.p.x++; + } + } + mario.p.x=t.tx*8; mario.p.y=t.ty*8; mario.p.vx=0; mario.p.vy=0;