diff --git a/SuperCbr.g1a b/SuperCbr.g1a index 13535bf..6d56d63 100644 Binary files a/SuperCbr.g1a and b/SuperCbr.g1a differ diff --git a/build-fx/SuperCbr.bin b/build-fx/SuperCbr.bin index 6516a2d..e8af015 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 b8c598f..104f432 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 71e2885..6a2bd14 100644 --- a/build-fx/map +++ b/build-fx/map @@ -69,7 +69,7 @@ Archive member included to satisfy reference by file (symbol) /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) build-fx/src/world.c.o (_ll_sendp) /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) (___movmemSI24) + build-fx/src/level.c.o (___movmemSI44) /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) (___udivdi3) /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) @@ -233,7 +233,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 - 0x000000000000de14 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x000000000000def0 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8d0 *(.pretext.entry) @@ -273,7 +273,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 0x64a8 +.text 0x0000000000300ad0 0x6558 0x0000000000300ad0 _gint_exch_tlbh_start = . *(.gint.exch_tlbh) .gint.exch_tlbh @@ -281,475 +281,477 @@ 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 0x280 build-fx/src/levelchanger.c.o + .text 0x0000000000300b1c 0x288 build-fx/src/levelchanger.c.o 0x0000000000300b1c _callback 0x0000000000300b24 _play_level - 0x0000000000300c20 _launch_ui - .text 0x0000000000300d9c 0x440 build-fx/src/level.c.o - 0x0000000000300d9c _malloc_error - 0x0000000000300dd4 _init_level - 0x0000000000300e48 _init_ennemies - 0x0000000000300ea8 _set_level - 0x00000000003011ac _get_lvl_id - .text 0x00000000003011dc 0xd8 build-fx/src/config.c.o - 0x00000000003011dc _configmenu - .text 0x00000000003012b4 0x1e4 build-fx/src/score.c.o - 0x00000000003012b4 _new_level - 0x00000000003012d4 _get_score - 0x00000000003012e0 _score_reset - 0x0000000000301300 _score_add_coin - 0x0000000000301310 _score_add - 0x0000000000301360 _score_display - .text 0x0000000000301498 0x40 build-fx/src/tile.c.o - 0x0000000000301498 _draw_tile - .text 0x00000000003014d8 0x2cc build-fx/src/plateforme.c.o - 0x00000000003014d8 _reset_plateforme - 0x00000000003014e6 _move_plateforme - 0x0000000000301690 _display_plateformes - 0x000000000030171c _move_plateformes - 0x000000000030175c _plateforme_check_collide - .text 0x00000000003017a4 0x42c build-fx/src/box.c.o - 0x00000000003017a4 _sgn - 0x00000000003017b6 _check_collision - 0x0000000000301848 _box_move - 0x0000000000301b6c _box_jump - .text 0x0000000000301bd0 0x608 build-fx/src/world.c.o - 0x0000000000301bd0 _world_get_width - 0x0000000000301be0 _world_get - 0x0000000000301c44 _display_cell - 0x0000000000301f50 _world_get_ctg - 0x0000000000301fa4 _world_get_real_x0 - 0x0000000000301fec _world_get_real_y0 - 0x000000000030201c _world_draw - 0x000000000030212c _world_move - .text 0x00000000003021d8 0x56c build-fx/src/bonus.c.o - 0x00000000003021d8 _bonus_set - 0x0000000000302208 _bonus_move - 0x00000000003023bc _bonus_draw - 0x00000000003024d0 _lance_bullet - 0x000000000030252c _bullet_display - 0x00000000003025c4 _bullet_move - .text 0x0000000000302744 0x154 build-fx/src/save.c.o - 0x0000000000302744 _load_save - 0x0000000000302748 _flash_save - 0x000000000030274c _get_highscore - 0x000000000030279c _set_highscore - 0x00000000003027ec _get_best_time - 0x000000000030283c _set_best_time - 0x000000000030288c _get_progress_status - .text 0x0000000000302898 0x770 build-fx/src/mario.c.o - 0x00000000003028a8 _mario_bigger - 0x00000000003028c4 _mario_smaller - 0x00000000003028f0 _mario_draw - 0x0000000000302aac _test_sol_le_plus_proche - 0x0000000000302b18 _mario_move - .text 0x0000000000303008 0x0 build-fx/src/main.c.o - .text.startup 0x0000000000303008 0x2c build-fx/src/main.c.o - 0x0000000000303008 _main - .text 0x0000000000303034 0x2b8 build-fx/src/keyboard.c.o - 0x0000000000303034 _keyboard_clear - 0x0000000000303054 _getkey_custom - 0x00000000003030a4 _menu_pause - 0x00000000003031fc _update_keyboard - .text 0x00000000003032ec 0x7d0 build-fx/src/ennemi.c.o - 0x00000000003032ec _display_ennemi - 0x0000000000303534 _ennemi_check_collision - 0x0000000000303598 _hurt_mario - 0x00000000003035cc _move_ennemi - 0x0000000000303a7c _display_ennemi_table - .text 0x0000000000303abc 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x00000000003044b8 _kprint_opt - 0x0000000000304600 _kprint - 0x00000000003046d8 _kvsprint - 0x0000000000304720 _sprintf - 0x0000000000304748 _vsprintf - 0x0000000000304768 _snprintf - 0x0000000000304788 _vsnprintf - .text 0x00000000003047a0 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - 0x00000000003047a0 _memcpy - 0x000000000030485a __memmove - 0x000000000030485e __memcmp - 0x0000000000304862 _memset - .text 0x000000000030487c 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 0x000000000030487c 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 0x000000000030487c 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) - 0x000000000030487c _drect - .text 0x0000000000304998 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - 0x0000000000304998 _dupdate - 0x00000000003049b0 _dupdate_noint - .text 0x00000000003049bc 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - 0x00000000003049bc _masks - .text 0x0000000000304a58 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - 0x0000000000304a58 _dimage - 0x0000000000304aac _dsubimage - .text 0x0000000000304b20 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - 0x0000000000304b20 _dclear - .text 0x0000000000304b6c 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x0000000000304d14 _pollevent - 0x0000000000304e58 _waitevent - 0x0000000000304ea4 _clearevents - 0x0000000000304ec4 _keydown - 0x0000000000304ef0 _keydown_all - 0x0000000000304f2c _keydown_any - .text 0x0000000000304f68 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - 0x0000000000304f74 _iokbd_row - 0x000000000030505c _iokbd_scan - .text 0x000000000030508c 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - 0x000000000030508c _getkey_opt - 0x0000000000305238 _getkey - 0x0000000000305244 _getkey_repeat - .text 0x0000000000305280 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 0x0000000000305280 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - 0x0000000000305410 _gint_panic - 0x0000000000305420 _gint_panic_set - 0x000000000030542c _gint_exc_catch - 0x0000000000305438 _gint_exc_skip - .text 0x0000000000305444 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 0x0000000000305444 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - 0x00000000003054f8 _gint_install - 0x00000000003055a8 _gint_unload - .text 0x00000000003055c0 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 0x00000000003055c0 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 0x00000000003055c0 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - 0x00000000003055c0 _tlb_addr - 0x00000000003055d4 _tlb_data - 0x00000000003055e8 _tlb_mapped_memory - 0x00000000003056bc _utlb_addr - 0x00000000003056cc _utlb_data - 0x00000000003056dc _utlb_mapped_memory - .text 0x00000000003057b4 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x00000000003057b4 _dsize - .text 0x0000000000305850 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - 0x0000000000305850 _dprint - .text 0x00000000003058a8 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x0000000000305bc8 _timer_setup - 0x0000000000305c58 _timer_delay - 0x0000000000305cb8 _timer_start - 0x0000000000305cec _timer_reload - 0x0000000000305d0c _timer_pause - 0x0000000000305d40 _timer_stop - 0x0000000000305d9c _timer_timeout - 0x0000000000305da8 _timer_address - 0x0000000000305de4 _timer_clear - .text 0x0000000000305e14 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - 0x0000000000305e14 _sleep_us - .text 0x0000000000305e6c 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x0000000000305f04 _t6k11_display - 0x0000000000305fd8 _t6k11_contrast - 0x0000000000306004 _t6k11_backlight - .text 0x0000000000306044 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x0000000000306188 _clock_freq - .text 0x0000000000306194 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 0x0000000000306194 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) - 0x0000000000306194 _bopti_asm_mono - 0x00000000003061ba _bopti_asm_mono_alpha - .text 0x00000000003061ec 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - 0x00000000003061ec _bopti_grid - 0x0000000000306360 _bopti_render - 0x0000000000306490 _bopti_render_clip - 0x00000000003065a4 _bopti_render_noclip - .text 0x00000000003065fc 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - 0x00000000003065fc _gint_setvbr - .text 0x0000000000306628 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - 0x0000000000306628 _gint_intlevel - 0x000000000030667c _gint_inthandler - .text 0x00000000003066a0 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 0x00000000003066a0 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 0x00000000003066a0 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) - 0x0000000000306780 _ll_set_size - 0x0000000000306794 _ll_set_state - 0x00000000003067b4 _ll_get_state - 0x00000000003067c4 _ll_clear - 0x0000000000306810 _ll_send - 0x0000000000306884 _ll_sendp - 0x00000000003068d0 _ll_display_custom - 0x000000000030693c _ll_display - 0x0000000000306950 _ll_pause - 0x00000000003069a8 _ll_panic - 0x00000000003069e4 _ll_set_panic - 0x00000000003069f4 _ll_set_level - 0x0000000000306a00 _ll_get_level - .text 0x0000000000306a0c 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - 0x0000000000306a0c ___movstr - 0x0000000000306a0c ___movmem - 0x0000000000306a40 ___movmemSI64 - 0x0000000000306a40 ___movstrSI64 - 0x0000000000306a44 ___movstrSI60 - 0x0000000000306a44 ___movmemSI60 - 0x0000000000306a48 ___movmemSI56 - 0x0000000000306a48 ___movstrSI56 - 0x0000000000306a4c ___movstrSI52 - 0x0000000000306a4c ___movmemSI52 - 0x0000000000306a50 ___movstrSI48 - 0x0000000000306a50 ___movmemSI48 - 0x0000000000306a54 ___movstrSI44 - 0x0000000000306a54 ___movmemSI44 - 0x0000000000306a58 ___movstrSI40 - 0x0000000000306a58 ___movmemSI40 - 0x0000000000306a5c ___movstrSI36 - 0x0000000000306a5c ___movmemSI36 - 0x0000000000306a60 ___movmemSI32 - 0x0000000000306a60 ___movstrSI32 - 0x0000000000306a64 ___movmemSI28 - 0x0000000000306a64 ___movstrSI28 - 0x0000000000306a68 ___movstrSI24 - 0x0000000000306a68 ___movmemSI24 - 0x0000000000306a6c ___movmemSI20 - 0x0000000000306a6c ___movstrSI20 - 0x0000000000306a70 ___movstrSI16 - 0x0000000000306a70 ___movmemSI16 - 0x0000000000306a74 ___movmemSI12 - 0x0000000000306a74 ___movstrSI12 - 0x0000000000306a78 ___movmemSI8 - 0x0000000000306a78 ___movstrSI8 - 0x0000000000306a7c ___movmemSI4 - 0x0000000000306a7c ___movstrSI4 - .text 0x0000000000306a84 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - 0x0000000000306a84 ___udivdi3 - .text 0x0000000000306c74 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - 0x0000000000306c74 ___umoddi3 - .text 0x0000000000306ea8 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - 0x0000000000306eca ___udivsi3 - *fill* 0x0000000000306f14 0x4 - .text 0x0000000000306f18 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000306f18 ___udiv_qrnnd_16 - .text 0x0000000000306f78 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x0000000000300c28 _launch_ui + .text 0x0000000000300da4 0x4a4 build-fx/src/level.c.o + 0x0000000000300da4 _malloc_error + 0x0000000000300ddc _init_level + 0x0000000000300e50 _init_ennemies + 0x0000000000300eb0 _set_level + 0x0000000000301218 _get_lvl_id + .text 0x0000000000301248 0xd8 build-fx/src/config.c.o + 0x0000000000301248 _configmenu + .text 0x0000000000301320 0x1e4 build-fx/src/score.c.o + 0x0000000000301320 _new_level + 0x0000000000301340 _get_score + 0x000000000030134c _score_reset + 0x000000000030136c _score_add_coin + 0x000000000030137c _score_add + 0x00000000003013cc _score_display + .text 0x0000000000301504 0x40 build-fx/src/tile.c.o + 0x0000000000301504 _draw_tile + .text 0x0000000000301544 0x2e0 build-fx/src/plateforme.c.o + 0x0000000000301544 _reset_plateforme + 0x0000000000301552 _move_plateforme + 0x0000000000301710 _display_plateformes + 0x000000000030179c _move_plateformes + 0x00000000003017dc _plateforme_check_collide + .text 0x0000000000301824 0x42c build-fx/src/box.c.o + 0x0000000000301824 _sgn + 0x0000000000301836 _check_collision + 0x00000000003018c8 _box_move + 0x0000000000301bec _box_jump + .text 0x0000000000301c50 0x638 build-fx/src/world.c.o + 0x0000000000301c50 _world_get_width + 0x0000000000301c60 _world_get + 0x0000000000301cc4 _display_cell + 0x0000000000301fd0 _world_get_ctg + 0x0000000000302024 _reset_camera + 0x0000000000302040 _world_get_real_x0 + 0x0000000000302084 _reload_camera + 0x00000000003020ac _world_get_real_y0 + 0x00000000003020c0 _world_draw + 0x00000000003021dc _world_move + .text 0x0000000000302288 0x56c build-fx/src/bonus.c.o + 0x0000000000302288 _bonus_set + 0x00000000003022b8 _bonus_move + 0x000000000030246c _bonus_draw + 0x0000000000302580 _lance_bullet + 0x00000000003025dc _bullet_display + 0x0000000000302674 _bullet_move + .text 0x00000000003027f4 0x154 build-fx/src/save.c.o + 0x00000000003027f4 _load_save + 0x00000000003027f8 _flash_save + 0x00000000003027fc _get_highscore + 0x000000000030284c _set_highscore + 0x000000000030289c _get_best_time + 0x00000000003028ec _set_best_time + 0x000000000030293c _get_progress_status + .text 0x0000000000302948 0x770 build-fx/src/mario.c.o + 0x0000000000302958 _mario_bigger + 0x0000000000302974 _mario_smaller + 0x00000000003029a0 _mario_draw + 0x0000000000302b5c _test_sol_le_plus_proche + 0x0000000000302bc8 _mario_move + .text 0x00000000003030b8 0x0 build-fx/src/main.c.o + .text.startup 0x00000000003030b8 0x2c build-fx/src/main.c.o + 0x00000000003030b8 _main + .text 0x00000000003030e4 0x2b8 build-fx/src/keyboard.c.o + 0x00000000003030e4 _keyboard_clear + 0x0000000000303104 _getkey_custom + 0x0000000000303154 _menu_pause + 0x00000000003032ac _update_keyboard + .text 0x000000000030339c 0x7d0 build-fx/src/ennemi.c.o + 0x000000000030339c _display_ennemi + 0x00000000003035e4 _ennemi_check_collision + 0x0000000000303648 _hurt_mario + 0x000000000030367c _move_ennemi + 0x0000000000303b2c _display_ennemi_table + .text 0x0000000000303b6c 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x0000000000304568 _kprint_opt + 0x00000000003046b0 _kprint + 0x0000000000304788 _kvsprint + 0x00000000003047d0 _sprintf + 0x00000000003047f8 _vsprintf + 0x0000000000304818 _snprintf + 0x0000000000304838 _vsnprintf + .text 0x0000000000304850 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + 0x0000000000304850 _memcpy + 0x000000000030490a __memmove + 0x000000000030490e __memcmp + 0x0000000000304912 _memset + .text 0x000000000030492c 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 0x000000000030492c 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 0x000000000030492c 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) + 0x000000000030492c _drect + .text 0x0000000000304a48 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + 0x0000000000304a48 _dupdate + 0x0000000000304a60 _dupdate_noint + .text 0x0000000000304a6c 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + 0x0000000000304a6c _masks + .text 0x0000000000304b08 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x0000000000304b08 _dimage + 0x0000000000304b5c _dsubimage + .text 0x0000000000304bd0 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + 0x0000000000304bd0 _dclear + .text 0x0000000000304c1c 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000304dc4 _pollevent + 0x0000000000304f08 _waitevent + 0x0000000000304f54 _clearevents + 0x0000000000304f74 _keydown + 0x0000000000304fa0 _keydown_all + 0x0000000000304fdc _keydown_any + .text 0x0000000000305018 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + 0x0000000000305024 _iokbd_row + 0x000000000030510c _iokbd_scan + .text 0x000000000030513c 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + 0x000000000030513c _getkey_opt + 0x00000000003052e8 _getkey + 0x00000000003052f4 _getkey_repeat + .text 0x0000000000305330 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 0x0000000000305330 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x00000000003054c0 _gint_panic + 0x00000000003054d0 _gint_panic_set + 0x00000000003054dc _gint_exc_catch + 0x00000000003054e8 _gint_exc_skip + .text 0x00000000003054f4 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 0x00000000003054f4 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + 0x00000000003055a8 _gint_install + 0x0000000000305658 _gint_unload + .text 0x0000000000305670 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 0x0000000000305670 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 0x0000000000305670 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + 0x0000000000305670 _tlb_addr + 0x0000000000305684 _tlb_data + 0x0000000000305698 _tlb_mapped_memory + 0x000000000030576c _utlb_addr + 0x000000000030577c _utlb_data + 0x000000000030578c _utlb_mapped_memory + .text 0x0000000000305864 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x0000000000305864 _dsize + .text 0x0000000000305900 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + 0x0000000000305900 _dprint + .text 0x0000000000305958 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000305c78 _timer_setup + 0x0000000000305d08 _timer_delay + 0x0000000000305d68 _timer_start + 0x0000000000305d9c _timer_reload + 0x0000000000305dbc _timer_pause + 0x0000000000305df0 _timer_stop + 0x0000000000305e4c _timer_timeout + 0x0000000000305e58 _timer_address + 0x0000000000305e94 _timer_clear + .text 0x0000000000305ec4 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + 0x0000000000305ec4 _sleep_us + .text 0x0000000000305f1c 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x0000000000305fb4 _t6k11_display + 0x0000000000306088 _t6k11_contrast + 0x00000000003060b4 _t6k11_backlight + .text 0x00000000003060f4 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x0000000000306238 _clock_freq + .text 0x0000000000306244 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 0x0000000000306244 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) + 0x0000000000306244 _bopti_asm_mono + 0x000000000030626a _bopti_asm_mono_alpha + .text 0x000000000030629c 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x000000000030629c _bopti_grid + 0x0000000000306410 _bopti_render + 0x0000000000306540 _bopti_render_clip + 0x0000000000306654 _bopti_render_noclip + .text 0x00000000003066ac 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + 0x00000000003066ac _gint_setvbr + .text 0x00000000003066d8 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + 0x00000000003066d8 _gint_intlevel + 0x000000000030672c _gint_inthandler + .text 0x0000000000306750 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 0x0000000000306750 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 0x0000000000306750 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) + 0x0000000000306830 _ll_set_size + 0x0000000000306844 _ll_set_state + 0x0000000000306864 _ll_get_state + 0x0000000000306874 _ll_clear + 0x00000000003068c0 _ll_send + 0x0000000000306934 _ll_sendp + 0x0000000000306980 _ll_display_custom + 0x00000000003069ec _ll_display + 0x0000000000306a00 _ll_pause + 0x0000000000306a58 _ll_panic + 0x0000000000306a94 _ll_set_panic + 0x0000000000306aa4 _ll_set_level + 0x0000000000306ab0 _ll_get_level + .text 0x0000000000306abc 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + 0x0000000000306abc ___movstr + 0x0000000000306abc ___movmem + 0x0000000000306af0 ___movmemSI64 + 0x0000000000306af0 ___movstrSI64 + 0x0000000000306af4 ___movstrSI60 + 0x0000000000306af4 ___movmemSI60 + 0x0000000000306af8 ___movmemSI56 + 0x0000000000306af8 ___movstrSI56 + 0x0000000000306afc ___movstrSI52 + 0x0000000000306afc ___movmemSI52 + 0x0000000000306b00 ___movstrSI48 + 0x0000000000306b00 ___movmemSI48 + 0x0000000000306b04 ___movstrSI44 + 0x0000000000306b04 ___movmemSI44 + 0x0000000000306b08 ___movstrSI40 + 0x0000000000306b08 ___movmemSI40 + 0x0000000000306b0c ___movstrSI36 + 0x0000000000306b0c ___movmemSI36 + 0x0000000000306b10 ___movmemSI32 + 0x0000000000306b10 ___movstrSI32 + 0x0000000000306b14 ___movmemSI28 + 0x0000000000306b14 ___movstrSI28 + 0x0000000000306b18 ___movstrSI24 + 0x0000000000306b18 ___movmemSI24 + 0x0000000000306b1c ___movmemSI20 + 0x0000000000306b1c ___movstrSI20 + 0x0000000000306b20 ___movstrSI16 + 0x0000000000306b20 ___movmemSI16 + 0x0000000000306b24 ___movmemSI12 + 0x0000000000306b24 ___movstrSI12 + 0x0000000000306b28 ___movmemSI8 + 0x0000000000306b28 ___movstrSI8 + 0x0000000000306b2c ___movmemSI4 + 0x0000000000306b2c ___movstrSI4 + .text 0x0000000000306b34 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + 0x0000000000306b34 ___udivdi3 + .text 0x0000000000306d24 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + 0x0000000000306d24 ___umoddi3 + .text 0x0000000000306f58 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + 0x0000000000306f7a ___udivsi3 + *fill* 0x0000000000306fc4 0x4 + .text 0x0000000000306fc8 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000306fc8 ___udiv_qrnnd_16 + .text 0x0000000000307028 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 0x0000000000306f80 0x120 +.gint.blocks 0x0000000000307030 0x120 *(.gint.blocks) - .gint.blocks 0x0000000000306f80 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - 0x0000000000306f80 _gint_inth_7305 - 0x0000000000306fa0 _gint_inth_7705 - .gint.blocks 0x0000000000306fc0 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - 0x0000000000306fc0 _inth_tmu - 0x0000000000307040 _inth_etmu2 - 0x0000000000307060 _inth_etmu_help - 0x0000000000307080 _inth_etmux + .gint.blocks 0x0000000000307030 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + 0x0000000000307030 _gint_inth_7305 + 0x0000000000307050 _gint_inth_7705 + .gint.blocks 0x0000000000307070 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + 0x0000000000307070 _inth_tmu + 0x00000000003070f0 _inth_etmu2 + 0x0000000000307110 _inth_etmu_help + 0x0000000000307130 _inth_etmux -.gint.drivers 0x00000000003070a0 0x90 - 0x00000000003070a0 _bdrv = . +.gint.drivers 0x0000000000307150 0x90 + 0x0000000000307150 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x00000000003070a0 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x00000000003070a0 _drv_cpg + 0x0000000000307150 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x0000000000307150 _drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x00000000003070c4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x00000000003070c4 _drv_tmu + 0x0000000000307174 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000307174 _drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x00000000003070e8 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x00000000003070e8 _drv_keysc + 0x0000000000307198 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000307198 _drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x000000000030710c 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x000000000030710c _drv_t6k11 + 0x00000000003071bc 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x00000000003071bc _drv_t6k11 *(.gint.drivers.6) - 0x0000000000307130 _edrv = . + 0x00000000003071e0 _edrv = . -.rodata 0x0000000000307130 0x75bc +.rodata 0x00000000003071e0 0x75e8 *(.rodata.4) *(.rodata .rodata.*) - .rodata 0x0000000000307130 0x2de8 build-fx/src/level.c.o + .rodata 0x00000000003071e0 0x2e14 build-fx/src/level.c.o .rodata.str1.4 - 0x0000000000309f18 0x22 build-fx/src/config.c.o - *fill* 0x0000000000309f3a 0x2 + 0x0000000000309ff4 0x22 build-fx/src/config.c.o + *fill* 0x000000000030a016 0x2 .rodata.str1.4 - 0x0000000000309f3c 0x1a build-fx/src/score.c.o + 0x000000000030a018 0x1a build-fx/src/score.c.o 0x1e (size before relaxing) - *fill* 0x0000000000309f56 0x2 - .rodata 0x0000000000309f58 0x130 build-fx/src/tile.c.o - 0x0000000000309f58 _tplateforme - 0x0000000000309f68 _mario_big - 0x0000000000309f78 _mario_small - 0x0000000000309f88 _bullet - 0x0000000000309f98 _fleur - 0x0000000000309fa8 _mario_starman - 0x0000000000309fb8 _life_1up - 0x0000000000309fc8 _champi - 0x0000000000309fd8 _bloc - 0x0000000000309fe8 _end_level - 0x0000000000309ff8 _castle - 0x000000000030a008 _colline - 0x000000000030a018 _buisson - 0x000000000030a028 _nuage - 0x000000000030a038 _coin - 0x000000000030a048 _gift - 0x000000000030a058 _earth - 0x000000000030a068 _brick - 0x000000000030a078 _tuyau + *fill* 0x000000000030a032 0x2 + .rodata 0x000000000030a034 0x130 build-fx/src/tile.c.o + 0x000000000030a034 _tplateforme + 0x000000000030a044 _mario_big + 0x000000000030a054 _mario_small + 0x000000000030a064 _bullet + 0x000000000030a074 _fleur + 0x000000000030a084 _mario_starman + 0x000000000030a094 _life_1up + 0x000000000030a0a4 _champi + 0x000000000030a0b4 _bloc + 0x000000000030a0c4 _end_level + 0x000000000030a0d4 _castle + 0x000000000030a0e4 _colline + 0x000000000030a0f4 _buisson + 0x000000000030a104 _nuage + 0x000000000030a114 _coin + 0x000000000030a124 _gift + 0x000000000030a134 _earth + 0x000000000030a144 _brick + 0x000000000030a154 _tuyau .rodata.str1.4 - 0x000000000030a088 0x63 build-fx/src/world.c.o - *fill* 0x000000000030a0eb 0x1 - .rodata 0x000000000030a0ec 0x28 build-fx/src/keyboard.c.o - .rodata 0x000000000030a114 0x60 build-fx/src/ennemi.c.o - 0x000000000030a144 _ennemi_heights - 0x000000000030a15c _ennemi_widths - .rodata 0x000000000030a174 0x204 build-fx/assets/fonts/mario.png.o - 0x000000000030a174 _font_mario - 0x000000000030a378 _font_mario_end - .rodata 0x000000000030a378 0x20 build-fx/assets/img/bonus.png.o - 0x000000000030a378 _img_bonus - 0x000000000030a398 _img_bonus_end - .rodata 0x000000000030a398 0x24 build-fx/assets/img/bloc.png.o - 0x000000000030a398 _img_bloc - 0x000000000030a3bc _img_bloc_end - .rodata 0x000000000030a3bc 0x404 build-fx/assets/img/ram.png.o - 0x000000000030a3bc _img_ram - 0x000000000030a7c0 _img_ram_end - .rodata 0x000000000030a7c0 0x58 build-fx/assets/img/w5.png.o - 0x000000000030a7c0 _img_w5 - 0x000000000030a818 _img_w5_end - .rodata 0x000000000030a818 0x404 build-fx/assets/img/options.png.o - 0x000000000030a818 _img_options - 0x000000000030ac1c _img_options_end - .rodata 0x000000000030ac1c 0x44 build-fx/assets/img/fleur.png.o - 0x000000000030ac1c _img_fleur - 0x000000000030ac60 _img_fleur_end - .rodata 0x000000000030ac60 0x58 build-fx/assets/img/w2.png.o - 0x000000000030ac60 _img_w2 - 0x000000000030acb8 _img_w2_end - .rodata 0x000000000030acb8 0x404 build-fx/assets/img/main.png.o - 0x000000000030acb8 _img_main - 0x000000000030b0bc _img_main_end - .rodata 0x000000000030b0bc 0x64 build-fx/assets/img/flag.png.o - 0x000000000030b0bc _img_flag - 0x000000000030b120 _img_flag_end - .rodata 0x000000000030b120 0x404 build-fx/assets/img/new_level.png.o - 0x000000000030b120 _img_new_level - 0x000000000030b524 _img_new_level_end - .rodata 0x000000000030b524 0x4c build-fx/assets/img/brick.png.o - 0x000000000030b524 _img_brick - 0x000000000030b570 _img_brick_end - .rodata 0x000000000030b570 0xbc build-fx/assets/img/menu_pause.png.o - 0x000000000030b570 _img_menu_pause - 0x000000000030b62c _img_menu_pause_end - .rodata 0x000000000030b62c 0x18 build-fx/assets/img/select_arrow.png.o - 0x000000000030b62c _img_select_arrow - 0x000000000030b644 _img_select_arrow_end - .rodata 0x000000000030b644 0x804 build-fx/assets/img/dev.png.o - 0x000000000030b644 _img_dev - 0x000000000030be48 _img_dev_end - .rodata 0x000000000030be48 0x24 build-fx/assets/img/death.png.o - 0x000000000030be48 _img_death - 0x000000000030be6c _img_death_end - .rodata 0x000000000030be6c 0x404 build-fx/assets/img/mainmenu.png.o - 0x000000000030be6c _img_mainmenu - 0x000000000030c270 _img_mainmenu_end - .rodata 0x000000000030c270 0x58 build-fx/assets/img/w3.png.o - 0x000000000030c270 _img_w3 - 0x000000000030c2c8 _img_w3_end - .rodata 0x000000000030c2c8 0x404 build-fx/assets/img/time_over.png.o - 0x000000000030c2c8 _img_time_over - 0x000000000030c6cc _img_time_over_end - .rodata 0x000000000030c6cc 0x4c build-fx/assets/img/coin.png.o - 0x000000000030c6cc _img_coin - 0x000000000030c718 _img_coin_end - .rodata 0x000000000030c718 0x24 build-fx/assets/img/champi.png.o - 0x000000000030c718 _img_champi - 0x000000000030c73c _img_champi_end - .rodata 0x000000000030c73c 0xdc build-fx/assets/img/mariosmall.png.o - 0x000000000030c73c _img_mariosmall - 0x000000000030c818 _img_mariosmall_end - .rodata 0x000000000030c818 0x28 build-fx/assets/img/gift.png.o - 0x000000000030c818 _img_gift - 0x000000000030c840 _img_gift_end - .rodata 0x000000000030c840 0x44 build-fx/assets/img/buisson.png.o - 0x000000000030c840 _img_buisson - 0x000000000030c884 _img_buisson_end - .rodata 0x000000000030c884 0x84 build-fx/assets/img/colline.png.o - 0x000000000030c884 _img_colline - 0x000000000030c908 _img_colline_end - .rodata 0x000000000030c908 0x24 build-fx/assets/img/star.png.o - 0x000000000030c908 _img_star - 0x000000000030c92c _img_star_end - .rodata 0x000000000030c92c 0x224 build-fx/assets/img/mariobig.png.o - 0x000000000030c92c _img_mariobig - 0x000000000030cb50 _img_mariobig_end - .rodata 0x000000000030cb50 0x804 build-fx/assets/img/error.png.o - 0x000000000030cb50 _img_error - 0x000000000030d354 _img_error_end - .rodata 0x000000000030d354 0x44 build-fx/assets/img/1up.png.o - 0x000000000030d354 _img_1up - 0x000000000030d398 _img_1up_end - .rodata 0x000000000030d398 0xb8 build-fx/assets/img/tuyau.png.o - 0x000000000030d398 _img_tuyau - 0x000000000030d450 _img_tuyau_end - .rodata 0x000000000030d450 0x24 build-fx/assets/img/bullet.png.o - 0x000000000030d450 _img_bullet - 0x000000000030d474 _img_bullet_end - .rodata 0x000000000030d474 0x4c build-fx/assets/img/carapace_verte.png.o - 0x000000000030d474 _img_carapace_verte - 0x000000000030d4c0 _img_carapace_verte_end - .rodata 0x000000000030d4c0 0x44 build-fx/assets/img/nuage.png.o - 0x000000000030d4c0 _img_nuage - 0x000000000030d504 _img_nuage_end - .rodata 0x000000000030d504 0x10 build-fx/assets/img/plateforme.png.o - 0x000000000030d504 _img_plateforme - 0x000000000030d514 _img_plateforme_end - .rodata 0x000000000030d514 0xc4 build-fx/assets/img/koopa_verte.png.o - 0x000000000030d514 _img_koopa_verte - 0x000000000030d5d8 _img_koopa_verte_end - .rodata 0x000000000030d5d8 0x404 build-fx/assets/img/level.png.o - 0x000000000030d5d8 _img_level - 0x000000000030d9dc _img_level_end - .rodata 0x000000000030d9dc 0xe4 build-fx/assets/img/castle.png.o - 0x000000000030d9dc _img_castle - 0x000000000030dac0 _img_castle_end - .rodata 0x000000000030dac0 0x4c build-fx/assets/img/goomba.png.o - 0x000000000030dac0 _img_goomba - 0x000000000030db0c _img_goomba_end - .rodata 0x000000000030db0c 0x4c build-fx/assets/img/stone.png.o - 0x000000000030db0c _img_stone - 0x000000000030db58 _img_stone_end - .rodata 0x000000000030db58 0x24 build-fx/assets/img/tickbox.png.o - 0x000000000030db58 _img_tickbox - 0x000000000030db7c _img_tickbox_end - .rodata 0x000000000030db7c 0x58 build-fx/assets/img/w4.png.o - 0x000000000030db7c _img_w4 - 0x000000000030dbd4 _img_w4_end - .rodata 0x000000000030dbd4 0x58 build-fx/assets/img/w1.png.o - 0x000000000030dbd4 _img_w1 - 0x000000000030dc2c _img_w1_end - .rodata 0x000000000030dc2c 0x404 build-fx/assets/img/lvl0.png.o - 0x000000000030dc2c _img_lvl0 - 0x000000000030e030 _img_lvl0_end + 0x000000000030a164 0x63 build-fx/src/world.c.o + *fill* 0x000000000030a1c7 0x1 + .rodata 0x000000000030a1c8 0x28 build-fx/src/keyboard.c.o + .rodata 0x000000000030a1f0 0x60 build-fx/src/ennemi.c.o + 0x000000000030a220 _ennemi_heights + 0x000000000030a238 _ennemi_widths + .rodata 0x000000000030a250 0x204 build-fx/assets/fonts/mario.png.o + 0x000000000030a250 _font_mario + 0x000000000030a454 _font_mario_end + .rodata 0x000000000030a454 0x20 build-fx/assets/img/bonus.png.o + 0x000000000030a454 _img_bonus + 0x000000000030a474 _img_bonus_end + .rodata 0x000000000030a474 0x24 build-fx/assets/img/bloc.png.o + 0x000000000030a474 _img_bloc + 0x000000000030a498 _img_bloc_end + .rodata 0x000000000030a498 0x404 build-fx/assets/img/ram.png.o + 0x000000000030a498 _img_ram + 0x000000000030a89c _img_ram_end + .rodata 0x000000000030a89c 0x58 build-fx/assets/img/w5.png.o + 0x000000000030a89c _img_w5 + 0x000000000030a8f4 _img_w5_end + .rodata 0x000000000030a8f4 0x404 build-fx/assets/img/options.png.o + 0x000000000030a8f4 _img_options + 0x000000000030acf8 _img_options_end + .rodata 0x000000000030acf8 0x44 build-fx/assets/img/fleur.png.o + 0x000000000030acf8 _img_fleur + 0x000000000030ad3c _img_fleur_end + .rodata 0x000000000030ad3c 0x58 build-fx/assets/img/w2.png.o + 0x000000000030ad3c _img_w2 + 0x000000000030ad94 _img_w2_end + .rodata 0x000000000030ad94 0x404 build-fx/assets/img/main.png.o + 0x000000000030ad94 _img_main + 0x000000000030b198 _img_main_end + .rodata 0x000000000030b198 0x64 build-fx/assets/img/flag.png.o + 0x000000000030b198 _img_flag + 0x000000000030b1fc _img_flag_end + .rodata 0x000000000030b1fc 0x404 build-fx/assets/img/new_level.png.o + 0x000000000030b1fc _img_new_level + 0x000000000030b600 _img_new_level_end + .rodata 0x000000000030b600 0x4c build-fx/assets/img/brick.png.o + 0x000000000030b600 _img_brick + 0x000000000030b64c _img_brick_end + .rodata 0x000000000030b64c 0xbc build-fx/assets/img/menu_pause.png.o + 0x000000000030b64c _img_menu_pause + 0x000000000030b708 _img_menu_pause_end + .rodata 0x000000000030b708 0x18 build-fx/assets/img/select_arrow.png.o + 0x000000000030b708 _img_select_arrow + 0x000000000030b720 _img_select_arrow_end + .rodata 0x000000000030b720 0x804 build-fx/assets/img/dev.png.o + 0x000000000030b720 _img_dev + 0x000000000030bf24 _img_dev_end + .rodata 0x000000000030bf24 0x24 build-fx/assets/img/death.png.o + 0x000000000030bf24 _img_death + 0x000000000030bf48 _img_death_end + .rodata 0x000000000030bf48 0x404 build-fx/assets/img/mainmenu.png.o + 0x000000000030bf48 _img_mainmenu + 0x000000000030c34c _img_mainmenu_end + .rodata 0x000000000030c34c 0x58 build-fx/assets/img/w3.png.o + 0x000000000030c34c _img_w3 + 0x000000000030c3a4 _img_w3_end + .rodata 0x000000000030c3a4 0x404 build-fx/assets/img/time_over.png.o + 0x000000000030c3a4 _img_time_over + 0x000000000030c7a8 _img_time_over_end + .rodata 0x000000000030c7a8 0x4c build-fx/assets/img/coin.png.o + 0x000000000030c7a8 _img_coin + 0x000000000030c7f4 _img_coin_end + .rodata 0x000000000030c7f4 0x24 build-fx/assets/img/champi.png.o + 0x000000000030c7f4 _img_champi + 0x000000000030c818 _img_champi_end + .rodata 0x000000000030c818 0xdc build-fx/assets/img/mariosmall.png.o + 0x000000000030c818 _img_mariosmall + 0x000000000030c8f4 _img_mariosmall_end + .rodata 0x000000000030c8f4 0x28 build-fx/assets/img/gift.png.o + 0x000000000030c8f4 _img_gift + 0x000000000030c91c _img_gift_end + .rodata 0x000000000030c91c 0x44 build-fx/assets/img/buisson.png.o + 0x000000000030c91c _img_buisson + 0x000000000030c960 _img_buisson_end + .rodata 0x000000000030c960 0x84 build-fx/assets/img/colline.png.o + 0x000000000030c960 _img_colline + 0x000000000030c9e4 _img_colline_end + .rodata 0x000000000030c9e4 0x24 build-fx/assets/img/star.png.o + 0x000000000030c9e4 _img_star + 0x000000000030ca08 _img_star_end + .rodata 0x000000000030ca08 0x224 build-fx/assets/img/mariobig.png.o + 0x000000000030ca08 _img_mariobig + 0x000000000030cc2c _img_mariobig_end + .rodata 0x000000000030cc2c 0x804 build-fx/assets/img/error.png.o + 0x000000000030cc2c _img_error + 0x000000000030d430 _img_error_end + .rodata 0x000000000030d430 0x44 build-fx/assets/img/1up.png.o + 0x000000000030d430 _img_1up + 0x000000000030d474 _img_1up_end + .rodata 0x000000000030d474 0xb8 build-fx/assets/img/tuyau.png.o + 0x000000000030d474 _img_tuyau + 0x000000000030d52c _img_tuyau_end + .rodata 0x000000000030d52c 0x24 build-fx/assets/img/bullet.png.o + 0x000000000030d52c _img_bullet + 0x000000000030d550 _img_bullet_end + .rodata 0x000000000030d550 0x4c build-fx/assets/img/carapace_verte.png.o + 0x000000000030d550 _img_carapace_verte + 0x000000000030d59c _img_carapace_verte_end + .rodata 0x000000000030d59c 0x44 build-fx/assets/img/nuage.png.o + 0x000000000030d59c _img_nuage + 0x000000000030d5e0 _img_nuage_end + .rodata 0x000000000030d5e0 0x10 build-fx/assets/img/plateforme.png.o + 0x000000000030d5e0 _img_plateforme + 0x000000000030d5f0 _img_plateforme_end + .rodata 0x000000000030d5f0 0xc4 build-fx/assets/img/koopa_verte.png.o + 0x000000000030d5f0 _img_koopa_verte + 0x000000000030d6b4 _img_koopa_verte_end + .rodata 0x000000000030d6b4 0x404 build-fx/assets/img/level.png.o + 0x000000000030d6b4 _img_level + 0x000000000030dab8 _img_level_end + .rodata 0x000000000030dab8 0xe4 build-fx/assets/img/castle.png.o + 0x000000000030dab8 _img_castle + 0x000000000030db9c _img_castle_end + .rodata 0x000000000030db9c 0x4c build-fx/assets/img/goomba.png.o + 0x000000000030db9c _img_goomba + 0x000000000030dbe8 _img_goomba_end + .rodata 0x000000000030dbe8 0x4c build-fx/assets/img/stone.png.o + 0x000000000030dbe8 _img_stone + 0x000000000030dc34 _img_stone_end + .rodata 0x000000000030dc34 0x24 build-fx/assets/img/tickbox.png.o + 0x000000000030dc34 _img_tickbox + 0x000000000030dc58 _img_tickbox_end + .rodata 0x000000000030dc58 0x58 build-fx/assets/img/w4.png.o + 0x000000000030dc58 _img_w4 + 0x000000000030dcb0 _img_w4_end + .rodata 0x000000000030dcb0 0x58 build-fx/assets/img/w1.png.o + 0x000000000030dcb0 _img_w1 + 0x000000000030dd08 _img_w1_end + .rodata 0x000000000030dd08 0x404 build-fx/assets/img/lvl0.png.o + 0x000000000030dd08 _img_lvl0 + 0x000000000030e10c _img_lvl0_end .rodata.str1.4 - 0x000000000030e030 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* 0x000000000030e061 0x3 - .rodata 0x000000000030e064 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x000000000030e10c 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* 0x000000000030e13d 0x3 + .rodata 0x000000000030e140 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 - 0x000000000030e06c 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* 0x000000000030e072 0x2 + 0x000000000030e148 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* 0x000000000030e14e 0x2 .rodata.str1.4 - 0x000000000030e074 0x11a /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x000000000030e150 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* 0x000000000030e18e 0x2 - .rodata 0x000000000030e190 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* 0x000000000030e26a 0x2 + .rodata 0x000000000030e26c 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 - 0x000000000030e1a8 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 0x000000000030e1ac 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) - 0x000000000030e1ac _gint_font5x7 - 0x000000000030e5b4 _gint_font5x7_end + 0x000000000030e284 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 0x000000000030e288 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) + 0x000000000030e288 _gint_font5x7 + 0x000000000030e690 _gint_font5x7_end .rodata.str1.4 - 0x000000000030e5b4 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* 0x000000000030e5ba 0x2 + 0x000000000030e690 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* 0x000000000030e696 0x2 .rodata.str1.4 - 0x000000000030e5bc 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 0x000000000030e5c0 0x10 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x000000000030e698 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 0x000000000030e69c 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 - 0x000000000030e5d0 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* 0x000000000030e5eb 0x1 - .rodata 0x000000000030e5ec 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) - 0x000000000030e5ec ___clz_tab + 0x000000000030e6ac 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* 0x000000000030e6c7 0x1 + .rodata 0x000000000030e6c8 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x000000000030e6c8 ___clz_tab -.rela.dyn 0x000000000030e6ec 0x0 - .rela.text 0x000000000030e6ec 0x0 build-fx/src/levelchanger.c.o +.rela.dyn 0x000000000030e7c8 0x0 + .rela.text 0x000000000030e7c8 0x0 build-fx/src/levelchanger.c.o .rela.pretext.entry - 0x000000000030e6ec 0x0 build-fx/src/levelchanger.c.o + 0x000000000030e7c8 0x0 build-fx/src/levelchanger.c.o 0x0000000008100000 . = ORIGIN (ram) .bss 0x0000000008100000 0x740 @@ -843,8 +845,8 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x0000000008100740 . = ALIGN (0x10) 0x0000000000000740 _sbss = SIZEOF (.bss) -.data 0x0000000008100740 0x160 load address 0x000000000030e6ec - 0x000000000030e6ec _ldata = LOADADDR (.data) +.data 0x0000000008100740 0x160 load address 0x000000000030e7c8 + 0x000000000030e7c8 _ldata = LOADADDR (.data) 0x0000000008100740 _rdata = . *(.data .data.*) .data 0x0000000008100740 0x0 build-fx/src/levelchanger.c.o @@ -911,28 +913,28 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a *(D) 0x00000000081008a0 . = ALIGN (0x10) -.data.4 0x00000000081008a0 0x0 load address 0x000000000030e84c +.data.4 0x00000000081008a0 0x0 load address 0x000000000030e928 *(.data.4) 0x00000000081008a0 . = ALIGN (0x10) 0x0000000000000160 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x00000000e5200000 . = ORIGIN (ilram) -.ilram 0x00000000e5200000 0x0 load address 0x000000000030e84c - 0x000000000030e84c _lilram = LOADADDR (.ilram) +.ilram 0x00000000e5200000 0x0 load address 0x000000000030e928 + 0x000000000030e928 _lilram = LOADADDR (.ilram) 0x00000000e5200000 _rilram = . *(.ilram) 0x00000000e5200000 . = ALIGN (0x10) 0x00000000e5007000 . = ORIGIN (xram) -.xram 0x00000000e5007000 0x0 load address 0x000000000030e84c - 0x000000000030e84c _lxram = LOADADDR (.xram) +.xram 0x00000000e5007000 0x0 load address 0x000000000030e928 + 0x000000000030e928 _lxram = LOADADDR (.xram) 0x00000000e5007000 _rxram = . *(.xram) 0x00000000e5007000 . = ALIGN (0x10) 0x00000000e5017000 . = ORIGIN (yram) -.yram 0x00000000e5017000 0x0 load address 0x000000000030e84c - 0x000000000030e84c _lyram = LOADADDR (.yram) +.yram 0x00000000e5017000 0x0 load address 0x000000000030e928 + 0x000000000030e928 _lyram = LOADADDR (.yram) 0x00000000e5017000 _ryram = . *(.yram) 0x00000000e5017000 . = ALIGN (0x10) @@ -942,8 +944,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 0x000000000030e84c - 0x000000000030e84c _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x140 load address 0x000000000030e928 + 0x000000000030e928 _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) @@ -964,7 +966,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 0x000000000030e98c +.gint.bss 0x000000008800f540 0x290 load address 0x000000000030ea68 *(.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/level.c.o b/build-fx/src/level.c.o index b669a97..5c422cb 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/levelchanger.c.o b/build-fx/src/levelchanger.c.o index 64e814d..7a47361 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/plateforme.c.o b/build-fx/src/plateforme.c.o index e4dee1a..85037dd 100644 Binary files a/build-fx/src/plateforme.c.o and b/build-fx/src/plateforme.c.o differ diff --git a/build-fx/src/world.c.o b/build-fx/src/world.c.o index c76ab0c..ac5599a 100644 Binary files a/build-fx/src/world.c.o and b/build-fx/src/world.c.o differ diff --git a/include/plateforme.h b/include/plateforme.h index 813b868..bdc9af7 100644 --- a/include/plateforme.h +++ b/include/plateforme.h @@ -32,8 +32,8 @@ typedef struct #define PLATEFORME_HEIGHT 3 #define PLATEFORME_FALLING(x,y,w) {P_FALLING,x,y,x,y,w,0,0,.xmin=0,.xmax=0,0} -#define PLATEFORME_MOVING_H(x,y,w,v,x0,x1) {P_MOVING_H,x,y,x,y,w,0,v,.xmin=x0,.xmax=x0,0} -#define PLATEFORME_MOVING_V(x,y,w,v,y0,y1) {P_MOVING_V,x,y,x,y,w,0,v,.ymin=y0,.ymax=y0,0} +#define PLATEFORME_MOVING_H(x,y,w,v,x0,x1) {P_MOVING_H,x,y,x,y,w,0,v,.xmin=x0,.xmax=x1,0} +#define PLATEFORME_MOVING_V(x,y,w,v,y0,y1) {P_MOVING_V,x,y,x,y,w,0,v,.ymin=y0,.ymax=y1,0} //void reset_plateforme(plateforme_t* p); diff --git a/include/world.h b/include/world.h index a33d44c..710daf2 100755 --- a/include/world.h +++ b/include/world.h @@ -118,6 +118,8 @@ void world_reset(); #define CTG_DEATH 3 int world_get_ctg(int x, int y); +void reset_camera(); + extern world_t * w_current; extern image_t * w_fond; extern int w_current_x; diff --git a/src/level.c b/src/level.c index 3d1fcbd..3252c8e 100644 --- a/src/level.c +++ b/src/level.c @@ -329,13 +329,13 @@ void set_level(int n) GOOMBA(924,16,-1) }; init_ennemies(ennemies0); -/* + plateforme_t plateforme0[]= { PLATEFORME_MOVING_H(15,25,16,1,0,60) }; plateforme_table_size=1; - init_plateformes(plateforme0);*/ + init_plateformes(plateforme0); } } diff --git a/src/levelchanger.c b/src/levelchanger.c index d920b50..e04d319 100644 --- a/src/levelchanger.c +++ b/src/levelchanger.c @@ -109,6 +109,7 @@ int play_level(int l) //int finish_status=0; // FAil finish_level=0; mario_dead=0; set_level(l); + reset_camera(); while(global_quit==0) { if (has_ticked) diff --git a/src/plateforme.c b/src/plateforme.c index cecdf63..dafa992 100644 --- a/src/plateforme.c +++ b/src/plateforme.c @@ -48,7 +48,7 @@ void move_plateforme(plateforme_t* p) { if (p->v) p->v++; - p->y+=p->v; + p->y+=p->v/2; } if (p->type==P_MOVING_H) @@ -58,9 +58,11 @@ void move_plateforme(plateforme_t* p) if (p->v==0) p->v=p->vinit; p->x+=t_v; - if (p->x+p->width >= p->xmax && p->v>0) + if (xc&&yc) + mario.p.x+=t_v; + if (p->x+p->width > p->xmax && p->v>0) p->v *= -1; - if (p->x <= p->xmin && p->v<0) + if (p->x < p->xmin && p->v<0) p->v *= -1; } @@ -80,9 +82,7 @@ void move_plateforme(plateforme_t* p) int s=sgn(p->v); int t_v=((s*p->v+time_id%2)/2)*s; if (p->type==P_FALLING) - mario.p.y+=t_v; - if (p->type==P_MOVING_H) - mario.p.x+=t_v; + mario.p.y+=p->v/2; if (p->type==P_MOVING_V) mario.p.y+=t_v; } diff --git a/src/world.c b/src/world.c index 42732ff..84ea06b 100755 --- a/src/world.c +++ b/src/world.c @@ -164,29 +164,39 @@ static int min(const int x, const int y) return (x>y?y:x); } +static int max_cy=0; + +void reset_camera() +{ + max_cy=mario.p.y; + mario_x_max=mario.p.x; +} + int world_get_real_x0() //mario delta en 0,0 { if (mario.p.x>mario_x_max) mario_x_max=mario.p.x; if (mario_x_max-40>mario.p.x) - mario_x_max--; + mario_x_max=mario.p.x; return min(max(mario_x_max-40,0),w_current_x*8-128); } +void reload_camera() +{ + const int step=3; // on ajoute 1/3 + max_cy+=(mario.p.y-max_cy)/step; +} + int world_get_real_y0() //mario delta en 0,0 { //static int y=mario.p.y; - static int y=0; - if (y>mario.p.y) - y--; - else if (y