diff --git a/SuperCbr.g1a b/SuperCbr.g1a index 12900c8..6784e71 100644 Binary files a/SuperCbr.g1a and b/SuperCbr.g1a differ diff --git a/build-fx/SuperCbr.bin b/build-fx/SuperCbr.bin index bf5b20a..590abf0 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 307f710..882a7f5 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 2bc87a1..99ad8bf 100644 --- a/build-fx/map +++ b/build-fx/map @@ -238,7 +238,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 - 0x0000000000010a68 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x0000000000010a70 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8d0 *(.pretext.entry) @@ -278,7 +278,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 0x8888 +.text 0x0000000000300ad0 0x8890 0x0000000000300ad0 _gint_exch_tlbh_start = . *(.gint.exch_tlbh) .gint.exch_tlbh @@ -307,231 +307,232 @@ 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 0x17c build-fx/src/tuyau.c.o + .text 0x00000000003034cc 0x180 build-fx/src/tuyau.c.o 0x00000000003034cc _set_teleporteurs 0x0000000000303504 _teleport_active - .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) + .text 0x000000000030364c 0x40 build-fx/src/tile.c.o + 0x000000000030364c _draw_tile + .text 0x000000000030368c 0x324 build-fx/src/plateforme.c.o + 0x000000000030368c _reset_plateforme + 0x000000000030369a _move_plateforme + 0x0000000000303864 _display_plateformes + 0x0000000000303904 _move_plateformes + 0x000000000030395c _plateforme_check_collide + .text 0x00000000003039b0 0x470 build-fx/src/box.c.o + 0x00000000003039b0 _sgn + 0x00000000003039c2 _check_collision + 0x0000000000303a54 _box_move + 0x0000000000303d9c _box_jump + .text 0x0000000000303e20 0x620 build-fx/src/world.c.o + 0x0000000000303e20 _world_get_width + 0x0000000000303e30 _world_get + 0x0000000000303e94 _display_cell + 0x00000000003041a0 _world_get_ctg + 0x00000000003041f4 _reset_camera + 0x0000000000304210 _world_get_real_x0 + 0x0000000000304238 _reload_camera + 0x0000000000304260 _world_get_real_y0 + 0x0000000000304274 _world_draw + 0x0000000000304390 _world_move + .text 0x0000000000304440 0x70 build-fx/src/framerate.c.o + 0x0000000000304440 _callback + 0x0000000000304448 _init_refresh + 0x0000000000304488 _quit_refresh + 0x0000000000304494 _wait_next_frame + .text 0x00000000003044b0 0x56c build-fx/src/bonus.c.o + 0x00000000003044b0 _bonus_set + 0x00000000003044e0 _bonus_move + 0x0000000000304694 _bonus_draw + 0x00000000003047a8 _lance_bullet + 0x0000000000304804 _bullet_display + 0x000000000030489c _bullet_move + .text 0x0000000000304a1c 0x224 build-fx/src/save.c.o + 0x0000000000304a1c _load_save + 0x0000000000304a20 _flash_save + 0x0000000000304a24 _get_highscore + 0x0000000000304a74 _set_highscore + 0x0000000000304ad0 _get_highcoins + 0x0000000000304b20 _set_highcoins + 0x0000000000304b7c _get_best_time + 0x0000000000304bcc _set_best_time + 0x0000000000304c34 _get_progress_status + .text 0x0000000000304c40 0x7d0 build-fx/src/mario.c.o + 0x0000000000304c50 _mario_bigger + 0x0000000000304c6c _mario_smaller + 0x0000000000304c98 _mario_draw + 0x0000000000304e54 _test_sol_le_plus_proche + 0x0000000000304ec0 _mario_move + .text 0x0000000000305410 0x0 build-fx/src/main.c.o + .text.startup 0x0000000000305410 0x24 build-fx/src/main.c.o + 0x0000000000305410 _main + .text 0x0000000000305434 0x2c0 build-fx/src/keyboard.c.o + 0x0000000000305434 _keyboard_clear + 0x0000000000305454 _getkey_custom + 0x00000000003054a4 _menu_pause + 0x00000000003055fc _update_keyboard + .text 0x00000000003056f4 0x7b0 build-fx/src/ennemi.c.o + 0x00000000003056f4 _display_ennemi + 0x000000000030593c _ennemi_check_collision + 0x00000000003059a0 _hurt_mario + 0x00000000003059d4 _move_ennemi + 0x0000000000305e64 _display_ennemi_table + .text 0x0000000000305ea4 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x00000000003068a0 _kprint_opt + 0x00000000003069e8 _kprint + 0x0000000000306ac0 _kvsprint + 0x0000000000306b08 _sprintf + 0x0000000000306b30 _vsprintf + 0x0000000000306b50 _snprintf + 0x0000000000306b70 _vsnprintf + .text 0x0000000000306b88 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + 0x0000000000306b88 _memcpy + 0x0000000000306c42 __memmove + 0x0000000000306c46 __memcmp + 0x0000000000306c4a _memset + .text 0x0000000000306c64 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 0x0000000000306c64 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 0x0000000000306c64 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) + 0x0000000000306c64 _drect + .text 0x0000000000306d80 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + 0x0000000000306d80 _dupdate + 0x0000000000306d98 _dupdate_noint + .text 0x0000000000306da4 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + 0x0000000000306da4 _masks + .text 0x0000000000306e40 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x0000000000306e40 _dimage + 0x0000000000306e94 _dsubimage + .text 0x0000000000306f08 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + 0x0000000000306f08 _dclear + .text 0x0000000000306f54 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x00000000003070fc _pollevent + 0x0000000000307240 _waitevent + 0x000000000030728c _clearevents + 0x00000000003072ac _keydown + 0x00000000003072d8 _keydown_all + 0x0000000000307314 _keydown_any + .text 0x0000000000307350 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + 0x000000000030735c _iokbd_row + 0x0000000000307444 _iokbd_scan + .text 0x0000000000307474 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + 0x0000000000307474 _getkey_opt + 0x0000000000307620 _getkey + 0x000000000030762c _getkey_repeat + .text 0x0000000000307668 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 0x0000000000307668 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x00000000003077f8 _gint_panic + 0x0000000000307808 _gint_panic_set + 0x0000000000307814 _gint_exc_catch + 0x0000000000307820 _gint_exc_skip + .text 0x000000000030782c 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 0x000000000030782c 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + 0x00000000003078e0 _gint_install + 0x0000000000307990 _gint_unload + .text 0x00000000003079a8 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 0x00000000003079a8 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 0x00000000003079a8 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + 0x00000000003079a8 _tlb_addr + 0x00000000003079bc _tlb_data + 0x00000000003079d0 _tlb_mapped_memory + 0x0000000000307aa4 _utlb_addr + 0x0000000000307ab4 _utlb_data + 0x0000000000307ac4 _utlb_mapped_memory + .text 0x0000000000307b9c 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x0000000000307b9c _dsize + .text 0x0000000000307c38 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + 0x0000000000307c38 _dprint + .text 0x0000000000307c90 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000307fb0 _timer_setup + 0x0000000000308040 _timer_delay + 0x00000000003080a0 _timer_start + 0x00000000003080d4 _timer_reload + 0x00000000003080f4 _timer_pause + 0x0000000000308128 _timer_stop + 0x0000000000308184 _timer_timeout + 0x0000000000308190 _timer_address + 0x00000000003081cc _timer_clear + .text 0x00000000003081fc 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + 0x00000000003081fc _sleep_us + .text 0x0000000000308254 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x00000000003082ec _t6k11_display + 0x00000000003083c0 _t6k11_contrast + 0x00000000003083ec _t6k11_backlight + .text 0x000000000030842c 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x0000000000308570 _clock_freq + .text 0x000000000030857c 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 0x000000000030857c 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) + 0x000000000030857c _bopti_asm_mono + 0x00000000003085a2 _bopti_asm_mono_alpha + .text 0x00000000003085d4 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x00000000003085d4 _bopti_grid + 0x0000000000308748 _bopti_render + 0x0000000000308878 _bopti_render_clip + 0x000000000030898c _bopti_render_noclip + .text 0x00000000003089e4 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + 0x00000000003089e4 _gint_setvbr + .text 0x0000000000308a10 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + 0x0000000000308a10 _gint_intlevel + 0x0000000000308a64 _gint_inthandler + .text 0x0000000000308a88 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 0x0000000000308a88 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 0x0000000000308a88 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) + 0x0000000000308b68 _ll_set_size + 0x0000000000308b7c _ll_set_state + 0x0000000000308b9c _ll_get_state + 0x0000000000308bac _ll_clear + 0x0000000000308bf8 _ll_send + 0x0000000000308c6c _ll_sendp + 0x0000000000308cb8 _ll_display_custom + 0x0000000000308d24 _ll_display + 0x0000000000308d38 _ll_pause + 0x0000000000308d90 _ll_panic + 0x0000000000308dcc _ll_set_panic + 0x0000000000308ddc _ll_set_level + 0x0000000000308de8 _ll_get_level + .text 0x0000000000308df4 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + 0x0000000000308df4 ___movstr + 0x0000000000308df4 ___movmem + 0x0000000000308e28 ___movmemSI64 + 0x0000000000308e28 ___movstrSI64 + 0x0000000000308e2c ___movstrSI60 + 0x0000000000308e2c ___movmemSI60 + 0x0000000000308e30 ___movmemSI56 + 0x0000000000308e30 ___movstrSI56 + 0x0000000000308e34 ___movstrSI52 + 0x0000000000308e34 ___movmemSI52 + 0x0000000000308e38 ___movstrSI48 + 0x0000000000308e38 ___movmemSI48 + 0x0000000000308e3c ___movstrSI44 + 0x0000000000308e3c ___movmemSI44 + 0x0000000000308e40 ___movstrSI40 + 0x0000000000308e40 ___movmemSI40 + 0x0000000000308e44 ___movstrSI36 + 0x0000000000308e44 ___movmemSI36 + 0x0000000000308e48 ___movmemSI32 + 0x0000000000308e48 ___movstrSI32 + 0x0000000000308e4c ___movmemSI28 + 0x0000000000308e4c ___movstrSI28 + 0x0000000000308e50 ___movstrSI24 + 0x0000000000308e50 ___movmemSI24 + 0x0000000000308e54 ___movmemSI20 + 0x0000000000308e54 ___movstrSI20 + 0x0000000000308e58 ___movstrSI16 + 0x0000000000308e58 ___movmemSI16 + 0x0000000000308e5c ___movmemSI12 + 0x0000000000308e5c ___movstrSI12 + 0x0000000000308e60 ___movmemSI8 + 0x0000000000308e60 ___movstrSI8 + 0x0000000000308e64 ___movmemSI4 + 0x0000000000308e64 ___movstrSI4 + .text 0x0000000000308e6c 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + 0x0000000000308e6c ___udivdi3 + .text 0x000000000030905c 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + 0x000000000030905c ___umoddi3 + .text 0x0000000000309290 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + 0x00000000003092b2 ___udivsi3 + *fill* 0x00000000003092fc 0x4 + .text 0x0000000000309300 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000309300 ___udiv_qrnnd_16 + .text 0x0000000000309360 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 0x0000000000309360 0x120 diff --git a/build-fx/src/level.c.o b/build-fx/src/level.c.o index bcf6f98..5fe18a5 100644 Binary files a/build-fx/src/level.c.o and b/build-fx/src/level.c.o differ diff --git a/build-fx/src/tuyau.c.o b/build-fx/src/tuyau.c.o index 5924e39..b75c9b5 100644 Binary files a/build-fx/src/tuyau.c.o and b/build-fx/src/tuyau.c.o differ diff --git a/src/level.c b/src/level.c index 06cbd81..0372bb2 100644 --- a/src/level.c +++ b/src/level.c @@ -377,7 +377,7 @@ void set_level(int w, int l) teleport_t t[]= { {57,6, 212,12, MK_LITTLE}, - {222,2, 178,4, MK_RIGHT} + {222,2, 178,3, MK_RIGHT} }; set_teleporteurs(t, sizeof(t)/sizeof(teleport_t)); diff --git a/src/tuyau.c b/src/tuyau.c index aa0d9c2..afcb46d 100644 --- a/src/tuyau.c +++ b/src/tuyau.c @@ -67,7 +67,7 @@ void teleport_active() } - mario.p.x=t.tx*8; mario.p.y=t.ty*8; + mario.p.x=t.tx*8+4; mario.p.y=t.ty*8; mario.p.vx=0; mario.p.vy=0; reset_camera(); }