From ca1f602345f46cd79335ca8446e189b5c2de91f7 Mon Sep 17 00:00:00 2001 From: Milang Date: Mon, 27 Jan 2020 16:46:37 +0100 Subject: [PATCH] experimental physics change to add completely plateforms support --- SuperCbr.g1a | Bin 71136 -> 71136 bytes build-fx/SuperCbr.bin | Bin 70624 -> 70624 bytes build-fx/SuperCbr.elf | Bin 89252 -> 89252 bytes build-fx/map | 441 ++++++++++++++++++++--------------------- build-fx/src/box.c.o | Bin 2144 -> 2084 bytes build-fx/src/tuyau.c.o | Bin 1388 -> 1452 bytes src/box.c | 14 +- src/tuyau.c | 17 +- 8 files changed, 242 insertions(+), 230 deletions(-) diff --git a/SuperCbr.g1a b/SuperCbr.g1a index cd5164a031eba513b78ab441dbd52878cbd80723..12900c85baf544de310b5f96054f2b6befe7c1b7 100644 GIT binary patch delta 3243 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 PmC?8z8!nGT<4F8(7}yqU diff --git a/build-fx/SuperCbr.bin b/build-fx/SuperCbr.bin index b2b7552edb14eb954b1edf375a7cdf390d85f026..bf5b20a3391dad4ea2dfa72112ba27d8ca52c929 100755 GIT binary patch delta 3240 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 LTP_VnVI}@Iagr3^ diff --git a/build-fx/SuperCbr.elf b/build-fx/SuperCbr.elf index 91a5a28b197e29afc29232a6d35a30599eaef0bf..307f710f5a0ef54a1eb5c06c2602d3baf9aba6c5 100755 GIT binary patch delta 5352 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 delta 5336 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 S;1Ck-LN?{|Q!aWT^M3#}CapC9 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 4a8afe4e6385b66f19d44a1e7a81c6b4c9c4268c..9482d003bb3e4a0bbb8379fe5e323d7b85eb6df3 100644 GIT binary patch delta 1005 zcmaJ`A@dd*|Oqo`;X`-rx88b3RU{XuRmQ z1HQdeIVrR^v-j91>?E6Jm)Nzo3UXf9m```2<+SLF6o-+Y;(c+HI59sHEPf9YEnnZY zQvA&4Y1(`lRXl96LT1Dmoaj})Z&h6Hh3=YANfTHF?poh5c#2{gDI-%}I8qxylo>K? zF)-6i7vlb$D;@Tyd_MsZ2#G= zSv3TQltCqgPdyCwsi*61w~i^d~J#5~^CD4)Nt#T|xY09fYkHd4H##xQiCF=qr_ zy0N-SV!kq8P3pJcDkEZ$Za~R2j|ZXrvVN4qXYKNm^99L|wk$6IORH_f;F(RCybp-T z(e6Nx5-#zM`YB+EtA?qi0Vv`yBC$rB`t`A2(e%5pE6}Zk5x<~K_8HUPI*|97|C}fQP+lXkiGZ;g!V6NWpw58SrImt54QLSn3g+g~7Xav;eg%LdJADQK z({^uc-`96auS_>#w{+USd75yIL+q)X0a$op=XZ zbF8`%(bGmE5z-z6dq||Git@oU`uF0F|0W?+BEtvg?cOz6*@Di);XCL1ec$gphu?@M zuDQ*?%{xaYIQ@P7sD48KQvX4}(%sNn&Y$8oXItFpbBnLeRqjMKimmgbpl-IQt^73% zp8wL=NU`H{Hj2E0m_S28NI}qj;>tGT?t?~a2h#u+fw88(jJN@5{r*NuL6_!-EN;}k z-i06u=_3Vz+(V!Jak40I;ojv4*SrS!B^I}-O==(R7j2XiN$sX%uYk&joya_0b+P(Z zoYbnS?KpL&q`Ed_Y$^;ZSj;cU8d+f)^TTijJJd1PCo)qVn4pc;IH)Z1uJ8%(stfrr zi!;9Ev&Hf=0x)_QsAh_4DUKbI@)2$nJ>f#<78V!yME#+9Ym_o*J&<2+Q(IB^IR-aj zY}7K@x$eLgUF>~jG)Lr5v3Ed~ng_d<7XXNXX}apP&UjrLyA$(V<26j1r4oRNuS|O76um)}bK*3)F z1vddu@8B%}_GU04(aH=~jQoZl3j@j_I3{c<8E6+u$qE=3ddMQ-5~)ce`TRh--4I?# O`;xFK?URBg|KLwfM1-t1bzd9{?y#ffeTwVI&v7w z7&7#-rZcx}P2e%8F=XhD2wEJoNM0#uiIZTzd%E&9J$H_TV)i`sir#wf1mzCad)mDw z9gO|f0iP0$?`ePxXt|PnF@eXJ!&to6AmEd}kSF&OhNldEK=QJpGdBb0Wd&z$dBfn3 zAa?S_V#dTz>!0cxqNo!Gs}n=0YrUBGso;O(#ny{Jr(I3vNhmh3Q88rieiHD>hvOoz z1BU@m<3^h^4;Zu$I&wE|u3%hWQzgQ{z`!z@kwtNGA>%$qm&pc9;(>ucF)$E-P!Uir z1C$?!#?M0I7o+i8CeL6B6HZCaNlh$bh|f(d%FJho&rYo@o~*zuCKq3xm{}5^ms(L0 zpH`HZo5~Phlv;eV`ei*xifk6Pqu9$p)xtXzMvI~ncW5whQ7InrAlP7@59bobSkUTP(gH@gJ V$z%goH8Bg8({bps4@= delta 564 zcmZ3({f29TG9$}G6|Z{zY5L3bx9J~y!=Qgn|Jf~Lf2Eto^*=5eCkh!J@8qoK@K?+G zmisN|TlTlCZ<*g1xHG=p)=k`)And?kz;%+{K<43J2bsi03H$~E{W7_mBNn!9^x&}Q zv0&(BO=ND_n!sZqW5LkPAG9QJk&|FAU)W+t4nvuQWNkqQj*Bt|JdMd4A22v_H*T(B zTz|Am{@=Meo-HClJl+1QY?OEc&0Ioc1a3rjGfU$0QY%X0(~1&vQyJoO6N@tQ8RCml zi&IPDlYv4-i45`Csg=bH@hQnUsfk6C9ht=@moaN5N&wx+2r-mVhJk?_##TTQS7Bh_ zfr)D{Fz~|IIt&baFtz~$13!#y!oVN^V_QsOX=b#U+`^*FXfb&Oi#lV$;WW~OfFzm6JtIBbc+?tlRz454giA{hYJ7z 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;