diff --git a/SuperCbr.g1a b/SuperCbr.g1a index da285a8..b5a695e 100644 Binary files a/SuperCbr.g1a and b/SuperCbr.g1a differ diff --git a/assets-fx/img/mainmenu.png b/assets-fx/img/mainmenu.png index a217b56..8f4c0d0 100644 Binary files a/assets-fx/img/mainmenu.png and b/assets-fx/img/mainmenu.png differ diff --git a/assets-fx/img/options.png b/assets-fx/img/options.png new file mode 100644 index 0000000..56477e2 Binary files /dev/null and b/assets-fx/img/options.png differ diff --git a/assets-fx/img/plateforme.png b/assets-fx/img/plateforme.png new file mode 100644 index 0000000..35cd9d0 Binary files /dev/null and b/assets-fx/img/plateforme.png differ diff --git a/assets-fx/img/w4.png b/assets-fx/img/w4.png index 86f98bf..925aab9 100644 Binary files a/assets-fx/img/w4.png and b/assets-fx/img/w4.png differ diff --git a/build-fx/SuperCbr.bin b/build-fx/SuperCbr.bin index 64ab873..c77df52 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 f3a1988..87278b7 100755 Binary files a/build-fx/SuperCbr.elf and b/build-fx/SuperCbr.elf differ diff --git a/build-fx/assets/img/mainmenu.png.o b/build-fx/assets/img/mainmenu.png.o index 4e861e9..4597f65 100644 Binary files a/build-fx/assets/img/mainmenu.png.o and b/build-fx/assets/img/mainmenu.png.o differ diff --git a/build-fx/assets/img/options.png.o b/build-fx/assets/img/options.png.o new file mode 100644 index 0000000..2f1579b Binary files /dev/null and b/build-fx/assets/img/options.png.o differ diff --git a/build-fx/assets/img/plateforme.png.o b/build-fx/assets/img/plateforme.png.o new file mode 100644 index 0000000..7ee85b2 Binary files /dev/null and b/build-fx/assets/img/plateforme.png.o differ diff --git a/build-fx/assets/img/w4.png.o b/build-fx/assets/img/w4.png.o index 897aefe..55a4b60 100644 Binary files a/build-fx/assets/img/w4.png.o and b/build-fx/assets/img/w4.png.o differ diff --git a/build-fx/map b/build-fx/map index 185b5eb..eb9f340 100644 --- a/build-fx/map +++ b/build-fx/map @@ -23,7 +23,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/libgint-fx.a(iokbd.c.o) /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) (_iokbd_scan) /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - build-fx/src/levelchanger.c.o (_getkey) + build-fx/src/level.c.o (_getkey) /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) (_start) /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) @@ -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) @@ -94,6 +94,7 @@ Discarded input sections .comment 0x0000000000000000 0x12 build-fx/src/config.c.o .comment 0x0000000000000000 0x12 build-fx/src/score.c.o .comment 0x0000000000000000 0x12 build-fx/src/tile.c.o + .comment 0x0000000000000000 0x12 build-fx/src/plateforme.c.o .comment 0x0000000000000000 0x12 build-fx/src/box.c.o .comment 0x0000000000000000 0x12 build-fx/src/world.c.o .comment 0x0000000000000000 0x12 build-fx/src/bonus.c.o @@ -175,6 +176,7 @@ LOAD build-fx/src/level.c.o LOAD build-fx/src/config.c.o LOAD build-fx/src/score.c.o LOAD build-fx/src/tile.c.o +LOAD build-fx/src/plateforme.c.o LOAD build-fx/src/box.c.o LOAD build-fx/src/world.c.o LOAD build-fx/src/bonus.c.o @@ -188,6 +190,7 @@ LOAD build-fx/assets/img/bonus.png.o LOAD build-fx/assets/img/bloc.png.o LOAD build-fx/assets/img/ram.png.o LOAD build-fx/assets/img/w5.png.o +LOAD build-fx/assets/img/options.png.o LOAD build-fx/assets/img/fleur.png.o LOAD build-fx/assets/img/w2.png.o LOAD build-fx/assets/img/main.png.o @@ -215,6 +218,7 @@ LOAD build-fx/assets/img/tuyau.png.o LOAD build-fx/assets/img/bullet.png.o LOAD build-fx/assets/img/carapace_verte.png.o LOAD build-fx/assets/img/nuage.png.o +LOAD build-fx/assets/img/plateforme.png.o LOAD build-fx/assets/img/koopa_verte.png.o LOAD build-fx/assets/img/level.png.o LOAD build-fx/assets/img/castle.png.o @@ -229,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 - 0x000000000000da94 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x000000000000de88 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8d0 *(.pretext.entry) @@ -269,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 0x61a0 +.text 0x0000000000300ad0 0x64f0 0x0000000000300ad0 _gint_exch_tlbh_start = . *(.gint.exch_tlbh) .gint.exch_tlbh @@ -277,465 +281,478 @@ 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 0x26c build-fx/src/levelchanger.c.o + .text 0x0000000000300b1c 0x280 build-fx/src/levelchanger.c.o 0x0000000000300b1c _callback - 0x0000000000300b24 _launch_ui - 0x0000000000300c68 _system_error - 0x0000000000300ca0 _play_level - .text 0x0000000000300d88 0x440 build-fx/src/level.c.o - 0x0000000000300d88 _malloc_error - 0x0000000000300dc0 _init_level - 0x0000000000300e34 _init_ennemies - 0x0000000000300e94 _set_level - 0x0000000000301198 _get_lvl_id - .text 0x00000000003011c8 0xd8 build-fx/src/config.c.o - 0x00000000003011c8 _configmenu - .text 0x00000000003012a0 0x1dc build-fx/src/score.c.o - 0x00000000003012a0 _new_level - 0x00000000003012c4 _get_score - 0x00000000003012d0 _score_reset - 0x00000000003012f0 _score_add_coin - 0x0000000000301300 _score_add - 0x0000000000301350 _score_display - .text 0x000000000030147c 0x40 build-fx/src/tile.c.o - 0x000000000030147c _draw_tile - .text 0x00000000003014bc 0x42c build-fx/src/box.c.o - 0x00000000003014bc _sgn - 0x00000000003014ce _check_collision - 0x0000000000301560 _box_move - 0x0000000000301884 _box_jump - .text 0x00000000003018e8 0x5bc build-fx/src/world.c.o - 0x00000000003018e8 _world_get_width - 0x00000000003018f8 _world_get - 0x000000000030195c _display_cell - 0x0000000000301c68 _world_get_ctg - 0x0000000000301c9c _world_get_real_x0 - 0x0000000000301ce4 _world_get_real_y0 - 0x0000000000301cf8 _world_draw - 0x0000000000301e04 _world_move - .text 0x0000000000301ea4 0x56c build-fx/src/bonus.c.o - 0x0000000000301ea4 _bonus_set - 0x0000000000301ed4 _bonus_move - 0x0000000000302088 _bonus_draw - 0x000000000030219c _lance_bullet - 0x00000000003021f8 _bullet_display - 0x0000000000302290 _bullet_move - .text 0x0000000000302410 0x154 build-fx/src/save.c.o - 0x0000000000302410 _load_save - 0x0000000000302414 _flash_save - 0x0000000000302418 _get_highscore - 0x0000000000302468 _set_highscore - 0x00000000003024b8 _get_best_time - 0x0000000000302508 _set_best_time - 0x0000000000302558 _get_progress_status - .text 0x0000000000302564 0x770 build-fx/src/mario.c.o - 0x0000000000302574 _mario_bigger - 0x0000000000302590 _mario_smaller - 0x00000000003025bc _mario_draw - 0x0000000000302778 _test_sol_le_plus_proche - 0x00000000003027e4 _mario_move - .text 0x0000000000302cd4 0x0 build-fx/src/main.c.o - .text.startup 0x0000000000302cd4 0x38 build-fx/src/main.c.o - 0x0000000000302cd4 _main - .text 0x0000000000302d0c 0x2d8 build-fx/src/keyboard.c.o - 0x0000000000302d0c _keyboard_clear - 0x0000000000302d2c _menu_pause - 0x0000000000302ef4 _update_keyboard - .text 0x0000000000302fe4 0x7d0 build-fx/src/ennemi.c.o - 0x0000000000302fe4 _display_ennemi - 0x000000000030322c _ennemi_check_collision - 0x0000000000303290 _hurt_mario - 0x00000000003032c4 _move_ennemi - 0x0000000000303774 _display_ennemi_table - .text 0x00000000003037b4 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x00000000003041b0 _kprint_opt - 0x00000000003042f8 _kprint - 0x00000000003043d0 _kvsprint - 0x0000000000304418 _sprintf - 0x0000000000304440 _vsprintf - 0x0000000000304460 _snprintf - 0x0000000000304480 _vsnprintf - .text 0x0000000000304498 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - 0x0000000000304498 _memcpy - 0x0000000000304552 __memmove - 0x0000000000304556 __memcmp - 0x000000000030455a _memset - .text 0x0000000000304574 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 0x0000000000304574 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 0x0000000000304574 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) - 0x0000000000304574 _drect - .text 0x0000000000304690 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - 0x0000000000304690 _dupdate - 0x00000000003046a8 _dupdate_noint - .text 0x00000000003046b4 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - 0x00000000003046b4 _masks - .text 0x0000000000304750 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - 0x0000000000304750 _dimage - 0x00000000003047a4 _dsubimage - .text 0x0000000000304818 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - 0x0000000000304818 _dclear - .text 0x0000000000304864 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x0000000000304a0c _pollevent - 0x0000000000304b50 _waitevent - 0x0000000000304b9c _clearevents - 0x0000000000304bbc _keydown - 0x0000000000304be8 _keydown_all - 0x0000000000304c24 _keydown_any - .text 0x0000000000304c60 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - 0x0000000000304c6c _iokbd_row - 0x0000000000304d54 _iokbd_scan - .text 0x0000000000304d84 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - 0x0000000000304d84 _getkey_opt - 0x0000000000304f30 _getkey - 0x0000000000304f3c _getkey_repeat - .text 0x0000000000304f78 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 0x0000000000304f78 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - 0x0000000000305108 _gint_panic - 0x0000000000305118 _gint_panic_set - 0x0000000000305124 _gint_exc_catch - 0x0000000000305130 _gint_exc_skip - .text 0x000000000030513c 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 0x000000000030513c 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - 0x00000000003051f0 _gint_install - 0x00000000003052a0 _gint_unload - .text 0x00000000003052b8 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 0x00000000003052b8 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 0x00000000003052b8 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - 0x00000000003052b8 _tlb_addr - 0x00000000003052cc _tlb_data - 0x00000000003052e0 _tlb_mapped_memory - 0x00000000003053b4 _utlb_addr - 0x00000000003053c4 _utlb_data - 0x00000000003053d4 _utlb_mapped_memory - .text 0x00000000003054ac 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x00000000003054ac _dsize - .text 0x0000000000305548 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - 0x0000000000305548 _dprint - .text 0x00000000003055a0 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x00000000003058c0 _timer_setup - 0x0000000000305950 _timer_delay - 0x00000000003059b0 _timer_start - 0x00000000003059e4 _timer_reload - 0x0000000000305a04 _timer_pause - 0x0000000000305a38 _timer_stop - 0x0000000000305a94 _timer_timeout - 0x0000000000305aa0 _timer_address - 0x0000000000305adc _timer_clear - .text 0x0000000000305b0c 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - 0x0000000000305b0c _sleep_us - .text 0x0000000000305b64 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x0000000000305bfc _t6k11_display - 0x0000000000305cd0 _t6k11_contrast - 0x0000000000305cfc _t6k11_backlight - .text 0x0000000000305d3c 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x0000000000305e80 _clock_freq - .text 0x0000000000305e8c 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 0x0000000000305e8c 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) - 0x0000000000305e8c _bopti_asm_mono - 0x0000000000305eb2 _bopti_asm_mono_alpha - .text 0x0000000000305ee4 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - 0x0000000000305ee4 _bopti_grid - 0x0000000000306058 _bopti_render - 0x0000000000306188 _bopti_render_clip - 0x000000000030629c _bopti_render_noclip - .text 0x00000000003062f4 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - 0x00000000003062f4 _gint_setvbr - .text 0x0000000000306320 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - 0x0000000000306320 _gint_intlevel - 0x0000000000306374 _gint_inthandler - .text 0x0000000000306398 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 0x0000000000306398 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 0x0000000000306398 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) - 0x0000000000306478 _ll_set_size - 0x000000000030648c _ll_set_state - 0x00000000003064ac _ll_get_state - 0x00000000003064bc _ll_clear - 0x0000000000306508 _ll_send - 0x000000000030657c _ll_sendp - 0x00000000003065c8 _ll_display_custom - 0x0000000000306634 _ll_display - 0x0000000000306648 _ll_pause - 0x00000000003066a0 _ll_panic - 0x00000000003066dc _ll_set_panic - 0x00000000003066ec _ll_set_level - 0x00000000003066f8 _ll_get_level - .text 0x0000000000306704 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - 0x0000000000306704 ___movstr - 0x0000000000306704 ___movmem - 0x0000000000306738 ___movmemSI64 - 0x0000000000306738 ___movstrSI64 - 0x000000000030673c ___movstrSI60 - 0x000000000030673c ___movmemSI60 - 0x0000000000306740 ___movmemSI56 - 0x0000000000306740 ___movstrSI56 - 0x0000000000306744 ___movstrSI52 - 0x0000000000306744 ___movmemSI52 - 0x0000000000306748 ___movstrSI48 - 0x0000000000306748 ___movmemSI48 - 0x000000000030674c ___movstrSI44 - 0x000000000030674c ___movmemSI44 - 0x0000000000306750 ___movstrSI40 - 0x0000000000306750 ___movmemSI40 - 0x0000000000306754 ___movstrSI36 - 0x0000000000306754 ___movmemSI36 - 0x0000000000306758 ___movmemSI32 - 0x0000000000306758 ___movstrSI32 - 0x000000000030675c ___movmemSI28 - 0x000000000030675c ___movstrSI28 - 0x0000000000306760 ___movstrSI24 - 0x0000000000306760 ___movmemSI24 - 0x0000000000306764 ___movmemSI20 - 0x0000000000306764 ___movstrSI20 - 0x0000000000306768 ___movstrSI16 - 0x0000000000306768 ___movmemSI16 - 0x000000000030676c ___movmemSI12 - 0x000000000030676c ___movstrSI12 - 0x0000000000306770 ___movmemSI8 - 0x0000000000306770 ___movstrSI8 - 0x0000000000306774 ___movmemSI4 - 0x0000000000306774 ___movstrSI4 - .text 0x000000000030677c 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - 0x000000000030677c ___udivdi3 - .text 0x000000000030696c 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - 0x000000000030696c ___umoddi3 - .text 0x0000000000306ba0 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - 0x0000000000306bc2 ___udivsi3 - *fill* 0x0000000000306c0c 0x4 - .text 0x0000000000306c10 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000306c10 ___udiv_qrnnd_16 - .text 0x0000000000306c70 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x0000000000300b24 _play_level + 0x0000000000300c20 _launch_ui + .text 0x0000000000300d9c 0x4a4 build-fx/src/level.c.o + 0x0000000000300d9c _malloc_error + 0x0000000000300dd4 _init_level + 0x0000000000300e48 _init_ennemies + 0x0000000000300ea8 _set_level + 0x0000000000301210 _get_lvl_id + .text 0x0000000000301240 0xd8 build-fx/src/config.c.o + 0x0000000000301240 _configmenu + .text 0x0000000000301318 0x1e4 build-fx/src/score.c.o + 0x0000000000301318 _new_level + 0x0000000000301338 _get_score + 0x0000000000301344 _score_reset + 0x0000000000301364 _score_add_coin + 0x0000000000301374 _score_add + 0x00000000003013c4 _score_display + .text 0x00000000003014fc 0x40 build-fx/src/tile.c.o + 0x00000000003014fc _draw_tile + .text 0x000000000030153c 0x2cc build-fx/src/plateforme.c.o + 0x000000000030153c _reset_plateforme + 0x000000000030154a _move_plateforme + 0x00000000003016f4 _display_plateformes + 0x0000000000301780 _move_plateformes + 0x00000000003017c0 _plateforme_check_collide + .text 0x0000000000301808 0x42c build-fx/src/box.c.o + 0x0000000000301808 _sgn + 0x000000000030181a _check_collision + 0x00000000003018ac _box_move + 0x0000000000301bd0 _box_jump + .text 0x0000000000301c34 0x5ec build-fx/src/world.c.o + 0x0000000000301c34 _world_get_width + 0x0000000000301c44 _world_get + 0x0000000000301ca8 _display_cell + 0x0000000000301fb4 _world_get_ctg + 0x0000000000302008 _world_get_real_x0 + 0x0000000000302050 _world_get_real_y0 + 0x0000000000302064 _world_draw + 0x0000000000302174 _world_move + .text 0x0000000000302220 0x56c build-fx/src/bonus.c.o + 0x0000000000302220 _bonus_set + 0x0000000000302250 _bonus_move + 0x0000000000302404 _bonus_draw + 0x0000000000302518 _lance_bullet + 0x0000000000302574 _bullet_display + 0x000000000030260c _bullet_move + .text 0x000000000030278c 0x154 build-fx/src/save.c.o + 0x000000000030278c _load_save + 0x0000000000302790 _flash_save + 0x0000000000302794 _get_highscore + 0x00000000003027e4 _set_highscore + 0x0000000000302834 _get_best_time + 0x0000000000302884 _set_best_time + 0x00000000003028d4 _get_progress_status + .text 0x00000000003028e0 0x770 build-fx/src/mario.c.o + 0x00000000003028f0 _mario_bigger + 0x000000000030290c _mario_smaller + 0x0000000000302938 _mario_draw + 0x0000000000302af4 _test_sol_le_plus_proche + 0x0000000000302b60 _mario_move + .text 0x0000000000303050 0x0 build-fx/src/main.c.o + .text.startup 0x0000000000303050 0x2c build-fx/src/main.c.o + 0x0000000000303050 _main + .text 0x000000000030307c 0x2b8 build-fx/src/keyboard.c.o + 0x000000000030307c _keyboard_clear + 0x000000000030309c _getkey_custom + 0x00000000003030ec _menu_pause + 0x0000000000303244 _update_keyboard + .text 0x0000000000303334 0x7d0 build-fx/src/ennemi.c.o + 0x0000000000303334 _display_ennemi + 0x000000000030357c _ennemi_check_collision + 0x00000000003035e0 _hurt_mario + 0x0000000000303614 _move_ennemi + 0x0000000000303ac4 _display_ennemi_table + .text 0x0000000000303b04 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x0000000000304500 _kprint_opt + 0x0000000000304648 _kprint + 0x0000000000304720 _kvsprint + 0x0000000000304768 _sprintf + 0x0000000000304790 _vsprintf + 0x00000000003047b0 _snprintf + 0x00000000003047d0 _vsnprintf + .text 0x00000000003047e8 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + 0x00000000003047e8 _memcpy + 0x00000000003048a2 __memmove + 0x00000000003048a6 __memcmp + 0x00000000003048aa _memset + .text 0x00000000003048c4 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 0x00000000003048c4 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 0x00000000003048c4 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) + 0x00000000003048c4 _drect + .text 0x00000000003049e0 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + 0x00000000003049e0 _dupdate + 0x00000000003049f8 _dupdate_noint + .text 0x0000000000304a04 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + 0x0000000000304a04 _masks + .text 0x0000000000304aa0 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x0000000000304aa0 _dimage + 0x0000000000304af4 _dsubimage + .text 0x0000000000304b68 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + 0x0000000000304b68 _dclear + .text 0x0000000000304bb4 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000304d5c _pollevent + 0x0000000000304ea0 _waitevent + 0x0000000000304eec _clearevents + 0x0000000000304f0c _keydown + 0x0000000000304f38 _keydown_all + 0x0000000000304f74 _keydown_any + .text 0x0000000000304fb0 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + 0x0000000000304fbc _iokbd_row + 0x00000000003050a4 _iokbd_scan + .text 0x00000000003050d4 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + 0x00000000003050d4 _getkey_opt + 0x0000000000305280 _getkey + 0x000000000030528c _getkey_repeat + .text 0x00000000003052c8 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 0x00000000003052c8 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x0000000000305458 _gint_panic + 0x0000000000305468 _gint_panic_set + 0x0000000000305474 _gint_exc_catch + 0x0000000000305480 _gint_exc_skip + .text 0x000000000030548c 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 0x000000000030548c 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + 0x0000000000305540 _gint_install + 0x00000000003055f0 _gint_unload + .text 0x0000000000305608 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 0x0000000000305608 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 0x0000000000305608 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + 0x0000000000305608 _tlb_addr + 0x000000000030561c _tlb_data + 0x0000000000305630 _tlb_mapped_memory + 0x0000000000305704 _utlb_addr + 0x0000000000305714 _utlb_data + 0x0000000000305724 _utlb_mapped_memory + .text 0x00000000003057fc 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x00000000003057fc _dsize + .text 0x0000000000305898 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + 0x0000000000305898 _dprint + .text 0x00000000003058f0 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000305c10 _timer_setup + 0x0000000000305ca0 _timer_delay + 0x0000000000305d00 _timer_start + 0x0000000000305d34 _timer_reload + 0x0000000000305d54 _timer_pause + 0x0000000000305d88 _timer_stop + 0x0000000000305de4 _timer_timeout + 0x0000000000305df0 _timer_address + 0x0000000000305e2c _timer_clear + .text 0x0000000000305e5c 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + 0x0000000000305e5c _sleep_us + .text 0x0000000000305eb4 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x0000000000305f4c _t6k11_display + 0x0000000000306020 _t6k11_contrast + 0x000000000030604c _t6k11_backlight + .text 0x000000000030608c 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x00000000003061d0 _clock_freq + .text 0x00000000003061dc 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 0x00000000003061dc 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) + 0x00000000003061dc _bopti_asm_mono + 0x0000000000306202 _bopti_asm_mono_alpha + .text 0x0000000000306234 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x0000000000306234 _bopti_grid + 0x00000000003063a8 _bopti_render + 0x00000000003064d8 _bopti_render_clip + 0x00000000003065ec _bopti_render_noclip + .text 0x0000000000306644 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + 0x0000000000306644 _gint_setvbr + .text 0x0000000000306670 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + 0x0000000000306670 _gint_intlevel + 0x00000000003066c4 _gint_inthandler + .text 0x00000000003066e8 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 0x00000000003066e8 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 0x00000000003066e8 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) + 0x00000000003067c8 _ll_set_size + 0x00000000003067dc _ll_set_state + 0x00000000003067fc _ll_get_state + 0x000000000030680c _ll_clear + 0x0000000000306858 _ll_send + 0x00000000003068cc _ll_sendp + 0x0000000000306918 _ll_display_custom + 0x0000000000306984 _ll_display + 0x0000000000306998 _ll_pause + 0x00000000003069f0 _ll_panic + 0x0000000000306a2c _ll_set_panic + 0x0000000000306a3c _ll_set_level + 0x0000000000306a48 _ll_get_level + .text 0x0000000000306a54 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + 0x0000000000306a54 ___movstr + 0x0000000000306a54 ___movmem + 0x0000000000306a88 ___movmemSI64 + 0x0000000000306a88 ___movstrSI64 + 0x0000000000306a8c ___movstrSI60 + 0x0000000000306a8c ___movmemSI60 + 0x0000000000306a90 ___movmemSI56 + 0x0000000000306a90 ___movstrSI56 + 0x0000000000306a94 ___movstrSI52 + 0x0000000000306a94 ___movmemSI52 + 0x0000000000306a98 ___movstrSI48 + 0x0000000000306a98 ___movmemSI48 + 0x0000000000306a9c ___movstrSI44 + 0x0000000000306a9c ___movmemSI44 + 0x0000000000306aa0 ___movstrSI40 + 0x0000000000306aa0 ___movmemSI40 + 0x0000000000306aa4 ___movstrSI36 + 0x0000000000306aa4 ___movmemSI36 + 0x0000000000306aa8 ___movmemSI32 + 0x0000000000306aa8 ___movstrSI32 + 0x0000000000306aac ___movmemSI28 + 0x0000000000306aac ___movstrSI28 + 0x0000000000306ab0 ___movstrSI24 + 0x0000000000306ab0 ___movmemSI24 + 0x0000000000306ab4 ___movmemSI20 + 0x0000000000306ab4 ___movstrSI20 + 0x0000000000306ab8 ___movstrSI16 + 0x0000000000306ab8 ___movmemSI16 + 0x0000000000306abc ___movmemSI12 + 0x0000000000306abc ___movstrSI12 + 0x0000000000306ac0 ___movmemSI8 + 0x0000000000306ac0 ___movstrSI8 + 0x0000000000306ac4 ___movmemSI4 + 0x0000000000306ac4 ___movstrSI4 + .text 0x0000000000306acc 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + 0x0000000000306acc ___udivdi3 + .text 0x0000000000306cbc 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + 0x0000000000306cbc ___umoddi3 + .text 0x0000000000306ef0 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + 0x0000000000306f12 ___udivsi3 + *fill* 0x0000000000306f5c 0x4 + .text 0x0000000000306f60 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000306f60 ___udiv_qrnnd_16 + .text 0x0000000000306fc0 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 0x0000000000306c70 0x120 +.gint.blocks 0x0000000000306fc0 0x120 *(.gint.blocks) - .gint.blocks 0x0000000000306c70 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - 0x0000000000306c70 _gint_inth_7305 - 0x0000000000306c90 _gint_inth_7705 - .gint.blocks 0x0000000000306cb0 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - 0x0000000000306cb0 _inth_tmu - 0x0000000000306d30 _inth_etmu2 - 0x0000000000306d50 _inth_etmu_help - 0x0000000000306d70 _inth_etmux + .gint.blocks 0x0000000000306fc0 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + 0x0000000000306fc0 _gint_inth_7305 + 0x0000000000306fe0 _gint_inth_7705 + .gint.blocks 0x0000000000307000 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + 0x0000000000307000 _inth_tmu + 0x0000000000307080 _inth_etmu2 + 0x00000000003070a0 _inth_etmu_help + 0x00000000003070c0 _inth_etmux -.gint.drivers 0x0000000000306d90 0x90 - 0x0000000000306d90 _bdrv = . +.gint.drivers 0x00000000003070e0 0x90 + 0x00000000003070e0 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x0000000000306d90 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x0000000000306d90 _drv_cpg + 0x00000000003070e0 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x00000000003070e0 _drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x0000000000306db4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x0000000000306db4 _drv_tmu + 0x0000000000307104 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000307104 _drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x0000000000306dd8 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x0000000000306dd8 _drv_keysc + 0x0000000000307128 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000307128 _drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x0000000000306dfc 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x0000000000306dfc _drv_t6k11 + 0x000000000030714c 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x000000000030714c _drv_t6k11 *(.gint.drivers.6) - 0x0000000000306e20 _edrv = . + 0x0000000000307170 _edrv = . -.rodata 0x0000000000306e20 0x7544 +.rodata 0x0000000000307170 0x75e8 *(.rodata.4) *(.rodata .rodata.*) - .rodata 0x0000000000306e20 0x2de8 build-fx/src/level.c.o + .rodata 0x0000000000307170 0x2e14 build-fx/src/level.c.o .rodata.str1.4 - 0x0000000000309c08 0x22 build-fx/src/config.c.o - *fill* 0x0000000000309c2a 0x2 + 0x0000000000309f84 0x22 build-fx/src/config.c.o + *fill* 0x0000000000309fa6 0x2 .rodata.str1.4 - 0x0000000000309c2c 0x1a build-fx/src/score.c.o + 0x0000000000309fa8 0x1a build-fx/src/score.c.o 0x1e (size before relaxing) - *fill* 0x0000000000309c46 0x2 - .rodata 0x0000000000309c48 0x120 build-fx/src/tile.c.o - 0x0000000000309c48 _mario_big - 0x0000000000309c58 _mario_small - 0x0000000000309c68 _bullet - 0x0000000000309c78 _fleur - 0x0000000000309c88 _mario_starman - 0x0000000000309c98 _life_1up - 0x0000000000309ca8 _champi - 0x0000000000309cb8 _bloc - 0x0000000000309cc8 _end_level - 0x0000000000309cd8 _castle - 0x0000000000309ce8 _colline - 0x0000000000309cf8 _buisson - 0x0000000000309d08 _nuage - 0x0000000000309d18 _coin - 0x0000000000309d28 _gift - 0x0000000000309d38 _earth - 0x0000000000309d48 _brick - 0x0000000000309d58 _tuyau + *fill* 0x0000000000309fc2 0x2 + .rodata 0x0000000000309fc4 0x130 build-fx/src/tile.c.o + 0x0000000000309fc4 _tplateforme + 0x0000000000309fd4 _mario_big + 0x0000000000309fe4 _mario_small + 0x0000000000309ff4 _bullet + 0x000000000030a004 _fleur + 0x000000000030a014 _mario_starman + 0x000000000030a024 _life_1up + 0x000000000030a034 _champi + 0x000000000030a044 _bloc + 0x000000000030a054 _end_level + 0x000000000030a064 _castle + 0x000000000030a074 _colline + 0x000000000030a084 _buisson + 0x000000000030a094 _nuage + 0x000000000030a0a4 _coin + 0x000000000030a0b4 _gift + 0x000000000030a0c4 _earth + 0x000000000030a0d4 _brick + 0x000000000030a0e4 _tuyau .rodata.str1.4 - 0x0000000000309d68 0x63 build-fx/src/world.c.o - *fill* 0x0000000000309dcb 0x1 - .rodata 0x0000000000309dcc 0x28 build-fx/src/keyboard.c.o - .rodata 0x0000000000309df4 0x60 build-fx/src/ennemi.c.o - 0x0000000000309e24 _ennemi_heights - 0x0000000000309e3c _ennemi_widths - .rodata 0x0000000000309e54 0x204 build-fx/assets/fonts/mario.png.o - 0x0000000000309e54 _font_mario - 0x000000000030a058 _font_mario_end - .rodata 0x000000000030a058 0x20 build-fx/assets/img/bonus.png.o - 0x000000000030a058 _img_bonus - 0x000000000030a078 _img_bonus_end - .rodata 0x000000000030a078 0x24 build-fx/assets/img/bloc.png.o - 0x000000000030a078 _img_bloc - 0x000000000030a09c _img_bloc_end - .rodata 0x000000000030a09c 0x404 build-fx/assets/img/ram.png.o - 0x000000000030a09c _img_ram - 0x000000000030a4a0 _img_ram_end - .rodata 0x000000000030a4a0 0x58 build-fx/assets/img/w5.png.o - 0x000000000030a4a0 _img_w5 - 0x000000000030a4f8 _img_w5_end - .rodata 0x000000000030a4f8 0x44 build-fx/assets/img/fleur.png.o - 0x000000000030a4f8 _img_fleur - 0x000000000030a53c _img_fleur_end - .rodata 0x000000000030a53c 0x58 build-fx/assets/img/w2.png.o - 0x000000000030a53c _img_w2 - 0x000000000030a594 _img_w2_end - .rodata 0x000000000030a594 0x404 build-fx/assets/img/main.png.o - 0x000000000030a594 _img_main - 0x000000000030a998 _img_main_end - .rodata 0x000000000030a998 0x64 build-fx/assets/img/flag.png.o - 0x000000000030a998 _img_flag - 0x000000000030a9fc _img_flag_end - .rodata 0x000000000030a9fc 0x404 build-fx/assets/img/new_level.png.o - 0x000000000030a9fc _img_new_level - 0x000000000030ae00 _img_new_level_end - .rodata 0x000000000030ae00 0x4c build-fx/assets/img/brick.png.o - 0x000000000030ae00 _img_brick - 0x000000000030ae4c _img_brick_end - .rodata 0x000000000030ae4c 0xbc build-fx/assets/img/menu_pause.png.o - 0x000000000030ae4c _img_menu_pause - 0x000000000030af08 _img_menu_pause_end - .rodata 0x000000000030af08 0x18 build-fx/assets/img/select_arrow.png.o - 0x000000000030af08 _img_select_arrow - 0x000000000030af20 _img_select_arrow_end - .rodata 0x000000000030af20 0x804 build-fx/assets/img/dev.png.o - 0x000000000030af20 _img_dev - 0x000000000030b724 _img_dev_end - .rodata 0x000000000030b724 0x24 build-fx/assets/img/death.png.o - 0x000000000030b724 _img_death - 0x000000000030b748 _img_death_end - .rodata 0x000000000030b748 0x404 build-fx/assets/img/mainmenu.png.o - 0x000000000030b748 _img_mainmenu - 0x000000000030bb4c _img_mainmenu_end - .rodata 0x000000000030bb4c 0x58 build-fx/assets/img/w3.png.o - 0x000000000030bb4c _img_w3 - 0x000000000030bba4 _img_w3_end - .rodata 0x000000000030bba4 0x404 build-fx/assets/img/time_over.png.o - 0x000000000030bba4 _img_time_over - 0x000000000030bfa8 _img_time_over_end - .rodata 0x000000000030bfa8 0x4c build-fx/assets/img/coin.png.o - 0x000000000030bfa8 _img_coin - 0x000000000030bff4 _img_coin_end - .rodata 0x000000000030bff4 0x24 build-fx/assets/img/champi.png.o - 0x000000000030bff4 _img_champi - 0x000000000030c018 _img_champi_end - .rodata 0x000000000030c018 0xdc build-fx/assets/img/mariosmall.png.o - 0x000000000030c018 _img_mariosmall - 0x000000000030c0f4 _img_mariosmall_end - .rodata 0x000000000030c0f4 0x28 build-fx/assets/img/gift.png.o - 0x000000000030c0f4 _img_gift - 0x000000000030c11c _img_gift_end - .rodata 0x000000000030c11c 0x44 build-fx/assets/img/buisson.png.o - 0x000000000030c11c _img_buisson - 0x000000000030c160 _img_buisson_end - .rodata 0x000000000030c160 0x84 build-fx/assets/img/colline.png.o - 0x000000000030c160 _img_colline - 0x000000000030c1e4 _img_colline_end - .rodata 0x000000000030c1e4 0x24 build-fx/assets/img/star.png.o - 0x000000000030c1e4 _img_star - 0x000000000030c208 _img_star_end - .rodata 0x000000000030c208 0x224 build-fx/assets/img/mariobig.png.o - 0x000000000030c208 _img_mariobig - 0x000000000030c42c _img_mariobig_end - .rodata 0x000000000030c42c 0x804 build-fx/assets/img/error.png.o - 0x000000000030c42c _img_error - 0x000000000030cc30 _img_error_end - .rodata 0x000000000030cc30 0x44 build-fx/assets/img/1up.png.o - 0x000000000030cc30 _img_1up - 0x000000000030cc74 _img_1up_end - .rodata 0x000000000030cc74 0xb8 build-fx/assets/img/tuyau.png.o - 0x000000000030cc74 _img_tuyau - 0x000000000030cd2c _img_tuyau_end - .rodata 0x000000000030cd2c 0x24 build-fx/assets/img/bullet.png.o - 0x000000000030cd2c _img_bullet - 0x000000000030cd50 _img_bullet_end - .rodata 0x000000000030cd50 0x4c build-fx/assets/img/carapace_verte.png.o - 0x000000000030cd50 _img_carapace_verte - 0x000000000030cd9c _img_carapace_verte_end - .rodata 0x000000000030cd9c 0x44 build-fx/assets/img/nuage.png.o - 0x000000000030cd9c _img_nuage - 0x000000000030cde0 _img_nuage_end - .rodata 0x000000000030cde0 0xc4 build-fx/assets/img/koopa_verte.png.o - 0x000000000030cde0 _img_koopa_verte - 0x000000000030cea4 _img_koopa_verte_end - .rodata 0x000000000030cea4 0x404 build-fx/assets/img/level.png.o - 0x000000000030cea4 _img_level - 0x000000000030d2a8 _img_level_end - .rodata 0x000000000030d2a8 0xe4 build-fx/assets/img/castle.png.o - 0x000000000030d2a8 _img_castle - 0x000000000030d38c _img_castle_end - .rodata 0x000000000030d38c 0x4c build-fx/assets/img/goomba.png.o - 0x000000000030d38c _img_goomba - 0x000000000030d3d8 _img_goomba_end - .rodata 0x000000000030d3d8 0x4c build-fx/assets/img/stone.png.o - 0x000000000030d3d8 _img_stone - 0x000000000030d424 _img_stone_end - .rodata 0x000000000030d424 0x24 build-fx/assets/img/tickbox.png.o - 0x000000000030d424 _img_tickbox - 0x000000000030d448 _img_tickbox_end - .rodata 0x000000000030d448 0x404 build-fx/assets/img/w4.png.o - 0x000000000030d448 _img_w4 - 0x000000000030d84c _img_w4_end - .rodata 0x000000000030d84c 0x58 build-fx/assets/img/w1.png.o - 0x000000000030d84c _img_w1 - 0x000000000030d8a4 _img_w1_end - .rodata 0x000000000030d8a4 0x404 build-fx/assets/img/lvl0.png.o - 0x000000000030d8a4 _img_lvl0 - 0x000000000030dca8 _img_lvl0_end + 0x000000000030a0f4 0x63 build-fx/src/world.c.o + *fill* 0x000000000030a157 0x1 + .rodata 0x000000000030a158 0x28 build-fx/src/keyboard.c.o + .rodata 0x000000000030a180 0x60 build-fx/src/ennemi.c.o + 0x000000000030a1b0 _ennemi_heights + 0x000000000030a1c8 _ennemi_widths + .rodata 0x000000000030a1e0 0x204 build-fx/assets/fonts/mario.png.o + 0x000000000030a1e0 _font_mario + 0x000000000030a3e4 _font_mario_end + .rodata 0x000000000030a3e4 0x20 build-fx/assets/img/bonus.png.o + 0x000000000030a3e4 _img_bonus + 0x000000000030a404 _img_bonus_end + .rodata 0x000000000030a404 0x24 build-fx/assets/img/bloc.png.o + 0x000000000030a404 _img_bloc + 0x000000000030a428 _img_bloc_end + .rodata 0x000000000030a428 0x404 build-fx/assets/img/ram.png.o + 0x000000000030a428 _img_ram + 0x000000000030a82c _img_ram_end + .rodata 0x000000000030a82c 0x58 build-fx/assets/img/w5.png.o + 0x000000000030a82c _img_w5 + 0x000000000030a884 _img_w5_end + .rodata 0x000000000030a884 0x404 build-fx/assets/img/options.png.o + 0x000000000030a884 _img_options + 0x000000000030ac88 _img_options_end + .rodata 0x000000000030ac88 0x44 build-fx/assets/img/fleur.png.o + 0x000000000030ac88 _img_fleur + 0x000000000030accc _img_fleur_end + .rodata 0x000000000030accc 0x58 build-fx/assets/img/w2.png.o + 0x000000000030accc _img_w2 + 0x000000000030ad24 _img_w2_end + .rodata 0x000000000030ad24 0x404 build-fx/assets/img/main.png.o + 0x000000000030ad24 _img_main + 0x000000000030b128 _img_main_end + .rodata 0x000000000030b128 0x64 build-fx/assets/img/flag.png.o + 0x000000000030b128 _img_flag + 0x000000000030b18c _img_flag_end + .rodata 0x000000000030b18c 0x404 build-fx/assets/img/new_level.png.o + 0x000000000030b18c _img_new_level + 0x000000000030b590 _img_new_level_end + .rodata 0x000000000030b590 0x4c build-fx/assets/img/brick.png.o + 0x000000000030b590 _img_brick + 0x000000000030b5dc _img_brick_end + .rodata 0x000000000030b5dc 0xbc build-fx/assets/img/menu_pause.png.o + 0x000000000030b5dc _img_menu_pause + 0x000000000030b698 _img_menu_pause_end + .rodata 0x000000000030b698 0x18 build-fx/assets/img/select_arrow.png.o + 0x000000000030b698 _img_select_arrow + 0x000000000030b6b0 _img_select_arrow_end + .rodata 0x000000000030b6b0 0x804 build-fx/assets/img/dev.png.o + 0x000000000030b6b0 _img_dev + 0x000000000030beb4 _img_dev_end + .rodata 0x000000000030beb4 0x24 build-fx/assets/img/death.png.o + 0x000000000030beb4 _img_death + 0x000000000030bed8 _img_death_end + .rodata 0x000000000030bed8 0x404 build-fx/assets/img/mainmenu.png.o + 0x000000000030bed8 _img_mainmenu + 0x000000000030c2dc _img_mainmenu_end + .rodata 0x000000000030c2dc 0x58 build-fx/assets/img/w3.png.o + 0x000000000030c2dc _img_w3 + 0x000000000030c334 _img_w3_end + .rodata 0x000000000030c334 0x404 build-fx/assets/img/time_over.png.o + 0x000000000030c334 _img_time_over + 0x000000000030c738 _img_time_over_end + .rodata 0x000000000030c738 0x4c build-fx/assets/img/coin.png.o + 0x000000000030c738 _img_coin + 0x000000000030c784 _img_coin_end + .rodata 0x000000000030c784 0x24 build-fx/assets/img/champi.png.o + 0x000000000030c784 _img_champi + 0x000000000030c7a8 _img_champi_end + .rodata 0x000000000030c7a8 0xdc build-fx/assets/img/mariosmall.png.o + 0x000000000030c7a8 _img_mariosmall + 0x000000000030c884 _img_mariosmall_end + .rodata 0x000000000030c884 0x28 build-fx/assets/img/gift.png.o + 0x000000000030c884 _img_gift + 0x000000000030c8ac _img_gift_end + .rodata 0x000000000030c8ac 0x44 build-fx/assets/img/buisson.png.o + 0x000000000030c8ac _img_buisson + 0x000000000030c8f0 _img_buisson_end + .rodata 0x000000000030c8f0 0x84 build-fx/assets/img/colline.png.o + 0x000000000030c8f0 _img_colline + 0x000000000030c974 _img_colline_end + .rodata 0x000000000030c974 0x24 build-fx/assets/img/star.png.o + 0x000000000030c974 _img_star + 0x000000000030c998 _img_star_end + .rodata 0x000000000030c998 0x224 build-fx/assets/img/mariobig.png.o + 0x000000000030c998 _img_mariobig + 0x000000000030cbbc _img_mariobig_end + .rodata 0x000000000030cbbc 0x804 build-fx/assets/img/error.png.o + 0x000000000030cbbc _img_error + 0x000000000030d3c0 _img_error_end + .rodata 0x000000000030d3c0 0x44 build-fx/assets/img/1up.png.o + 0x000000000030d3c0 _img_1up + 0x000000000030d404 _img_1up_end + .rodata 0x000000000030d404 0xb8 build-fx/assets/img/tuyau.png.o + 0x000000000030d404 _img_tuyau + 0x000000000030d4bc _img_tuyau_end + .rodata 0x000000000030d4bc 0x24 build-fx/assets/img/bullet.png.o + 0x000000000030d4bc _img_bullet + 0x000000000030d4e0 _img_bullet_end + .rodata 0x000000000030d4e0 0x4c build-fx/assets/img/carapace_verte.png.o + 0x000000000030d4e0 _img_carapace_verte + 0x000000000030d52c _img_carapace_verte_end + .rodata 0x000000000030d52c 0x44 build-fx/assets/img/nuage.png.o + 0x000000000030d52c _img_nuage + 0x000000000030d570 _img_nuage_end + .rodata 0x000000000030d570 0x10 build-fx/assets/img/plateforme.png.o + 0x000000000030d570 _img_plateforme + 0x000000000030d580 _img_plateforme_end + .rodata 0x000000000030d580 0xc4 build-fx/assets/img/koopa_verte.png.o + 0x000000000030d580 _img_koopa_verte + 0x000000000030d644 _img_koopa_verte_end + .rodata 0x000000000030d644 0x404 build-fx/assets/img/level.png.o + 0x000000000030d644 _img_level + 0x000000000030da48 _img_level_end + .rodata 0x000000000030da48 0xe4 build-fx/assets/img/castle.png.o + 0x000000000030da48 _img_castle + 0x000000000030db2c _img_castle_end + .rodata 0x000000000030db2c 0x4c build-fx/assets/img/goomba.png.o + 0x000000000030db2c _img_goomba + 0x000000000030db78 _img_goomba_end + .rodata 0x000000000030db78 0x4c build-fx/assets/img/stone.png.o + 0x000000000030db78 _img_stone + 0x000000000030dbc4 _img_stone_end + .rodata 0x000000000030dbc4 0x24 build-fx/assets/img/tickbox.png.o + 0x000000000030dbc4 _img_tickbox + 0x000000000030dbe8 _img_tickbox_end + .rodata 0x000000000030dbe8 0x58 build-fx/assets/img/w4.png.o + 0x000000000030dbe8 _img_w4 + 0x000000000030dc40 _img_w4_end + .rodata 0x000000000030dc40 0x58 build-fx/assets/img/w1.png.o + 0x000000000030dc40 _img_w1 + 0x000000000030dc98 _img_w1_end + .rodata 0x000000000030dc98 0x404 build-fx/assets/img/lvl0.png.o + 0x000000000030dc98 _img_lvl0 + 0x000000000030e09c _img_lvl0_end .rodata.str1.4 - 0x000000000030dca8 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* 0x000000000030dcd9 0x3 - .rodata 0x000000000030dcdc 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x000000000030e09c 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* 0x000000000030e0cd 0x3 + .rodata 0x000000000030e0d0 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 - 0x000000000030dce4 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* 0x000000000030dcea 0x2 + 0x000000000030e0d8 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* 0x000000000030e0de 0x2 .rodata.str1.4 - 0x000000000030dcec 0x11a /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x000000000030e0e0 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* 0x000000000030de06 0x2 - .rodata 0x000000000030de08 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* 0x000000000030e1fa 0x2 + .rodata 0x000000000030e1fc 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 - 0x000000000030de20 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 0x000000000030de24 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) - 0x000000000030de24 _gint_font5x7 - 0x000000000030e22c _gint_font5x7_end + 0x000000000030e214 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 0x000000000030e218 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) + 0x000000000030e218 _gint_font5x7 + 0x000000000030e620 _gint_font5x7_end .rodata.str1.4 - 0x000000000030e22c 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* 0x000000000030e232 0x2 + 0x000000000030e620 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* 0x000000000030e626 0x2 .rodata.str1.4 - 0x000000000030e234 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 0x000000000030e238 0x10 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x000000000030e628 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 0x000000000030e62c 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 - 0x000000000030e248 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* 0x000000000030e263 0x1 - .rodata 0x000000000030e264 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) - 0x000000000030e264 ___clz_tab + 0x000000000030e63c 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* 0x000000000030e657 0x1 + .rodata 0x000000000030e658 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x000000000030e658 ___clz_tab -.rela.dyn 0x000000000030e364 0x0 - .rela.text 0x000000000030e364 0x0 build-fx/src/levelchanger.c.o +.rela.dyn 0x000000000030e758 0x0 + .rela.text 0x000000000030e758 0x0 build-fx/src/levelchanger.c.o .rela.pretext.entry - 0x000000000030e364 0x0 build-fx/src/levelchanger.c.o + 0x000000000030e758 0x0 build-fx/src/levelchanger.c.o 0x0000000008100000 . = ORIGIN (ram) -.bss 0x0000000008100000 0x730 +.bss 0x0000000008100000 0x740 0x0000000008100000 _rbss = . *(.bss COMMON) .bss 0x0000000008100000 0x0 build-fx/src/levelchanger.c.o @@ -743,176 +760,180 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x0000000008100000 _frame_id .bss 0x0000000008100004 0x0 build-fx/src/level.c.o .bss 0x0000000008100004 0x0 build-fx/src/config.c.o - .bss 0x0000000008100004 0x14 build-fx/src/score.c.o - 0x0000000008100004 _time_left - 0x0000000008100008 _time_id - 0x000000000810000c _pieces - 0x0000000008100010 _combo - .bss 0x0000000008100018 0x4 build-fx/src/tile.c.o - 0x0000000008100018 _dark_theme - .bss 0x000000000810001c 0x0 build-fx/src/box.c.o - .bss 0x000000000810001c 0x1c build-fx/src/world.c.o - 0x000000000810001c _death - 0x0000000008100020 _w_mario_starty - 0x0000000008100024 _w_mario_startx - 0x0000000008100028 _w_current_y - 0x000000000810002c _w_current_x - 0x0000000008100030 _w_fond - 0x0000000008100034 _w_current - .bss 0x0000000008100038 0x0 build-fx/src/bonus.c.o - .bss 0x0000000008100038 0xb8 build-fx/src/save.c.o - 0x0000000008100038 _progress_status - 0x000000000810003c _level_highscores - COMMON 0x00000000081000f0 0xb4 build-fx/src/save.c.o - 0x00000000081000f0 _level_best_times - .bss 0x00000000081001a4 0x24 build-fx/src/mario.c.o - 0x00000000081001a4 _global_quit - 0x00000000081001a8 _mario_star_mode - 0x00000000081001ac _mario_immunity - 0x00000000081001b0 _mario_dead - 0x00000000081001b4 _mario_has_bullets - 0x00000000081001b8 _mario_x_max - 0x00000000081001bc _id_frame - .bss 0x00000000081001c8 0x0 build-fx/src/main.c.o - .bss 0x00000000081001c8 0x18 build-fx/src/keyboard.c.o - 0x00000000081001c8 _keys - .bss 0x00000000081001e0 0x8 build-fx/src/ennemi.c.o - 0x00000000081001e0 _ennemis_global_size - 0x00000000081001e4 _ennemis_global - .bss 0x00000000081001e8 0x114 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - .bss 0x00000000081002fc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - .bss 0x00000000081002fc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) - .bss 0x00000000081002fc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - .bss 0x00000000081002fc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) - .bss 0x00000000081002fc 0x400 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - .bss 0x00000000081006fc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - .bss 0x00000000081006fc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - .bss 0x00000000081006fc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - .bss 0x00000000081006fc 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - .bss 0x0000000008100720 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - .bss 0x0000000008100720 0xc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - .bss 0x000000000810072c 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) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - .bss 0x000000000810072c 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) - .bss 0x0000000008100730 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - .bss 0x0000000008100730 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - .bss 0x0000000008100730 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - .bss 0x0000000008100730 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - .bss 0x0000000008100730 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - .bss 0x0000000008100730 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + .bss 0x0000000008100004 0x18 build-fx/src/score.c.o + 0x0000000008100004 _finish_level + 0x0000000008100008 _time_left + 0x000000000810000c _time_id + 0x0000000008100010 _pieces + 0x0000000008100014 _combo + .bss 0x000000000810001c 0x4 build-fx/src/tile.c.o + 0x000000000810001c _dark_theme + .bss 0x0000000008100020 0x8 build-fx/src/plateforme.c.o + 0x0000000008100020 _plateformes + 0x0000000008100024 _plateforme_table_size + .bss 0x0000000008100028 0x0 build-fx/src/box.c.o + .bss 0x0000000008100028 0x1c build-fx/src/world.c.o + 0x0000000008100028 _death + 0x000000000810002c _w_mario_starty + 0x0000000008100030 _w_mario_startx + 0x0000000008100034 _w_current_y + 0x0000000008100038 _w_current_x + 0x000000000810003c _w_fond + 0x0000000008100040 _w_current + .bss 0x0000000008100044 0x0 build-fx/src/bonus.c.o + .bss 0x0000000008100044 0xb8 build-fx/src/save.c.o + 0x0000000008100044 _progress_status + 0x0000000008100048 _level_highscores + COMMON 0x00000000081000fc 0xb4 build-fx/src/save.c.o + 0x00000000081000fc _level_best_times + .bss 0x00000000081001b0 0x24 build-fx/src/mario.c.o + 0x00000000081001b0 _global_quit + 0x00000000081001b4 _mario_star_mode + 0x00000000081001b8 _mario_immunity + 0x00000000081001bc _mario_dead + 0x00000000081001c0 _mario_has_bullets + 0x00000000081001c4 _mario_x_max + 0x00000000081001c8 _id_frame + .bss 0x00000000081001d4 0x0 build-fx/src/main.c.o + .bss 0x00000000081001d4 0x18 build-fx/src/keyboard.c.o + 0x00000000081001d4 _keys + .bss 0x00000000081001ec 0x8 build-fx/src/ennemi.c.o + 0x00000000081001ec _ennemis_global_size + 0x00000000081001f0 _ennemis_global + .bss 0x00000000081001f4 0x114 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + .bss 0x0000000008100308 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + .bss 0x0000000008100308 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) + .bss 0x0000000008100308 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + .bss 0x0000000008100308 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) + .bss 0x0000000008100308 0x400 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + .bss 0x0000000008100708 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + .bss 0x0000000008100708 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + .bss 0x0000000008100708 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + .bss 0x0000000008100708 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + .bss 0x000000000810072c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + .bss 0x000000000810072c 0xc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + .bss 0x0000000008100738 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) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + .bss 0x0000000008100738 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + .bss 0x0000000008100738 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) + .bss 0x000000000810073c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + .bss 0x000000000810073c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + .bss 0x000000000810073c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + .bss 0x000000000810073c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + .bss 0x000000000810073c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + .bss 0x000000000810073c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) *(B R) - 0x0000000008100730 . = ALIGN (0x10) - 0x0000000000000730 _sbss = SIZEOF (.bss) + 0x0000000008100740 . = ALIGN (0x10) + *fill* 0x000000000810073c 0x4 + 0x0000000000000740 _sbss = SIZEOF (.bss) -.data 0x0000000008100730 0x170 load address 0x000000000030e364 - 0x000000000030e364 _ldata = LOADADDR (.data) - 0x0000000008100730 _rdata = . +.data 0x0000000008100740 0x160 load address 0x000000000030e758 + 0x000000000030e758 _ldata = LOADADDR (.data) + 0x0000000008100740 _rdata = . *(.data .data.*) - .data 0x0000000008100730 0x0 build-fx/src/levelchanger.c.o - .data 0x0000000008100730 0x0 build-fx/src/level.c.o - .data 0x0000000008100730 0x54 build-fx/src/config.c.o - 0x0000000008100730 _loglevels - .data 0x0000000008100784 0xc build-fx/src/score.c.o - 0x0000000008100784 _finish_level - 0x0000000008100788 _combo_id - 0x000000000810078c _lifes - .data 0x0000000008100790 0x0 build-fx/src/tile.c.o - .data 0x0000000008100790 0x0 build-fx/src/box.c.o - .data 0x0000000008100790 0x0 build-fx/src/world.c.o - .data 0x0000000008100790 0x3c build-fx/src/bonus.c.o - .data 0x00000000081007cc 0x0 build-fx/src/save.c.o - .data 0x00000000081007cc 0x20 build-fx/src/mario.c.o - 0x00000000081007cc _last_vx_sign - 0x00000000081007d0 _mario - .data 0x00000000081007ec 0x0 build-fx/src/main.c.o - .data 0x00000000081007ec 0x0 build-fx/src/keyboard.c.o - .data 0x00000000081007ec 0x0 build-fx/src/ennemi.c.o - .data 0x00000000081007ec 0x68 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x00000000081007ec _kprint_formatters - .data 0x0000000008100854 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - .data 0x0000000008100854 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) - .data 0x0000000008100854 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x0000000008100854 _topti_font - 0x0000000008100858 _gint_default_font - .data 0x000000000810085c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) - .data 0x000000000810085c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - .data 0x000000000810085c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - .data 0x000000000810085c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - .data 0x000000000810085c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - .data 0x000000000810085c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - .data 0x000000000810085c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - .data 0x000000000810085c 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - .data 0x0000000008100864 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) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - .data 0x0000000008100864 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - .data 0x0000000008100864 0x30 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) - .data 0x0000000008100894 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - .data 0x0000000008100894 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - .data 0x0000000008100894 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - .data 0x0000000008100894 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - .data 0x0000000008100894 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - .data 0x0000000008100894 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + .data 0x0000000008100740 0x0 build-fx/src/levelchanger.c.o + .data 0x0000000008100740 0x0 build-fx/src/level.c.o + .data 0x0000000008100740 0x54 build-fx/src/config.c.o + 0x0000000008100740 _loglevels + .data 0x0000000008100794 0x8 build-fx/src/score.c.o + 0x0000000008100794 _combo_id + 0x0000000008100798 _lifes + .data 0x000000000810079c 0x0 build-fx/src/tile.c.o + .data 0x000000000810079c 0x0 build-fx/src/plateforme.c.o + .data 0x000000000810079c 0x0 build-fx/src/box.c.o + .data 0x000000000810079c 0x0 build-fx/src/world.c.o + .data 0x000000000810079c 0x3c build-fx/src/bonus.c.o + .data 0x00000000081007d8 0x0 build-fx/src/save.c.o + .data 0x00000000081007d8 0x20 build-fx/src/mario.c.o + 0x00000000081007d8 _last_vx_sign + 0x00000000081007dc _mario + .data 0x00000000081007f8 0x0 build-fx/src/main.c.o + .data 0x00000000081007f8 0x0 build-fx/src/keyboard.c.o + .data 0x00000000081007f8 0x0 build-fx/src/ennemi.c.o + .data 0x00000000081007f8 0x68 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x00000000081007f8 _kprint_formatters + .data 0x0000000008100860 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + .data 0x0000000008100860 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) + .data 0x0000000008100860 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x0000000008100860 _topti_font + 0x0000000008100864 _gint_default_font + .data 0x0000000008100868 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) + .data 0x0000000008100868 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + .data 0x0000000008100868 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + .data 0x0000000008100868 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + .data 0x0000000008100868 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + .data 0x0000000008100868 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + .data 0x0000000008100868 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + .data 0x0000000008100868 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + .data 0x0000000008100870 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) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + .data 0x0000000008100870 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + .data 0x0000000008100870 0x30 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) + .data 0x00000000081008a0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + .data 0x00000000081008a0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + .data 0x00000000081008a0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + .data 0x00000000081008a0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + .data 0x00000000081008a0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + .data 0x00000000081008a0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) *(D) 0x00000000081008a0 . = ALIGN (0x10) - *fill* 0x0000000008100894 0xc -.data.4 0x00000000081008a0 0x0 load address 0x000000000030e4d4 +.data.4 0x00000000081008a0 0x0 load address 0x000000000030e8b8 *(.data.4) 0x00000000081008a0 . = ALIGN (0x10) - 0x0000000000000170 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) + 0x0000000000000160 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x00000000e5200000 . = ORIGIN (ilram) -.ilram 0x00000000e5200000 0x0 load address 0x000000000030e4d4 - 0x000000000030e4d4 _lilram = LOADADDR (.ilram) +.ilram 0x00000000e5200000 0x0 load address 0x000000000030e8b8 + 0x000000000030e8b8 _lilram = LOADADDR (.ilram) 0x00000000e5200000 _rilram = . *(.ilram) 0x00000000e5200000 . = ALIGN (0x10) 0x00000000e5007000 . = ORIGIN (xram) -.xram 0x00000000e5007000 0x0 load address 0x000000000030e4d4 - 0x000000000030e4d4 _lxram = LOADADDR (.xram) +.xram 0x00000000e5007000 0x0 load address 0x000000000030e8b8 + 0x000000000030e8b8 _lxram = LOADADDR (.xram) 0x00000000e5007000 _rxram = . *(.xram) 0x00000000e5007000 . = ALIGN (0x10) 0x00000000e5017000 . = ORIGIN (yram) -.yram 0x00000000e5017000 0x0 load address 0x000000000030e4d4 - 0x000000000030e4d4 _lyram = LOADADDR (.yram) +.yram 0x00000000e5017000 0x0 load address 0x000000000030e8b8 + 0x000000000030e8b8 _lyram = LOADADDR (.yram) 0x00000000e5017000 _ryram = . *(.yram) 0x00000000e5017000 . = ALIGN (0x10) @@ -922,8 +943,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 0x000000000030e4d4 - 0x000000000030e4d4 _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x140 load address 0x000000000030e8b8 + 0x000000000030e8b8 _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) @@ -944,7 +965,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 0x000000000030e614 +.gint.bss 0x000000008800f540 0x290 load address 0x000000000030e9f8 *(.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/keyboard.c.o b/build-fx/src/keyboard.c.o index 6faea0b..cfbf959 100644 Binary files a/build-fx/src/keyboard.c.o and b/build-fx/src/keyboard.c.o differ diff --git a/build-fx/src/level.c.d b/build-fx/src/level.c.d index 8057325..eb3b35b 100644 --- a/build-fx/src/level.c.d +++ b/build-fx/src/level.c.d @@ -1,6 +1,6 @@ build-fx/src/level.c.o: src/level.c include/level.h include/world.h \ include/mario.h include/box.h include/score.h include/ennemi.h \ - include/keyboard.h + include/keyboard.h include/plateforme.h include/level.h: @@ -15,3 +15,5 @@ include/score.h: include/ennemi.h: include/keyboard.h: + +include/plateforme.h: diff --git a/build-fx/src/level.c.o b/build-fx/src/level.c.o index b669a97..01a15bb 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.d b/build-fx/src/levelchanger.c.d index 9c5e8bc..641f306 100644 --- a/build-fx/src/levelchanger.c.d +++ b/build-fx/src/levelchanger.c.d @@ -1,6 +1,6 @@ build-fx/src/levelchanger.c.o: src/levelchanger.c include/levelchanger.h \ include/keyboard.h include/mario.h include/box.h include/world.h \ - include/score.h include/level.h include/save.h + include/score.h include/level.h include/save.h include/config.h include/levelchanger.h: @@ -17,3 +17,5 @@ include/score.h: include/level.h: include/save.h: + +include/config.h: diff --git a/build-fx/src/levelchanger.c.o b/build-fx/src/levelchanger.c.o index af0b690..64e814d 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/main.c.o b/build-fx/src/main.c.o index 55c46ef..dd1cdae 100644 Binary files a/build-fx/src/main.c.o and b/build-fx/src/main.c.o differ diff --git a/build-fx/src/plateforme.c.d b/build-fx/src/plateforme.c.d new file mode 100644 index 0000000..645359b --- /dev/null +++ b/build-fx/src/plateforme.c.d @@ -0,0 +1,15 @@ +build-fx/src/plateforme.c.o: src/plateforme.c include/plateforme.h \ + include/world.h include/mario.h include/box.h include/tile.h \ + include/score.h + +include/plateforme.h: + +include/world.h: + +include/mario.h: + +include/box.h: + +include/tile.h: + +include/score.h: diff --git a/build-fx/src/plateforme.c.o b/build-fx/src/plateforme.c.o new file mode 100644 index 0000000..e4dee1a Binary files /dev/null and b/build-fx/src/plateforme.c.o differ diff --git a/build-fx/src/score.c.o b/build-fx/src/score.c.o index c0b6001..b692250 100644 Binary files a/build-fx/src/score.c.o and b/build-fx/src/score.c.o differ diff --git a/build-fx/src/tile.c.o b/build-fx/src/tile.c.o index fc3056d..29fc834 100644 Binary files a/build-fx/src/tile.c.o and b/build-fx/src/tile.c.o differ diff --git a/build-fx/src/world.c.d b/build-fx/src/world.c.d index 110f754..69a4dad 100644 --- a/build-fx/src/world.c.d +++ b/build-fx/src/world.c.d @@ -1,6 +1,6 @@ build-fx/src/world.c.o: src/world.c include/world.h include/tile.h \ include/mario.h include/box.h include/ennemi.h include/bonus.h \ - include/constants.h + include/constants.h include/plateforme.h include/world.h: @@ -15,3 +15,5 @@ include/ennemi.h: include/bonus.h: include/constants.h: + +include/plateforme.h: diff --git a/build-fx/src/world.c.o b/build-fx/src/world.c.o index 83a35e7..16df994 100644 Binary files a/build-fx/src/world.c.o and b/build-fx/src/world.c.o differ diff --git a/include/keyboard.h b/include/keyboard.h index 6020707..88f90bc 100755 --- a/include/keyboard.h +++ b/include/keyboard.h @@ -17,4 +17,6 @@ void update_keyboard(); void keyboard_clear(); +int getkey_custom(); + #endif \ No newline at end of file diff --git a/include/plateforme.h b/include/plateforme.h new file mode 100644 index 0000000..813b868 --- /dev/null +++ b/include/plateforme.h @@ -0,0 +1,53 @@ +#ifndef PLATEFORME_H +#define PLATEFORME_H + +#define P_FALLING 0 +#define P_MOVING_H 1 +#define P_MOVING_V 2 + + + + +typedef struct +{ + unsigned type; + int xinit, yinit; + int x, y; + int width; // height fixed to 3 + int v, vinit; + + union + { + int xmin; + int ymin; + }; + union + { + int xmax; + int ymax; + }; + int counter; +} plateforme_t; + +#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} + +//void reset_plateforme(plateforme_t* p); + + + +//void move_plateforme(plateforme_t* p); // touch mario stuff + +void move_plateformes(); + +void display_plateformes(); + +int plateforme_check_collide(int x, int y); + +extern int plateforme_table_size; +extern plateforme_t* plateformes; + +#endif \ No newline at end of file diff --git a/include/tile.h b/include/tile.h index 7715632..b537632 100755 --- a/include/tile.h +++ b/include/tile.h @@ -37,6 +37,8 @@ extern const tileset_t bloc; extern const tileset_t mario_small; extern const tileset_t mario_big; +extern const tileset_t tplateforme; + void draw_tile(int sx, int sy, tileset_t const * const set, int x, int y); #endif diff --git a/src/keyboard.c b/src/keyboard.c index 6fa0bce..6db4e76 100755 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -9,7 +9,7 @@ mkey_t keys[6]={0}; - + static int konami[]={KEY_UP,KEY_UP,KEY_DOWN,KEY_DOWN,KEY_LEFT,KEY_RIGHT,KEY_LEFT,KEY_RIGHT,KEY_ALPHA,KEY_SHIFT}; @@ -24,11 +24,9 @@ int menu_pause() // 1 exit, 0 continue { extern image_t img_menu_pause; extern image_t img_select_arrow; - key_event_t e; - e=pollevent(); - while(e.type!=KEYEV_NONE) - e=pollevent(); - int key; + + clearevents(); + int choice=0; int x=64-img_menu_pause.width/2; @@ -37,65 +35,63 @@ int menu_pause() // 1 exit, 0 continue keys[i]=0; while (1) { - e=pollevent(); - while(e.type!=KEYEV_NONE) - { - if (keydown(KEY_EXE)) - { - if (choice==2) - configmenu(); - else - return choice; - } - if (keydown(KEY_UP) && choice>0) - choice--; - if (keydown(KEY_DOWN) && choice<2) - choice++; - if (keydown(KEY_MENU)) - return 1; - if (keydown(KEY_EXIT)) - return 0; - if (keydown(KEY_OPTN)) - configmenu(); - if (keydown(KEY_F1)) - { - e=pollevent(); - int a=0; - while (a<10) - { - if (e.type==KEYEV_DOWN) - { - if (e.key==konami[a]) - a++; - else - break; - } - if (keydown(KEY_EXIT)) - break; - if (a==10) // CHEAT MENU - { - mario_bigger(); - mario_has_bullets=1; - lifes=50; - extern image_t img_dev; - dimage(0,0,&img_dev); - dupdate(); - sleep_ms(3,1000); - return 0; - } - else - e=pollevent(); - } - } - e=pollevent(); - } - - dimage(x,y,&img_menu_pause); dimage(x+2, y+2+7*choice, &img_select_arrow); - + dupdate(); - sleep_ms(3,1); + switch (getkey_custom()) + { + case KEY_EXIT: + return 0; + + case KEY_MENU: + return 1; + + case KEY_OPTN: + choice=2; + + case KEY_EXE: + if (choice==2) + configmenu(); + return choice & 1; + + case KEY_UP: + if (choice>0) + choice--; + break; + + case KEY_DOWN: + if (choice<2) + choice++; + break; + + case KEY_F1: + + for (int a=0; a<10; a++) + { + key_event_t e=pollevent(); + if (e.type==KEYEV_DOWN) + { + if (e.key!=konami[a]) + break; + } + if (keydown(KEY_EXIT)) + break; + if (a==10) // Cheat code + { + mario_bigger(); + mario_has_bullets=1; + lifes=50; + extern image_t img_dev; + dimage(0,0,&img_dev); + dupdate(); + sleep_ms(3,1000); + return 0; + } + else + e=pollevent(); + } + } } } @@ -128,7 +124,7 @@ void update_keyboard() if(keydown(KEY_EXIT)) menu=1; - + if (k!=MK_NONE) @@ -145,5 +141,23 @@ void update_keyboard() e=pollevent(); } if (menu) - global_quit=menu_pause(); + mario_dead=menu_pause(); +} + +int getkey_custom() +{ + key_event_t e; + + for (int i=0; i<6; i++) + keys[i]=0; + + clearevents(); + while (1) + { + e=pollevent(); + if (e.type==KEYEV_DOWN) + return e.key; + else + sleep(); + } } \ No newline at end of file diff --git a/src/level.c b/src/level.c index b103f6b..3252c8e 100644 --- a/src/level.c +++ b/src/level.c @@ -4,13 +4,15 @@ #include "score.h" #include "ennemi.h" #include "keyboard.h" -//#include "teleporteur.h" +#include + #include #include #include #include #include + void malloc_error() { extern image_t img_ram; @@ -52,6 +54,20 @@ void init_ennemies(ennemi_t * table) memcpy(ennemis_global, table, size); } +static void init_plateformes(plateforme_t * table) +{ + if (plateformes) + { + free(plateformes); + } + int size=sizeof(plateforme_t)*plateforme_table_size; + plateformes=malloc(size); + if (plateformes==0) + malloc_error(); + + memcpy(plateformes, table, size); +} + void set_level(int n) { new_level(); @@ -313,6 +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); } } diff --git a/src/levelchanger.c b/src/levelchanger.c index 3fc14d1..d920b50 100644 --- a/src/levelchanger.c +++ b/src/levelchanger.c @@ -11,6 +11,7 @@ #include #include #include +#include extern image_t img_mainmenu; @@ -49,7 +50,8 @@ void launch_ui() drect(xt+24*choice_x,yt+24*choice_y, xt+24*choice_x+20,yt+24*choice_y+20, C_INVERT); dupdate(); - int key=getkey().key; + //int key=getkey_opt(GETKEY_REP_ARROWS,0).key; + int key=getkey_custom(); if (key==KEY_UP && choice_y>0) choice_y--; if (key==KEY_LEFT && choice_x>0) @@ -65,7 +67,19 @@ void launch_ui() if (choice_x==3 && choice_y==1) break; if (choice_x==2 && choice_y==1) - break; + { + configmenu(); + } + if (choice_y*choice_x==0) + { + int world_chosen=0; + if (choice_y==1) + world_chosen=4; + else + world_chosen=choice_x; + if (world_chosen<=get_progress_status()) + play_level(world_chosen); + } } if (key==KEY_EXIT || key==KEY_MENU) @@ -75,17 +89,6 @@ void launch_ui() } - - -extern image_t img_error; -GNORETURN void system_error(uint32_t code) -{ - timer_stop(0); - dimage(0,0,&img_error); - dupdate(); - while(1) getkey(); -} - int frame_id; int callback(volatile void *arg) { @@ -99,16 +102,12 @@ int callback(volatile void *arg) int play_level(int l) { - set_level(l); - - - volatile int has_ticked = 1; timer_setup(0, timer_delay(0, 50000), timer_Po_4, callback, &has_ticked); timer_start(0); //int finish_status=0; // FAil - finish_level=0; + finish_level=0; mario_dead=0; set_level(l); while(global_quit==0) { @@ -126,6 +125,7 @@ int play_level(int l) dupdate(); if (mario_dead || finish_level) { + timer_stop(0); return 0; } @@ -133,4 +133,5 @@ int play_level(int l) else sleep_ms(3,1); } + } \ No newline at end of file diff --git a/src/main.c b/src/main.c index 4e102db..4aa784e 100755 --- a/src/main.c +++ b/src/main.c @@ -24,9 +24,6 @@ int main(void) //gint_panic_set(system_error); ll_set_panic(); - int current_level=0; launch_ui(); - - timer_stop(0); } diff --git a/src/plateforme.c b/src/plateforme.c new file mode 100644 index 0000000..cecdf63 --- /dev/null +++ b/src/plateforme.c @@ -0,0 +1,122 @@ +#include + +#include +#include +#include +#include + +int plateforme_table_size=0; +plateforme_t* plateformes=0; + + +static int sgn(int x) +{ + if (x==0) + return 0; + else if (x>0) + return 1; + return -1; +} + + + +void reset_plateforme(plateforme_t* p) +{ + p->x=p->xinit; + p->y=p->yinit; + p->v=p->vinit; +} + +void move_plateforme(plateforme_t* p) +{/* + if (p->x+p->width-world_get_real_x0()<-50) + return; + if (p->x-world_get_real_x0()-128>50) + return; + + + if (p->y-world_get_real_y0()-64>50) + return; + if (p->y+3-world_get_real_y0()<-50) + return; + */ + + int xc = (mario.p.xx+p->width && mario.p.x>=p->x) || (mario.p.x+mario.p.wx+p->width && mario.p.x+mario.p.w>=p->x); + int yc = (mario.p.y+mario.p.h==p->y); + + if (p->type==P_FALLING) + { + if (p->v) + p->v++; + p->y+=p->v; + } + + if (p->type==P_MOVING_H) + { + int s=sgn(p->v); + int t_v=((s*p->v+time_id%2)/2)*s; + if (p->v==0) + p->v=p->vinit; + 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) + p->v *= -1; + } + + if (p->type==P_MOVING_V) + { + int s=sgn(p->v); + int t_v=((s*p->v+time_id%2)/2)*s; + if (p->v==0) + p->v=p->vinit; + p->y+=t_v; + if (p->y > p->ymax || p->y+3 < p->ymin) + p->v *= -1; + } + + if (xc&&yc) + { + 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; + if (p->type==P_MOVING_V) + mario.p.y+=t_v; + } +} + +void display_plateformes() +{ + plateforme_t * p=0; + for (int i=0; ix; j < p->x+p->width; j+=3) + draw_tile(j-world_get_real_x0(),p->y-world_get_real_y0(), &tplateforme, 0,0); + //drect(p->x-world_get_real_x0(),64-(p->y-world_get_real_y0()),p->x-world_get_real_x0()+p->width,64-(p->y-world_get_real_y0()-3), C_BLACK); + } +} + +void move_plateformes() +{ + plateforme_t * p=0; + for (int i=0; ix<=x && p->x+p->width>x && p->y<=y && p->y+3>y) + return 1; + } + return 0; +} \ No newline at end of file diff --git a/src/score.c b/src/score.c index 1db70cf..d90cb83 100644 --- a/src/score.c +++ b/src/score.c @@ -17,7 +17,7 @@ int pieces=0; int time_id=0; int time_left=0; -int finish_level=-1; +int finish_level=0; static void new_game() { @@ -32,7 +32,7 @@ static void new_game() void new_level() { - finish_level=-1; + finish_level=0; time_left=400; time_id=0; } @@ -105,5 +105,6 @@ void score_display() sleep_ms(3,1000); sleep_ms(3,1000); finish_level=0; + mario_dead=1; } } diff --git a/src/tile.c b/src/tile.c index 1cf5163..a65be83 100755 --- a/src/tile.c +++ b/src/tile.c @@ -56,6 +56,9 @@ const tileset_t mario_small={&img_mariosmall, TILE_W, TILE_H, 1}; extern image_t img_mariobig; const tileset_t mario_big={&img_mariobig, TILE_W, 2*TILE_H, 1}; +extern image_t img_plateforme; +const tileset_t tplateforme={&img_plateforme, 3, 3, 0}; + void draw_tile(int sx, int sy, tileset_t const * const set, int x, int y) { diff --git a/src/world.c b/src/world.c index 808961c..b1ba02e 100755 --- a/src/world.c +++ b/src/world.c @@ -7,6 +7,7 @@ #include #include "constants.h" #include "ennemi.h" +#include world_t * w_current=0; image_t * w_fond=0; @@ -138,6 +139,8 @@ int world_get_ctg(int x, int y) { return CTG_DEATH; } + if (plateforme_check_collide(x,y)) + return CTG_SOIL; switch (c->type) { case TUYAU: @@ -176,8 +179,8 @@ int world_get_real_y0() //mario delta en 0,0 void world_draw(int x, int y) { - int mx0=world_get_real_x0(x); - int my0=world_get_real_y0(y); + int mx0=world_get_real_x0(); + int my0=world_get_real_y0(); int sx0=mx0%8; int sy0=my0%8; int mx=mx0; @@ -196,6 +199,7 @@ void world_draw(int x, int y) display_ennemi_table(); bullet_display(); + display_plateformes(); mario_draw(); //int mx, my; @@ -228,6 +232,7 @@ void world_move() ll_sendp(LEVEL_INFO,"\n > Moved bonus"); bullet_move(); ll_sendp(LEVEL_INFO,"\n > Moved bullets"); + move_plateformes(); mario_move(); ll_sendp(LEVEL_INFO,"\n > Moved mario !\n");