From 0c574a7e1d61340a6aea74a61c7d51d85011dda5 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Tue, 11 Feb 2020 14:14:18 +0100 Subject: [PATCH] Draw offset and final screen size --- build-cg/map | 272 +++++++++++++++++++-------------------- build-cg/platform.bin | Bin 19600 -> 19764 bytes build-cg/platform.elf | Bin 29656 -> 29784 bytes build-cg/src/collide.c.o | Bin 788 -> 788 bytes build-cg/src/draw.c.o | Bin 1024 -> 1040 bytes build-cg/src/levels.c.o | Bin 976 -> 1132 bytes build-cg/src/main.c.o | Bin 1376 -> 1368 bytes levels.lua | 28 ++-- platform.g3a | Bin 48276 -> 48440 bytes src/collide.c | 2 +- src/draw.c | 14 +- src/levels.c | 2 +- src/main.c | 2 +- 13 files changed, 160 insertions(+), 160 deletions(-) diff --git a/build-cg/map b/build-cg/map index 507d1ab..50426a9 100644 --- a/build-cg/map +++ b/build-cg/map @@ -160,7 +160,7 @@ LOAD /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a LOAD /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a LOAD /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/m4-nofpu/libgcc.a 0x0000000000300000 _brom = 0x300000 - 0x0000000000004b10 _srom = (((SIZEOF (.text) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x0000000000004bb4 _srom = (((SIZEOF (.text) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .text 0x0000000000300000 0x3910 *(.pretext.entry) @@ -199,100 +199,99 @@ LOAD /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/m4-nofpu/libgcc.a .text 0x000000000030067c 0xd2 build-cg/src/collide.c.o 0x000000000030067c _collide *fill* 0x000000000030074e 0x2 - .text 0x0000000000300750 0xd0 build-cg/src/draw.c.o + .text 0x0000000000300750 0xe0 build-cg/src/draw.c.o 0x0000000000300750 _draw_player - 0x00000000003007a4 _draw_level - .text 0x0000000000300820 0x20 build-cg/src/levels.c.o - 0x0000000000300820 _set_level - .text 0x0000000000300840 0x34 build-cg/src/main.c.o - 0x0000000000300840 _jump_test - .text.startup 0x0000000000300874 0xe8 build-cg/src/main.c.o - 0x0000000000300874 _main - .text 0x000000000030095c 0xdc /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(memory.c.o) - 0x000000000030095c _memcpy - 0x0000000000300a16 __memmove - 0x0000000000300a1a __memcmp - 0x0000000000300a1e _memset - .text 0x0000000000300a38 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(start.c.o) - .text 0x0000000000300a38 0x104 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(setup.c.o) - 0x0000000000300aa4 _gint_install - 0x0000000000300b24 _gint_unload - .text 0x0000000000300b3c 0xf8 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(mmu.c.o) - 0x0000000000300b3c _utlb_addr - 0x0000000000300b4c _utlb_data - 0x0000000000300b5c _utlb_mapped_memory - .text 0x0000000000300c34 0x2dc /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(exch.c.o) - 0x0000000000300edc _gint_panic - 0x0000000000300eec _gint_panic_set - 0x0000000000300ef8 _gint_exc_catch - 0x0000000000300f04 _gint_exc_skip - .text 0x0000000000300f10 0x5c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(gint.c.o) - 0x0000000000300f10 _gint_intlevel - 0x0000000000300f48 _gint_inthandler - .text 0x0000000000300f6c 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(exch.s.o) - .text 0x0000000000300f6c 0x2c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(vbr.s.o) - 0x0000000000300f6c _gint_setvbr - .text 0x0000000000300f98 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(hardware.c.o) - .text 0x0000000000300f98 0x9c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(topti.c.o) - 0x0000000000300f98 _dsize - .text 0x0000000000301034 0x58 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dprint.c.o) - 0x0000000000301034 _dprint - .text 0x000000000030108c 0x40 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dimage.c.o) - 0x000000000030108c _dimage - 0x00000000003010b4 _dsubimage - .text 0x00000000003010cc 0x1c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dclear.c.o) - 0x00000000003010cc _dclear - .text 0x00000000003010e8 0x4 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dvram.c.o) - 0x00000000003010e8 _dvram - .text 0x00000000003010ec 0xc0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(drect.c.o) - 0x00000000003010ec _drect - .text 0x00000000003011ac 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(topti.c.o) - .text 0x00000000003011ac 0x30 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dupdate.c.o) - 0x00000000003011ac _dupdate - 0x00000000003011c4 _dupdate_noint - .text 0x00000000003011dc 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(topti-asm.s.o) - .text 0x00000000003011dc 0x1e4 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(bopti.c.o) - 0x00000000003011dc _bopti_render - 0x00000000003012cc _bopti_render_clip - 0x0000000000301394 _bopti_render_noclip - .text 0x00000000003013c0 0x3ac /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(keysc.c.o) - 0x0000000000301518 _pollevent - 0x000000000030165c _waitevent - 0x00000000003016a8 _clearevents - 0x00000000003016c8 _keydown - 0x00000000003016f4 _keydown_all - 0x0000000000301730 _keydown_any - .text 0x000000000030176c 0x4cc /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(tmu.c.o) - 0x00000000003019f4 _timer_setup - 0x0000000000301a84 _timer_delay - 0x0000000000301ae4 _timer_start - 0x0000000000301b18 _timer_reload - 0x0000000000301b38 _timer_pause - 0x0000000000301b6c _timer_stop - 0x0000000000301bc8 _timer_timeout - 0x0000000000301bd4 _timer_address - 0x0000000000301c08 _timer_clear - .text 0x0000000000301c38 0x4c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(memset.c.o) - 0x0000000000301c38 _dma_memset - .text 0x0000000000301c84 0x2d4 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(r61524.c.o) - 0x0000000000301cd4 _r61524_win_get - 0x0000000000301d8c _r61524_win_set - 0x0000000000301e4c _r61524_display - .text 0x0000000000301f58 0x7c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(string.c.o) - 0x0000000000301f58 _strlen - 0x0000000000301f68 _strncpy - 0x0000000000301f80 _strcat - 0x0000000000301fc4 _strcmp - .text 0x0000000000301fd4 0xce4 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(stdio.c.o) - 0x00000000003029d0 _kprint_opt - 0x0000000000302b18 _kprint - 0x0000000000302bf0 _kvsprint - 0x0000000000302c38 _sprintf - 0x0000000000302c60 _vsprintf - 0x0000000000302c80 _snprintf - 0x0000000000302ca0 _vsnprintf - .text 0x0000000000302cb8 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(inth.S.o) - *fill* 0x0000000000302cb8 0x8 + 0x00000000003007ac _draw_level + .text 0x0000000000300830 0x20 build-cg/src/levels.c.o + 0x0000000000300830 _set_level + .text 0x0000000000300850 0x34 build-cg/src/main.c.o + 0x0000000000300850 _jump_test + .text.startup 0x0000000000300884 0xe0 build-cg/src/main.c.o + 0x0000000000300884 _main + .text 0x0000000000300964 0xdc /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(memory.c.o) + 0x0000000000300964 _memcpy + 0x0000000000300a1e __memmove + 0x0000000000300a22 __memcmp + 0x0000000000300a26 _memset + .text 0x0000000000300a40 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(start.c.o) + .text 0x0000000000300a40 0x104 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(setup.c.o) + 0x0000000000300aac _gint_install + 0x0000000000300b2c _gint_unload + .text 0x0000000000300b44 0xf8 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(mmu.c.o) + 0x0000000000300b44 _utlb_addr + 0x0000000000300b54 _utlb_data + 0x0000000000300b64 _utlb_mapped_memory + .text 0x0000000000300c3c 0x2dc /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(exch.c.o) + 0x0000000000300ee4 _gint_panic + 0x0000000000300ef4 _gint_panic_set + 0x0000000000300f00 _gint_exc_catch + 0x0000000000300f0c _gint_exc_skip + .text 0x0000000000300f18 0x5c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(gint.c.o) + 0x0000000000300f18 _gint_intlevel + 0x0000000000300f50 _gint_inthandler + .text 0x0000000000300f74 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(exch.s.o) + .text 0x0000000000300f74 0x2c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(vbr.s.o) + 0x0000000000300f74 _gint_setvbr + .text 0x0000000000300fa0 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(hardware.c.o) + .text 0x0000000000300fa0 0x9c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(topti.c.o) + 0x0000000000300fa0 _dsize + .text 0x000000000030103c 0x58 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dprint.c.o) + 0x000000000030103c _dprint + .text 0x0000000000301094 0x40 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dimage.c.o) + 0x0000000000301094 _dimage + 0x00000000003010bc _dsubimage + .text 0x00000000003010d4 0x1c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dclear.c.o) + 0x00000000003010d4 _dclear + .text 0x00000000003010f0 0x4 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dvram.c.o) + 0x00000000003010f0 _dvram + .text 0x00000000003010f4 0xc0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(drect.c.o) + 0x00000000003010f4 _drect + .text 0x00000000003011b4 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(topti.c.o) + .text 0x00000000003011b4 0x30 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dupdate.c.o) + 0x00000000003011b4 _dupdate + 0x00000000003011cc _dupdate_noint + .text 0x00000000003011e4 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(topti-asm.s.o) + .text 0x00000000003011e4 0x1e4 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(bopti.c.o) + 0x00000000003011e4 _bopti_render + 0x00000000003012d4 _bopti_render_clip + 0x000000000030139c _bopti_render_noclip + .text 0x00000000003013c8 0x3ac /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(keysc.c.o) + 0x0000000000301520 _pollevent + 0x0000000000301664 _waitevent + 0x00000000003016b0 _clearevents + 0x00000000003016d0 _keydown + 0x00000000003016fc _keydown_all + 0x0000000000301738 _keydown_any + .text 0x0000000000301774 0x4cc /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(tmu.c.o) + 0x00000000003019fc _timer_setup + 0x0000000000301a8c _timer_delay + 0x0000000000301aec _timer_start + 0x0000000000301b20 _timer_reload + 0x0000000000301b40 _timer_pause + 0x0000000000301b74 _timer_stop + 0x0000000000301bd0 _timer_timeout + 0x0000000000301bdc _timer_address + 0x0000000000301c10 _timer_clear + .text 0x0000000000301c40 0x4c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(memset.c.o) + 0x0000000000301c40 _dma_memset + .text 0x0000000000301c8c 0x2d4 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(r61524.c.o) + 0x0000000000301cdc _r61524_win_get + 0x0000000000301d94 _r61524_win_set + 0x0000000000301e54 _r61524_display + .text 0x0000000000301f60 0x7c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(string.c.o) + 0x0000000000301f60 _strlen + 0x0000000000301f70 _strncpy + 0x0000000000301f88 _strcat + 0x0000000000301fcc _strcmp + .text 0x0000000000301fdc 0xce4 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(stdio.c.o) + 0x00000000003029d8 _kprint_opt + 0x0000000000302b20 _kprint + 0x0000000000302bf8 _kvsprint + 0x0000000000302c40 _sprintf + 0x0000000000302c68 _vsprintf + 0x0000000000302c88 _snprintf + 0x0000000000302ca8 _vsnprintf + .text 0x0000000000302cc0 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(inth.S.o) .text 0x0000000000302cc0 0x100 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(bopti-asm.s.o) 0x0000000000302cc0 _bopti_r5g6b5 0x0000000000302d10 _bopti_r5g6b5a @@ -392,51 +391,50 @@ LOAD /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/m4-nofpu/libgcc.a *(.gint.drivers.6) 0x0000000000303b04 _edrv = . -.rodata 0x0000000000303b04 0x100c +.rodata 0x0000000000303b04 0x10b0 *(.rodata.4) *(.rodata .rodata.*) .rodata.str1.4 - 0x0000000000303b04 0xc5 build-cg/src/levels.c.o - *fill* 0x0000000000303bc9 0x3 - .rodata 0x0000000000303bcc 0x208 build-cg/assets/img/ground.png.o - 0x0000000000303bcc _img_ground - 0x0000000000303dd4 _img_ground_end - .rodata 0x0000000000303dd4 0x488 build-cg/assets/img/player.png.o - 0x0000000000303dd4 _img_player - 0x000000000030425c _img_player_end + 0x0000000000303b04 0x15f build-cg/src/levels.c.o + *fill* 0x0000000000303c63 0x1 + .rodata 0x0000000000303c64 0x208 build-cg/assets/img/ground.png.o + 0x0000000000303c64 _img_ground + 0x0000000000303e6c _img_ground_end + .rodata 0x0000000000303e6c 0x488 build-cg/assets/img/player.png.o + 0x0000000000303e6c _img_player + 0x00000000003042f4 _img_player_end .rodata.str1.4 - 0x000000000030425c 0x288 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(exch.c.o) + 0x00000000003042f4 0x288 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(exch.c.o) 0x28c (size before relaxing) - .rodata 0x00000000003044e4 0x18 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(topti.c.o) + .rodata 0x000000000030457c 0x18 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(topti.c.o) .rodata.str1.4 - 0x00000000003044fc 0x6 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(keysc.c.o) - *fill* 0x0000000000304502 0x2 + 0x0000000000304594 0x6 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(keysc.c.o) + *fill* 0x000000000030459a 0x2 .rodata.str1.4 - 0x0000000000304504 0x4 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(tmu.c.o) - .rodata 0x0000000000304508 0x49c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(font8x9.png.o) - 0x0000000000304508 _gint_font8x9 - 0x00000000003049a4 _gint_font8x9_end + 0x000000000030459c 0x4 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(tmu.c.o) + .rodata 0x00000000003045a0 0x49c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(font8x9.png.o) + 0x00000000003045a0 _gint_font8x9 + 0x0000000000304a3c _gint_font8x9_end .rodata.str1.4 - 0x00000000003049a4 0x7 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(r61524.c.o) - *fill* 0x00000000003049ab 0x1 + 0x0000000000304a3c 0x7 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(r61524.c.o) + *fill* 0x0000000000304a43 0x1 .rodata.str1.4 - 0x00000000003049ac 0x25 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(stdio.c.o) - 0x31 (size before relaxing) - *fill* 0x00000000003049d1 0x3 + 0x0000000000304a44 0x31 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(stdio.c.o) + *fill* 0x0000000000304a75 0x3 .rodata.str1.4 - 0x00000000003049d4 0x4 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(cpg.c.o) - .rodata 0x00000000003049d8 0x30 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dma.c.o) + 0x0000000000304a78 0x4 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(cpg.c.o) + .rodata 0x0000000000304a7c 0x30 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dma.c.o) .rodata.str1.4 - 0x0000000000304a08 0x8 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dma.c.o) + 0x0000000000304aac 0x8 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(dma.c.o) 0x5 (size before relaxing) - .rodata 0x0000000000304a10 0x100 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/m4-nofpu/libgcc.a(_clz.o) - 0x0000000000304a10 ___clz_tab + .rodata 0x0000000000304ab4 0x100 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/m4-nofpu/libgcc.a(_clz.o) + 0x0000000000304ab4 ___clz_tab -.rela.dyn 0x0000000000304b10 0x0 +.rela.dyn 0x0000000000304bb4 0x0 .rela.pretext.entry - 0x0000000000304b10 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(start.c.o) - .rela.text 0x0000000000304b10 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(start.c.o) - .rela.pretext 0x0000000000304b10 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(start.c.o) + 0x0000000000304bb4 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(start.c.o) + .rela.text 0x0000000000304bb4 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(start.c.o) + .rela.pretext 0x0000000000304bb4 0x0 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(start.c.o) 0x0000000008102000 . = ORIGIN (ram) .bss 0x0000000008102000 0x150 @@ -487,8 +485,8 @@ LOAD /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/m4-nofpu/libgcc.a *fill* 0x0000000008102144 0xc 0x0000000000000150 _sbss = SIZEOF (.bss) -.data 0x0000000008102150 0x80 load address 0x0000000000304b10 - 0x0000000000304b10 _ldata = LOADADDR (.data) +.data 0x0000000008102150 0x80 load address 0x0000000000304bb4 + 0x0000000000304bb4 _ldata = LOADADDR (.data) 0x0000000008102150 _rdata = . *(.data .data.*) .data 0x0000000008102150 0x0 build-cg/src/collide.c.o @@ -539,29 +537,29 @@ LOAD /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/m4-nofpu/libgcc.a 0x00000000081021d0 . = ALIGN (0x10) *fill* 0x00000000081021cc 0x4 -.data.4 0x00000000081021d0 0x0 load address 0x0000000000304b90 +.data.4 0x00000000081021d0 0x0 load address 0x0000000000304c34 *(.data.4) 0x00000000081021d0 . = ALIGN (0x10) 0x0000000000000080 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x00000000e5200000 . = ORIGIN (ilram) -.ilram 0x00000000e5200000 0x20 load address 0x0000000000304b90 - 0x0000000000304b90 _lilram = LOADADDR (.ilram) +.ilram 0x00000000e5200000 0x20 load address 0x0000000000304c34 + 0x0000000000304c34 _lilram = LOADADDR (.ilram) 0x00000000e5200000 _rilram = . *(.ilram) .ilram 0x00000000e5200000 0x20 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(memset.c.o) 0x00000000e5200020 . = ALIGN (0x10) 0x00000000e5007000 . = ORIGIN (xram) -.xram 0x00000000e5007000 0x0 load address 0x0000000000304bb0 - 0x0000000000304bb0 _lxram = LOADADDR (.xram) +.xram 0x00000000e5007000 0x0 load address 0x0000000000304c54 + 0x0000000000304c54 _lxram = LOADADDR (.xram) 0x00000000e5007000 _rxram = . *(.xram) 0x00000000e5007000 . = ALIGN (0x10) 0x00000000e5017000 . = ORIGIN (yram) -.yram 0x00000000e5017000 0x0 load address 0x0000000000304bb0 - 0x0000000000304bb0 _lyram = LOADADDR (.yram) +.yram 0x00000000e5017000 0x0 load address 0x0000000000304c54 + 0x0000000000304c54 _lyram = LOADADDR (.yram) 0x00000000e5017000 _ryram = . *(.yram) 0x00000000e5017000 . = ALIGN (0x10) @@ -571,8 +569,8 @@ LOAD /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/m4-nofpu/libgcc.a 0x000000008c15ff00 _gint_vbr = (ORIGIN (vbr) - 0x100) 0x000000008c161400 . = ORIGIN (rram) -.gint.data 0x000000008c161400 0xe0 load address 0x0000000000304bb0 - 0x0000000000304bb0 _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008c161400 0xe0 load address 0x0000000000304c54 + 0x0000000000304c54 _lgdata = LOADADDR (.gint.data) 0x000000008c161400 _rgdata = . *(.gint.data .gint.data.*) .gint.data 0x000000008c161400 0x8 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(exch.c.o) @@ -590,7 +588,7 @@ LOAD /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/m4-nofpu/libgcc.a *fill* 0x000000008c1614d8 0x8 0x00000000000000e0 _sgdata = SIZEOF (.gint.data) -.gint.bss 0x000000008c1614e0 0x300 load address 0x0000000000304c90 +.gint.bss 0x000000008c1614e0 0x300 load address 0x0000000000304d34 *(.gint.bss .gint.bss.*) .gint.bss 0x000000008c1614e0 0x1c /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(setup.c.o) .gint.bss 0x000000008c1614fc 0x40 /home/user/opt/sh-elf-2.32-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-cg.a(hardware.c.o) diff --git a/build-cg/platform.bin b/build-cg/platform.bin index bc98319d62c0f98e6f9f38f1bb37056e57e0cd25..aa2ef7180054a06f907fb64eca5e7b18eed1ef79 100755 GIT binary patch delta 1848 zcmcIkZ){Ul6hHTMY_EGdx_@owHrjQtL0Wj1*g?mtw6+b})vRV!maHLw9So@kSV7Sx zZ8F4#ZA@|(M6HOC5I@X7@+SJh#3djhMw8cMF2pP{OeY|IVBON}!(u({TgOQFsQ2Y} z&%b-_Irp6V?uQ?fu}{dAEhOp-@R~Y50K|Z{j?Ea6126*hS!du-PCz~|Lmu$}#LsJt zXls)ITE~DQON9{7k|faLQJ~xWKwAoc7OqvmpHQe^+0%Y_wNw4atW(`oKSU0bJM0_s z1?TCNI=BIj%(G-c57{kstnv_2#m*Q0xK4iu#Ii^x@$}J*)z=i<=i1+XOy?Bd)^)K^ z-z0xDli(v67AvZb&I5fu3{*2Bp6qssXYYe}=`Rqk9&8tHgkKjY#Xmo@w3!mx=;HYe z&-r$r=%+*F{XIi9d)aZmd3u<$$?x*_VIUPPXlr;Y{bo9xKA3(ZeIN}&cly`j33bz` zSZ0k+@=ZafVD(*2?nxct%%;6x9x1r|yTwFymB7tx@MtEJ0csC1Bd;wayMU@g%+7DE zm&KFQAf6R3iC4uNZKgBr+x4+jY|cOooV?y4Bq7nr;=DfEIU7v9M-p{i*LJ2tl2dqX zRyO=*bO@l94V|+NA($H3=tarMCy#jr+o|pkjQkLH;PipM<3!fqrGeRfbFZe3J>?Lr zaU(y>y)wHwZYWKZbSdo4IdS4?`>;Xc~H_AhWGIp6F_+ivQxbJx`WjS3fCdo1wj?X9adEUWQ*a}=WZBv z)c|$55!fZyIn>)R62k33yom520*Gz|u5rf@cyru?h&bYB#Ns~?!z?^J0yFfWzbAyc z-AE59nZ7WO*}6tC$T(s;K`sNR@uRMJHdQiALQ;5jH6dTIevNtagnurfx=98g!8y&! zvT}@7Hjz+uy)3KT>({kTsvPD}nR1322TN*hR|OKPyCAD(;4I17U|O-R2}o0=-x88! zBjsk2l*Y?dghbf&3YU5jXgOYxXa1Hnm5dN0yQr0(7-rN><$_#KEpt_mGHWt7#`>iVfEOKt`Bv%^c1SLm&P=*A4r* z(gvW0DNKtZtU&83nBDYXS!>N&vRcVj|0$`&#l{Ou4v$Rt*0yoAs4mX$wQK_F#YTEN zq(I~FlD85@37HGGu>M*lp2Qo@E?k+2ByZS3NCVTGuc>cke~{erq`4jIVYAee1s1dz zaPH0V7c4rmAdOqLs?fY3p5nZ{(h1tfmHL6w4%~YL-y2P?I{Ie^RAfxLxTT0AV{Fv+ z0Be7)c_-1Zhs~X(NdSDbsP`RwtpMo8adxJ)s*!r)imVUjC_w+9R{K3rT?BDYv3W;X ze4DAnGopwUco8eI?vdTg+-TdJdUX>8g=A2a3! z)c&7_XfDow9Hb|o{7U-d7+Y~k*7D@B(*JQ@`l+S3gwK0P@=H5N7hX@#1+20%XdQN~ p-jNrVX;w!Y^BrDR16}(N=!O-t$(<9j`usqi^|rPUJNvHn*1y1W;W_{S delta 1818 zcmcgsUrbY182`?_MQ^Uziu7Qv;ZHKWoE7ThG-2hJI1(amMxHF4 zeE-h(?|kRn{Fq$&h)g$-NZYg^RdoQs2+%fZ(Sj6!1?fwRFpy`Eo?ax+XaLe7NEXz! z7X!3OK#`4lCSIVqmpNMg`*rh1CXGK-d*YILR$5)OY9rxO;k;%wpUv}jEk?5Hf zGjGpo8z}E!Z>&0yA$$zBxQ~~r2C^i**9Xtg>KO~ZxP10 z*Q0gwW?fnr&W5t5c?`k%#mo?H`e^|o!AP*Z=AV_r2cX63l0XHVhmDg6JlB#bpvDAH zgBj2CUDUZBR65Q#82dUeZawU62z2X?9!>DQ@>%T#;tAqpbfF!M8v)`*9_OS{iW>`X zE$+uzam5W!P_AD|b1D8V@3x0ZL96gj^&PTL6!{3IP@o5R@&u@NBtNdSB?hzwQ)$6N z_M$s4rYAXZ{Q@zKxQX}{kwPdozaf?oe**Ps5NPWQ{RJafnr{Gc6@fl{NtAWtI;WP} zf@5v;>TzQ&qBTu!0ColY;tjG)(M1xJhl~+bGY?@DyF-UVByK1Jp4742$^Tsb#^i@Cv-d^ z{Vb{XYOx004A2)cvf020F|#S74gV=)FG(<$sfi@yA=4p_w6auLIg#Y0vipR%Sh9SO z^vmweorKJ?%UixDakjrAi~rWjDBikcWiMA!0km=!6QBreQB@)HSs$%Sor*@0%5K{= zVnAaH_AS5RnQFPZo!f%qO>4f^RY3iCWd0epTy0_pY_;;WZ5>a&sNvMmN`Mcy-!@?D zo3Kp(%=7ukbK74bq=H%Ox3ze-S~S8Wm+YO`0QU}C)iMx#n5?OS$g1N=Pv>2YTkOp$ z7aQ=d0JSf(m|}$%8nig|Z!HdN{*z~R?BdboisJ(3pOa%W%9XSNrCpfMGQMyUPN*cC zUmD}Fzmp9cIU=zs*CRZjtBnVUz?K^imCOU+GfDlkd5?7G466&2ZKHcNDsSGehJw+! z(TJmJ>PIZ7x_tt>zS~;lTUA;89iaNJal64r{gbL}b1c6C2yvsy2XxCBpcTqf46L!a zJVNP<&wc+p*FXpVBRqZnds+rI3nY1v(; o*9b*Mx2<(_O$tD(@#5F6tP7~MIZrF{wGU}#2{aKW3kK%?1~vNLyZ`_I diff --git a/build-cg/platform.elf b/build-cg/platform.elf index 413d3956c9016dd68eecb7ee1b093fa26a2683fb..4108693a11be233d7e4fb493b8deb7ee10ca8190 100755 GIT binary patch delta 3104 zcmcImeN0=|6~Fg6z%wS`NBDRN;Aad0GECk@Gm1&PVi%(!*NI8-7AH7-#WZAPYXVM| zZb-Hi)>;i2jV{WN#@bY6RsLWK)ni@$h&HBV5!y1z)>ve1XeE=g&~?)I65sd9%DMGL6t{Kqvz!3WO2z##v)&3nGeKmdTW^ z)qo$5J~IPHyf!H1mQ1_w6KJ>~PsaTqUqDC)v>W#!)@W7;p-&%O#1XGwaVR?ir%LB? zr{Lfjx(K%LL1)kKi#Ck2MeYP4pQHppWF12Yk?a&AnUjbdg#eE2K_tCgC3Z-y4c4yK zOF1t6-YUGR;@^Q~73U54)$_R!F^C+y{|1RLI>QMM?uhR7>@h!{u3cX}JeTVEjYlYb)d zvo~ACM}6nSC*nVTX7yPT1(D4U4t>MhITRx|_QeKn6nE3N+4_YM#vcCx`vtnb64~Rc z_}=<=*ZbDrT>sAcg>_`;UH^0DoW5>S%(aa_Ve5h}gUx$4)wR;kR9m_~?%#9wZ&nL# z&qlMd^T^iL79x%iHR}t~aXTXV5OwH}l*Pq&7La&L{6zdreB`s-Y;EA9E74T}3rxJq zX-J_&B^}rEk+$XF$`5g(wCBO8m5}5ze0w=A{Kf1vAbnhDTXq_PE2A|Y;LL35ipOAo zulHRudxN>~;|tf`#&P~R@h`uz`mL2KSx$p(+{}(JCzor-1ul`>vl?2xtaBN{jK`1) zgUufo&`&ZN27MK~1I3kn=tmI793m`1Bm?F$1Ll&OMx-E)NItBK^g+N{q+sTU7>DSl zp(rg3lkTL&S!ydFIkF782=tH!>rhUHn^%`~V=*F)ZXlSY#xamPz!Q+$3DgYa1@Z&+ z0)dV@3Ir?1Jq$Ds^cZOKKPU>LXkvk2giT=I6arZ%)ECu}zPbjZZJY!rGe8Rod>0`- z{G@S>&gYEakkn@^!uSr2an-eREvpILEWVBsjH_Bz+XudK=MuV}<8ht4>fmcnbk6Ef zt{OwJlcu=O_xlsN=P0gwhHhaQLklWu@=No%zrr|0NAs$2N}9>jVH~Cp^BeV>i0p#} za^PQ*v4CQ1rW1u_P|g;f$8k#dV>mAL@oh{=3vAyIBJ~7nh^c-FYKXsn3XvRMN*(wd zV<&xBJb=TJy`&Z6c{*(R4IZUlVHHZJ`5J7WhvxGPSAmEy55porHbhGEsH5!59jQ%5 zWT|8?|0&J~W%F&#;03gJ(8rX3ICHzN9S9K*Or$3u`Kv}WYt@bFQgOF&=s`Y2;^~tW zcMn90f9;zXS5V&iK%bO1h@zgdwn9GaHD!2%25ST;2bK2innJuG&D0#x0lY!pV?2Y> zQ0+B_Ye9qrpzl#QZ;VQIc-wUyo|Yz#WH5M|PS$@3xgR@v3LELt(KarH5FA>>a}`c2 zgh@{9591sG{Ow z&6*u9D1^+EL=iFBW!d4EKKctsQG{sU;lt!5aGL??{}YHPe*VW!2DS&kyZ&k)M?ghJ zzWUp3|8iUUy(2T5-L{hAo*HZv%SJx z9qW9n6lNLiQ56k$=q7AgN7E)-dgBq4%lMV zVsAZUVF>sIYCU&Ap4#Sf0-l$8&z;J~Q*`E1KjTBx)?W$NcM!@2Is|2uPAcs=rQGbV gU``-fJ|M$hr3^#4M8^jz3ND49^Dxl%hvmk90apIn>;M1& delta 3078 zcmcgueN0=|6~Fh{glFs!n-Ajvv5ol%Dx~kCnZyY}*ul|Y7)%OXoZtlWO;@r~AQ`PP z*&1GjildO-C_-wrw!)qG11VH5ThTOiOktI!G0E0w#5ATJ+8hL$QBO;QV$rv3` zdcf<^x)nH5Hx4cPV{{k~MT{8?p8@#_LMouccteQSTM;9KzWBNy2kT}ehs+T;m5ei^ z;9wo~gA#mTY#qP)hk3#ztpIqBNdXY1qxB<_x{OFl6p?cfK!qBSBLyCno@5n`rQ|Zr>fA7jzMM9e0lhBs? zdz!kdf0X6Y-pYEychLmjIa2PodxC0j(OWyNlHMKp4{3XM5YcZUQn?6ygiiCvJ4(E^ zzh(ya5}B2rKzNkg$rv5HlhaP$;{$ZG|1RfdLmwQDF*yoS2AUD}(vL{ay4*Y+*`rn(dO zA>GvxfB1czuysAY9PXTSX}>=bxBl7c)FMsXdUeF9^@s1Dss+x`QnqYLPo#HkcW&QQfeWryyEX)a{ z(GgSii0`F*h+TfD3?Jx`h!LTPQ3Z8!Rv$4YL4T|dYQ+)Bd{F+5Wf?27;+vfJLqbbJZ|Cy&d`~pc$Y?K)(Ts12LTq zpiQ6`h`7~2pzH4Z7YadW?tY*NAh6+H09gR~B{|d!P}auk3>a7pRFl9D5o87OQthW} z$L?akIHb?P_)|J=C@EWL+)k)scnl>tSBb2aejkyvg@mfBKCW^X7uG$If|O&(bKTfw*3knjC16EH%^qBku*cv*~Ps4(uM3z^j#h#`Frk?b|mWTY6I z=yX;-wDGJS9HS0X1&)bBrWOv@(0FzZ){C3jPce4Th1@~hCpu3wVZ2E1n}3TVwAr!^ zZH;vVcHM%thclQFu`I#_2oR(wPeaA5N7S%;rWP5uYDI|GqsjJ z*1+0oKnW(fS=s~%aGuJ~+hV7v*A`C-?g{PPP2Z@U+MaE;u@USQL`t@3m}!BA8Z-v} z8-;?EK5_2U85Nk^B_DFNOJcZegfrA2LVPfvEjZ!yP@#I!WFJ#OexqlSIjpDCXTOC7 znmBhE^K|Q6i(wfdI3`K$qGXYrn!C4p{3N-kmRVD?>8T%ejKd!K) zy7y!@V;+%=*?X&*`J^@~i*mzKj}RX*X1NhLF^q_r9mI&9t;`7$^7^6g|IVEzga5-l zIs7SMK&p^l?62IzG*qdc?5om=!*xDP1N8+o?n&!7tttaEZsMdn8T|>0xseWE@?txUUHSyi z(cU*&4YQ!3lQnP{7HFO>z2SudC~guAD}W8X!c5Jyx58m^4`nc7$afaJ_;z!mg+R zzCgj-*qeYlu2}GS>boKsJ_XFA=zb1|H~76G-~f$*hMjI)5nQaS1M=u2Dbh`YP^rSF zvpom6L*Z@gXazo|@a3RCMSWL;2DV9VE7H%{T|zgmT40CrEfzxzFr9)eA(G>uj+Rzz zq!TScJWox2bDH#af_i-U9G+&7WlJxu@tZlg<9ng2T%@CZi-E0IR5p_g_fi(2vwr4c z$uAfR08>)LH%Ko6(=`FkteR^=nF%uImdEiA*clGGc7>mW>97^{EBr%N^mOW)mmNgc z1OwXuM8-5H5P|!{aovI^sPB3eenBVTf0NE$H*3vB)6rG|d+2QIT|*p9)W}m{FTK(b^#!WH?L^>pt~N?z z0WVflQ`MOR7+!$xxPtuy?za1sZx`}>AXN%W zmj@#r0k33LS1O(4zV=pw6{J>qtZo#}!3d4D58`HezM}-P*4tqzWF@17bF>WXu#(A@ zM;tv1Sr`I-gHCs3v!#u7Sn#5_(Q!Ey>!@>JfNKcRM*}BuBVC3zK-GgMF`}i=257U? i-X1LC>O(XtF$+@r0@{9>J5*%sXUoeR?0;}MA@pyixYoJ= diff --git a/build-cg/src/collide.c.o b/build-cg/src/collide.c.o index c73be1324cb109cf7fa1bb5d0dbca31c799b526e..0796c81bb756a7d3b5f37c1014ded5e82b1ab7b2 100644 GIT binary patch delta 12 TcmbQjHid0MD5K=YuzgGb8P)^) delta 12 TcmbQjHid0MC?ns-uzgGb8J`32 diff --git a/build-cg/src/draw.c.o b/build-cg/src/draw.c.o index 7515fe0736ac8dccd8f71ebb138ee0f320fbf6e0..e19f2b88bf1491afeb4260629319b5daa70d8ee8 100644 GIT binary patch delta 293 zcmZqRn7}bXnQ_HL6=hY4hYb2cCI2t-mi{;KF^x%cP7f{3K|hnlg({Ah4BemVS^U-VzU6+) z`Ih}H>s#hG2JVb+SGlfmny%3oGMRIY!!*W`+r(%6lf+L&Oxj9Gi;Gy+-_ucIjAJ;# z00i~_|No!F*vuF+xrNc1H3lfsGWiH&ykP(X13M!~0T6^RFmS-w5ey8RF!mKB_MOQg zOwEiBCf{IEW;B@mhe@4LWU>k~i1Y!IB|uVR@*E)fV)7AYbMUfW;k zo@o7_i=wtZ2`wE4y&@gOz0ygOD>)J-cNFw9SzM^%c*)THv7W_WE$>_Ix14X;-?F}C zeq-Ry_@*zECY-uBWwL3EAGe9m`lpGXikP&Ok`@=StiP|L#BhWG2qp_KHZz7yp2BF& z8Up0jOuoVxZ|K3mz|IJg1p*%i1`ZfIfPsM%#y)|>J~KImshRP@S5S~q2ZL0^X2!aYZh}0j3w)CQ>LeVM|FDiI4r0s%-#!7dQ_T(ez$rte@ zJbLlwOZWsjlkCP=QuXRbCNtm6x09XS+#R$Jg(Dz_fNhEs3FnP?3F@Ju3`HpP+8amr zIsfz}^O$|jGkZ@0KOvro)Aht)jWs9Ef_SF*fsFUUvv5DY d#sZn$8->mVz1GPrxEG^Dmeg^tV=fqkx=+Vvc*Ot! delta 266 zcmaFEae;k;GNZ#p6*Vq~BMeY5xsy@4-oQW)3DBLVWl)UAdIMxIc@v}h#`p#3O;4C#fixqC4FGx( BGwA>T diff --git a/build-cg/src/main.c.o b/build-cg/src/main.c.o index 51a1f366d268e72986ea7d3c1618ff3ffe027dde..b2790a13658fdeba5d16962b02d1bb678c427a17 100644 GIT binary patch delta 342 zcmaFBb%SeyGUI}YDgk2tN)v3&>O8cv9xYZPAs{uE5dDl-ZZrT*-Jr z;<-V{$F$F(pUQX~xJ~9LaP%_;el(mTFL+TX^>fPSQf5c)5+*P1CnZ2VXCE+3XSc8M zSIha9{VnTT<~IiJjBkw0ISj3nH!>?t_G8@0_+S##`@}sA3|x#15O9Ejfg8p?!oa`- zW1nDP;DxczFfj1J*cTWWIAH863=I4*_6-IG0T}zvP?vxxun7Q)=UpuT delta 371 zcmcb?^?+-FGUJMgDgpKS*Zh_0m((xG_}tLc&|L9Df?0y)f`$Y46NZZ#PZ&}^J93xu zTvSW@ocg(pqm(5D$S>iEYL02CV!Wu7dN{l#Ww9f7Sn~yin+gux44fAfqM9AJV_K%@ zdIEV098bzTxvh6)Z&%>xWy;-`ySbL}g2Z!!kmj_{p)F-R4%{Y|cN93fnF5;)???z= z6i)q|^0|~5Xa$oe_mdK!rn3(i>SO9-{MB;5<$TNjmh~<38v}R7H-=UQ&dCdzRVRBg zu48;L`3K|s#3Kw0T#O75aDst>8^%7vz`z4zUtnP1g|V+NFz~_HHy9W=VC*{#4E!+m z0|o{G82ia&59ZyB4<@s)R0C~nU{Pj#GkFP%I%B}(Ge9zB@)sakGFgUIT{Hsd2w$j6 IKor;n0D3cNzyJUM diff --git a/levels.lua b/levels.lua index 0b871a4..94088ae 100644 --- a/levels.lua +++ b/levels.lua @@ -1,18 +1,18 @@ levels = {[[ -00000000000000 -0............0 -0............0 -0............0 -0............0 -0............0 -0............0 -0............0 -0............0 -0............0 -0............0 -0s...........0 -0............0 -00000000000000 +......................... +.00000000000000000000000. +.0.....................0. +.0.....................0. +.0.....................0. +.0.....................0. +.0.....................0. +.0.....................0. +.0.....................0. +.0.....................0. +.0s....................0. +.0.....................0. +.00000000000000000000000. +......................... ]] } diff --git a/platform.g3a b/platform.g3a index 49398c8928340449b454f93740ac0dc3df5bb60c..6b886b2aacc23d1702bee7b4b24464728b759321 100644 GIT binary patch delta 1932 zcmcIkZ%k8H6hHS><&{nZgi;6E0ty<`UbYg->}G4*xYQbI=q3q`L01%Kx2P0EC2JQD znG~73jk?(>i^eFjvE(u5qGlvIXO=B#Ge#CeCN5>_+y^P7VGFT4?E}QbkK29u-E+^s zd(J)QzU%*+yYdhBQg_ew-VfV8>G(PJ1i#iNvDmur7r?Bsxx18*r~F0@`yxfovPq@{ zu4|7~-0n+aLOPB(nFOmPp?>F!u)etk@1Epco&?x<+U zGRXF2)i7uCAYUH~@$MM&?#uR!1AWZ}G}W(etu?BTKLqvpKS6zYSB3hP>n-)5`j1an zmgj}!p2^cIUbR-Yw9$@*ZFLU2$DkS}ohtQ$>RaV`$12t;ybQjdZt|>AG>u*4TqV`Vqq+(hDHPj~d6>(0iT4DY!h@gj`^4-lF0G z+gM0)o3ulSGZcwt3o%yuKuA)vF(@%DU$$XTqAzl$i)YBuv#|H>B6~=3AA*t*I8Nd^ z7#6il?84CdUlS5${^lYQ7W$hdgt*zw7Nc|$=t8_8Fa9N@9%6*3*tynxoNu@8AVEeC zuOUIfb-0RKZ1c%8oIuMcQan@HW2AWgvM+%yPzd1MBH{0uoThRI{2pM9&j&F&d zS&xq4tnX~b-{)rM4lb<#sB#F?q6iJp+zh7s=+TT+6W7G0f|i{knP{x)nsRumdf+eT z7Naj^1fic>eFzs7%% zgn9T>1=d3w$R`ub5m4gXlvsBKvdDzcA1IZedg9Cx&e9~bbTxBnHlVZ;_x9s^lbWcG z;%vKw^aWEUe99FVH30xNP+^ zgMEG}+e4?u>eciaf#QBed)J-Qpn?65ADVoGJ&mXh>pIr+-TuM&ir@e&W zH|t3aUQcruR#_Z07rU0PpJr!hTt*A0J3J!>y7V#76|?v}Q-X=hrw6WC)73RZ$F5wx I!*!Sb3(hnah5!Hn delta 1902 zcmcgseN0nV6hHU9s;@qV<)ftz#Zvqr>s+r}Q5-XAY0c>91_n2X_76k~IB-F}MEB8d ztqi3M<|R%C*<2t-O(Q06o5rw>M7Quqm$Vrgw~&cTiCg3kT$hF|M0VOI$o9wn+&2yR@Zbiw)12K!CE+$hT*2RFTrh)Dl$Jx&Uhga`6l<0p}yXV5{9ga$0 zC+$w}Z0^piVn>8Z*4fy@<%f<6zd_f7xQ91l2V)Jf`q=BS1F^U-V`@#BYp|N-IbRV? zj^U|&zc+CPebr!-V))L}dbkmff!PKbZPzT1vq~p(v~P2d89OGyc*=Or_@(hX={riode`-G zU-h6xe9aru{irjGpbY8uc+H~I*SFb@oKA?e*~Nlu^;dL4H+S&sgVNh1q;=n;yS+8h zSAA_sX3;dE6S}xv-YpZ_v~Zd$S{-fWF$8B9BQ3b-`$=#+-OiGY|I8eYffBO|0u`_y zRtzEVTvGx-HDf^4T0GOYP-nio&e*Y4Q&-lrVV`xYqcUy({xQB*I&$O$u{g0aD$tJl zH2{7MkA1RT<<~63c~t}UO1@t`kMi`{Fc;!)@@7MIDk$UpBYml4dsF1yxP@iu0Q2)e zt)4`?(n255LflFr9ZJIQ8DshH7mzWj<^8=J zDPp1HnM5T`AHPFLJ_~j=lLpD`FC%1}^>u$k{A~9JQT!M6c=6T+duq9qETHSgaRU^A zCCW}>wv+c4rKY$hE|tuzpQzDThjmLVc&wV~E8*6nc;$kxMHNsx9+`cV&Gcoka+WLg ze^mO&iyTf49S?Bw%yl)Ez5vs-k1pMhbooXWnG1VUCIIl6r1tTI zN4j~G?INo;(VYsJ*Y1`>L8o7%!B)*^KupTImjpI&QJ-v^liBneK+~_{a&->156QAM zzQhb5_%#_epljQKX2qXkVA}(kZc3k7GX8gND{cOd@O0^Tlm-?HR8nJLjxbL^G1zb^ zNov1lB`yKzPGQl8W@D9d@)!99A}*tw7Am?R1)%Hk;^)pT3aI{t1Ra+z45XQEq=1;1 KbL1zkqvCHwq7`QV diff --git a/src/collide.c b/src/collide.c index cba67db..c46ca11 100644 --- a/src/collide.c +++ b/src/collide.c @@ -1,5 +1,5 @@ #define PLAYER_SIDES 11 -#define LEVEL_WIDTH 14 +#define LEVEL_WIDTH 25 char collide(int x, int y, char level[], char tile) { diff --git a/src/draw.c b/src/draw.c index a1a22b2..1c89dff 100644 --- a/src/draw.c +++ b/src/draw.c @@ -2,7 +2,8 @@ #define PLAYER_SIDES 11 #define BG_COLOR 0 -#define LEVEL_WIDTH 14 +#define LEVEL_WIDTH 25 +#define DRAW_OFFSET -2 extern image_t img_player; //player texture, 24x24 @@ -10,9 +11,10 @@ void draw_player(int old_x, int old_y, int x, int y) { if (old_x != x || old_y != y) { - drect(old_x * 2, old_y * 2, (old_x + PLAYER_SIDES) * 2 + 1, - (old_y + PLAYER_SIDES) * 2 + 1, BG_COLOR); - dimage(x * 2, y * 2, &img_player); + drect(old_x * 2 + DRAW_OFFSET, old_y * 2 + DRAW_OFFSET, + (old_x + PLAYER_SIDES) * 2 + 1 + DRAW_OFFSET, + (old_y + PLAYER_SIDES) * 2 + 1 + DRAW_OFFSET, BG_COLOR); + dimage(x * 2 + DRAW_OFFSET, y * 2 + DRAW_OFFSET, &img_player); } } @@ -22,12 +24,12 @@ void draw_level(char level[], int *player_x, int *player_y) unsigned int i = 0; unsigned int x = 0; unsigned int y = 0; - while (i != 14*14) + while (i != LEVEL_WIDTH*14) { switch (level[i]) { case '0': - dimage(x * 2, y * 2, &img_ground); + dimage(x * 2 + DRAW_OFFSET, y * 2 + DRAW_OFFSET, &img_ground); break; case 's': *player_x = x + 2; diff --git a/src/levels.c b/src/levels.c index 3d05718..1242f61 100644 --- a/src/levels.c +++ b/src/levels.c @@ -4,7 +4,7 @@ void set_level(unsigned char level_id, char *level) { switch (level_id) { case 0: - memcpy(level, "000000000000000............00............00............00............00............00............00............00............00............00............00s...........00............000000000000000", 196); + memcpy(level, "..........................00000000000000000000000..0.....................0..0.....................0..0.....................0..0.....................0..0.....................0..0.....................0..0.....................0..0.....................0..0s....................0..0.....................0..00000000000000000000000..........................", 350); break; } } diff --git a/src/main.c b/src/main.c index 0c6c3af..0a703c4 100644 --- a/src/main.c +++ b/src/main.c @@ -7,7 +7,7 @@ void jump_test(char *jump_pressed, char *jump_buffer); //test if jump pressed int main(void) { - char level[13*13]; + char level[14*25]; unsigned char level_id = 0; char jump_pressed = 0; //avoid holding jump char jump_buffer = 0; //jump buffer, last 3 frames