diff --git a/SuperCbr.g1a b/SuperCbr.g1a index cf8537c..7c02da1 100644 Binary files a/SuperCbr.g1a and b/SuperCbr.g1a differ diff --git a/build-fx/SuperCbr.bin b/build-fx/SuperCbr.bin index 5a1b764..cc1067e 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 185197c..72ff94f 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 8b4eb04..3d9e75c 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) - build-fx/src/level.c.o (___movmemSI44) + build-fx/src/level.c.o (___movmemSI60) /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) @@ -238,7 +238,7 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x0000000000300000 _brom = 0x300000 - 0x0000000000010af0 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x0000000000010c7c _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8d0 *(.pretext.entry) @@ -278,7 +278,7 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a *(.dtors .dtors.*) 0x0000000000300ad0 _etors = . -.text 0x0000000000300ad0 0x88b0 +.text 0x0000000000300ad0 0x8a00 0x0000000000300ad0 _gint_exch_tlbh_start = . *(.gint.exch_tlbh) .gint.exch_tlbh @@ -289,499 +289,498 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a .text 0x0000000000300b1c 0x654 build-fx/src/levelchanger.c.o 0x0000000000300b1c _play_level 0x0000000000300c88 _launch_ui - .text 0x0000000000301170 0x2028 build-fx/src/level.c.o + .text 0x0000000000301170 0x217c build-fx/src/level.c.o 0x0000000000301170 _malloc_error 0x00000000003011a8 _init_level 0x000000000030122c _init_ennemies 0x000000000030129c _set_level - 0x0000000000303178 _get_lvl_id - .text 0x0000000000303198 0xd8 build-fx/src/config.c.o - 0x0000000000303198 _configmenu - .text 0x0000000000303270 0x25c build-fx/src/score.c.o - 0x0000000000303270 _new_level - 0x0000000000303290 _new_game - 0x00000000003032e4 _get_score - 0x00000000003032f0 _get_coins - 0x00000000003032fc _score_reset - 0x000000000030331c _score_add_coin - 0x000000000030332c _score_add - 0x000000000030337c _score_display - 0x00000000003034c0 _get_time_spent - .text 0x00000000003034cc 0x180 build-fx/src/tuyau.c.o - 0x00000000003034cc _set_teleporteurs - 0x0000000000303504 _teleport_active - .text 0x000000000030364c 0x40 build-fx/src/tile.c.o - 0x000000000030364c _draw_tile - .text 0x000000000030368c 0x324 build-fx/src/plateforme.c.o - 0x000000000030368c _reset_plateforme - 0x000000000030369a _move_plateforme - 0x0000000000303864 _display_plateformes - 0x0000000000303904 _move_plateformes - 0x000000000030395c _plateforme_check_collide - .text 0x00000000003039b0 0x470 build-fx/src/box.c.o - 0x00000000003039b0 _sgn - 0x00000000003039c2 _check_collision - 0x0000000000303a54 _box_move - 0x0000000000303d9c _box_jump - .text 0x0000000000303e20 0x620 build-fx/src/world.c.o - 0x0000000000303e20 _world_get_width - 0x0000000000303e30 _world_get - 0x0000000000303e94 _display_cell - 0x00000000003041a0 _world_get_ctg - 0x00000000003041f4 _reset_camera - 0x0000000000304210 _world_get_real_x0 - 0x0000000000304238 _reload_camera - 0x0000000000304260 _world_get_real_y0 - 0x0000000000304274 _world_draw - 0x0000000000304390 _world_move - .text 0x0000000000304440 0x70 build-fx/src/framerate.c.o - 0x0000000000304440 _callback - 0x0000000000304448 _init_refresh - 0x0000000000304488 _quit_refresh - 0x0000000000304494 _wait_next_frame - .text 0x00000000003044b0 0x56c build-fx/src/bonus.c.o - 0x00000000003044b0 _bonus_set - 0x00000000003044e0 _bonus_move - 0x0000000000304694 _bonus_draw - 0x00000000003047a8 _lance_bullet - 0x0000000000304804 _bullet_display - 0x000000000030489c _bullet_move - .text 0x0000000000304a1c 0x224 build-fx/src/save.c.o - 0x0000000000304a1c _load_save - 0x0000000000304a20 _flash_save - 0x0000000000304a24 _get_highscore - 0x0000000000304a74 _set_highscore - 0x0000000000304ad0 _get_highcoins - 0x0000000000304b20 _set_highcoins - 0x0000000000304b7c _get_best_time - 0x0000000000304bcc _set_best_time - 0x0000000000304c34 _get_progress_status - .text 0x0000000000304c40 0x7b8 build-fx/src/mario.c.o - 0x0000000000304c50 _mario_bigger - 0x0000000000304c6c _mario_smaller - 0x0000000000304c98 _mario_draw - 0x0000000000304e54 _test_sol_le_plus_proche - 0x0000000000304ec0 _mario_move - .text 0x00000000003053f8 0x0 build-fx/src/main.c.o - .text.startup 0x00000000003053f8 0x5c build-fx/src/main.c.o - 0x00000000003053f8 _main - .text 0x0000000000305454 0x2c0 build-fx/src/keyboard.c.o - 0x0000000000305454 _keyboard_clear - 0x0000000000305474 _getkey_custom - 0x00000000003054c4 _menu_pause - 0x000000000030561c _update_keyboard - .text 0x0000000000305714 0x7b0 build-fx/src/ennemi.c.o - 0x0000000000305714 _display_ennemi - 0x000000000030595c _ennemi_check_collision - 0x00000000003059c0 _hurt_mario - 0x00000000003059f4 _move_ennemi - 0x0000000000305e84 _display_ennemi_table - .text 0x0000000000305ec4 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x00000000003068c0 _kprint_opt - 0x0000000000306a08 _kprint - 0x0000000000306ae0 _kvsprint - 0x0000000000306b28 _sprintf - 0x0000000000306b50 _vsprintf - 0x0000000000306b70 _snprintf - 0x0000000000306b90 _vsnprintf - .text 0x0000000000306ba8 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - 0x0000000000306ba8 _memcpy - 0x0000000000306c62 __memmove - 0x0000000000306c66 __memcmp - 0x0000000000306c6a _memset - .text 0x0000000000306c84 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 0x0000000000306c84 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 0x0000000000306c84 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) - 0x0000000000306c84 _drect - .text 0x0000000000306da0 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - 0x0000000000306da0 _dupdate - 0x0000000000306db8 _dupdate_noint - .text 0x0000000000306dc4 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - 0x0000000000306dc4 _masks - .text 0x0000000000306e60 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - 0x0000000000306e60 _dimage - 0x0000000000306eb4 _dsubimage - .text 0x0000000000306f28 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - 0x0000000000306f28 _dclear - .text 0x0000000000306f74 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x000000000030711c _pollevent - 0x0000000000307260 _waitevent - 0x00000000003072ac _clearevents - 0x00000000003072cc _keydown - 0x00000000003072f8 _keydown_all - 0x0000000000307334 _keydown_any - .text 0x0000000000307370 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - 0x000000000030737c _iokbd_row - 0x0000000000307464 _iokbd_scan - .text 0x0000000000307494 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - 0x0000000000307494 _getkey_opt - 0x0000000000307640 _getkey - 0x000000000030764c _getkey_repeat - .text 0x0000000000307688 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 0x0000000000307688 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - 0x0000000000307818 _gint_panic - 0x0000000000307828 _gint_panic_set - 0x0000000000307834 _gint_exc_catch - 0x0000000000307840 _gint_exc_skip - .text 0x000000000030784c 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 0x000000000030784c 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - 0x0000000000307900 _gint_install - 0x00000000003079b0 _gint_unload - .text 0x00000000003079c8 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 0x00000000003079c8 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 0x00000000003079c8 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - 0x00000000003079c8 _tlb_addr - 0x00000000003079dc _tlb_data - 0x00000000003079f0 _tlb_mapped_memory - 0x0000000000307ac4 _utlb_addr - 0x0000000000307ad4 _utlb_data - 0x0000000000307ae4 _utlb_mapped_memory - .text 0x0000000000307bbc 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x0000000000307bbc _dsize - .text 0x0000000000307c58 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - 0x0000000000307c58 _dprint - .text 0x0000000000307cb0 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x0000000000307fd0 _timer_setup - 0x0000000000308060 _timer_delay - 0x00000000003080c0 _timer_start - 0x00000000003080f4 _timer_reload - 0x0000000000308114 _timer_pause - 0x0000000000308148 _timer_stop - 0x00000000003081a4 _timer_timeout - 0x00000000003081b0 _timer_address - 0x00000000003081ec _timer_clear - .text 0x000000000030821c 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - 0x000000000030821c _sleep_us - .text 0x0000000000308274 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x000000000030830c _t6k11_display - 0x00000000003083e0 _t6k11_contrast - 0x000000000030840c _t6k11_backlight - .text 0x000000000030844c 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x0000000000308590 _clock_freq - .text 0x000000000030859c 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 0x000000000030859c 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) - 0x000000000030859c _bopti_asm_mono - 0x00000000003085c2 _bopti_asm_mono_alpha - .text 0x00000000003085f4 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - 0x00000000003085f4 _bopti_grid - 0x0000000000308768 _bopti_render - 0x0000000000308898 _bopti_render_clip - 0x00000000003089ac _bopti_render_noclip - .text 0x0000000000308a04 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - 0x0000000000308a04 _gint_setvbr - .text 0x0000000000308a30 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - 0x0000000000308a30 _gint_intlevel - 0x0000000000308a84 _gint_inthandler - .text 0x0000000000308aa8 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 0x0000000000308aa8 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 0x0000000000308aa8 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) - 0x0000000000308b88 _ll_set_size - 0x0000000000308b9c _ll_set_state - 0x0000000000308bbc _ll_get_state - 0x0000000000308bcc _ll_clear - 0x0000000000308c18 _ll_send - 0x0000000000308c8c _ll_sendp - 0x0000000000308cd8 _ll_display_custom - 0x0000000000308d44 _ll_display - 0x0000000000308d58 _ll_pause - 0x0000000000308db0 _ll_panic - 0x0000000000308dec _ll_set_panic - 0x0000000000308dfc _ll_set_level - 0x0000000000308e08 _ll_get_level - .text 0x0000000000308e14 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - 0x0000000000308e14 ___movstr - 0x0000000000308e14 ___movmem - 0x0000000000308e48 ___movmemSI64 - 0x0000000000308e48 ___movstrSI64 - 0x0000000000308e4c ___movstrSI60 - 0x0000000000308e4c ___movmemSI60 - 0x0000000000308e50 ___movmemSI56 - 0x0000000000308e50 ___movstrSI56 - 0x0000000000308e54 ___movstrSI52 - 0x0000000000308e54 ___movmemSI52 - 0x0000000000308e58 ___movstrSI48 - 0x0000000000308e58 ___movmemSI48 - 0x0000000000308e5c ___movstrSI44 - 0x0000000000308e5c ___movmemSI44 - 0x0000000000308e60 ___movstrSI40 - 0x0000000000308e60 ___movmemSI40 - 0x0000000000308e64 ___movstrSI36 - 0x0000000000308e64 ___movmemSI36 - 0x0000000000308e68 ___movmemSI32 - 0x0000000000308e68 ___movstrSI32 - 0x0000000000308e6c ___movmemSI28 - 0x0000000000308e6c ___movstrSI28 - 0x0000000000308e70 ___movstrSI24 - 0x0000000000308e70 ___movmemSI24 - 0x0000000000308e74 ___movmemSI20 - 0x0000000000308e74 ___movstrSI20 - 0x0000000000308e78 ___movstrSI16 - 0x0000000000308e78 ___movmemSI16 - 0x0000000000308e7c ___movmemSI12 - 0x0000000000308e7c ___movstrSI12 - 0x0000000000308e80 ___movmemSI8 - 0x0000000000308e80 ___movstrSI8 - 0x0000000000308e84 ___movmemSI4 - 0x0000000000308e84 ___movstrSI4 - .text 0x0000000000308e8c 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - 0x0000000000308e8c ___udivdi3 - .text 0x000000000030907c 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - 0x000000000030907c ___umoddi3 - .text 0x00000000003092b0 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - 0x00000000003092d2 ___udivsi3 - *fill* 0x000000000030931c 0x4 - .text 0x0000000000309320 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000309320 ___udiv_qrnnd_16 - .text 0x0000000000309380 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x00000000003032cc _get_lvl_id + .text 0x00000000003032ec 0xd8 build-fx/src/config.c.o + 0x00000000003032ec _configmenu + .text 0x00000000003033c4 0x25c build-fx/src/score.c.o + 0x00000000003033c4 _new_level + 0x00000000003033e4 _new_game + 0x0000000000303438 _get_score + 0x0000000000303444 _get_coins + 0x0000000000303450 _score_reset + 0x0000000000303470 _score_add_coin + 0x0000000000303480 _score_add + 0x00000000003034d0 _score_display + 0x0000000000303614 _get_time_spent + .text 0x0000000000303620 0x180 build-fx/src/tuyau.c.o + 0x0000000000303620 _set_teleporteurs + 0x0000000000303658 _teleport_active + .text 0x00000000003037a0 0x40 build-fx/src/tile.c.o + 0x00000000003037a0 _draw_tile + .text 0x00000000003037e0 0x324 build-fx/src/plateforme.c.o + 0x00000000003037e0 _reset_plateforme + 0x00000000003037ee _move_plateforme + 0x00000000003039b8 _display_plateformes + 0x0000000000303a58 _move_plateformes + 0x0000000000303ab0 _plateforme_check_collide + .text 0x0000000000303b04 0x470 build-fx/src/box.c.o + 0x0000000000303b04 _sgn + 0x0000000000303b16 _check_collision + 0x0000000000303ba8 _box_move + 0x0000000000303ef0 _box_jump + .text 0x0000000000303f74 0x620 build-fx/src/world.c.o + 0x0000000000303f74 _world_get_width + 0x0000000000303f84 _world_get + 0x0000000000303fe8 _display_cell + 0x00000000003042f4 _world_get_ctg + 0x0000000000304348 _reset_camera + 0x0000000000304364 _world_get_real_x0 + 0x000000000030438c _reload_camera + 0x00000000003043b4 _world_get_real_y0 + 0x00000000003043c8 _world_draw + 0x00000000003044e4 _world_move + .text 0x0000000000304594 0x70 build-fx/src/framerate.c.o + 0x0000000000304594 _callback + 0x000000000030459c _init_refresh + 0x00000000003045dc _quit_refresh + 0x00000000003045e8 _wait_next_frame + .text 0x0000000000304604 0x56c build-fx/src/bonus.c.o + 0x0000000000304604 _bonus_set + 0x0000000000304634 _bonus_move + 0x00000000003047e8 _bonus_draw + 0x00000000003048fc _lance_bullet + 0x0000000000304958 _bullet_display + 0x00000000003049f0 _bullet_move + .text 0x0000000000304b70 0x224 build-fx/src/save.c.o + 0x0000000000304b70 _load_save + 0x0000000000304b74 _flash_save + 0x0000000000304b78 _get_highscore + 0x0000000000304bc8 _set_highscore + 0x0000000000304c24 _get_highcoins + 0x0000000000304c74 _set_highcoins + 0x0000000000304cd0 _get_best_time + 0x0000000000304d20 _set_best_time + 0x0000000000304d88 _get_progress_status + .text 0x0000000000304d94 0x7b8 build-fx/src/mario.c.o + 0x0000000000304da4 _mario_bigger + 0x0000000000304dc0 _mario_smaller + 0x0000000000304dec _mario_draw + 0x0000000000304fa8 _test_sol_le_plus_proche + 0x0000000000305014 _mario_move + .text 0x000000000030554c 0x0 build-fx/src/main.c.o + .text.startup 0x000000000030554c 0x5c build-fx/src/main.c.o + 0x000000000030554c _main + .text 0x00000000003055a8 0x2c0 build-fx/src/keyboard.c.o + 0x00000000003055a8 _keyboard_clear + 0x00000000003055c8 _getkey_custom + 0x0000000000305618 _menu_pause + 0x0000000000305770 _update_keyboard + .text 0x0000000000305868 0x7b0 build-fx/src/ennemi.c.o + 0x0000000000305868 _display_ennemi + 0x0000000000305ab0 _ennemi_check_collision + 0x0000000000305b14 _hurt_mario + 0x0000000000305b48 _move_ennemi + 0x0000000000305fd8 _display_ennemi_table + .text 0x0000000000306018 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x0000000000306a14 _kprint_opt + 0x0000000000306b5c _kprint + 0x0000000000306c34 _kvsprint + 0x0000000000306c7c _sprintf + 0x0000000000306ca4 _vsprintf + 0x0000000000306cc4 _snprintf + 0x0000000000306ce4 _vsnprintf + .text 0x0000000000306cfc 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + 0x0000000000306cfc _memcpy + 0x0000000000306db6 __memmove + 0x0000000000306dba __memcmp + 0x0000000000306dbe _memset + .text 0x0000000000306dd8 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 0x0000000000306dd8 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 0x0000000000306dd8 0x11c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(drect.c.o) + 0x0000000000306dd8 _drect + .text 0x0000000000306ef4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + 0x0000000000306ef4 _dupdate + 0x0000000000306f0c _dupdate_noint + .text 0x0000000000306f18 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + 0x0000000000306f18 _masks + .text 0x0000000000306fb4 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x0000000000306fb4 _dimage + 0x0000000000307008 _dsubimage + .text 0x000000000030707c 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + 0x000000000030707c _dclear + .text 0x00000000003070c8 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000307270 _pollevent + 0x00000000003073b4 _waitevent + 0x0000000000307400 _clearevents + 0x0000000000307420 _keydown + 0x000000000030744c _keydown_all + 0x0000000000307488 _keydown_any + .text 0x00000000003074c4 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + 0x00000000003074d0 _iokbd_row + 0x00000000003075b8 _iokbd_scan + .text 0x00000000003075e8 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + 0x00000000003075e8 _getkey_opt + 0x0000000000307794 _getkey + 0x00000000003077a0 _getkey_repeat + .text 0x00000000003077dc 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 0x00000000003077dc 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x000000000030796c _gint_panic + 0x000000000030797c _gint_panic_set + 0x0000000000307988 _gint_exc_catch + 0x0000000000307994 _gint_exc_skip + .text 0x00000000003079a0 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 0x00000000003079a0 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + 0x0000000000307a54 _gint_install + 0x0000000000307b04 _gint_unload + .text 0x0000000000307b1c 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 0x0000000000307b1c 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 0x0000000000307b1c 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + 0x0000000000307b1c _tlb_addr + 0x0000000000307b30 _tlb_data + 0x0000000000307b44 _tlb_mapped_memory + 0x0000000000307c18 _utlb_addr + 0x0000000000307c28 _utlb_data + 0x0000000000307c38 _utlb_mapped_memory + .text 0x0000000000307d10 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x0000000000307d10 _dsize + .text 0x0000000000307dac 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + 0x0000000000307dac _dprint + .text 0x0000000000307e04 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000308124 _timer_setup + 0x00000000003081b4 _timer_delay + 0x0000000000308214 _timer_start + 0x0000000000308248 _timer_reload + 0x0000000000308268 _timer_pause + 0x000000000030829c _timer_stop + 0x00000000003082f8 _timer_timeout + 0x0000000000308304 _timer_address + 0x0000000000308340 _timer_clear + .text 0x0000000000308370 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + 0x0000000000308370 _sleep_us + .text 0x00000000003083c8 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x0000000000308460 _t6k11_display + 0x0000000000308534 _t6k11_contrast + 0x0000000000308560 _t6k11_backlight + .text 0x00000000003085a0 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x00000000003086e4 _clock_freq + .text 0x00000000003086f0 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 0x00000000003086f0 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) + 0x00000000003086f0 _bopti_asm_mono + 0x0000000000308716 _bopti_asm_mono_alpha + .text 0x0000000000308748 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x0000000000308748 _bopti_grid + 0x00000000003088bc _bopti_render + 0x00000000003089ec _bopti_render_clip + 0x0000000000308b00 _bopti_render_noclip + .text 0x0000000000308b58 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + 0x0000000000308b58 _gint_setvbr + .text 0x0000000000308b84 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + 0x0000000000308b84 _gint_intlevel + 0x0000000000308bd8 _gint_inthandler + .text 0x0000000000308bfc 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 0x0000000000308bfc 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 0x0000000000308bfc 0x36c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/liblog-fx.a(liblog.c.o) + 0x0000000000308cdc _ll_set_size + 0x0000000000308cf0 _ll_set_state + 0x0000000000308d10 _ll_get_state + 0x0000000000308d20 _ll_clear + 0x0000000000308d6c _ll_send + 0x0000000000308de0 _ll_sendp + 0x0000000000308e2c _ll_display_custom + 0x0000000000308e98 _ll_display + 0x0000000000308eac _ll_pause + 0x0000000000308f04 _ll_panic + 0x0000000000308f40 _ll_set_panic + 0x0000000000308f50 _ll_set_level + 0x0000000000308f5c _ll_get_level + .text 0x0000000000308f68 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + 0x0000000000308f68 ___movstr + 0x0000000000308f68 ___movmem + 0x0000000000308f9c ___movmemSI64 + 0x0000000000308f9c ___movstrSI64 + 0x0000000000308fa0 ___movstrSI60 + 0x0000000000308fa0 ___movmemSI60 + 0x0000000000308fa4 ___movmemSI56 + 0x0000000000308fa4 ___movstrSI56 + 0x0000000000308fa8 ___movstrSI52 + 0x0000000000308fa8 ___movmemSI52 + 0x0000000000308fac ___movstrSI48 + 0x0000000000308fac ___movmemSI48 + 0x0000000000308fb0 ___movstrSI44 + 0x0000000000308fb0 ___movmemSI44 + 0x0000000000308fb4 ___movstrSI40 + 0x0000000000308fb4 ___movmemSI40 + 0x0000000000308fb8 ___movstrSI36 + 0x0000000000308fb8 ___movmemSI36 + 0x0000000000308fbc ___movmemSI32 + 0x0000000000308fbc ___movstrSI32 + 0x0000000000308fc0 ___movmemSI28 + 0x0000000000308fc0 ___movstrSI28 + 0x0000000000308fc4 ___movstrSI24 + 0x0000000000308fc4 ___movmemSI24 + 0x0000000000308fc8 ___movmemSI20 + 0x0000000000308fc8 ___movstrSI20 + 0x0000000000308fcc ___movstrSI16 + 0x0000000000308fcc ___movmemSI16 + 0x0000000000308fd0 ___movmemSI12 + 0x0000000000308fd0 ___movstrSI12 + 0x0000000000308fd4 ___movmemSI8 + 0x0000000000308fd4 ___movstrSI8 + 0x0000000000308fd8 ___movmemSI4 + 0x0000000000308fd8 ___movstrSI4 + .text 0x0000000000308fe0 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + 0x0000000000308fe0 ___udivdi3 + .text 0x00000000003091d0 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + 0x00000000003091d0 ___umoddi3 + .text 0x0000000000309404 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + 0x0000000000309426 ___udivsi3 + .text 0x0000000000309470 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000309470 ___udiv_qrnnd_16 + .text 0x00000000003094d0 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 0x0000000000309380 0x120 +.gint.blocks 0x00000000003094d0 0x120 *(.gint.blocks) - .gint.blocks 0x0000000000309380 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - 0x0000000000309380 _gint_inth_7305 - 0x00000000003093a0 _gint_inth_7705 - .gint.blocks 0x00000000003093c0 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - 0x00000000003093c0 _inth_tmu - 0x0000000000309440 _inth_etmu2 - 0x0000000000309460 _inth_etmu_help - 0x0000000000309480 _inth_etmux + .gint.blocks 0x00000000003094d0 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + 0x00000000003094d0 _gint_inth_7305 + 0x00000000003094f0 _gint_inth_7705 + .gint.blocks 0x0000000000309510 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + 0x0000000000309510 _inth_tmu + 0x0000000000309590 _inth_etmu2 + 0x00000000003095b0 _inth_etmu_help + 0x00000000003095d0 _inth_etmux -.gint.drivers 0x00000000003094a0 0x90 - 0x00000000003094a0 _bdrv = . +.gint.drivers 0x00000000003095f0 0x90 + 0x00000000003095f0 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x00000000003094a0 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x00000000003094a0 _drv_cpg + 0x00000000003095f0 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x00000000003095f0 _drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x00000000003094c4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x00000000003094c4 _drv_tmu + 0x0000000000309614 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000309614 _drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x00000000003094e8 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x00000000003094e8 _drv_keysc + 0x0000000000309638 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000309638 _drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x000000000030950c 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x000000000030950c _drv_t6k11 + 0x000000000030965c 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x000000000030965c _drv_t6k11 *(.gint.drivers.6) - 0x0000000000309530 _edrv = . + 0x0000000000309680 _edrv = . -.rodata 0x0000000000309530 0x7e90 +.rodata 0x0000000000309680 0x7ecc *(.rodata.4) *(.rodata .rodata.*) .rodata.str1.4 - 0x0000000000309530 0xe build-fx/src/levelchanger.c.o + 0x0000000000309680 0xe build-fx/src/levelchanger.c.o 0x12 (size before relaxing) - *fill* 0x000000000030953e 0x2 - .rodata 0x0000000000309540 0x2e3c build-fx/src/level.c.o + *fill* 0x000000000030968e 0x2 + .rodata 0x0000000000309690 0x2e78 build-fx/src/level.c.o .rodata.str1.4 - 0x000000000030c37c 0x6 build-fx/src/level.c.o - *fill* 0x000000000030c382 0x2 + 0x000000000030c508 0x6 build-fx/src/level.c.o + *fill* 0x000000000030c50e 0x2 .rodata.str1.4 - 0x000000000030c384 0x22 build-fx/src/config.c.o - *fill* 0x000000000030c3a6 0x2 + 0x000000000030c510 0x22 build-fx/src/config.c.o + *fill* 0x000000000030c532 0x2 .rodata.str1.4 - 0x000000000030c3a8 0x1a build-fx/src/score.c.o + 0x000000000030c534 0x1a build-fx/src/score.c.o 0x1e (size before relaxing) - *fill* 0x000000000030c3c2 0x2 - .rodata 0x000000000030c3c4 0x130 build-fx/src/tile.c.o - 0x000000000030c3c4 _tplateforme - 0x000000000030c3d4 _mario_big - 0x000000000030c3e4 _mario_small - 0x000000000030c3f4 _bullet - 0x000000000030c404 _fleur - 0x000000000030c414 _mario_starman - 0x000000000030c424 _life_1up - 0x000000000030c434 _champi - 0x000000000030c444 _bloc - 0x000000000030c454 _end_level - 0x000000000030c464 _castle - 0x000000000030c474 _colline - 0x000000000030c484 _buisson - 0x000000000030c494 _nuage - 0x000000000030c4a4 _coin - 0x000000000030c4b4 _gift - 0x000000000030c4c4 _earth - 0x000000000030c4d4 _brick - 0x000000000030c4e4 _tuyau + *fill* 0x000000000030c54e 0x2 + .rodata 0x000000000030c550 0x130 build-fx/src/tile.c.o + 0x000000000030c550 _tplateforme + 0x000000000030c560 _mario_big + 0x000000000030c570 _mario_small + 0x000000000030c580 _bullet + 0x000000000030c590 _fleur + 0x000000000030c5a0 _mario_starman + 0x000000000030c5b0 _life_1up + 0x000000000030c5c0 _champi + 0x000000000030c5d0 _bloc + 0x000000000030c5e0 _end_level + 0x000000000030c5f0 _castle + 0x000000000030c600 _colline + 0x000000000030c610 _buisson + 0x000000000030c620 _nuage + 0x000000000030c630 _coin + 0x000000000030c640 _gift + 0x000000000030c650 _earth + 0x000000000030c660 _brick + 0x000000000030c670 _tuyau .rodata.str1.4 - 0x000000000030c4f4 0x63 build-fx/src/world.c.o - *fill* 0x000000000030c557 0x1 - .rodata 0x000000000030c558 0x28 build-fx/src/keyboard.c.o - .rodata 0x000000000030c580 0x60 build-fx/src/ennemi.c.o - 0x000000000030c5b0 _ennemi_heights - 0x000000000030c5c8 _ennemi_widths - .rodata 0x000000000030c5e0 0x204 build-fx/assets/fonts/mario.png.o - 0x000000000030c5e0 _font_mario - 0x000000000030c7e4 _font_mario_end - .rodata 0x000000000030c7e4 0x20 build-fx/assets/img/bonus.png.o - 0x000000000030c7e4 _img_bonus - 0x000000000030c804 _img_bonus_end - .rodata 0x000000000030c804 0x24 build-fx/assets/img/bloc.png.o - 0x000000000030c804 _img_bloc - 0x000000000030c828 _img_bloc_end - .rodata 0x000000000030c828 0x404 build-fx/assets/img/ram.png.o - 0x000000000030c828 _img_ram - 0x000000000030cc2c _img_ram_end - .rodata 0x000000000030cc2c 0x58 build-fx/assets/img/w5.png.o - 0x000000000030cc2c _img_w5 - 0x000000000030cc84 _img_w5_end - .rodata 0x000000000030cc84 0x404 build-fx/assets/img/options.png.o - 0x000000000030cc84 _img_options - 0x000000000030d088 _img_options_end - .rodata 0x000000000030d088 0x44 build-fx/assets/img/fleur.png.o - 0x000000000030d088 _img_fleur - 0x000000000030d0cc _img_fleur_end - .rodata 0x000000000030d0cc 0x58 build-fx/assets/img/w2.png.o - 0x000000000030d0cc _img_w2 - 0x000000000030d124 _img_w2_end - .rodata 0x000000000030d124 0x404 build-fx/assets/img/main.png.o - 0x000000000030d124 _img_main - 0x000000000030d528 _img_main_end - .rodata 0x000000000030d528 0xc4 build-fx/assets/img/flag.png.o - 0x000000000030d528 _img_flag - 0x000000000030d5ec _img_flag_end - .rodata 0x000000000030d5ec 0x404 build-fx/assets/img/new_level.png.o - 0x000000000030d5ec _img_new_level - 0x000000000030d9f0 _img_new_level_end - .rodata 0x000000000030d9f0 0x4c build-fx/assets/img/brick.png.o - 0x000000000030d9f0 _img_brick - 0x000000000030da3c _img_brick_end - .rodata 0x000000000030da3c 0xbc build-fx/assets/img/menu_pause.png.o - 0x000000000030da3c _img_menu_pause - 0x000000000030daf8 _img_menu_pause_end - .rodata 0x000000000030daf8 0x18 build-fx/assets/img/select_arrow.png.o - 0x000000000030daf8 _img_select_arrow - 0x000000000030db10 _img_select_arrow_end - .rodata 0x000000000030db10 0x804 build-fx/assets/img/dev.png.o - 0x000000000030db10 _img_dev - 0x000000000030e314 _img_dev_end - .rodata 0x000000000030e314 0x24 build-fx/assets/img/death.png.o - 0x000000000030e314 _img_death - 0x000000000030e338 _img_death_end - .rodata 0x000000000030e338 0x404 build-fx/assets/img/mainmenu.png.o - 0x000000000030e338 _img_mainmenu - 0x000000000030e73c _img_mainmenu_end - .rodata 0x000000000030e73c 0x58 build-fx/assets/img/w3.png.o - 0x000000000030e73c _img_w3 - 0x000000000030e794 _img_w3_end - .rodata 0x000000000030e794 0x404 build-fx/assets/img/time_over.png.o - 0x000000000030e794 _img_time_over - 0x000000000030eb98 _img_time_over_end - .rodata 0x000000000030eb98 0x4c build-fx/assets/img/coin.png.o - 0x000000000030eb98 _img_coin - 0x000000000030ebe4 _img_coin_end - .rodata 0x000000000030ebe4 0x24 build-fx/assets/img/champi.png.o - 0x000000000030ebe4 _img_champi - 0x000000000030ec08 _img_champi_end - .rodata 0x000000000030ec08 0xdc build-fx/assets/img/mariosmall.png.o - 0x000000000030ec08 _img_mariosmall - 0x000000000030ece4 _img_mariosmall_end - .rodata 0x000000000030ece4 0x404 build-fx/assets/img/levelchanger.png.o - 0x000000000030ece4 _img_levelchanger - 0x000000000030f0e8 _img_levelchanger_end - .rodata 0x000000000030f0e8 0x28 build-fx/assets/img/gift.png.o - 0x000000000030f0e8 _img_gift - 0x000000000030f110 _img_gift_end - .rodata 0x000000000030f110 0x44 build-fx/assets/img/buisson.png.o - 0x000000000030f110 _img_buisson - 0x000000000030f154 _img_buisson_end - .rodata 0x000000000030f154 0x84 build-fx/assets/img/colline.png.o - 0x000000000030f154 _img_colline - 0x000000000030f1d8 _img_colline_end - .rodata 0x000000000030f1d8 0x24 build-fx/assets/img/star.png.o - 0x000000000030f1d8 _img_star - 0x000000000030f1fc _img_star_end - .rodata 0x000000000030f1fc 0x224 build-fx/assets/img/mariobig.png.o - 0x000000000030f1fc _img_mariobig - 0x000000000030f420 _img_mariobig_end - .rodata 0x000000000030f420 0x804 build-fx/assets/img/error.png.o - 0x000000000030f420 _img_error - 0x000000000030fc24 _img_error_end - .rodata 0x000000000030fc24 0x44 build-fx/assets/img/1up.png.o - 0x000000000030fc24 _img_1up - 0x000000000030fc68 _img_1up_end - .rodata 0x000000000030fc68 0xb8 build-fx/assets/img/tuyau.png.o - 0x000000000030fc68 _img_tuyau - 0x000000000030fd20 _img_tuyau_end - .rodata 0x000000000030fd20 0x24 build-fx/assets/img/bullet.png.o - 0x000000000030fd20 _img_bullet - 0x000000000030fd44 _img_bullet_end - .rodata 0x000000000030fd44 0x4c build-fx/assets/img/carapace_verte.png.o - 0x000000000030fd44 _img_carapace_verte - 0x000000000030fd90 _img_carapace_verte_end - .rodata 0x000000000030fd90 0x44 build-fx/assets/img/nuage.png.o - 0x000000000030fd90 _img_nuage - 0x000000000030fdd4 _img_nuage_end - .rodata 0x000000000030fdd4 0x10 build-fx/assets/img/plateforme.png.o - 0x000000000030fdd4 _img_plateforme - 0x000000000030fde4 _img_plateforme_end - .rodata 0x000000000030fde4 0xc4 build-fx/assets/img/koopa_verte.png.o - 0x000000000030fde4 _img_koopa_verte - 0x000000000030fea8 _img_koopa_verte_end - .rodata 0x000000000030fea8 0x404 build-fx/assets/img/game_over.png.o - 0x000000000030fea8 _img_game_over - 0x00000000003102ac _img_game_over_end - .rodata 0x00000000003102ac 0x404 build-fx/assets/img/level.png.o - 0x00000000003102ac _img_level - 0x00000000003106b0 _img_level_end - .rodata 0x00000000003106b0 0xe4 build-fx/assets/img/castle.png.o - 0x00000000003106b0 _img_castle - 0x0000000000310794 _img_castle_end - .rodata 0x0000000000310794 0x4c build-fx/assets/img/goomba.png.o - 0x0000000000310794 _img_goomba - 0x00000000003107e0 _img_goomba_end - .rodata 0x00000000003107e0 0x4c build-fx/assets/img/stone.png.o - 0x00000000003107e0 _img_stone - 0x000000000031082c _img_stone_end - .rodata 0x000000000031082c 0x24 build-fx/assets/img/tickbox.png.o - 0x000000000031082c _img_tickbox - 0x0000000000310850 _img_tickbox_end - .rodata 0x0000000000310850 0x58 build-fx/assets/img/w4.png.o - 0x0000000000310850 _img_w4 - 0x00000000003108a8 _img_w4_end - .rodata 0x00000000003108a8 0x58 build-fx/assets/img/w1.png.o - 0x00000000003108a8 _img_w1 - 0x0000000000310900 _img_w1_end - .rodata 0x0000000000310900 0x404 build-fx/assets/img/lvl0.png.o - 0x0000000000310900 _img_lvl0 - 0x0000000000310d04 _img_lvl0_end + 0x000000000030c680 0x63 build-fx/src/world.c.o + *fill* 0x000000000030c6e3 0x1 + .rodata 0x000000000030c6e4 0x28 build-fx/src/keyboard.c.o + .rodata 0x000000000030c70c 0x60 build-fx/src/ennemi.c.o + 0x000000000030c73c _ennemi_heights + 0x000000000030c754 _ennemi_widths + .rodata 0x000000000030c76c 0x204 build-fx/assets/fonts/mario.png.o + 0x000000000030c76c _font_mario + 0x000000000030c970 _font_mario_end + .rodata 0x000000000030c970 0x20 build-fx/assets/img/bonus.png.o + 0x000000000030c970 _img_bonus + 0x000000000030c990 _img_bonus_end + .rodata 0x000000000030c990 0x24 build-fx/assets/img/bloc.png.o + 0x000000000030c990 _img_bloc + 0x000000000030c9b4 _img_bloc_end + .rodata 0x000000000030c9b4 0x404 build-fx/assets/img/ram.png.o + 0x000000000030c9b4 _img_ram + 0x000000000030cdb8 _img_ram_end + .rodata 0x000000000030cdb8 0x58 build-fx/assets/img/w5.png.o + 0x000000000030cdb8 _img_w5 + 0x000000000030ce10 _img_w5_end + .rodata 0x000000000030ce10 0x404 build-fx/assets/img/options.png.o + 0x000000000030ce10 _img_options + 0x000000000030d214 _img_options_end + .rodata 0x000000000030d214 0x44 build-fx/assets/img/fleur.png.o + 0x000000000030d214 _img_fleur + 0x000000000030d258 _img_fleur_end + .rodata 0x000000000030d258 0x58 build-fx/assets/img/w2.png.o + 0x000000000030d258 _img_w2 + 0x000000000030d2b0 _img_w2_end + .rodata 0x000000000030d2b0 0x404 build-fx/assets/img/main.png.o + 0x000000000030d2b0 _img_main + 0x000000000030d6b4 _img_main_end + .rodata 0x000000000030d6b4 0xc4 build-fx/assets/img/flag.png.o + 0x000000000030d6b4 _img_flag + 0x000000000030d778 _img_flag_end + .rodata 0x000000000030d778 0x404 build-fx/assets/img/new_level.png.o + 0x000000000030d778 _img_new_level + 0x000000000030db7c _img_new_level_end + .rodata 0x000000000030db7c 0x4c build-fx/assets/img/brick.png.o + 0x000000000030db7c _img_brick + 0x000000000030dbc8 _img_brick_end + .rodata 0x000000000030dbc8 0xbc build-fx/assets/img/menu_pause.png.o + 0x000000000030dbc8 _img_menu_pause + 0x000000000030dc84 _img_menu_pause_end + .rodata 0x000000000030dc84 0x18 build-fx/assets/img/select_arrow.png.o + 0x000000000030dc84 _img_select_arrow + 0x000000000030dc9c _img_select_arrow_end + .rodata 0x000000000030dc9c 0x804 build-fx/assets/img/dev.png.o + 0x000000000030dc9c _img_dev + 0x000000000030e4a0 _img_dev_end + .rodata 0x000000000030e4a0 0x24 build-fx/assets/img/death.png.o + 0x000000000030e4a0 _img_death + 0x000000000030e4c4 _img_death_end + .rodata 0x000000000030e4c4 0x404 build-fx/assets/img/mainmenu.png.o + 0x000000000030e4c4 _img_mainmenu + 0x000000000030e8c8 _img_mainmenu_end + .rodata 0x000000000030e8c8 0x58 build-fx/assets/img/w3.png.o + 0x000000000030e8c8 _img_w3 + 0x000000000030e920 _img_w3_end + .rodata 0x000000000030e920 0x404 build-fx/assets/img/time_over.png.o + 0x000000000030e920 _img_time_over + 0x000000000030ed24 _img_time_over_end + .rodata 0x000000000030ed24 0x4c build-fx/assets/img/coin.png.o + 0x000000000030ed24 _img_coin + 0x000000000030ed70 _img_coin_end + .rodata 0x000000000030ed70 0x24 build-fx/assets/img/champi.png.o + 0x000000000030ed70 _img_champi + 0x000000000030ed94 _img_champi_end + .rodata 0x000000000030ed94 0xdc build-fx/assets/img/mariosmall.png.o + 0x000000000030ed94 _img_mariosmall + 0x000000000030ee70 _img_mariosmall_end + .rodata 0x000000000030ee70 0x404 build-fx/assets/img/levelchanger.png.o + 0x000000000030ee70 _img_levelchanger + 0x000000000030f274 _img_levelchanger_end + .rodata 0x000000000030f274 0x28 build-fx/assets/img/gift.png.o + 0x000000000030f274 _img_gift + 0x000000000030f29c _img_gift_end + .rodata 0x000000000030f29c 0x44 build-fx/assets/img/buisson.png.o + 0x000000000030f29c _img_buisson + 0x000000000030f2e0 _img_buisson_end + .rodata 0x000000000030f2e0 0x84 build-fx/assets/img/colline.png.o + 0x000000000030f2e0 _img_colline + 0x000000000030f364 _img_colline_end + .rodata 0x000000000030f364 0x24 build-fx/assets/img/star.png.o + 0x000000000030f364 _img_star + 0x000000000030f388 _img_star_end + .rodata 0x000000000030f388 0x224 build-fx/assets/img/mariobig.png.o + 0x000000000030f388 _img_mariobig + 0x000000000030f5ac _img_mariobig_end + .rodata 0x000000000030f5ac 0x804 build-fx/assets/img/error.png.o + 0x000000000030f5ac _img_error + 0x000000000030fdb0 _img_error_end + .rodata 0x000000000030fdb0 0x44 build-fx/assets/img/1up.png.o + 0x000000000030fdb0 _img_1up + 0x000000000030fdf4 _img_1up_end + .rodata 0x000000000030fdf4 0xb8 build-fx/assets/img/tuyau.png.o + 0x000000000030fdf4 _img_tuyau + 0x000000000030feac _img_tuyau_end + .rodata 0x000000000030feac 0x24 build-fx/assets/img/bullet.png.o + 0x000000000030feac _img_bullet + 0x000000000030fed0 _img_bullet_end + .rodata 0x000000000030fed0 0x4c build-fx/assets/img/carapace_verte.png.o + 0x000000000030fed0 _img_carapace_verte + 0x000000000030ff1c _img_carapace_verte_end + .rodata 0x000000000030ff1c 0x44 build-fx/assets/img/nuage.png.o + 0x000000000030ff1c _img_nuage + 0x000000000030ff60 _img_nuage_end + .rodata 0x000000000030ff60 0x10 build-fx/assets/img/plateforme.png.o + 0x000000000030ff60 _img_plateforme + 0x000000000030ff70 _img_plateforme_end + .rodata 0x000000000030ff70 0xc4 build-fx/assets/img/koopa_verte.png.o + 0x000000000030ff70 _img_koopa_verte + 0x0000000000310034 _img_koopa_verte_end + .rodata 0x0000000000310034 0x404 build-fx/assets/img/game_over.png.o + 0x0000000000310034 _img_game_over + 0x0000000000310438 _img_game_over_end + .rodata 0x0000000000310438 0x404 build-fx/assets/img/level.png.o + 0x0000000000310438 _img_level + 0x000000000031083c _img_level_end + .rodata 0x000000000031083c 0xe4 build-fx/assets/img/castle.png.o + 0x000000000031083c _img_castle + 0x0000000000310920 _img_castle_end + .rodata 0x0000000000310920 0x4c build-fx/assets/img/goomba.png.o + 0x0000000000310920 _img_goomba + 0x000000000031096c _img_goomba_end + .rodata 0x000000000031096c 0x4c build-fx/assets/img/stone.png.o + 0x000000000031096c _img_stone + 0x00000000003109b8 _img_stone_end + .rodata 0x00000000003109b8 0x24 build-fx/assets/img/tickbox.png.o + 0x00000000003109b8 _img_tickbox + 0x00000000003109dc _img_tickbox_end + .rodata 0x00000000003109dc 0x58 build-fx/assets/img/w4.png.o + 0x00000000003109dc _img_w4 + 0x0000000000310a34 _img_w4_end + .rodata 0x0000000000310a34 0x58 build-fx/assets/img/w1.png.o + 0x0000000000310a34 _img_w1 + 0x0000000000310a8c _img_w1_end + .rodata 0x0000000000310a8c 0x404 build-fx/assets/img/lvl0.png.o + 0x0000000000310a8c _img_lvl0 + 0x0000000000310e90 _img_lvl0_end .rodata.str1.4 - 0x0000000000310d04 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* 0x0000000000310d35 0x3 - .rodata 0x0000000000310d38 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x0000000000310e90 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* 0x0000000000310ec1 0x3 + .rodata 0x0000000000310ec4 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 - 0x0000000000310d40 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* 0x0000000000310d46 0x2 + 0x0000000000310ecc 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* 0x0000000000310ed2 0x2 .rodata.str1.4 - 0x0000000000310d48 0x11a /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x0000000000310ed4 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* 0x0000000000310e62 0x2 - .rodata 0x0000000000310e64 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* 0x0000000000310fee 0x2 + .rodata 0x0000000000310ff0 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 - 0x0000000000310e7c 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 0x0000000000310e80 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) - 0x0000000000310e80 _gint_font5x7 - 0x0000000000311288 _gint_font5x7_end + 0x0000000000311008 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 0x000000000031100c 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) + 0x000000000031100c _gint_font5x7 + 0x0000000000311414 _gint_font5x7_end .rodata.str1.4 - 0x0000000000311288 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* 0x000000000031128e 0x2 + 0x0000000000311414 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* 0x000000000031141a 0x2 .rodata.str1.4 - 0x0000000000311290 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 0x0000000000311294 0x10 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x000000000031141c 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 0x0000000000311420 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 - 0x00000000003112a4 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* 0x00000000003112bf 0x1 - .rodata 0x00000000003112c0 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) - 0x00000000003112c0 ___clz_tab + 0x0000000000311430 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* 0x000000000031144b 0x1 + .rodata 0x000000000031144c 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x000000000031144c ___clz_tab -.rela.dyn 0x00000000003113c0 0x0 - .rela.text 0x00000000003113c0 0x0 build-fx/src/levelchanger.c.o +.rela.dyn 0x000000000031154c 0x0 + .rela.text 0x000000000031154c 0x0 build-fx/src/levelchanger.c.o .rela.pretext.entry - 0x00000000003113c0 0x0 build-fx/src/levelchanger.c.o + 0x000000000031154c 0x0 build-fx/src/levelchanger.c.o 0x0000000008100000 . = ORIGIN (ram) .bss 0x0000000008100000 0x930 @@ -880,8 +879,8 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a *fill* 0x000000000810092c 0x4 0x0000000000000930 _sbss = SIZEOF (.bss) -.data 0x0000000008100930 0x160 load address 0x00000000003113c0 - 0x00000000003113c0 _ldata = LOADADDR (.data) +.data 0x0000000008100930 0x160 load address 0x000000000031154c + 0x000000000031154c _ldata = LOADADDR (.data) 0x0000000008100930 _rdata = . *(.data .data.*) .data 0x0000000008100930 0x0 build-fx/src/levelchanger.c.o @@ -950,28 +949,28 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a *(D) 0x0000000008100a90 . = ALIGN (0x10) -.data.4 0x0000000008100a90 0x0 load address 0x0000000000311520 +.data.4 0x0000000008100a90 0x0 load address 0x00000000003116ac *(.data.4) 0x0000000008100a90 . = ALIGN (0x10) 0x0000000000000160 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x00000000e5200000 . = ORIGIN (ilram) -.ilram 0x00000000e5200000 0x0 load address 0x0000000000311520 - 0x0000000000311520 _lilram = LOADADDR (.ilram) +.ilram 0x00000000e5200000 0x0 load address 0x00000000003116ac + 0x00000000003116ac _lilram = LOADADDR (.ilram) 0x00000000e5200000 _rilram = . *(.ilram) 0x00000000e5200000 . = ALIGN (0x10) 0x00000000e5007000 . = ORIGIN (xram) -.xram 0x00000000e5007000 0x0 load address 0x0000000000311520 - 0x0000000000311520 _lxram = LOADADDR (.xram) +.xram 0x00000000e5007000 0x0 load address 0x00000000003116ac + 0x00000000003116ac _lxram = LOADADDR (.xram) 0x00000000e5007000 _rxram = . *(.xram) 0x00000000e5007000 . = ALIGN (0x10) 0x00000000e5017000 . = ORIGIN (yram) -.yram 0x00000000e5017000 0x0 load address 0x0000000000311520 - 0x0000000000311520 _lyram = LOADADDR (.yram) +.yram 0x00000000e5017000 0x0 load address 0x00000000003116ac + 0x00000000003116ac _lyram = LOADADDR (.yram) 0x00000000e5017000 _ryram = . *(.yram) 0x00000000e5017000 . = ALIGN (0x10) @@ -981,8 +980,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 0x0000000000311520 - 0x0000000000311520 _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x140 load address 0x00000000003116ac + 0x00000000003116ac _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) @@ -1003,7 +1002,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 0x0000000000311660 +.gint.bss 0x000000008800f540 0x290 load address 0x00000000003117ec *(.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 5fe18a5..eb57090 100644 Binary files a/build-fx/src/level.c.o and b/build-fx/src/level.c.o differ diff --git a/levelconverter/1-2.png b/levelconverter/1-2.png index 0c6b693..f030b12 100644 Binary files a/levelconverter/1-2.png and b/levelconverter/1-2.png differ diff --git a/levelconverter/1-2.png.c b/levelconverter/1-2.png.c index 13cac53..98b627f 100644 --- a/levelconverter/1-2.png.c +++ b/levelconverter/1-2.png.c @@ -1,4 +1,5 @@ -w_current_x = 280; +// !b Here the generated section begins (see the end at "!e") +w_current_x = 279; w_current_y = 14; world_t lvl[]= { @@ -79,39 +80,18 @@ world_t lvl[]= {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x20}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {EARTH,0x00}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {EARTH,0x20}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {EARTH,0x00}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,'?'}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x00}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, @@ -241,47 +221,67 @@ world_t lvl[]= {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {TUYAU,0x04}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {TUYAU,0x14}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, - {EARTH,0x21}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x00}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x00}, {TUYAU,0x03}, {TUYAU,0x03}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x00}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {TUYAU,0x11}, {TUYAU,0x10}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {TUYAU,0x21}, {TUYAU,0x20}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {COIN,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x02}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,'?'}, {0,0}, {0,0}, {EARTH,0x10}, - {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x12}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x10}, + {EARTH,0x11}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x00}, + {EARTH,0x11}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x20}, {TUYAU,0x03}, {TUYAU,0x03}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {TUYAU,0x11}, {TUYAU,0x10}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {TUYAU,0x21}, {TUYAU,0x20}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {COIN,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x02}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,'?'}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x12}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x11}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x20}, + {EARTH,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x02}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x12}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x00}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {END_LEVEL,0x1102},{END_LEVEL,0x1102},{END_LEVEL,0x1102},{END_LEVEL,0x1102},{END_LEVEL,0x1202}, {END_LEVEL,0x1202}, {END_LEVEL,0x1202}, {END_LEVEL,0x1302}, {END_LEVEL,0x1401}, {END_LEVEL,0x1400}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, }; init_level(lvl); @@ -291,16 +291,18 @@ ennemi_t ennemies0[]={ GOOMBA(264, 8, -1), GOOMBA(408, 8, -1), GOOMBA(424, 8, -1), - KOOPA(440, 8, -1), - GOOMBA(960, 64, -1), - GOOMBA(968, 88, -1), - GOOMBA(1064, 8, -1), - GOOMBA(1320, 8, -1), - GOOMBA(1336, 8, -1), - KOOPA(1352, 8, -1), - KOOPA(1648, 8, -1), - GOOMBA(1728, 8, -1), - GOOMBA(1744, 8, -1), + KOOPA_V(440, 8, -1), + GOOMBA(792, 64, -1), + GOOMBA(800, 88, -1), + GOOMBA(896, 8, -1), + GOOMBA(1152, 8, -1), + GOOMBA(1168, 8, -1), + KOOPA_V(1184, 8, -1), + KOOPA_V(1480, 8, -1), + GOOMBA(1560, 8, -1), + GOOMBA(1576, 8, -1), }; ennemis_global_size=12; init_ennemies(ennemies0); + +// !e End of generated section \ No newline at end of file diff --git a/levelconverter/levelconv.py b/levelconverter/levelconv.py index 26fe868..e4f250c 100644 --- a/levelconverter/levelconv.py +++ b/levelconverter/levelconv.py @@ -1,19 +1,27 @@ from PIL import Image # Palette de couleurs -pierre = (0, 0, 0, 255) -brique = (255, 0, 0, 255) -empty = (255, 255, 255, 255) -piece = (203, 255, 0, 255) -boite_piece = (255, 153, 0, 255) -boite_champi = (204, 0, 255, 255) -brique_piece = (101, 127, 0, 255) -beton = (84, 84, 84, 255) -tuyau_milieu = (0, 255, 102, 255) -tuyau_bout = (50, 255, 0, 255) +pierre = (0, 0, 0) +brique = (255, 0, 0) +empty = (255, 255, 255) +piece = (203, 255, 0) +boite_piece = (255, 153, 0) +boite_champi = (204, 0, 255) +brique_piece = (101, 127, 0) +beton = (84, 84, 84) +tuyau_milieu = (0, 255, 102) +tuyau_bout = (50, 255, 0) +drapeau = (0, 255, 216) + +goomba = (127, 76, 0) +koopa_vert = (25, 127, 0) + +def color_compare(color1, color2): + if color1[0] == color2[0] and color1[1] == color2[1] and color1[2] == color2[2]: + return 1 + else: + return 0 -goomba = (127, 76, 0, 255) -koopa_vert = (25, 127, 0, 255) # Load image @@ -21,13 +29,12 @@ filename = input("File name ?\n> ") img = Image.open(filename) print("Converting", filename, "to", "\"" + filename + ".c\",", "size =", img.size) -code = "w_current_x = " + str(img.size[0]) + ";\nw_current_y = " + str(img.size[1]) + ";\nworld_t lvl[]=\n{" +code = "// !b Here the generated section begins (see the end at \"!e\")\nw_current_x = " + str(img.size[0]) + ";\nw_current_y = " + str(img.size[1]) + ";\nworld_t lvl[]=\n{" nombre_ennemis=0 ennemis = "\nennemi_t ennemies0[]={" - # Balayage des pixels : passe pour dessiner les murs pixels = img.load() for x in range(0,img.size[0]): @@ -35,16 +42,16 @@ for x in range(0,img.size[0]): for i in range(0, img.size[1]): y=img.size[1]-i-1 - if pixels[x,y] == pierre: + if color_compare(pixels[x,y], pierre): hexa="0x" left=1 right=1 if x != 0: - left = (pixels[x-1,y] == pierre) + left = (color_compare(pixels[x-1,y], pierre)) if x != img.size[0]-1: - right = (pixels[x+1,y] == pierre) + right = (color_compare(pixels[x+1,y], pierre)) sx=0 if left and right: @@ -60,31 +67,31 @@ for x in range(0,img.size[0]): down=1 if y != 0: - up = (pixels[x,y-1] == pierre) + up = (color_compare(pixels[x,y-1], pierre)) if y != img.size[1]-1: - down = (pixels[x,y+1] == pierre) + down = (color_compare(pixels[x,y+1], pierre)) sy = int(bool(up)) hexa += str(sy) code += "{EARTH," + hexa + "}, " - elif pixels[x,y]==piece: + elif color_compare(pixels[x,y], piece): code += "{COIN,0}, " - elif pixels[x,y] == brique: + elif color_compare(pixels[x,y], brique): code += "{BRICK,0}, " - elif pixels[x,y]==brique_piece: + elif color_compare(pixels[x,y],brique_piece): code += "{BRICK,0x15}, " - elif pixels[x,y]==boite_piece: + elif color_compare(pixels[x,y],boite_piece): code += "{GIFT,0x11}, " - elif pixels[x,y]==boite_champi: + elif color_compare(pixels[x,y],boite_champi): code += "{GIFT,0x21}, " - elif pixels[x,y]==empty: + elif color_compare(pixels[x,y],empty): code += "{0,0}, " - elif pixels[x,y]==beton: + elif color_compare(pixels[x,y],beton): code += "{BLOC,0}, " - elif pixels[x,y]==tuyau_bout: + elif color_compare(pixels[x,y],tuyau_bout): left=0 right=0 up=0 # vide par defaut @@ -92,21 +99,21 @@ for x in range(0,img.size[0]): tx=0 ty=0 if x: - left = (pixels[x-1,y] == tuyau_bout) or (pixels[x-1,y] == tuyau_milieu) + left = (color_compare(pixels[x-1,y], tuyau_bout)) or (color_compare(pixels[x-1,y], tuyau_milieu)) if x != img.size[0]-1: - right = (pixels[x+1,y] == tuyau_bout) or (pixels[x+1,y] == tuyau_milieu) + right = (color_compare(pixels[x+1,y], tuyau_bout)) or (color_compare(pixels[x+1,y], tuyau_milieu)) if y: - up = (pixels[x,y-1] == tuyau_bout) or (pixels[x,y-1] == tuyau_milieu) + up = (color_compare(pixels[x,y-1], tuyau_bout)) or (color_compare(pixels[x,y-1], tuyau_milieu)) if y != img.size[1]-1: - down = (pixels[x,y+1] == tuyau_bout) or (pixels[x,y+1] == tuyau_milieu) + down = (color_compare(pixels[x,y+1], tuyau_bout)) or (color_compare(pixels[x,y+1], tuyau_milieu)) if right and down: tx=0 - if (pixels[x,y+1]==tuyau_milieu): + if (color_compare(pixels[x,y+1], tuyau_milieu)): ty=2 elif left and down: - if (pixels[x,y+1]==tuyau_milieu): + if (color_compare(pixels[x,y+1], tuyau_milieu)): tx=1 ty=2 else: @@ -114,12 +121,12 @@ for x in range(0,img.size[0]): ty=0 elif up and right: tx=0 - if (pixels[x,y-1]==tuyau_milieu): + if (color_compare(pixels[x,y-1], tuyau_milieu)): ty=4 else: ty=1 elif up and left: - if (pixels[x,y-1]==tuyau_milieu): + if (color_compare(pixels[x,y-1], tuyau_milieu)): tx=1 ty=4 else: @@ -127,7 +134,7 @@ for x in range(0,img.size[0]): ty=1 hexa="0x"+str(tx)+str(ty) code += "{TUYAU,"+hexa+"}, " - elif pixels[x,y]==tuyau_milieu: + elif color_compare(pixels[x,y], tuyau_milieu): left=0 right=0 up=0 # vide par defaut @@ -135,14 +142,14 @@ for x in range(0,img.size[0]): tx=0 ty=0 if x: - left = (pixels[x-1,y] == tuyau_bout) or (pixels[x-1,y] == tuyau_milieu) + left = (color_compare(pixels[x-1,y], tuyau_bout)) or (color_compare(pixels[x-1,y], tuyau_milieu)) if x != img.size[0]-1: - right = (pixels[x+1,y] == tuyau_bout) or (pixels[x+1,y] == tuyau_milieu) + right = (color_compare(pixels[x+1,y], tuyau_bout)) or (color_compare(pixels[x+1,y], tuyau_milieu)) if y: - up = (pixels[x,y-1] == tuyau_bout) or (pixels[x,y-1] == tuyau_milieu) + up = (color_compare(pixels[x,y-1], tuyau_bout)) or (color_compare(pixels[x,y-1], tuyau_milieu)) if y != img.size[1]-1: - down = (pixels[x,y+1] == tuyau_bout) or (pixels[x,y+1] == tuyau_milieu) + down = (color_compare(pixels[x,y+1], tuyau_bout)) or (color_compare(pixels[x,y+1], tuyau_milieu)) if right and left==0: tx=0 @@ -158,20 +165,35 @@ for x in range(0,img.size[0]): ty=1 hexa="0x"+str(tx)+str(ty) code += "{TUYAU,"+hexa+"}, " + elif color_compare(pixels[x,y], drapeau): + if not color_compare(pixels[x,y-1], drapeau): + code += "{END_LEVEL,0x1400}, " + elif not color_compare(pixels[x,y-2], drapeau): + code+= "{END_LEVEL,0x1401}, " + elif not color_compare(pixels[x,y-3], drapeau): + code+= "{END_LEVEL,0x1302}, " + elif not color_compare(pixels[x,y-4], drapeau): + code+= "{END_LEVEL,0x1202}, " + elif not color_compare(pixels[x,y-5], drapeau): + code+= "{END_LEVEL,0x1202}, " + elif not color_compare(pixels[x,y-6], drapeau): + code+= "{END_LEVEL,0x1202}, " + else: + code+= "{END_LEVEL,0x1102}," else: code += "{0,'?'}, " #code += str(pixels[x,y]) - if pixels[x,y]==goomba: + if color_compare(pixels[x,y], goomba): nombre_ennemis += 1 ennemis += "\n GOOMBA(" + str(8*x) + ", " + str(8*i) + ", -1)," - elif pixels[x,y]==koopa_vert: + elif color_compare(pixels[x,y], koopa_vert): ennemis += "\n KOOPA_V(" + str(8*x) + ", " + str(8*i) + ", -1)," code += "\n};\ninit_level(lvl);\n" ennemis += "\n};\nennemis_global_size=" + str(nombre_ennemis) + ";\ninit_ennemies(ennemies0);\n" f = open(filename+".c", 'w') -f.write(code + ennemis) +f.write(code + ennemis + "\n// !e End of generated section") f.close() print("Converted succesfully !") \ No newline at end of file diff --git a/src/level.c b/src/level.c index 0372bb2..b923d80 100644 --- a/src/level.c +++ b/src/level.c @@ -386,7 +386,9 @@ void set_level(int w, int l) } else if (w+1==1 && l+1==2) { - w_current_x = 280; + + // !b Here the generated section begins (see the end at "!e") + w_current_x = 279; w_current_y = 14; world_t lvl[]= { @@ -467,39 +469,18 @@ void set_level(int w, int l) {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x20}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {EARTH,0x00}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {EARTH,0x20}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, {BRICK,0}, - {EARTH,0x00}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, - {EARTH,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {BRICK,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,'?'}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x00}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, @@ -629,47 +610,67 @@ void set_level(int w, int l) {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {TUYAU,0x04}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x03}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {TUYAU,0x14}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x13}, - {EARTH,0x21}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x00}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, - {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x00}, {TUYAU,0x03}, {TUYAU,0x03}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x00}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {TUYAU,0x11}, {TUYAU,0x10}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {TUYAU,0x21}, {TUYAU,0x20}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {COIN,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x02}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,'?'}, {0,0}, {0,0}, {EARTH,0x10}, - {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x12}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x10}, - {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x10}, + {EARTH,0x11}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x00}, + {EARTH,0x11}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x20}, {TUYAU,0x03}, {TUYAU,0x03}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {TUYAU,0x11}, {TUYAU,0x10}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {TUYAU,0x21}, {TUYAU,0x20}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {COIN,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {COIN,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {COIN,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x02}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,'?'}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x12}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x01}, {EARTH,0x11}, {EARTH,0x10}, + {EARTH,0x11}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x21}, {EARTH,0x20}, + {EARTH,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {TUYAU,0x03}, {TUYAU,0x03}, {TUYAU,0x02}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {TUYAU,0x13}, {TUYAU,0x13}, {TUYAU,0x12}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x00}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {BLOC,0}, {END_LEVEL,0x1102},{END_LEVEL,0x1102},{END_LEVEL,0x1102},{END_LEVEL,0x1102},{END_LEVEL,0x1202}, {END_LEVEL,0x1202}, {END_LEVEL,0x1202}, {END_LEVEL,0x1302}, {END_LEVEL,0x1401}, {END_LEVEL,0x1400}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, }; init_level(lvl); @@ -680,24 +681,36 @@ void set_level(int w, int l) GOOMBA(408, 8, -1), GOOMBA(424, 8, -1), KOOPA_V(440, 8, -1), - GOOMBA(960, 64, -1), - GOOMBA(968, 88, -1), - GOOMBA(1064, 8, -1), - GOOMBA(1320, 8, -1), - GOOMBA(1336, 8, -1), - KOOPA_V(1352, 8, -1), - KOOPA_V(1648, 8, -1), - GOOMBA(1728, 8, -1), - GOOMBA(1744, 8, -1), + GOOMBA(792, 64, -1), + GOOMBA(800, 88, -1), + GOOMBA(896, 8, -1), + GOOMBA(1152, 8, -1), + GOOMBA(1168, 8, -1), + KOOPA_V(1184, 8, -1), + KOOPA_V(1480, 8, -1), + GOOMBA(1560, 8, -1), + GOOMBA(1576, 8, -1), }; ennemis_global_size=12; init_ennemies(ennemies0); +// !e End of generated section + mario_x_max=0; mario.p.x=25; mario.p.y=32; + + teleport_t t[]= + { + {106,4, 222,9, MK_LITTLE}, + {243,3, 174,4, MK_LITTLE}, + {216,3, 248,2, MK_UP}, + }; + + set_teleporteurs(t, sizeof(t)/sizeof(teleport_t)); + } }