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 bc98319..aa2ef71 100755 Binary files a/build-cg/platform.bin and b/build-cg/platform.bin differ diff --git a/build-cg/platform.elf b/build-cg/platform.elf index 413d395..4108693 100755 Binary files a/build-cg/platform.elf and b/build-cg/platform.elf differ diff --git a/build-cg/src/collide.c.o b/build-cg/src/collide.c.o index c73be13..0796c81 100644 Binary files a/build-cg/src/collide.c.o and b/build-cg/src/collide.c.o differ diff --git a/build-cg/src/draw.c.o b/build-cg/src/draw.c.o index 7515fe0..e19f2b8 100644 Binary files a/build-cg/src/draw.c.o and b/build-cg/src/draw.c.o differ diff --git a/build-cg/src/levels.c.o b/build-cg/src/levels.c.o index b299fef..482a1d0 100644 Binary files a/build-cg/src/levels.c.o and b/build-cg/src/levels.c.o differ diff --git a/build-cg/src/main.c.o b/build-cg/src/main.c.o index 51a1f36..b2790a1 100644 Binary files a/build-cg/src/main.c.o and b/build-cg/src/main.c.o differ 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 49398c8..6b886b2 100644 Binary files a/platform.g3a and b/platform.g3a differ 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